diff --git a/toolchain/Dockerfile b/toolchain/Dockerfile
index 3f75538..32a0cfd 100644
--- a/toolchain/Dockerfile
+++ b/toolchain/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:buster-slim
+FROM debian/eol:buster-slim
 ENV DEBIAN_FRONTEND noninteractive
 
 ENV TZ=America/New_York
@@ -39,4 +39,4 @@ RUN cat ./setup-env.sh >> .bashrc
 VOLUME /root/workspace
 WORKDIR /root/workspace
 
-CMD ["/bin/bash"]
\ No newline at end of file
+CMD ["/bin/bash"]
diff --git a/toolchain/makefile b/toolchain/makefile
index 102a27e..47babe4 100644
--- a/toolchain/makefile
+++ b/toolchain/makefile
@@ -16,7 +16,7 @@ NORM=$(shell tput sgr0)
 ifeq ($(CONTAINER_NAME),)
 shell: .build
 	$(info $(BOLD)Starting $(TOOLCHAIN_NAME)...$(NORM))
-	docker run -it --rm -v "$(WORKSPACE_DIR)":/root/workspace $(TOOLCHAIN_NAME) /bin/bash
+	docker run -it --rm -v "$(WORKSPACE_DIR)":/root/workspace $(TOOLCHAIN_NAME) /bin/bash -c "git config --global --add safe.directory '*' && exec bash"
 else
 shell:
 	$(info $(BOLD)Connecting to running $(TOOLCHAIN_NAME)...$(NORM))