diff --git a/.woodpecker.yml b/.woodpecker.yml
index 7c2da76..673ef09 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -31,29 +31,31 @@ steps:
   package-targz:
     image: alpine
     commands: |
-      tar czf $${CI_REPO_NAME}.tar.gz --directory=$${CI_WORKSPACE}/pkg .
+      tar czf $${CI_REPO_NAME}-$${CI_COMMIT_TAG}.tar.gz --directory=$${CI_WORKSPACE}/pkg .
 
   publish:
     image: woodpeckerci/plugin-gitea-release
     settings:
       base_url: https://git.snaile.de
       files:
-        - "${CI_REPO_NAME}.tar.gz"
-        - "${CI_REPO_NAME}.xbps"
+        - "${CI_REPO_NAME}-$${CI_COMMIT_TAG}.tar.gz"
       api_key:
-        from_secret: GITEA_RELEASE_KEY
+        from_secret: gitea_release
       target: main
 
   publish-xbps:
     image: alpine
+    environment:
+      - XBPS_TARGET_ARCH="x86_64"
     secrets: 
-      - source: XBPS_SIGNING_KEYPHRASE
+      - source: xbps_pem_passphrase
         target: XBPS_PASSPHRASE
     volumes:
-      - /srv/www:/target
-      - /etc/woodpecker.pem:/etc/privatekey.pem:ro
+      - /srv/xbps:/target
+      - /etc/woodpecker/:/etc/woodpecker:ro
     commands: |
+      export XBPS_TARGET_ARCH
       tar xvf xbps-static-latest.x86_64-musl.tar.xz -C /
-      mv $${CI_REPO_NAME}.xbps /target
-      xbps-rindex -a /target/$${CI_REPO_NAME}.xbps
-      xbps-rindex --sign-pkg --signedby "$${CI_COMMIT_AUTHOR} <${CI_COMMIT_AUTHOR_EMAIL}>" --privkey /etc/privkey.pem /target/$${CI_REPO_NAME}.xbps
+      mv $${CI_REPO_NAME}-$${CI_COMMIT_TAG}.x86_64.xbps /target
+      xbps-rindex -daf /target/$${CI_REPO_NAME}-$${CI_COMMIT_TAG}.x86_64.xbps
+      xbps-rindex -dS --signedby "$${CI_COMMIT_AUTHOR} <$${CI_COMMIT_AUTHOR_EMAIL}>" --privkey /etc/woodpecker/privkey.pem /target/$${CI_REPO_NAME}-$${CI_COMMIT_TAG}.x86_64.xbps