diff --git a/.gitignore b/.gitignore
index 25e1cd3..8922b40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,7 @@
 .DS_Store
 .env
 
-/woodpecker/agent-data/
-/woodpecker/server-data/
+/woodpecker/agent/**/*.*
+!/woodpecker/agent/.gitkeep
+/woodpecker/server/**/*.*
+!/woodpecker/server/.gitkeep
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 868db81..f5a344b 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -5,9 +5,6 @@ services:
     container_name: caddy
     hostname: caddy
     restart: always
-    #    labels:
-    #      logging: promtail
-    #      logging_jobname: caddy
     cap_add:
       - NET_ADMIN
     ports:
@@ -24,20 +21,20 @@ services:
 
   woodpecker-server:
     image: woodpeckerci/woodpecker-server:v3
-    container_name: woodpecker-server
-    hostname: woodpecker-server
+    container_name: server
+    hostname: server
     env_file:
       - path: ./woodpecker/.default.env
         required: true
       - 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
-    container_name: woodpecker-agent
-    hostname: woodpecker-agent
+    container_name: agent
+    hostname: agent
     command: agent
     restart: always
     env_file:
@@ -48,6 +45,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/.gitkeep b/woodpecker/agent/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/woodpecker/server/.gitkeep b/woodpecker/server/.gitkeep
new file mode 100644
index 0000000..e69de29