diff --git a/client-java-contrib/publish-gen-image.sh b/client-java-contrib/publish-gen-image.sh
index e2dd2b5cb8..56a727b830 100644
--- a/client-java-contrib/publish-gen-image.sh
+++ b/client-java-contrib/publish-gen-image.sh
@@ -1,7 +1,11 @@
 #!/usr/bin/env bash
 
-GEN_IMAGE_NAME=docker.pkg.github.com/kubernetes-client/java/crd-model-gen
-GEN_IMAGE_VERSION=v2.0.0
+# User-overridable variables
+IMAGE_REPOSITORY=${IMAGE_REPOSITORY:-docker.pkg.github.com}
+IMAGE_NAME=${IMAGE_NAME:-kubernetes-client/java/crd-model-gen}
+IMAGE_VERSION=${IMAGE_VERSION:-v1.0.0}
 
-docker build -t ${GEN_IMAGE_NAME}:${GEN_IMAGE_VERSION} .
-docker push ${GEN_IMAGE_NAME}:${GEN_IMAGE_VERSION}
+IMAGE=${IMAGE_REPOSITORY}/${IMAGE_NAME}:${IMAGE_VERSION}
+BUILD_DIR="$(dirname $0)"
+docker build -t ${IMAGE} ${BUILD_DIR}
+docker push ${IMAGE}
diff --git a/scripts/publish-crd-model-gen-image.sh b/scripts/publish-crd-model-gen-image.sh
index b0da97b808..a05232b4cb 100755
--- a/scripts/publish-crd-model-gen-image.sh
+++ b/scripts/publish-crd-model-gen-image.sh
@@ -1,10 +1,7 @@
 #!/bin/bash
 
-IMAGE_REPOSITORY=docker.pkg.github.com
-IMAGE_NAME=kubernetes-client/java/crd-model-gen
-IMAGE_VERSION=v1.0.0
-IMAGE=${IMAGE_REPOSITORY}/${IMAGE_NAME}:${IMAGE_VERSION}
+export IMAGE_REPOSITORY=docker.pkg.github.com
+export IMAGE_NAME=kubernetes-client/java/crd-model-gen
+export IMAGE_VERSION=v1.0.0
 
-docker build -t ${IMAGE} client-java-contrib/
-
-docker push ${IMAGE}
\ No newline at end of file
+bash "$(dirname $0)/../client-java-contrib/publish-gen-image.sh"