diff --git a/.github/workflows/build-publish-release.yml b/.github/workflows/build-publish-release.yml
index d501e3e..b343ff5 100644
--- a/.github/workflows/build-publish-release.yml
+++ b/.github/workflows/build-publish-release.yml
@@ -42,7 +42,6 @@ jobs:
       -
         name: Build UTXORD wallet
         run: docker compose run build-wallet-utxord
-
       -
         name: Archive versioned release
         uses: thedoctor0/zip-release@0.7.1
@@ -51,71 +50,64 @@ jobs:
           directory: "./browser-extension/extension/prod"
           type: 'zip'
           filename: ../../../utxord-wallet-${{ steps.vars.outputs.tag }}.zip
+      -
+        name: Archive non-versioned release
+        uses: thedoctor0/zip-release@0.7.1
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          directory: "./browser-extension/extension/prod"
+          type: 'zip'
+          filename: ../../../utxord-wallet.zip
+
+      -
+        name: Build QA wallet
+        run: docker compose run build-wallet-qa
+      -
+        name: Archive versioned release
+        uses: thedoctor0/zip-release@0.7.1
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          directory: "./browser-extension/extension/prod"
+          type: 'zip'
+          filename: ../../../utxord-wallet-${{ steps.vars.outputs.tag }}-qa.zip
+      -
+        name: Archive non-versioned release
+        uses: thedoctor0/zip-release@0.7.1
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          directory: "./browser-extension/extension/prod"
+          type: 'zip'
+          filename: ../../../utxord-wallet-qa.zip
+
+      -
+        name: Build E2E wallet
+        run: docker compose run build-wallet-e2e
+      -
+        name: Archive versioned release
+        uses: thedoctor0/zip-release@0.7.1
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          directory: "./browser-extension/extension/prod"
+          type: 'zip'
+          filename: ../../../utxord-wallet-${{ steps.vars.outputs.tag }}-e2e.zip
+      -
+        name: Archive non-versioned release
+        uses: thedoctor0/zip-release@0.7.1
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          directory: "./browser-extension/extension/prod"
+          type: 'zip'
+          filename: ../../../utxord-wallet-e2e.zip
 
-#      -
-#        name: Archive non-versioned release
-#        uses: thedoctor0/zip-release@0.7.1
-#        if: startsWith(github.ref, 'refs/tags/')
-#        with:
-#          directory: "./browser-extension/extension/prod"
-#          type: 'zip'
-#          filename: ../../../utxord-wallet.zip
-#
-#      -
-#        name: Build QA wallet
-#        uses: adrielcodeco/docker-compose-run-action@v1
-#        with:
-#          compose-file: "./docker-compose.yml"
-#          service: build-wallet-qa
-#      -
-#        name: Archive versioned release
-#        uses: thedoctor0/zip-release@0.7.1
-#        if: startsWith(github.ref, 'refs/tags/')
-#        with:
-#          directory: "./browser-extension/extension/prod"
-#          type: 'zip'
-#          filename: ../../../utxord-wallet-${{ steps.vars.outputs.tag }}-qa.zip
-#      -
-#        name: Archive non-versioned release
-#        uses: thedoctor0/zip-release@0.7.1
-#        if: startsWith(github.ref, 'refs/tags/')
-#        with:
-#          directory: "./browser-extension/extension/prod"
-#          type: 'zip'
-#          filename: ../../../utxord-wallet-qa.zip
-#
-#      -
-#        name: Build E2E wallet
-#        uses: adrielcodeco/docker-compose-run-action@v1
-#        with:
-#          compose-file: "./docker-compose.yml"
-#          service: build-wallet-e2e
-#      -
-#        name: Archive versioned release
-#        uses: thedoctor0/zip-release@0.7.1
-#        if: startsWith(github.ref, 'refs/tags/')
-#        with:
-#          directory: "./browser-extension/extension/prod"
-#          type: 'zip'
-#          filename: ../../../utxord-wallet-${{ steps.vars.outputs.tag }}-e2e.zip
-#      -
-#        name: Archive non-versioned release
-#        uses: thedoctor0/zip-release@0.7.1
-#        if: startsWith(github.ref, 'refs/tags/')
-#        with:
-#          directory: "./browser-extension/extension/prod"
-#          type: 'zip'
-#          filename: ../../../utxord-wallet-e2e.zip
-#
-#      -
-#        name: Release
-#        uses: softprops/action-gh-release@v1
-#        if: startsWith(github.ref, 'refs/tags/')
-#        with:
-#          files: |
-#            utxord-wallet-${{ steps.vars.outputs.tag }}.zip
-#            utxord-wallet-${{ steps.vars.outputs.tag }}-qa.zip
-#            utxord-wallet-${{ steps.vars.outputs.tag }}-e2e.zip
-#            utxord-wallet.zip
-#            utxord-wallet-qa.zip
-#            utxord-wallet-e2e.zip
+      -
+        name: Release
+        uses: softprops/action-gh-release@v1
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          files: |
+            utxord-wallet-${{ steps.vars.outputs.tag }}.zip
+            utxord-wallet-${{ steps.vars.outputs.tag }}-qa.zip
+            utxord-wallet-${{ steps.vars.outputs.tag }}-e2e.zip
+            utxord-wallet.zip
+            utxord-wallet-qa.zip
+            utxord-wallet-e2e.zip