diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b9cd01a770..9e8c84cc31 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -66,8 +66,8 @@ jobs:
         uses: actions/cache@v6
         with:
           path: .docker
-          key: maven-${{ matrix.jdk }}-${{ matrix.maven }}-${{ hashFiles('compose.yaml', '**/pom.xml') }}
-          restore-keys: maven-${{ matrix.jdk }}-${{ matrix.maven }}-
+          key: maven-${{ matrix.image }}-${{ matrix.jdk }}-${{ matrix.maven }}-${{ hashFiles('compose.yaml', 'ci/docker/**', '**/pom.xml') }}
+          restore-keys: maven-${{ matrix.image }}-${{ matrix.jdk }}-${{ matrix.maven }}-
       - name: Execute Docker Build
         env:
           # Enables build caching, but not strictly required