diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3395b17..a8287b4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -90,7 +90,7 @@ jobs:
     needs: base
     strategy:
       matrix:
-        version: [23.3, 23.9, 23.11, 24.1, 24.3, 24.5]
+        version: [24.5]
     steps:
     - uses: actions/checkout@v2
     - name: Build
diff --git a/nvhpc/Dockerfile b/nvhpc/Dockerfile
index c16f632..a94e0ba 100644
--- a/nvhpc/Dockerfile
+++ b/nvhpc/Dockerfile
@@ -2,12 +2,20 @@ ARG REPOSITORY
 FROM ${REPOSITORY}:base
 LABEL maintainer="Felix Thaler <thaler@cscs.ch>"
 
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    gnupg2 curl ca-certificates && \
+    curl https://developer.download.nvidia.com/hpc-sdk/ubuntu/DEB-GPG-KEY-NVIDIA-HPC-SDK | gpg --dearmor -o /usr/share/keyrings/nvidia-hpcsdk-archive-keyring.gpg && \
+    apt-get purge --autoremove -y curl \
+    && rm -rf /var/lib/apt/lists/*
+
+
 ARG NVHPC_VERSION
 ENV NVHPC_VERSION ${NVHPC_VERSION}
 
 RUN NVHPC_VERSION_DASH=$(echo ${NVHPC_VERSION} | sed 's/\./-/g') && \
-    echo 'deb [trusted=yes] https://developer.download.nvidia.com/hpc-sdk/ubuntu/amd64 /' > /etc/apt/sources.list.d/nvhpc.list && \
-    apt-get update -qq && \
+    echo 'deb [signed-by=/usr/share/keyrings/nvidia-hpcsdk-archive-keyring.gpg] https://developer.download.nvidia.com/hpc-sdk/ubuntu/amd64 /' > /etc/apt/sources.list.d/nvhpc.list && \
+    apt-get update -qq -y && \
     DEBIAN_FRONTEND=noninteractive apt-get install -qq -y nvhpc-${NVHPC_VERSION_DASH} && \
     rm -rf /var/lib/apt/lists/*