diff --git a/.github/actions/target-specific-command/action.yml b/.github/actions/target-specific-command/action.yml
index 87ef1a20..4a8b246d 100644
--- a/.github/actions/target-specific-command/action.yml
+++ b/.github/actions/target-specific-command/action.yml
@@ -24,7 +24,7 @@ runs:
         elif [[ "${{env.TARGET}}" == "develop" ]]; then
           ${{ inputs.develop }}
         else
-          echo "Invalid target: ${{env.TARGET}}. Did you run the 'set-target' action?"
+          echo "Invalid target: '${{env.TARGET}}', did you run the 'set-target' action?"
           exit 1
         fi
       shell: bash
\ No newline at end of file
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index abf989b9..97793748 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -64,7 +64,10 @@ jobs:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.ACCESS_TOKEN }}
-
+      
+      - name: Set Target
+        uses: ./.github/actions/set-target
+      
       - name: Build and push Docker image
         uses: docker/build-push-action@v5
         with:
@@ -97,8 +100,11 @@ jobs:
       
       - name: Install NPM Packages
         run: npm i
-      
-      - name: Build Distributable
+
+      - name: Set Target
+        uses: ./.github/actions/set-target
+
+      - name: Build Distributable for Target
         uses: ./.github/actions/target-specific-command
         with:
           working_directory: ./frontend