diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index bc3259d..00bcdb6 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       ui_commit: ${{ steps.git-parse.outputs.PULP_UI_COMMIT }}
-      builder_commit: ${{ steps.git-parse.outputs.SHORT_BUILDER_SHA_COMMIT }}
+      builder_commit: ${{ steps.git-parse.outputs.BUILDER_SHA_COMMIT }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -16,10 +16,13 @@ jobs:
       - name: Fetch commit hash for Pulp UI repository
         id: git-parse
         run: |
-          echo "PULP_UI_COMMIT=$(git -C vendor/pulp-ui rev-parse HEAD)" >> $GITEA_OUTPUT
+          FULL_PULP_UI_COMMIT="$(git -C vendor/pulp-ui rev-parse HEAD)"
+          SHORT_PULP_UI_COMMIT="${FULL_PULP_UI_COMMIT:0:7}"
+          echo "PULP_UI_COMMIT=${SHORT_PULP_UI_COMMIT}" >> $GITEA_OUTPUT
+
           FULL_BUILDER_SHA="${{ gitea.sha }}"
           SHORT_BUILDER_SHA="${FULL_BUILDER_SHA:0:7}"
-          echo "SHORT_BUILDER_SHA_COMMIT=${SHORT_SHA}" >> $GITEA_OUTPUT
+          echo "BUILDER_SHA_COMMIT=${SHORT_SHA}" >> $GITEA_OUTPUT
       - name: Setup Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Log in to built-in registry
@@ -81,7 +84,7 @@ 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 }}
+            BASE_IMG=code.kruzya.dev/crazyhackgut/pulp-ui-cri/base-frontend:sha-${{ needs.build-frontend.outputs.builder_commit }}
 
 # TODO: add build nginx image