diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 915aba54e..19999bd32 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -117,4 +117,6 @@ RUN gem install rubocop
 
 ENV PATH=${HOME}/.local/bin:/opt/asdf-data/shims:/opt/asdf/bin:${PATH}
 
+RUN git config --global --add safe.directory /workspace
+
 CMD ["/bin/bash"]
diff --git a/.tool-versions b/.tool-versions
index de849c898..6df8ee5d8 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,6 +1,6 @@
 # These are used for the dev environment.
 # This should match the versions used in the built product.
 nodejs 14.18.3
-elixir ref:v1.13.4
-erlang 25.0-rc3
+elixir 1.13.4-otp-24
+erlang 24.3.4
 ruby 2.7.5