diff --git a/.github/workflows/ci-pr-reports.yml b/.github/workflows/ci-pr-reports.yml
index db189af5c5..3a62aa642a 100644
--- a/.github/workflows/ci-pr-reports.yml
+++ b/.github/workflows/ci-pr-reports.yml
@@ -11,7 +11,7 @@ jobs:
       matrix:
         include:
           - setup: linux-x86_64-java11
-          - setup: linux-x86_64-java15
+          - setup: linux-x86_64-java16
           - setup: linux-x86_64-java11-boringssl
     steps:
       - name: Download Artifacts
diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml
index c430071d66..697ff276ef 100644
--- a/.github/workflows/ci-pr.yml
+++ b/.github/workflows/ci-pr.yml
@@ -83,9 +83,9 @@ jobs:
           - setup: linux-x86_64-java11
             docker-compose-build: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.111.yaml build"
             docker-compose-run: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.111.yaml run build-leak"
-          - setup: linux-x86_64-java15
-            docker-compose-build: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.115.yaml build"
-            docker-compose-run: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.115.yaml run build-leak"
+          - setup: linux-x86_64-java16
+            docker-compose-build: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.116.yaml build"
+            docker-compose-run: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.116.yaml run build-leak"
           - setup: linux-x86_64-java11-boringssl
             docker-compose-build: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.111.yaml build"
             docker-compose-run: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.111.yaml run build-leak-boringssl-static"
diff --git a/docker/docker-compose.centos-6.115.yaml b/docker/docker-compose.centos-6.115.yaml
deleted file mode 100644
index 444b12fa5e..0000000000
--- a/docker/docker-compose.centos-6.115.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-version: "3"
-
-services:
-
-  runtime-setup:
-    image: netty:centos-6-1.15
-    build:
-      args:
-        # use zulu and not adoptjdk for now as adoptjdk15 does not support centos6
-        # https://github.com/AdoptOpenJDK/openjdk-build/issues/2097
-        java_version : "zulu@1.15.0-2"
-
-  build:
-    image: netty:centos-6-1.15
-
-  build-leak:
-    image: netty:centos-6-1.15
-
-  build-boringssl-static:
-    image: netty:centos-6-1.15
-
-  build-leak-boringssl-static:
-    image: netty:centos-6-1.15
-
-  shell:
-    image: netty:centos-6-1.15
diff --git a/docker/docker-compose.centos-6.116.yaml b/docker/docker-compose.centos-6.116.yaml
new file mode 100644
index 0000000000..65e74b8c07
--- /dev/null
+++ b/docker/docker-compose.centos-6.116.yaml
@@ -0,0 +1,24 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: netty:centos-6-1.16
+    build:
+      args:
+        java_version : "adopt-openj9@1.16.0-1"
+
+  build:
+    image: netty:centos-6-1.16
+
+  build-leak:
+    image: netty:centos-6-1.16
+
+  build-boringssl-static:
+    image: netty:centos-6-1.16
+
+  build-leak-boringssl-static:
+    image: netty:centos-6-1.16
+
+  shell:
+    image: netty:centos-6-1.16