diff --git a/.forgejo/regsync/regsync.yml b/.forgejo/regsync/regsync.yml
index 0a14db45..941c0f93 100644
--- a/.forgejo/regsync/regsync.yml
+++ b/.forgejo/regsync/regsync.yml
@@ -7,14 +7,14 @@ x-tags:
     tags:
       allow:
       - "latest"
-      - "v[0-9]+\\.[0-9]+\\.[0-9]+"
+      - "v[0-9]+\\.[0-9]+\\.[0-9]+(-[a-z0-9\\.]+)?"
       - "v[0-9]+\\.[0-9]+"
       - "v[0-9]+"
   main: &tags-main
     tags:
       allow:
       - "latest"
-      - "v[0-9]+\\.[0-9]+\\.[0-9]+"
+      - "v[0-9]+\\.[0-9]+\\.[0-9]+(-[a-z0-9\\.]+)?"
       - "v[0-9]+\\.[0-9]+"
       - "v[0-9]+"
       - "main"
@@ -22,7 +22,7 @@ x-tags:
     tags:
       allow:
       - "latest"
-      - "v[0-9]+\\.[0-9]+\\.[0-9]+"
+      - "v[0-9]+\\.[0-9]+\\.[0-9]+(-[a-z0-9\\.]+)?"
       - "v[0-9]+\\.[0-9]+"
       - "v[0-9]+"
       - "main"
diff --git a/.forgejo/workflows/mirror-images.yml b/.forgejo/workflows/mirror-images.yml
index 51f60e75..198832db 100644
--- a/.forgejo/workflows/mirror-images.yml
+++ b/.forgejo/workflows/mirror-images.yml
@@ -20,9 +20,9 @@ jobs:
   mirror-images:
     runs-on: ubuntu-latest
     env:
-      BUILTIN_REGISTRY_USER: ${{ secrets.BUILTIN_REGISTRY_USER }}
+      BUILTIN_REGISTRY_USER: ${{ vars.BUILTIN_REGISTRY_USER }}
       BUILTIN_REGISTRY_PASSWORD: ${{ secrets.BUILTIN_REGISTRY_PASSWORD }}
-      GITLAB_USERNAME: ${{ secrets.GITLAB_USERNAME }}
+      GITLAB_USERNAME: ${{ vars.GITLAB_USERNAME }}
       GITLAB_TOKEN: ${{ secrets.GITLAB_TOKEN }}
     steps:
       - name: Checkout repository
diff --git a/.forgejo/workflows/release-image.yml b/.forgejo/workflows/release-image.yml
index 4ecc803f..10303232 100644
--- a/.forgejo/workflows/release-image.yml
+++ b/.forgejo/workflows/release-image.yml
@@ -204,13 +204,16 @@ jobs:
           digest="${{ steps.build.outputs.digest }}"
           touch "/tmp/digests/${digest#sha256:}"
 
-      - name: Extract binary from container
+      - name: Extract binary from container (image)
+        id: extract-binary-image
         run: |
           mkdir -p /tmp/binaries
           digest="${{ steps.build.outputs.digest }}"
-          container_id=$(docker create --platform ${{ matrix.platform }} ${{ needs.define-variables.outputs.images_list }}@$digest)
-          docker cp $container_id:/sbin/conduwuit /tmp/binaries/conduwuit-${{ matrix.target_cpu }}-${{ matrix.slug }}-${{ matrix.profile }}
-          docker rm -v $container_id
+          echo "container_id=$(docker create --platform ${{ matrix.platform }} ${{ needs.define-variables.outputs.images_list }}@$digest)" >> $GITHUB_OUTPUT
+      - name: Extract binary from container (copy)
+        run: docker cp ${{ steps.extract-binary-image.outputs.container_id }}:/sbin/conduwuit /tmp/binaries/conduwuit-${{ matrix.target_cpu }}-${{ matrix.slug }}-${{ matrix.profile }}
+      - name: Extract binary from container (cleanup)
+        run: docker rm ${{ steps.extract-binary-image.outputs.container_id }}
 
       - name: Upload binary artifact
         uses: https://code.forgejo.org/actions/upload-artifact@v4