diff --git a/client-java-contrib/Dockerfile b/client-java-contrib/Dockerfile
index 9bc86f0284..d3496d155b 100644
--- a/client-java-contrib/Dockerfile
+++ b/client-java-contrib/Dockerfile
@@ -2,11 +2,15 @@ FROM docker:stable
 
 # install git, bash, kind, kubectl and clone the kubernetes-client/gen code base
 RUN apk add --no-cache git bash && \
-    wget -O /usr/bin/kind https://kind.sigs.k8s.io/dl/v0.8.1/kind-linux-amd64 && \
+    wget -O /usr/bin/kind https://kind.sigs.k8s.io/dl/v0.11.1/kind-linux-amd64 && \
     chmod +x /usr/bin/kind && \
-    wget -O /usr/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/linux/amd64/kubectl && \
+    wget -O /usr/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.20.2/bin/linux/amd64/kubectl && \
     chmod +x /usr/bin/kubectl && \
-    git clone https://github.com/kubernetes-client/gen.git
+    git clone https://github.com/kubernetes-client/gen.git && \
+    cd gen && \
+    git checkout 729332ad08f0f4d98983b7beb027e2f657236ef9
+    # 729332ad08f0f4d98983b7beb027e2f657236ef9 is the last commit using python2 interpreter
+
 
 COPY Dockerfile.gen gen/openapi/openapi-generator/Dockerfile
 COPY generate.sh generate.sh
diff --git a/client-java-contrib/admissionreview/generate.sh b/client-java-contrib/admissionreview/generate.sh
index 2906335ea2..eec826b83e 100644
--- a/client-java-contrib/admissionreview/generate.sh
+++ b/client-java-contrib/admissionreview/generate.sh
@@ -5,5 +5,5 @@ docker run --rm \
   -v $LOCAL_MANIFEST_FILE:$LOCAL_MANIFEST_FILE \
   -v /var/run/docker.sock:/var/run/docker.sock \
   -v $PWD:$PWD \
-  -it ghcr.io/yue9944882/crd-model-gen:v1.0.3 \
+  -it ghcr.io/yue9944882/crd-model-gen:v1.0.6 \
   sh -c "source /gen/openapi/java-crd-cmd.sh -n v1 -p io.kubernetes.client.admissionreview -l 2 -o $PWD/gen < $LOCAL_MANIFEST_FILE"
diff --git a/client-java-contrib/cert-manager/update.sh b/client-java-contrib/cert-manager/update.sh
index 215e8f9ee6..1edc3b5fbe 100755
--- a/client-java-contrib/cert-manager/update.sh
+++ b/client-java-contrib/cert-manager/update.sh
@@ -17,7 +17,7 @@
 # under src/main/java/io/cert/manager/models.
 
 DEFAULT_IMAGE_NAME=docker.pkg.github.com/kubernetes-client/java/crd-model-gen
-DEFAULT_IMAGE_TAG=v1.0.3
+DEFAULT_IMAGE_TAG=v1.0.6
 IMAGE_NAME=${IMAGE_NAME:=$DEFAULT_IMAGE_NAME}
 IMAGE_TAG=${IMAGE_TAG:=$DEFAULT_IMAGE_TAG}
 
diff --git a/client-java-contrib/prometheus-operator/update.sh b/client-java-contrib/prometheus-operator/update.sh
index e100c49142..15d96e68d5 100755
--- a/client-java-contrib/prometheus-operator/update.sh
+++ b/client-java-contrib/prometheus-operator/update.sh
@@ -17,7 +17,7 @@
 # under src/main/java/io/cert/manager/models.
 
 DEFAULT_IMAGE_NAME=docker.pkg.github.com/kubernetes-client/java/crd-model-gen
-DEFAULT_IMAGE_TAG=v1.0.3
+DEFAULT_IMAGE_TAG=v1.0.6
 IMAGE_NAME=${IMAGE_NAME:=$DEFAULT_IMAGE_NAME}
 IMAGE_TAG=${IMAGE_TAG:=$DEFAULT_IMAGE_TAG}