diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml
index 821bf62..18b295b 100644
--- a/.github/workflows/external_trigger.yml
+++ b/.github/workflows/external_trigger.yml
@@ -43,16 +43,18 @@ jobs:
           token=$(curl -sX GET \
             "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fgitqlient%3Apull" \
             | jq -r '.token')
-            multidigest=$(curl -s \
-              --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
-              --header "Authorization: Bearer ${token}" \
-              "https://ghcr.io/v2/${image}/manifests/${tag}" \
-              | jq -r 'first(.manifests[].digest)')
-            digest=$(curl -s \
-              --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
-              --header "Authorization: Bearer ${token}" \
-              "https://ghcr.io/v2/${image}/manifests/${multidigest}" \
-              | jq -r '.config.digest')
+          multidigest=$(curl -s \
+            --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
+            --header "Accept: application/vnd.oci.image.index.v1+json" \
+            --header "Authorization: Bearer ${token}" \
+            "https://ghcr.io/v2/${image}/manifests/${tag}")
+          multidigest=$(jq -r ".manifests[] | select(.platform.architecture == \"amd64\").digest?" <<< "${multidigest}")
+          digest=$(curl -s \
+            --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
+            --header "Accept: application/vnd.oci.image.manifest.v1+json" \
+            --header "Authorization: Bearer ${token}" \
+            "https://ghcr.io/v2/${image}/manifests/${multidigest}" \
+            | jq -r '.config.digest')
           image_info=$(curl -sL \
             --header "Authorization: Bearer ${token}" \
             "https://ghcr.io/v2/${image}/blobs/${digest}")
diff --git a/Dockerfile b/Dockerfile
index 2954937..ab78285 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.20 as buildstage
+FROM ghcr.io/linuxserver/baseimage-alpine:3.21 AS buildstage
 
 ARG GITQLIENT_RELEASE
 
@@ -27,7 +27,7 @@ RUN \
   make -j 4 && \
   make install
 
-FROM ghcr.io/linuxserver/baseimage-kasmvnc:alpine320
+FROM ghcr.io/linuxserver/baseimage-kasmvnc:alpine321
 
 # set version label
 ARG BUILD_DATE
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 670dde3..368e30e 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20 as buildstage
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.21 AS buildstage
 
 ARG GITQLIENT_RELEASE
 
@@ -27,7 +27,7 @@ RUN \
   make -j 4 && \
   make install
 
-FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-alpine320
+FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-alpine321
 
 # set version label
 ARG BUILD_DATE
diff --git a/README.md b/README.md
index c8d1f99..4f72179 100644
--- a/README.md
+++ b/README.md
@@ -377,6 +377,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **06.12.24:** - Rebase to Alpine 3.21.
 * **23.05.24:** - Rebase to Alpine 3.20.
 * **10.02.24:** - Update Readme with new env vars and ingest proper PWA icon.
 * **21.01.24:** - Rebase to Alpine 3.19.
diff --git a/readme-vars.yml b/readme-vars.yml
index 006be32..543f224 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -105,6 +105,7 @@ init_diagram: |
   "gitqlient:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "06.12.24:", desc: "Rebase to Alpine 3.21."}
   - {date: "23.05.24:", desc: "Rebase to Alpine 3.20."}
   - {date: "10.02.24:", desc: "Update Readme with new env vars and ingest proper PWA icon."}
   - {date: "21.01.24:", desc: "Rebase to Alpine 3.19."}