diff --git a/roles/alpina/templates/apps/gitea/.env.gitea.j2 b/roles/alpina/templates/apps/gitea/.env.gitea.j2
index 09d6d1f..c179ab2 100644
--- a/roles/alpina/templates/apps/gitea/.env.gitea.j2
+++ b/roles/alpina/templates/apps/gitea/.env.gitea.j2
@@ -25,5 +25,7 @@ GITEA__security__INTERNAL_TOKEN={{ internal_token }}
 
 GITEA__oauth2__JWT_SECRET={{ jwt_secret }}
 
+GITEA__webhook__ALLOWED_HOST_LIST="external,woodpecker.{{ domain }}"
+
 # Indexer
 GITEA__indexer__REPO_INDEXER_ENABLED=true
diff --git a/roles/alpina/templates/apps/woodpecker/compose.yml.j2 b/roles/alpina/templates/apps/woodpecker/compose.yml.j2
index 3f602c8..409de72 100644
--- a/roles/alpina/templates/apps/woodpecker/compose.yml.j2
+++ b/roles/alpina/templates/apps/woodpecker/compose.yml.j2
@@ -5,7 +5,7 @@ networks:
 
 services:
   woodpecker-server:
-    image: woodpeckerci/woodpecker-server:latest
+    image: woodpeckerci/woodpecker-server:v3
     container_name: woodpecker_server
     labels:
       - {{ helpers.traefik_labels('woodpecker', port='8000') | indent(6) }}
@@ -22,7 +22,7 @@ services:
       - WOODPECKER_AGENT_SECRET={{ woodpecker_agent_secret }}
 
   woodpecker-agent:
-    image: woodpeckerci/woodpecker-agent:latest
+    image: woodpeckerci/woodpecker-agent:v3
     container_name: woodpecker_agent
     restart: unless-stopped
     depends_on: