diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 6fed060..cf38a69 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -61,6 +61,6 @@ jobs:
         with:
           context: .
           file: ./Dockerfile.openj9
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: 1337kavin/piped:latest,1337kavin/piped:openj9
diff --git a/Dockerfile.openj9 b/Dockerfile.openj9
index cf302ad..1dd9048 100644
--- a/Dockerfile.openj9
+++ b/Dockerfile.openj9
@@ -1,4 +1,4 @@
-FROM adoptopenjdk/openjdk11-openj9:alpine-slim AS build
+FROM ibm-semeru-runtimes:open-11-jdk AS build
 
 WORKDIR /app/
 
@@ -6,7 +6,7 @@ COPY . /app/
 
 RUN chmod +x ./gradlew && ./gradlew shadowJar
 
-FROM adoptopenjdk/openjdk11-openj9:alpine-jre
+FROM ibm-semeru-runtimes:open-11-jre
 
 WORKDIR /app/