diff --git a/.dockerignore b/.dockerignore
index 7c347accc9..935dfe679b 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -8,6 +8,10 @@
 **/sed/
 **/AppVeyor/
 **/publish/
+**/Config/
+**/Dats/
+**/Logs/
+**/db-data/
 
 # files
 Dockerfile*
diff --git a/Source/ACE.Server/Command/CommandManager.cs b/Source/ACE.Server/Command/CommandManager.cs
index 756f79dedc..5fcc435fc6 100644
--- a/Source/ACE.Server/Command/CommandManager.cs
+++ b/Source/ACE.Server/Command/CommandManager.cs
@@ -50,7 +50,11 @@ public static void Initialize()
                 }
             }
 
-            if (Program.IsRunningInContainer && NonInteractiveConsole) return;
+            if (NonInteractiveConsole)
+            {
+                log.Info("ACEmulator command prompt disabled - Environment.GetEnvironmentVariable(ACE_NONINTERACTIVE_CONSOLE) was true");
+                return;
+            }
 
             var thread = new Thread(new ThreadStart(CommandThread));
             thread.Name = "Command Manager";
diff --git a/docker-compose.arm64 b/docker-compose.arm64
index e21f4b5eb6..bd2faac674 100644
--- a/docker-compose.arm64
+++ b/docker-compose.arm64
@@ -7,15 +7,17 @@ services:
     env_file:
       - docker.env
     volumes:
-      - /home/ubuntu/ace/db-data:/config
+      - ./db-data:/config
     ports:
-      - "3306:3306"
+      - "3306:3306/tcp"
     restart: unless-stopped
     healthcheck:
         test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
 
   ace-server:
-    build: .
+    build:
+      context: .
+      dockerfile: Dockerfile.arm64
     image: acemulator/ace:latest-arm64
     depends_on:
       - ace-db
@@ -23,10 +25,10 @@ services:
     env_file:
       - docker.env
     volumes:
-      - /home/ubuntu/ace/Config:/ace/Config
-      - /home/ubuntu/ace/Content:/ace/Content
-      - /home/ubuntu/ace/Dats:/ace/Dats
-      - /home/ubuntu/ace/Logs:/ace/Logs
+      - ./Config:/ace/Config
+      - ./Content:/ace/Content
+      - ./Dats:/ace/Dats
+      - ./Logs:/ace/Logs
     ports:
       - "9000-9001:9000-9001/udp"
     #restart: unless-stopped
diff --git a/docker-compose.yml b/docker-compose.yml
index 613b9e681c..671812ffdf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,9 +7,9 @@ services:
     env_file:
       - docker.env
     volumes:
-      - C:\ACE\db-data:/var/lib/mysql
+      - ./db-data:/var/lib/mysql
     ports:
-      - "3306:3306"
+      - "3306:3306/tcp"
     restart: unless-stopped
     healthcheck:
         test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
@@ -23,10 +23,10 @@ services:
     env_file:
       - docker.env
     volumes:
-      - C:\ACE\Config:/ace/Config
-      - C:\ACE\Content:/ace/Content
-      - C:\ACE\Dats:/ace/Dats
-      - C:\ACE\Logs:/ace/Logs
+      - ./Config:/ace/Config
+      - ./Content:/ace/Content
+      - ./Dats:/ace/Dats
+      - ./Logs:/ace/Logs
     ports:
       - "9000-9001:9000-9001/udp"
     #restart: unless-stopped