diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 0cd760b95..8be17566e 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   deploy:
-    if: ${{ (github.event_name == 'workflow_dispatch') || (github.event.workflow_run.conclusion == 'success' && (github.event.workflow_run.head_branch == 'main' || github.event.workflow_run.head_branch == 'staging')) }}
+    if: ${{ github.event.workflow_run.conclusion == 'success' && (github.event.workflow_run.head_branch == 'main' || github.event.workflow_run.head_branch == 'staging') }}
     runs-on: blacksmith-2vcpu-ubuntu-2404
     environment: ${{ github.event.workflow_run.head_branch }}
     
@@ -16,12 +16,12 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
-          ref: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.environment || github.event.workflow_run.head_branch }}
+          ref: ${{ github.event.workflow_run.head_branch }}
       
       - name: Get commit SHA
         id: commit
         run: |
-          echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+          echo "sha_short=$(git rev-parse --short=7 HEAD)" >> $GITHUB_OUTPUT
           echo "sha_full=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
       
       - name: Setup porter
diff --git a/.github/workflows/docker-build-server.yml b/.github/workflows/docker-build-server.yml
index 83f54969d..8ad5fd29d 100644
--- a/.github/workflows/docker-build-server.yml
+++ b/.github/workflows/docker-build-server.yml
@@ -8,6 +8,7 @@ on:
       - 'packages/**'
       - 'pnpm-lock.yaml'
       - '.github/workflows/docker-build-server.yml'
+      - '.github/workflows/deploy.yml'
 
 # Only one build per branch at a time, queue others
 concurrency:
@@ -116,7 +117,7 @@ jobs:
       - name: Extract metadata and determine tags
         id: meta
         run: |
-          SHA_SHORT=$(git rev-parse --short HEAD)
+          SHA_SHORT=$(git rev-parse --short=7 HEAD)
           echo "sha_short=${SHA_SHORT}" >> $GITHUB_OUTPUT
           
           if [[ "${{ github.ref_name }}" == "main" ]]; then