diff --git a/.gitea/workflows/actions.yaml b/.gitea/workflows/actions.yaml
index 8264385..bf620d8 100644
--- a/.gitea/workflows/actions.yaml
+++ b/.gitea/workflows/actions.yaml
@@ -78,10 +78,12 @@ jobs:
       - name: Run `packer validate`
         id: validate
         run: |
-          echo "${{ gitea.run_number }}-${BUILD_COMMIT}-${BUILD_SUFFIX}"
+          BUILD_COMMIT=$(echo "${{ gitea.sha }}" | cut -c 1-10)
+          BUILD_SUFFIX=$(openssl rand -hex 3)
+
           packer validate \
             -only=vsphere-iso.bootstrap \
-            -var vm_name=${{ gitea.run_number }}-${BUILD_COMMIT}-${$BUILD_SUFFIX} \
+            -var vm_name=${{ gitea.run_number }}-${BUILD_COMMIT}-${BUILD_SUFFIX} \
             -var docker_username=${{ secrets.DOCKER_USERNAME }} \
             -var docker_password=${{ secrets.DOCKER_PASSWORD }} \
             -var repo_username=${{ secrets.REPO_USERNAME }} \
@@ -91,15 +93,14 @@ jobs:
             -var k8s_version=${{ steps.get_k8sversion.outputs.result }} \
             -var appliance_version=${{ needs.semrel_dryrun.outputs.version }} \
             ./packer
-        env:
-          BUILD_COMMIT: echo "${{ gitea.sha }}" | cut -c 1-10
-          BUILD_SUFFIX: echo "$(openssl rand -hex 3)"
       - name: Run `packer build`
         run: |
+          BUILD_COMMIT=$(echo "${{ gitea.sha }}" | cut -c 1-10)
+          BUILD_SUFFIX=$(openssl rand -hex 3)
+
           packer build \
-            # -e PACKER_LOG=1 \
             -only=vsphere-iso.bootstrap \
-            -var vm_name=${{ gitea.job }}-${{ gitea.sha:0:10 }}-$(openssl rand -hex 3) \
+            -var vm_name=${{ gitea.run_number }}-${BUILD_COMMIT}-${BUILD_SUFFIX} \
             -var docker_username=${{ secrets.DOCKER_USERNAME }} \
             -var docker_password=${{ secrets.DOCKER_PASSWORD }} \
             -var repo_username=${{ secrets.REPO_USERNAME }} \