diff --git a/.gitignore b/.gitignore
index 23221c2..8922b40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,7 @@
 .DS_Store
 .env
 
-/woodpecker/agent-data/**/*.*
-!/woodpecker/agent-data/.gitkeep
-/woodpecker/server-data/**/*.*
-!/woodpecker/server-data/.gitkeep
+/woodpecker/agent/**/*.*
+!/woodpecker/agent/.gitkeep
+/woodpecker/server/**/*.*
+!/woodpecker/server/.gitkeep
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 868db81..a0a8cf0 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -32,7 +32,7 @@ services:
       - path: ./woodpecker/.env
         required: false
     volumes:
-      - ./woodpecker/server-data:/var/lib/woodpecker/
+      - ./woodpecker/server-data:/var/lib/woodpecker:rw
 
   woodpecker-agent:
     image: woodpeckerci/woodpecker-agent:v3
@@ -48,6 +48,6 @@ services:
     depends_on:
       - woodpecker-server
     volumes:
-      - ./woodpecker/agent-data:/etc/woodpecker
+      - ./woodpecker/agent-data:/etc/woodpecker:rw
       - /var/run/docker.sock:/var/run/docker.sock
 
diff --git a/woodpecker/agent-data/.gitkeep b/woodpecker/agent/.gitkeep
similarity index 100%
rename from woodpecker/agent-data/.gitkeep
rename to woodpecker/agent/.gitkeep
diff --git a/woodpecker/server-data/.gitkeep b/woodpecker/server/.gitkeep
similarity index 100%
rename from woodpecker/server-data/.gitkeep
rename to woodpecker/server/.gitkeep