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