diff --git a/roles/forgejo/templates/docker-stack.yml.j2 b/roles/forgejo/templates/docker-stack.yml.j2
index 4704ea2..5eb9756 100644
--- a/roles/forgejo/templates/docker-stack.yml.j2
+++ b/roles/forgejo/templates/docker-stack.yml.j2
@@ -86,7 +86,7 @@ services:
 
 {% if forgejo_use_ci %}
   wp-server:
-    image: woodpeckerci/woodpecker-server:latest
+    image: woodpeckerci/woodpecker-server:v3
     networks:
       - "{{ docker_swarm_public_network_name }}"
       - backend
@@ -120,11 +120,12 @@ services:
 {% endif %}
 
   wp-agent:
-    image: woodpeckerci/woodpecker-agent:latest
+    image: woodpeckerci/woodpecker-agent:v3
     networks:
       - backend
     command: agent
     volumes:
+      - woodpecker-agent-config:/etc/woodpecker
       - /var/run/docker.sock:/var/run/docker.sock
     environment:
       - WOODPECKER_SERVER=wp-server:9000
@@ -135,6 +136,7 @@ volumes:
   data:
   db:
   woodpecker:
+  woodpecker-agent-config:
 
 networks:
   "{{ docker_swarm_public_network_name }}":