diff --git a/kubernetes/plugins/intel-device-plugin/distroless/build-intel-device-plugins-image.sh b/kubernetes/plugins/intel-device-plugin/distroless/build-intel-device-plugins-image.sh
index 90c9b2942..9e7d10b0c 100644
--- a/kubernetes/plugins/intel-device-plugin/distroless/build-intel-device-plugins-image.sh
+++ b/kubernetes/plugins/intel-device-plugin/distroless/build-intel-device-plugins-image.sh
@@ -15,8 +15,15 @@ if [ -z "${IMAGE_TAG}" ]; then
 fi
 
 # https://bugs.launchpad.net/starlingx/+bug/1927153
+# https://bugs.launchpad.net/starlingx/+bug/1939448
 # pin clearlinux/golang to the last known working tag
-sed -i 's!clearlinux/golang:latest!clearlinux/golang:1.15.10!' build/docker/${DEVICE}.Dockerfile || exit 1
+CLEAR_LINUX_BASE=clearlinux/golang:1.15.10
+CLEAR_LINUX_VERSION=34900
+
+sed -i -r \
+    -e 's!^(\s*ARG\s+CLEAR_LINUX_BASE\s*=\s*).*!\1'$CLEAR_LINUX_BASE'!' \
+    -e 's!^(\s*ARG\s+CLEAR_LINUX_VERSION\s*=\s*).*!\1--version='$CLEAR_LINUX_VERSION'!' \
+    build/docker/${DEVICE}.Dockerfile || exit 1
 
 make ${DEVICE}