diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml
index 05566888..197f4d22 100644
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -25,7 +25,7 @@ jobs:
   docker-buildx:
     runs-on: ubuntu-20.04
     env:
-      CACHE_NAME: java11
+      CACHE_NAME: java11-openj9
     steps:
       - name: Checkout
         uses: actions/checkout@v2.3.4
@@ -67,7 +67,7 @@ jobs:
         uses: docker/build-push-action@v2.4.0
         with:
           context: .
-          platforms: linux/amd64,linux/arm/v7,linux/arm64
+          platforms: linux/amd64
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           # ensure latest base image is used
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 00bc22bb..0426212a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -30,7 +30,7 @@ jobs:
       - test
     runs-on: ubuntu-20.04
     env:
-      CACHE_NAME: master
+      CACHE_NAME: java11-openj9
 
     steps:
     - uses: actions/checkout@v2.3.4
diff --git a/Dockerfile b/Dockerfile
index a221e7cf..fabe2ec5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM adoptopenjdk:11-jre
+FROM adoptopenjdk:11-jre-openj9
 
 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"