diff --git a/Gopkg.lock b/Gopkg.lock
index 5280e869b..a56dccf4a 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -234,7 +234,8 @@
   revision = "d6023ce2651d8eafb5c75bb0c7167536102ec9f5"
 
 [[projects]]
-  digest = "1:59b55d57e1c4616eb376183c42b1b6ffd3c3fef868e96495c222fc4c53627ee8"
+  branch = "gardener-extensions-fixes"
+  digest = "1:bd2296f76b8ed83170cf0ad36e879c5bbec4a5f65d271de2726e9e7f5833c6cc"
   name = "github.com/gardener/gardener"
   packages = [
     "pkg/apis/core",
@@ -270,7 +271,7 @@
     "pkg/utils/secrets",
   ]
   pruneopts = "NUT"
-  revision = "f718e4bd65f08a62a8fa7836dcebb8e7d2476c1e"
+  revision = "c14e1eebd26fa76ea0f4cc7195f83bad6562ec14"
 
 [[projects]]
   digest = "1:b64bb6e3b9f54cb2f1d79c66ad664339f4c771ff0bab305262c5d34d98ea834d"
diff --git a/Gopkg.toml b/Gopkg.toml
index a0cfacd79..8fc226f02 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -9,7 +9,7 @@ required = [
 
 [[override]]
   name = "github.com/gardener/gardener"
-  revision = "f718e4bd65f08a62a8fa7836dcebb8e7d2476c1e"
+  branch = "gardener-extensions-fixes"
 
 [[override]]
   name = "github.com/gardener/machine-controller-manager"
diff --git a/vendor/github.com/gardener/gardener/pkg/operation/terraformer/waiter.go b/vendor/github.com/gardener/gardener/pkg/operation/terraformer/waiter.go
index 309506b7c..31dbdc9b3 100644
--- a/vendor/github.com/gardener/gardener/pkg/operation/terraformer/waiter.go
+++ b/vendor/github.com/gardener/gardener/pkg/operation/terraformer/waiter.go
@@ -101,7 +101,7 @@ func (t *Terraformer) waitForPod(ctx context.Context) int32 {
 // waitForJob waits for the Terraform Job to be completed (either successful or failed). It checks the
 // Job status field to identify the state.
 func (t *Terraformer) waitForJob(ctx context.Context) bool {
-	ctx, cancel := context.WithTimeout(ctx, time.Hour)
+	ctx, cancel := context.WithTimeout(ctx, 20*time.Minute)
 	defer cancel()
 
 	var succeeded = false