diff --git a/.github/workflows/services-docs-next-required.yml b/.github/workflows/services-docs-next-required.yml
index 7f52407..e5175bd 100644
--- a/.github/workflows/services-docs-next-required.yml
+++ b/.github/workflows/services-docs-next-required.yml
@@ -81,6 +81,10 @@ jobs:
             type=raw,value=latest
             type=sha,format=short
 
+      - name: Compute short SHA
+        id: vars
+        run: echo "short_sha=sha-$(echo ${{ github.sha }} | cut -c1-7)" >> $GITHUB_OUTPUT
+
       - name: Build and push Docker image
         uses: docker/build-push-action@v5
         with:
@@ -90,8 +94,8 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
-            COMMIT_SHA=sha-$(echo ${{ github.sha }} | cut -c1-7)
-            VERSION=sha-$(echo ${{ github.sha }} | cut -c1-7)
+            COMMIT_SHA=${{ steps.vars.outputs.short_sha }}
+            VERSION=${{ steps.vars.outputs.short_sha }}
 
   deploy:
     name: Deploy - Kubernetes (GitOps)
diff --git a/.github/workflows/services-www-next-required.yml b/.github/workflows/services-www-next-required.yml
index 409dae0..ef907e0 100644
--- a/.github/workflows/services-www-next-required.yml
+++ b/.github/workflows/services-www-next-required.yml
@@ -357,6 +357,10 @@ jobs:
             type=raw,value=next
             type=sha,format=short
 
+      - name: Compute short SHA
+        id: vars
+        run: echo "short_sha=sha-$(echo ${{ github.sha }} | cut -c1-7)" >> $GITHUB_OUTPUT
+
       - name: Build and push Docker image
         uses: docker/build-push-action@v5
         with:
@@ -366,5 +370,5 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
-            COMMIT_SHA=sha-$(echo ${{ github.sha }} | cut -c1-7)
-            VERSION=sha-$(echo ${{ github.sha }} | cut -c1-7)
+            COMMIT_SHA=${{ steps.vars.outputs.short_sha }}
+            VERSION=${{ steps.vars.outputs.short_sha }}
diff --git a/.github/workflows/services-www-releases-dispatch-release.yml b/.github/workflows/services-www-releases-dispatch-release.yml
index 261332c..8afc9ea 100644
--- a/.github/workflows/services-www-releases-dispatch-release.yml
+++ b/.github/workflows/services-www-releases-dispatch-release.yml
@@ -265,9 +265,11 @@ jobs:
           # Extract MAJOR.MINOR for tagging
           MAJOR_MINOR=$(echo "${{ github.ref_name }}" | cut -d/ -f3 | sed 's/^v//')
           MAJOR=$(echo "$MAJOR_MINOR" | cut -d. -f1)
+          SHORT_SHA="sha-$(echo ${{ github.sha }} | cut -c1-7)"
           echo "version=$RELEASE_VERSION" >> $GITHUB_OUTPUT
           echo "major_minor=$MAJOR_MINOR" >> $GITHUB_OUTPUT
           echo "major=$MAJOR" >> $GITHUB_OUTPUT
+          echo "short_sha=$SHORT_SHA" >> $GITHUB_OUTPUT
 
       - name: Create and Push Tag
         run: |
@@ -303,7 +305,7 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
-            COMMIT_SHA=sha-$(echo ${{ github.sha }} | cut -c1-7)
+            COMMIT_SHA=${{ steps.version.outputs.short_sha }}
             VERSION=v${{ steps.version.outputs.version }}
 
   deploy:
diff --git a/ci/k8s/clusters/production/kustomization.yaml b/ci/k8s/clusters/production/kustomization.yaml
index f8978bd..b4072e6 100644
--- a/ci/k8s/clusters/production/kustomization.yaml
+++ b/ci/k8s/clusters/production/kustomization.yaml
@@ -2,6 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
+  - flux-system
   - ../../base/namespaces
   - ../../infrastructure/cert-manager
   - ../../infrastructure/networking