diff --git a/operator/Dockerfile b/operator/Dockerfile
index b42475af..364b7458 100644
--- a/operator/Dockerfile
+++ b/operator/Dockerfile
@@ -1,14 +1,18 @@
-FROM gigaspaces/openjdk:11.1
-ARG GS_VERSION=16.4.1
-ARG GS_BUILD_NAME=16.4.1
-ARG GS_PRODUCT=smart-cache
+ARG BASE_IMAGE=gigaspaces/openjdk
+ARG BASE_TAG=17.1
+FROM ${BASE_IMAGE}:${BASE_TAG}
+# The argument below is no longer used. We are moving to ubi8/openjdk-11 image
+# instead of post-install of jdk due to tzdb corruption in upstream repo.
+#ARG JAVA_VERSION=java-11-openjdkARG GS_PRODUCT=smart-cache
+ARG GS_VERSION=17.0.0
+ARG GS_BUILD_NAME=17.0.0-m19-fri-70
 ARG GS_NAME=gigaspaces-${GS_PRODUCT}-enterprise-${GS_BUILD_NAME}
 ARG GS_BUCKET=gs-releases-us-east-1
 ENV GS_BUCKET $GS_BUCKET
 ARG GS_URL=https://${GS_BUCKET}.s3.amazonaws.com/${GS_PRODUCT}/${GS_VERSION}/${GS_NAME}.zip
 ENV GS_HOME /opt/gigaspaces
 ENV GS_PRODUCT ${GS_PRODUCT}
-ENV KUBERNETES_CLINET_URL=https://resources.gigaspaces.com/k8s-java-client/k8s-java-client-15.0.1.jar
+ENV KUBERNETES_CLINET_URL=https://s3.amazonaws.com/resources.gigaspaces.com/k8s-java-client/k8s-java-client.jar
 
 WORKDIR ${GS_HOME}
 # Download $GS_URL and unzip to $GS_HOME
diff --git a/smart-cache-enterprise/Dockerfile b/smart-cache-enterprise/Dockerfile
index e01621e4..45cc1fec 100644
--- a/smart-cache-enterprise/Dockerfile
+++ b/smart-cache-enterprise/Dockerfile
@@ -1,29 +1,32 @@
-FROM gigaspaces/openjdk:11.1
+ARG BASE_IMAGE=gigaspaces/openjdk
+ARG BASE_TAG=17.1
+FROM ${BASE_IMAGE}:${BASE_TAG}
 # The argument below is no longer used. We are moving to ubi8/openjdk-11 image
 # instead of post-install of jdk due to tzdb corruption in upstream repo.
+ARG JAVA_VERSION=openjdk-17-jdk-headless
 ARG GS_PRODUCT=smart-cache
-ARG GS_VERSION=16.5.0
-ARG GS_BUILD_NAME=16.5.0-PIC-3414-fri-1258
+ARG GS_VERSION=17.0.0
+ARG GS_BUILD_NAME=17.0.0-jdk17-ci-479
 ARG GS_NAME=gigaspaces-${GS_PRODUCT}-enterprise-${GS_BUILD_NAME}
 ARG GS_BUCKET=gs-releases-us-east-1
 ENV GS_BUCKET $GS_BUCKET
 ARG GS_URL=https://${GS_BUCKET}.s3.amazonaws.com/${GS_PRODUCT}/${GS_VERSION}/${GS_NAME}.zip
 ENV GS_HOME /opt/gigaspaces
 ENV GS_PRODUCT ${GS_PRODUCT}
-ENV KUBERNETES_CLIENT_URL=https://resources.gigaspaces.com/k8s-java-client/k8s-java-client-15.0.1.jar
-ENV KUBERNETES_CLIENT_API_URL=https://repo1.maven.org/maven2/io/kubernetes/client-java-api/20.0.0/client-java-api-20.0.0.jar
+ENV KUBERNETES_CLINET_URL=https://s3.amazonaws.com/resources.gigaspaces.com/k8s-java-client/k8s-java-client.jar
 
 WORKDIR ${GS_HOME}
 # Download $GS_URL and unzip to $GS_HOME
 USER root
 
+RUN apt-get update && \
+    apt-get install -y $JAVA_VERSION jq bind9-utils wget unzip    
 RUN wget --progress=bar:force -O /tmp/gigaspaces.zip ${GS_URL} &&\
     unzip -q /tmp/gigaspaces.zip -d /tmp &&\
     mkdir -p ${GS_HOME}/work &&\
     mv /tmp/${GS_NAME}/* ${GS_HOME}/ &&\
     rm -f /tmp/gigaspaces.zip &&\
-    wget ${KUBERNETES_CLIENT_URL} -O ${GS_HOME}/tools/kubernetes/lib/k8s-java-client.jar &&\
-    wget ${KUBERNETES_CLIENT_API_URL} -O ${GS_HOME}/tools/kubernetes/lib/k8s-java-client-api.jar &&\
+    wget ${KUBERNETES_CLINET_URL} -O ${GS_HOME}/tools/kubernetes/lib/k8s-java-client.jar &&\
     echo "#!/bin/bash" > /bin/kill && echo "kill \$@" >> /bin/kill && chmod +x /bin/kill
 RUN groupadd --gid 2000 --system gs_group &&\
     adduser --shell /bin/nologin --uid 2001 --gid 2000 gs_user &&\