diff --git a/cluster-autoscaler/hack/update-codegen.sh b/cluster-autoscaler/hack/update-codegen.sh
index f987075bf4d9..b7793d6fc777 100755
--- a/cluster-autoscaler/hack/update-codegen.sh
+++ b/cluster-autoscaler/hack/update-codegen.sh
@@ -25,7 +25,7 @@ set -o pipefail
 
 SCRIPT_ROOT=$(realpath $(dirname "${BASH_SOURCE[0]}"))/..
 CODEGEN_PKG="../vendor/k8s.io/code-generator"
-cd "${SCRIPT_ROOT}/apis"
+pushd "${SCRIPT_ROOT}/apis"
 
 chmod +x "${CODEGEN_PKG}"/generate-groups.sh
 chmod +x "${CODEGEN_PKG}"/generate-internal-groups.sh
@@ -38,3 +38,4 @@ bash "${CODEGEN_PKG}"/generate-groups.sh "applyconfiguration,client,deepcopy,inf
 
 chmod -x "${CODEGEN_PKG}"/generate-groups.sh
 chmod -x "${CODEGEN_PKG}"/generate-internal-groups.sh
+popd
diff --git a/cluster-autoscaler/hack/update-deps.sh b/cluster-autoscaler/hack/update-deps.sh
index 5212ecba5bb5..3eca5300d79b 100755
--- a/cluster-autoscaler/hack/update-deps.sh
+++ b/cluster-autoscaler/hack/update-deps.sh
@@ -48,22 +48,32 @@ MODS=($(
 popd
 rm -rf ${WORKDIR}
 
-for MOD in "${MODS[@]}"; do
-    V=$(
-        GOMOD="${MOD}@kubernetes-${VERSION}"
-        JSON=$(go mod download -json "${GOMOD}")
-        retval=$?
-        if [ $retval -ne 0 ]; then
-            echo "Error downloading module ${GOMOD}."
-            exit 1
-        fi
-        echo "${JSON}" | sed -n 's|.*"Version": "\(.*\)".*|\1|p'
-    )
-    go mod edit "-replace=${MOD}=${MOD}@${V}"
+PKGS=("." "./apis")
+for pkg in "${PKGS[@]}"; do
+  pushd "${pkg}"
+
+  for MOD in "${MODS[@]}"; do
+      V=$(
+          GOMOD="${MOD}@kubernetes-${VERSION}"
+          JSON=$(go mod download -json "${GOMOD}")
+          retval=$?
+          if [ $retval -ne 0 ]; then
+              echo "Error downloading module ${GOMOD}."
+              exit 1
+          fi
+          echo "${JSON}" | sed -n 's|.*"Version": "\(.*\)".*|\1|p'
+      )
+      go mod edit "-replace=${MOD}=${MOD}@${V}"
+  done
+
+  go get "k8s.io/kubernetes@v${VERSION}"
+  go mod tidy
+  if [ "$(pkg)" = "." ]; then \
+    go mod vendor
+    sed -i "s|\(const ClusterAutoscalerVersion = \)\".*\"|\1\"$VERSION\"|" version/version.go
+  fi
+  git rm -r --force --ignore-unmatch kubernetes
+
+  popd
 done
-go get "k8s.io/kubernetes@v${VERSION}"
-go mod tidy
-go mod vendor
-git rm -r --force --ignore-unmatch kubernetes
 
-sed -i "s|\(const ClusterAutoscalerVersion = \)\".*\"|\1\"$VERSION\"|" version/version.go