diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..cd6fff0
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,10 @@
+FROM getgrav/grav:latest
+
+# Copy custom files from Git
+COPY blueprints/ /var/www/html/user/blueprints/
+COPY plugins/ /var/www/html/user/plugins/
+COPY config/ /var/www/html/user/config/
+COPY pages/ /var/www/html/user/pages/
+
+# Fix permissions
+RUN chown -R www-data:www-data /var/www/html/user/
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 48e519a..025d2ec 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,19 +1,11 @@
 version: '3.8'
 services:
   grav-cms:
-    image: getgrav/grav:latest
+    build: .
     restart: unless-stopped
     volumes:
-      # Persistent storage for all Grav user content
-      - grav_user:/var/www/html/user
-      # Custom blueprints (mounted from host)
-      - ./blueprints:/var/www/html/user/blueprints
-      # Custom plugins
-      - ./plugins/json-export:/var/www/html/user/plugins/json-export
-      # Custom config
-      - ./config:/var/www/html/user/config
-      # Content pages
-      - ./pages:/var/www/html/user/pages
+      - grav_accounts:/var/www/html/user/accounts
+      - grav_data:/var/www/html/user/data
     environment:
       - GRAV_MULTISITE=false
     healthcheck:
@@ -23,5 +15,5 @@ services:
       retries: 3
 
 volumes:
-  grav_user:
-    driver: local
\ No newline at end of file
+  grav_accounts:
+  grav_data:
\ No newline at end of file