diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index dc828ec24..88046d3ef 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -135,6 +135,7 @@ jobs:
           DOCKER_CONTENT_TRUST=1
           export CW_CCSUFFIX='-15'
           export CW_GCCSUFFIX='-12'
+          export CW_GPPSUFFIX='-11'
           docker trust inspect --pretty "${DOCKER_IMAGE}"
           time docker pull "${DOCKER_IMAGE}"
           docker images --digests
@@ -169,6 +170,7 @@ jobs:
           DOCKER_CONTENT_TRUST=1
           export CW_CCSUFFIX='-15'
           export CW_GCCSUFFIX='-12'
+          export CW_GPPSUFFIX='-11'
           docker trust inspect --pretty "${DOCKER_IMAGE}"
           time docker pull "${DOCKER_IMAGE}"
           docker images --digests
@@ -265,6 +267,7 @@ jobs:
           DOCKER_CONTENT_TRUST=1
           export CW_CCSUFFIX='-15'
           export CW_GCCSUFFIX='-12'
+          export CW_GPPSUFFIX='-11'
           docker trust inspect --pretty "${DOCKER_IMAGE}"
           time docker pull "${DOCKER_IMAGE}"
           docker images --digests
@@ -299,6 +302,7 @@ jobs:
           DOCKER_CONTENT_TRUST=1
           export CW_CCSUFFIX='-15'
           export CW_GCCSUFFIX='-12'
+          export CW_GPPSUFFIX='-11'
           docker trust inspect --pretty "${DOCKER_IMAGE}"
           time docker pull "${DOCKER_IMAGE}"
           docker images --digests
diff --git a/_ci-linux-debian.sh b/_ci-linux-debian.sh
index 444fc2ee6..59ccbd1ab 100755
--- a/_ci-linux-debian.sh
+++ b/_ci-linux-debian.sh
@@ -94,12 +94,13 @@ elif [[ "${CW_CONFIG:-}" = *'linux'* ]]; then
   else
     # FIXME: workaround for glibc-llvm-riscv64 builds:
     [[ "${CW_CONFIG:-}" != *'gcc'* ]] && [[ "${CW_CONFIG:-}" = *'r64'* ]] && extra+=" gcc${CW_GCCSUFFIX}-riscv64-linux-gnu g++${CW_GCCSUFFIX}-riscv64-linux-gnu"
+    [ -n "${CW_GPPSUFFIX:-}" ] || CW_GPPSUFFIX='-12'
     if [ "$(uname -m)" = 'aarch64' ]; then
-      extra+=' libc6-dev-amd64-cross libstdc++-11-dev-amd64-cross'
+      extra+=" libc6-dev-amd64-cross libstdc++${CW_GPPSUFFIX}-dev-amd64-cross"
     else
-      extra+=' libc6-dev-arm64-cross libstdc++-11-dev-arm64-cross'
+      extra+=" libc6-dev-arm64-cross libstdc++${CW_GPPSUFFIX}-dev-arm64-cross"
     fi
-    [[ "${CW_CONFIG:-}" = *'r64'* ]] && extra+=' libc6-dev-riscv64-cross libstdc++-11-dev-riscv64-cross'
+    [[ "${CW_CONFIG:-}" = *'r64'* ]] && extra+=" libc6-dev-riscv64-cross libstdc++${CW_GPPSUFFIX}-dev-riscv64-cross"
   fi
 fi