diff --git a/.github/workflows/product-tests-specific-environment.yml b/.github/workflows/product-tests-specific-environment.yml
index 28b8584ef094..d51813002983 100644
--- a/.github/workflows/product-tests-specific-environment.yml
+++ b/.github/workflows/product-tests-specific-environment.yml
@@ -87,7 +87,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ 8, 17 ]
+        java: [ 17 ]
     runs-on: ubuntu-latest
     needs: changes
     if: needs.changes.outputs.codechange == 'true'
diff --git a/presto-product-tests/conf/docker/multinode-tls-kerberos/docker-compose.yml b/presto-product-tests/conf/docker/multinode-tls-kerberos/docker-compose.yml
index 7678c52ce429..7de31146141d 100644
--- a/presto-product-tests/conf/docker/multinode-tls-kerberos/docker-compose.yml
+++ b/presto-product-tests/conf/docker/multinode-tls-kerberos/docker-compose.yml
@@ -3,7 +3,7 @@ services:
   presto-master:
     domainname: docker.cluster
     hostname: presto-master
-    image: '${HADOOP_BASE_IMAGE}-kerberized:${DOCKER_IMAGES_VERSION}'
+    image: aaneja/hdp2.6-hive-kerberized-jdk17
     command: /docker/volumes/conf/docker/files/presto-launcher-wrapper.sh multinode-tls-kerberos-master run
     ports:
       - '7778:7778'
@@ -17,7 +17,7 @@ services:
   presto-worker-1:
     domainname: docker.cluster
     hostname: presto-worker-1
-    image: '${HADOOP_BASE_IMAGE}-kerberized:${DOCKER_IMAGES_VERSION}'
+    image: aaneja/hdp2.6-hive-kerberized-jdk17
     extends:
       file: ../common/standard.yml
       service: java-17-base
@@ -34,7 +34,7 @@ services:
   presto-worker-2:
     domainname: docker.cluster
     hostname: presto-worker-2
-    image: '${HADOOP_BASE_IMAGE}-kerberized:${DOCKER_IMAGES_VERSION}'
+    image: aaneja/hdp2.6-hive-kerberized-jdk17
     extends:
       file: ../common/standard.yml
       service: java-17-base
diff --git a/presto-product-tests/conf/docker/singlenode-ldap/docker-compose.yml b/presto-product-tests/conf/docker/singlenode-ldap/docker-compose.yml
index 03d15c000819..c17afedc708f 100644
--- a/presto-product-tests/conf/docker/singlenode-ldap/docker-compose.yml
+++ b/presto-product-tests/conf/docker/singlenode-ldap/docker-compose.yml
@@ -1,7 +1,7 @@
 services:
 
   presto-master:
-    image: 'prestodb/centos6-oj8-openldap:${DOCKER_IMAGES_VERSION}'
+    image: 'aaneja/centos6-oj8-openldap-jdk17'
     command: /docker/volumes/conf/docker/files/presto-launcher-wrapper.sh singlenode-ldap run
     extra_hosts:
        - "${LDAP_SERVER_HOST}:${LDAP_SERVER_IP}"