diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml
index 217fd9a..a1b9b86 100644
--- a/.woodpecker/build.yaml
+++ b/.woodpecker/build.yaml
@@ -29,8 +29,8 @@ steps:
         org.opencontainers.image.licenses: EUPL-1.2
         org.opencontainers.image.ref.name: kokuwaio/buildctl
         org.opencontainers.image.version: v0.21.0
-#    when:
-#      event: pull_request
+    when:
+      event: pull_request
 
   push:
     image: kokuwaio/buildctl:v0.21.0
@@ -39,8 +39,11 @@ steps:
       <<: *settings
       name:
         - registry.kokuwa.io/buildctl:latest
+        - registry.kokuwa.io/buildctl:v0.21.0
         - docker.io/kokuwaio/buildctl:latest
+        - docker.io/kokuwaio/buildctl:v0.21.0
         - ghcr.io/kokuwaio/buildctl:latest
+        - ghcr.io/kokuwaio/buildctl:v0.21.0
       auth:
         "https://index.docker.io/v1/":
           username: {from_secret: docker_io_username}
@@ -51,6 +54,6 @@ steps:
         registry.kokuwa.io:
           username: {from_secret: kokuwa_io_username}
           password: {from_secret: kokuwa_io_password}
-#    when:
-#      event: [manual, push]
-#      branch: main
+    when:
+      event: [manual, push]
+      branch: main
diff --git a/.woodpecker/dockerhub.yaml b/.woodpecker/dockerhub.yaml
index 47cd9df..4e29429 100644
--- a/.woodpecker/dockerhub.yaml
+++ b/.woodpecker/dockerhub.yaml
@@ -13,5 +13,5 @@ steps:
       repository: kokuwaio/buildctl
       description-short: A Woodpecker CI plugin for buildctl to build container images using a remote builtkitd instance.
       categories: [developer-tools, integration-and-delivery]
-      username: {from_secret: DOCKERHUB_USERNAME}
-      password: {from_secret: DOCKERHUB_PASSWORD}
+      username: {from_secret: dockerhub_username}
+      password: {from_secret: dockerhub_password}
diff --git a/renovate.json b/renovate.json
index 6ea399d..a7a4671 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,41 +1,6 @@
 {
 	"$schema": "https://docs.renovatebot.com/renovate-schema.json",
-	"labels": ["renovate", "renovate-manager/{{{manager}}}", "renovate-type/{{{updateType}}}"],
-	"assignees": ["renovate"],
-	"reviewers": ["stephan.schnabel"],
-	"dependencyDashboard": true,
-	"dependencyDashboardLabels": ["renovate"],
-	"dependencyDashboardApproval": false,
-	"dependencyDashboardAutoclose": false,
-	"dependencyDashboardOSVVulnerabilitySummary": "all",
-	"osvVulnerabilityAlerts": true,
-	"separateMajorMinor": true,
-	"separateMinorPatch": true,
-	"separateMultipleMinor": true,
-	"separateMultipleMajor": true,
-	"pinDigests": true,
-	"automerge": true,
-	"automergeStrategy": "fast-forward",
-	"rebaseWhen": "behind-base-branch",
-	"platformAutomerge": true,
-	"packageRules": [
-		{
-			"matchUpdateTypes": ["digest"],
-			"dependencyDashboardApproval": false,
-			"automergeType": "branch"
-		},{
-			"matchUpdateTypes": ["patch"],
-			"dependencyDashboardApproval": false
-		},{
-			"matchUpdateTypes": ["minor"],
-			"dependencyDashboardApproval": false,
-			"automerge": false
-		},{
-			"description": "Do not pin woodpecker images.",
-			"matchManagers": ["woodpecker"],
-			"pinDigests": false
-		}
-	],
+	"extends": ["local>infrastructure/renovate-config", ":reviewer(stephan.schnabel)"],
 	"customManagers": [
 		{
 			"customType": "regex",
@@ -58,4 +23,4 @@
 			"packageNameTemplate": "jqlang/jq"
 		}
 	]
-
+}