diff --git a/.github/workflows/build-and-upload.yaml b/.github/workflows/build-and-upload.yaml
index 4666126..c2c0346 100644
--- a/.github/workflows/build-and-upload.yaml
+++ b/.github/workflows/build-and-upload.yaml
@@ -12,7 +12,7 @@ on:
 
 env:
   DOCKER_BUILDKIT: 1
-  DIBBER_VERSION: 1.1.11
+  DIBBER_VERSION: 1.1.12
   DIBBER_PARALLEL_BUILDS: 8
 
 # Cancel previous builds if a new one is triggered
@@ -86,7 +86,7 @@ jobs:
     runs-on: faster-arm64
 
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Log in to the Container registry
         uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
@@ -130,7 +130,7 @@ jobs:
     # runs-on: faster-arm64
 
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Log in to the Container registry
         uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2.1.0
@@ -140,7 +140,7 @@ jobs:
           password: ${{ secrets.GHCR_PAT }}
 
       - name: Set up Python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6
+        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
         with:
           python-version: "3.13"
 
@@ -159,23 +159,9 @@ jobs:
 
       - name: Merge manifests
         run: |
-          # Append AMD64 files to temp files
-          cat amd64/manifest_data.txt >> tmp_manifest_data.txt
-          echo "" >> tmp_manifest_data.txt
-
-          cat amd64/uniq_ids.txt >> tmp_uniq_ids.txt
-          echo "" >> tmp_uniq_ids.txt
-
-          # Append ARM64 files to temp files
-          cat arm64/manifest_data.txt >> tmp_manifest_data.txt
-          echo "" >> tmp_manifest_data.txt
-
-          cat arm64/uniq_ids.txt >> tmp_uniq_ids.txt
-          echo "" >> tmp_uniq_ids.txt
-
-          # Sort + filter to target files
-          cat tmp_manifest_data.txt | sort -u | grep -v '^[[:space:]]*$' > manifest_data.txt
-          cat tmp_uniq_ids.txt | sort -u | grep -v '^[[:space:]]*$' > uniq_ids.txt
+          # Merge and sort manifest and uniq ids
+          cat amd64/manifest_data.txt arm64/manifest_data.txt | sort -u > manifest_data.txt
+          cat amd64/uniq_ids.txt arm64/uniq_ids.txt | sort -u > uniq_ids.txt
 
           echo
           echo "---- Manifest data ----"
diff --git a/.github/workflows/scan-images.yaml b/.github/workflows/scan-images.yaml
index ca86652..af6657c 100644
--- a/.github/workflows/scan-images.yaml
+++ b/.github/workflows/scan-images.yaml
@@ -14,7 +14,7 @@ on:
 
 env:
   DOCKER_BUILDKIT: 1
-  DIBBER_VERSION: 1.1.11
+  DIBBER_VERSION: 1.1.12
 
 jobs:
   build:
diff --git a/.gitignore b/.gitignore
index eb048f7..bfc94d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -146,3 +146,6 @@ cython_debug/
 .DS_Store
 
 .python-version
+
+/manifest_data.txt
+/uniq_ids.txt