diff --git a/.woodpecker.yml b/.woodpecker.yml
index e158a21..2c0ef26 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -18,7 +18,7 @@ steps:
     depends_on:
 
   - name: docker-build-only
-    image: thegeeklab/drone-docker-buildx
+    image: woodpeckerci/plugin-docker-buildx
     privileged: true
     settings:
       repo: git.faercol.me/polyculeconnect/polyculeconnect
@@ -34,16 +34,16 @@ steps:
           - main
 
   - name: docker-build-push
-    image: thegeeklab/drone-docker-buildx
+    image: woodpeckerci/plugin-docker-buildx
     privileged: true
     settings:
       repo: git.faercol.me/polyculeconnect/polyculeconnect
       registry: git.faercol.me
       tags: latest
       username:
-        from_secret: GIT_USERNAME
+        from_secret: git_username
       password:
-        from_secret: GIT_PASSWORD
+        from_secret: git_password
       platforms:
         - linux/amd64
         # - linux/arm64
@@ -69,7 +69,7 @@ depends_on:
 
 steps:
   - name: docker-push-tag
-    image: thegeeklab/drone-docker-buildx
+    image: woodpeckerci/plugin-docker-buildx
     privileged: true
     settings:
       registry: git.faercol.me
@@ -79,10 +79,10 @@ steps:
         - linux/amd64
         # - linux/arm64
       username:
-        from_secret: GIT_USERNAME
+        from_secret: git_username
       password:
-        from_secret: GIT_PASSWORD
+        from_secret: git_password
 
 trigger:
   event:
-    - tag
\ No newline at end of file
+    - tag