diff --git a/.dockerignore b/.dockerignore
index 3a396c8c..bb49c7dc 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -2,3 +2,4 @@
 **/.git
 Dockerfile*
 .*
+data/
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 26f6f920..bfa19b8b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,5 @@ yarn.lock
 # MongoDB VSCode extension playground scripts
 /database_scripts
 
-# Default Docker directories
-/static-data
-/database
+# Default Docker directory
+/data
diff --git a/docker-compose.yml b/docker-compose.yml
index b92f9c96..2628f6d2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -27,7 +27,8 @@ services:
       # APP_UNIVERSAL_POLARITY_EVERYWHERE: true
       # APP_SPOOF_MASTERY_RANK: -1
     volumes:
-      - ./static-data:/app/static/data
+      - ./data/static:/app/static/data
+      - ./data/logs:/app/logs
     ports:
       - 80:80
       - 443:443
@@ -39,4 +40,4 @@ services:
       MONGO_INITDB_ROOT_USERNAME: openwfagent
       MONGO_INITDB_ROOT_PASSWORD: spaceninjaserver
     volumes:
-      - ./database:/app/static/data
+      - ./data/database:/data/db
\ No newline at end of file