diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index 00bcdb6..7814835 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -54,6 +54,9 @@ jobs:
     name: Build nginx image
     runs-on: ubuntu-latest
     needs: build-frontend
+    env:
+      BUILDER_COMMIT: ${{ needs.build-frontend.outputs.builder_commit }}
+      UI_COMMIT: ${{ needs.build-frontend.outputs.ui_commit }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -74,7 +77,7 @@ jobs:
           images: code.kruzya.dev/${{ gitea.repository }}/nginx
           tags: |
             type=sha,format=short
-            type=raw,value=ui-${{ steps.git-parse.outputs.PULP_UI_COMMIT }}
+            type=raw,value=ui-${{ env.UI_COMMIT }}
       - name: Build nginx image
         uses: docker/build-push-action@v6
         with:
@@ -84,7 +87,5 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
-            BASE_IMG=code.kruzya.dev/crazyhackgut/pulp-ui-cri/base-frontend:sha-${{ needs.build-frontend.outputs.builder_commit }}
-
-# TODO: add build nginx image
+            BASE_IMG=code.kruzya.dev/crazyhackgut/pulp-ui-cri/base-frontend:sha-${{ env.BUILDER_COMMIT }}