diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c1b59a1..2dfc12f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -168,9 +168,9 @@ jobs:
         docker build
         --progress=plain
         --cache-from $CR_REPOSITORY:${{ matrix.base }}
-        --cache-from $CR_REPOSITORY:${{ matrix.base }}-hip
+        --cache-from $CR_REPOSITORY:${{ matrix.base }}-rocm-6.2
         --build-arg BUILDKIT_INLINE_CACHE=1
-        --tag $CR_REPOSITORY:${{ matrix.base }}-hip
+        --tag $CR_REPOSITORY:${{ matrix.base }}-rocm-6.2
         --build-arg REPOSITORY=$CR_REPOSITORY
         --build-arg BASE=${{ matrix.base }}
         hip
diff --git a/hip/Dockerfile b/hip/Dockerfile
index 6484bcd..f21b344 100644
--- a/hip/Dockerfile
+++ b/hip/Dockerfile
@@ -3,6 +3,8 @@ ARG BASE
 FROM ${REPOSITORY}:${BASE}
 LABEL maintainer="Felix Thaler <thaler@cscs.ch>"
 
+# NOTE: If you change the ROCm version here, also change it in the build.yml to avoid overwriting the old image,
+# see https://github.com/GridTools/gridtools-docker/issues/97.
 RUN wget https://repo.radeon.com/amdgpu-install/6.2.1/ubuntu/noble/amdgpu-install_6.2.60201-1_all.deb && \
     apt-get update -qq && \
     DEBIAN_FRONTEND=noninteractive apt-get install -qq -y ./amdgpu-install_6.2.60201-1_all.deb && \