diff --git a/go.mod b/go.mod
index bb38d4d5..f36a81a0 100644
--- a/go.mod
+++ b/go.mod
@@ -128,3 +128,6 @@ require (
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )
+
+// TODO(ialidzikov): Drop this replace and vendor v1.84.1 when there is a new gardener/gardener patch release.
+replace github.com/gardener/gardener => github.com/gardener/gardener v1.84.1-0.20231127080841-c244933100e2
diff --git a/go.sum b/go.sum
index cdd705c2..87fb255f 100644
--- a/go.sum
+++ b/go.sum
@@ -136,8 +136,8 @@ github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4
 github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
 github.com/gardener/etcd-druid v0.20.1 h1:o6F4higujfg7dvBXvk+yPb86+3t2+XLE0Hmw5W1kXtM=
 github.com/gardener/etcd-druid v0.20.1/go.mod h1:1tAeHycB0Vb2GfCX6sUCc6V6frGrCQI//quVg4K3GNA=
-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-0.20231127080841-c244933100e2 h1:G2Vx7JguTeQxzXkRVMa/F32FgzrMM379tzTL1nEnFwE=
+github.com/gardener/gardener v1.84.1-0.20231127080841-c244933100e2/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 c966f785..6b2e1d0f 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 eb8b7536..b728edf2 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/github.com/gardener/gardener/imagevector/images.yaml b/vendor/github.com/gardener/gardener/imagevector/images.yaml
index e01c88f7..2f0a3d96 100644
--- a/vendor/github.com/gardener/gardener/imagevector/images.yaml
+++ b/vendor/github.com/gardener/gardener/imagevector/images.yaml
@@ -353,7 +353,7 @@ images:
 # Miscellaenous
 - name: alpine
   repository: eu.gcr.io/gardener-project/3rd/alpine
-  tag: "3.15.8"
+  tag: "3.18.4"
 
 # Logging
 - name: fluent-operator
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 82357068..af37ec9c 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -72,7 +72,7 @@ github.com/fsnotify/fsnotify
 # github.com/gardener/etcd-druid v0.20.1
 ## explicit; go 1.20
 github.com/gardener/etcd-druid/api/v1alpha1
-# github.com/gardener/gardener v1.84.0
+# github.com/gardener/gardener v1.84.0 => github.com/gardener/gardener v1.84.1-0.20231127080841-c244933100e2
 ## explicit; go 1.21
 github.com/gardener/gardener/.github
 github.com/gardener/gardener/.github/ISSUE_TEMPLATE
@@ -1105,3 +1105,4 @@ sigs.k8s.io/structured-merge-diff/v4/value
 # sigs.k8s.io/yaml v1.3.0
 ## explicit; go 1.12
 sigs.k8s.io/yaml
+# github.com/gardener/gardener => github.com/gardener/gardener v1.84.1-0.20231127080841-c244933100e2