diff --git a/Makefile b/Makefile
index f269f220c..865e15360 100644
--- a/Makefile
+++ b/Makefile
@@ -77,9 +77,6 @@ docker-images:
 # Rules for verification, formatting, linting, testing and cleaning #
 #####################################################################
 
-.PHONY: tidy
-tidy: revendor
-
 .PHONY: revendor
 revendor:
 	@GO111MODULE=on go mod tidy
diff --git a/go.mod b/go.mod
index bb8030be1..9de1e5d56 100644
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@ go 1.21
 require (
 	github.com/ahmetb/gen-crd-api-reference-docs v0.3.0
 	github.com/gardener/external-dns-management v0.14.2
-	github.com/gardener/gardener v1.84.0
+	github.com/gardener/gardener v1.84.1
 	github.com/go-logr/logr v1.2.4
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/onsi/ginkgo/v2 v2.13.0
diff --git a/go.sum b/go.sum
index 7a9a078c3..5004cb3b3 100644
--- a/go.sum
+++ b/go.sum
@@ -138,8 +138,8 @@ github.com/gardener/etcd-druid v0.20.1 h1:o6F4higujfg7dvBXvk+yPb86+3t2+XLE0Hmw5W
 github.com/gardener/etcd-druid v0.20.1/go.mod h1:1tAeHycB0Vb2GfCX6sUCc6V6frGrCQI//quVg4K3GNA=
 github.com/gardener/external-dns-management v0.14.2 h1:l7ohlZTOplyK+1AuzO9a1J4/ChyGIuKtLFoyrU+T2uI=
 github.com/gardener/external-dns-management v0.14.2/go.mod h1:dwWtamT74fAhrw2v8N/72XEtc9TvG4R6Gwd0FXKF9Do=
-github.com/gardener/gardener v1.84.0 h1:sfW8RljFT6vaShlHV04RW/99GkTdyiwfsoUDEehVNVE=
-github.com/gardener/gardener v1.84.0/go.mod h1:3XZ+Yn5iHl0acqUIVZ0K78p1OYWp52sRBQOJW6sCRR8=
+github.com/gardener/gardener v1.84.1 h1:iRWByHwBkn6Ig2kRY9HvOTKlNF8Nk2ro03XDhKYyYZs=
+github.com/gardener/gardener v1.84.1/go.mod h1:3XZ+Yn5iHl0acqUIVZ0K78p1OYWp52sRBQOJW6sCRR8=
 github.com/gardener/hvpa-controller/api v0.5.0 h1:f4F3O7YUrenwh4S3TgPREPiB287JjjUiUL18OqPLyAA=
 github.com/gardener/hvpa-controller/api v0.5.0/go.mod h1:QQl3ELkCaki+8RhXl0FZMfvnm0WCGwGJlGmrxJj6lvM=
 github.com/gardener/machine-controller-manager v0.50.0 h1:3dcQjzueFU1TGgprV00adjb3OCR99myTBx8DQGxywks=
diff --git a/vendor/github.com/gardener/gardener/hack/check-generate.sh b/vendor/github.com/gardener/gardener/hack/check-generate.sh
index c966f7855..6b2e1d0ff 100755
--- a/vendor/github.com/gardener/gardener/hack/check-generate.sh
+++ b/vendor/github.com/gardener/gardener/hack/check-generate.sh
@@ -106,17 +106,33 @@ if which git &>/dev/null; then
     exit 1
   fi
 
-  echo ">> make tidy"
-  if ! out=$(make -f "$makefile" tidy 2>&1); then
-    echo "Error during calling make tidy: $out"
-    exit 1
-  fi
-  new_status="$(git status -s)"
+  repo_root="$(git rev-parse --show-toplevel)"
+  if [[ -d "$repo_root/vendor" ]]; then
+    echo ">> make revendor"
+    if ! out=$(make -f "$makefile" revendor 2>&1); then
+      echo "Error during calling make revendor: $out"
+      exit 1
+    fi
+    new_status="$(git status -s)"
 
-  if [[ "$old_status" != "$new_status" ]]; then
-    echo "make tidy needs to be run:"
-    echo "$new_status"
-    exit 1
+    if [[ "$old_status" != "$new_status" ]]; then
+      echo "make revendor needs to be run:"
+      echo "$new_status"
+      exit 1
+    fi
+  else
+    echo ">> make tidy"
+    if ! out=$(make -f "$makefile" tidy 2>&1); then
+      echo "Error during calling make tidy: $out"
+      exit 1
+    fi
+    new_status="$(git status -s)"
+
+    if [[ "$old_status" != "$new_status" ]]; then
+      echo "make tidy needs to be run:"
+      echo "$new_status"
+      exit 1
+    fi
   fi
 else
   echo "No git detected, cannot run make check-generate"
diff --git a/vendor/github.com/gardener/gardener/hack/check-skaffold-deps-for-binary.sh b/vendor/github.com/gardener/gardener/hack/check-skaffold-deps-for-binary.sh
index eb8b75363..b728edf25 100755
--- a/vendor/github.com/gardener/gardener/hack/check-skaffold-deps-for-binary.sh
+++ b/vendor/github.com/gardener/gardener/hack/check-skaffold-deps-for-binary.sh
@@ -73,6 +73,10 @@ go list -f '{{ join .Deps "\n" }}' "./cmd/$binary_name" |\
 
 # always add VERSION file
 echo "VERSION" >> "$path_actual_dependencies"
+# add vendor if the vendor/ dir exists
+if [[ -d "$repo_root/vendor" ]]; then
+  echo "vendor" >> "$path_actual_dependencies"
+fi
 
 # sort dependencies
 sort -fo "$path_current_skaffold_dependencies"{,}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index c7859b0b9..1ace9217f 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -76,7 +76,7 @@ github.com/gardener/etcd-druid/api/v1alpha1
 ## explicit; go 1.19
 github.com/gardener/external-dns-management/pkg/apis/dns
 github.com/gardener/external-dns-management/pkg/apis/dns/v1alpha1
-# github.com/gardener/gardener v1.84.0
+# github.com/gardener/gardener v1.84.1
 ## explicit; go 1.21
 github.com/gardener/gardener/.github
 github.com/gardener/gardener/.github/ISSUE_TEMPLATE