diff --git a/hack/update-yamlfmt.sh b/hack/update-yamlfmt.sh
index d663830a2a3..e3c36e16155 100755
--- a/hack/update-yamlfmt.sh
+++ b/hack/update-yamlfmt.sh
@@ -39,4 +39,5 @@ find_files() {
     \) -name 'OWNERS*'
 }
 
+export GO111MODULE=on
 find_files | xargs go run cmd/yamlfmt/yamlfmt.go
diff --git a/hack/verify-yamlfmt.sh b/hack/verify-yamlfmt.sh
index 453ce812888..cea2c7edde3 100755
--- a/hack/verify-yamlfmt.sh
+++ b/hack/verify-yamlfmt.sh
@@ -25,43 +25,23 @@ set -o nounset
 set -o pipefail
 
 KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
-export KUBE_ROOT
 source "${KUBE_ROOT}/hack/lib/init.sh"
 
 kube::util::ensure_clean_working_dir
 
-_tmpdir="$(kube::realpath "$(mktemp -d -t verify-yamlfmt.XXXXXX)")"
+_tmpdir="$(kube::realpath "$(mktemp -d -t "$(basename "$0").XXXXXX")")"
+git worktree add -f -q "${_tmpdir}" HEAD
+kube::util::trap_add "git worktree remove -f ${_tmpdir}" EXIT
+cd "${_tmpdir}"
 
-_tmp_gopath="${_tmpdir}/go"
-_tmp_kuberoot="${_tmp_gopath}/src/k8s.io/kubernetes"
-git worktree add -f "${_tmp_kuberoot}" HEAD
-kube::util::trap_add "git worktree remove -f ${_tmp_kuberoot} && rm -rf ${_tmpdir}" EXIT
+# Format YAML files
+hack/update-yamlfmt.sh
 
-find_files() {
-  pushd "${_tmp_kuberoot}" >/dev/null 2>&1
-  find "$(pwd)" -not \( \
-      \( \
-        -wholename './output' \
-        -o -wholename './.git' \
-        -o -wholename './_output' \
-        -o -wholename './_gopath' \
-        -o -wholename './release' \
-        -o -wholename './target' \
-        -o -wholename '*/vendor/*' \
-      \) -prune \
-    \) -name 'OWNERS*'
-  popd >/dev/null 2>&1
-}
-
-find_files | xargs go run cmd/yamlfmt/yamlfmt.go
-
-cd "${_tmp_kuberoot}"
-changed_files=$(git status --porcelain)
-
-if [[ -n "${changed_files}" ]]; then
-  echo "!!! OWNERS files need to be updated:" >&2
-  echo "${changed_files}" >&2
-  echo >&2
-  echo "Please run hack/update-yamlfmt.sh." >&2
+# Test for diffs
+diffs=$(git status --porcelain | wc -l)
+if [[ ${diffs} -gt 0 ]]; then
+  echo "YAML files need to be formatted" >&2
+  git diff
+  echo "Please run 'hack/update-yamlfmt.sh'" >&2
   exit 1
 fi