diff --git a/unity-command/action.yaml b/unity-command/action.yaml
index fa9fd2a..bbe9d42 100644
--- a/unity-command/action.yaml
+++ b/unity-command/action.yaml
@@ -57,14 +57,7 @@ runs:
       version: ${{ inputs.version }}
       platform: ${{ inputs.platform }}
   - name: "Pull Unity container."
-    id: lock
     run: |
-      LOCK_NAME="unity-lock:unity-lock"
-      echo "lockName=$LOCK_NAME" >> "$GITHUB_OUTPUT"
-
-      # Acquire Docker lock for exclusive access to retag the static image
-      bash ${{ github.action_path }}/acquire_lock.sh "$LOCK_NAME"
-
       IMAGE_TAG="${{ inputs.imageTag }}"
       CONTAINER="${{ steps.getContainer.outputs.container }}"
       CACHED_CONTAINER="$CONTAINER-cached"
@@ -81,6 +74,11 @@ runs:
         COMMAND="-nographics $COMMAND"
       fi
       echo "command=$COMMAND" >> "$GITHUB_OUTPUT"
+
+      LOCK_NAME="unity-lock:unity-lock"
+      echo "lockName=$LOCK_NAME" >> "$GITHUB_OUTPUT"
+      # Acquire Docker lock for exclusive access to retag the static image
+      bash ${{ github.action_path }}/acquire_lock.sh "$LOCK_NAME"
     shell: bash
   - name: "Run Unity command."
     uses: act/unity/unity@master
@@ -88,7 +86,7 @@ runs:
       SSH_PUBLIC_KEY: ${{ inputs.sshPublicKey }}
       SSH_PRIVATE_KEY: ${{ inputs.sshPrivateKey }}
       CATCH_ERRORS: ${{ inputs.catchErrors }}
-      LOCK_NAME: ${{ steps.lock.outputs.lockName }}
+      LOCK_NAME: ${{ steps.command.outputs.lockName }}
     with:
       serial: ${{ inputs.serial }}
       # serial: "activated"
@@ -99,7 +97,7 @@ runs:
   - name: "Release Unity Docker lock."
     if: ${{ always() }}
     run: |
-      LOCK_NAME="${{ steps.lock.outputs.lockName }}"
+      LOCK_NAME="${{ steps.command.outputs.lockName }}"
       echo "Releasing Docker lock '$LOCK_NAME'..."
       docker rmi "$LOCK_NAME" >/dev/null 2>&1 || true
     shell: bash