diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
index 7300c28..ae23eb4 100644
--- a/.github/workflows/nix.yml
+++ b/.github/workflows/nix.yml
@@ -5,7 +5,7 @@ on:
     branches: [ "main" ]
   push:
     branches: [ "main" ]
-    tags: [ "*-sgx-*" ]
+    tags: [ "*" ]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -121,6 +121,12 @@ jobs:
           docker tag "${{ steps.build.outputs.IMAGE_TAG }}" matterlabsrobot/"${{ steps.build.outputs.IMAGE_NAME }}:latest"
           docker push matterlabsrobot/"${{ steps.build.outputs.IMAGE_NAME }}:latest"
 
+      - name: Tag container with tag
+        if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
+        run: |
+          docker tag "${{ steps.build.outputs.IMAGE_TAG }}" matterlabsrobot/"${{ steps.build.outputs.IMAGE_NAME }}:$GITHUB_REF_NAME"
+          docker push matterlabsrobot/"${{ steps.build.outputs.IMAGE_NAME }}:$GITHUB_REF_NAME"
+
       - name: Generate build ID for Flux Image Automation
         id: flux
         if: ${{ github.event_name == 'push' && !startsWith(github.ref, 'refs/tags') }}