diff --git a/.woodpecker/binary-build.yaml b/.woodpecker/binary-build.yamldisabled
similarity index 95%
rename from .woodpecker/binary-build.yaml
rename to .woodpecker/binary-build.yamldisabled
index 6b34432..6426486 100644
--- a/.woodpecker/binary-build.yaml
+++ b/.woodpecker/binary-build.yamldisabled
@@ -15,13 +15,13 @@ depends_on:
   - lint
 
 steps:
-  build:
+  - name: build-and-upload
     secrets:
       - FORGEJO_APIKEY
     image: golang:1.20-alpine
     environment:
-      - APP_NAME=humble-bot
-      - FORGE=https://git.lauka.net
+      APP_NAME: humble-bot
+      FORGE: https://git.lauka.net
     commands:
       - apk add --update --no-cache xz curl jq
       - go mod download
@@ -57,4 +57,4 @@ steps:
         --header "Authorization: token $FORGEJO_APIKEY" \
         --header 'Content-Type: multipart/form-data' -s -S \
         --form "attachment=@$APP_NAME-${CI_COMMIT_TAG##v}-${GOOS}-${GOARCH}${GOARM}.xz.sha256;type=application/octet-stream" \
-        --fail-with-body
\ No newline at end of file
+        --fail-with-body
diff --git a/.woodpecker/docker-build.yamldisabled b/.woodpecker/docker-build.yamldisabled
deleted file mode 100644
index 44c3d63..0000000
--- a/.woodpecker/docker-build.yamldisabled
+++ /dev/null
@@ -1,30 +0,0 @@
-steps:
-  docker-deploy-push:
-    when:
-      - event: push
-        branch: main
-    image: woodpeckerci/plugin-docker-buildx
-    settings:
-      dockerfile: Dockerfile
-      platforms: linux/arm/v7,linux/arm64/v8,linux/amd64
-      repo: git.lauka.net/lauralani/humble-bot
-      registry: codeberg.org
-      tags: latest
-      username: lauralani
-      password:
-        from_secret: FORGEJO_APIKEY
-
-  docker-deploy-tag:
-    when:
-      event:
-        - tag
-    image: woodpeckerci/plugin-docker-buildx
-    settings:
-      dockerfile: Dockerfile
-      platforms: linux/arm/v7,linux/arm64/v8,linux/amd64
-      repo: git.lauka.net/lauralani/humble-bot
-      registry: codeberg.org
-      auto_tag: true
-      username: lauralani
-      password:
-        from_secret: FORGEJO_APIKEY
\ No newline at end of file
diff --git a/.woodpecker/docker-deploy.yaml b/.woodpecker/docker-deploy.yaml
new file mode 100644
index 0000000..854e7a7
--- /dev/null
+++ b/.woodpecker/docker-deploy.yaml
@@ -0,0 +1,48 @@
+steps:
+  - name: docker-deploy-push
+    depends_on:
+      - lint
+    when:
+      - event: push
+        branch: main
+    image: woodpeckerci/plugin-docker-buildx
+    settings:
+      dockerfile: Dockerfile
+      platforms: linux/arm/v7,linux/arm64/v8,linux/amd64
+      repo: adoralaura/humble-bot
+      registry: https://index.docker.io/v1/
+      tags: latest
+      username: adoralaura
+      password:
+        from_secret: dockerhub_token
+
+  - name: docker-deploy-tag
+    when:
+      - event: tag
+    image: woodpeckerci/plugin-docker-buildx
+    settings:
+      dockerfile: Dockerfile
+      platforms: linux/arm/v7,linux/arm64/v8,linux/amd64
+      repo: adoralaura/humble-bot
+      registry: https://index.docker.io/v1/
+      auto_tag: true
+      username: adoralaura
+      password:
+        from_secret: dockerhub_token
+  
+  - name: docker-deploy-unstable
+    depends_on:
+      - lint
+    when:
+      - event: push
+        branch: main
+    image: woodpeckerci/plugin-docker-buildx
+    settings:
+      dockerfile: Dockerfile
+      platforms: linux/arm64/v8,linux/amd64
+      repo: adoralaura/humble-bot
+      registry: https://index.docker.io/v1/
+      tags: unstable
+      username: adoralaura
+      password:
+        from_secret: dockerhub_token
diff --git a/.woodpecker/docker-unstable.yaml b/.woodpecker/docker-unstable.yaml
deleted file mode 100644
index 8a45a4c..0000000
--- a/.woodpecker/docker-unstable.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-steps:
-  docker-deploy-unstable:
-    when:
-      - event: push
-        branch: main
-    image: woodpeckerci/plugin-docker-buildx
-    settings:
-      dockerfile: Dockerfile
-      platforms: linux/arm64/v8,linux/amd64
-      repo: adoralaura/humble-bot
-      registry: https://index.docker.io/v1/
-      tags: unstable
-      username: adoralaura
-      password:
-        from_secret: dockerhub_token