diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6c98dfb5f81d6571bc2c6aab5f1f837c33026e45..53599a177bfdc3017c26554c55fe4fbb20f36c0f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ stages:
 ####
 
 .gradle:
-  image: ${DEVOPS_REGISTRY}usgs/java:11-jdk
+  image: ${DEVOPS_REGISTRY}usgs/amazoncorretto:11
   stage: build
   tags:
     - development
@@ -45,8 +45,8 @@ Build Image Haz:
   variables:
     CI_PROJECT_NAME: nshmp-haz
     DOCKER_BUILD_ARGS: |
-      BUILD_IMAGE=${DEVOPS_REGISTRY}usgs/java:11
-      FROM_IMAGE=${DEVOPS_REGISTRY}usgs/java:11
+      BUILD_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:11
+      FROM_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:11
       CI_JOB_TOKEN=${CI_JOB_TOKEN}
     UPSTREAM_PATH: ghsc/nshmp/nshmp-haz
 
@@ -56,8 +56,8 @@ Build Image WS:
   variables:
     CI_PROJECT_NAME: nshmp-haz-ws
     DOCKER_BUILD_ARGS: |
-      BUILD_IMAGE=${DEVOPS_REGISTRY}usgs/java:11
-      FROM_IMAGE=${DEVOPS_REGISTRY}usgs/java:11
+      BUILD_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:11
+      FROM_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:11
       CI_JOB_TOKEN=${CI_JOB_TOKEN}
     DOCKERFILE: ws.Dockerfile
     UPSTREAM_PATH: ghsc/nshmp/nshmp-haz
diff --git a/Dockerfile b/Dockerfile
index 934d0ee14bd0a25604e703ee66db0861e2744cb5..367f83e95d3a793a30959e3a748031b03b20d332 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,8 +27,8 @@
 #   docker build -t nshmp-haz .
 ####
 
-ARG BUILD_IMAGE=usgs/java:11
-ARG FROM_IMAGE=usgs/java:11
+ARG BUILD_IMAGE=usgs/amazoncorretto:11
+ARG FROM_IMAGE=usgs/amazoncorretto:11
 
 ####
 # Builder image: Build jar file.
diff --git a/ws.Dockerfile b/ws.Dockerfile
index 542c51e67cfad2397ee10cb5d9ac5ff4f23ed120..8bf60131e37ace8518cbdc7674ce576f8d336941 100644
--- a/ws.Dockerfile
+++ b/ws.Dockerfile
@@ -13,8 +13,8 @@
 #       nshmp-haz-ws
 ####
 
-ARG BUILD_IMAGE=usgs/java:11
-ARG FROM_IMAGE=usgs/java:11
+ARG BUILD_IMAGE=usgs/amazoncorretto:11
+ARG FROM_IMAGE=usgs/amazoncorretto:11
 
 ####
 # Builder image: Build jar file.