diff --git a/apps/docker/Dockerfile b/apps/docker/Dockerfile
index a0b02e746..fca5ec078 100644
--- a/apps/docker/Dockerfile
+++ b/apps/docker/Dockerfile
@@ -18,6 +18,9 @@ LABEL description="AC base image for dev containers"
 
 ENV DOCKER=1
 
+# Ensure ac-dev-server can properly pull versions
+ENV GIT_DISCOVERY_ACROSS_FILESYSTEM=1
+
 # set timezone environment variable
 ENV TZ=Etc/UTC
 
@@ -34,6 +37,9 @@ RUN apt-get update && apt-get install -y gdb gdbserver git dos2unix lsb-core sud
   libncurses5-dev ccache \
   && rm -rf /var/lib/apt/lists/*
 
+# Ensure git will work with the AzerothCore source directory
+RUN git config --global --add safe.directory /azerothcore
+
 # change timezone in container
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone && dpkg-reconfigure --frontend noninteractive tzdata