diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
index 46c995d6..0234f66b 100644
--- a/bazel/repository_locations.bzl
+++ b/bazel/repository_locations.bzl
@@ -1,8 +1,8 @@
 REPOSITORY_LOCATIONS = dict(
     envoy = dict(
-        # envoy 1.27.1
-        commit = "6b9db09c69965d5bfb37bdd29693f8b7f9e9e9ec",
-        remote = "https://github.com/envoyproxy/envoy",
+        # envoy 1.27.2 from branch release/v1.27-backportedfork
+        commit = "dcf8bfb08a20fbbb4f4dd479d1e2bf6747b9f206",
+        remote = "https://github.com/solo-io/envoy-fork",
     ),
     inja = dict(
         # Includes unmerged modifications for
diff --git a/changelog/v1.27.2-patch1/bump-envoy.yaml b/changelog/v1.27.2-patch1/bump-envoy.yaml
new file mode 100644
index 00000000..30a41b10
--- /dev/null
+++ b/changelog/v1.27.2-patch1/bump-envoy.yaml
@@ -0,0 +1,9 @@
+changelog:
+- type: DEPENDENCY_BUMP
+  issueLink: https://github.com/solo-io/solo-projects/issues/5315
+  dependencyOwner: solo-io
+  dependencyRepo: envoy-fork
+  dependencyTag: v1.27.2
+  resolvesIssue: false
+  description: >-
+    Update Envoy to latest 1.27.2, including changing to envoy fork for our extproc and tap changes
diff --git a/changelog/v1.27.1-patch3/update-extensions-build-config.yaml b/changelog/v1.27.2-patch1/update-extensions-build-config.yaml
similarity index 100%
rename from changelog/v1.27.1-patch3/update-extensions-build-config.yaml
rename to changelog/v1.27.2-patch1/update-extensions-build-config.yaml
diff --git a/ci/cloudbuild.yaml b/ci/cloudbuild.yaml
index 3ef2d5b5..d72fa876 100644
--- a/ci/cloudbuild.yaml
+++ b/ci/cloudbuild.yaml
@@ -54,7 +54,7 @@ steps:
 
 options:
   machineType: 'N1_HIGHCPU_32'
-timeout: 7200s
+timeout: 20000s
 
 artifacts:
   objects:
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index 99430fb3..5797547c 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -7,4 +7,4 @@ steps:
   args: ['builds','submit','--config=ci/cloudbuild.yaml','--substitutions','COMMIT_SHA=$COMMIT_SHA,_BUILD_TYPE=clang-asan']
   waitFor: ['-']
 
-timeout: 10000s
+timeout: 20000s