diff --git a/bazel/external/quiche.BUILD b/bazel/external/quiche.BUILD
index 9f5f256167f4..858d03fc28e8 100644
--- a/bazel/external/quiche.BUILD
+++ b/bazel/external/quiche.BUILD
@@ -63,7 +63,7 @@ test_suite(
         "quiche_balsa_header_properties_test",
         "quiche_balsa_simple_buffer_test",
         "quiche_common_test",
-        "spdy_core_http2_header_block_test",
+        "quiche_http_header_block_test",
     ],
 )
 
@@ -1318,17 +1318,6 @@ envoy_cc_library(
     deps = [":quiche_common_platform"],
 )
 
-envoy_cc_library(
-    name = "spdy_simple_arena_lib",
-    srcs = ["quiche/spdy/core/spdy_simple_arena.cc"],
-    hdrs = ["quiche/spdy/core/spdy_simple_arena.h"],
-    repository = "@envoy",
-    visibility = ["//visibility:public"],
-    deps = [
-        ":quiche_common_platform",
-    ],
-)
-
 envoy_cc_library(
     name = "spdy_no_op_headers_handler_lib",
     hdrs = ["quiche/spdy/core/no_op_headers_handler.h"],
@@ -1384,7 +1373,6 @@ envoy_cc_library(
 
 envoy_cc_library(
     name = "spdy_core_http2_header_block_lib",
-    srcs = ["quiche/spdy/core/http2_header_block.cc"],
     hdrs = ["quiche/spdy/core/http2_header_block.h"],
     copts = quiche_copts,
     repository = "@envoy",
@@ -1393,19 +1381,7 @@ envoy_cc_library(
         ":quiche_common_lib",
         ":quiche_common_platform",
         ":quiche_common_text_utils_lib",
-        ":spdy_core_http2_header_storage_lib",
-    ],
-)
-
-envoy_cc_library(
-    name = "spdy_core_http2_header_storage_lib",
-    srcs = ["quiche/spdy/core/http2_header_storage.cc"],
-    hdrs = ["quiche/spdy/core/http2_header_storage.h"],
-    copts = quiche_copts,
-    repository = "@envoy",
-    deps = [
-        "spdy_simple_arena_lib",
-        ":quiche_common_platform",
+        ":quiche_http_header_block_lib",
     ],
 )
 
@@ -3850,7 +3826,10 @@ envoy_quic_cc_library(
 envoy_quic_cc_library(
     name = "quic_core_qpack_qpack_stream_sender_delegate_lib",
     hdrs = ["quiche/quic/core/qpack/qpack_stream_sender_delegate.h"],
-    deps = [":quic_platform_base"],
+    deps = [
+        ":quic_core_types_lib",
+        ":quic_platform_base",
+    ],
 )
 
 envoy_quic_cc_library(
@@ -5122,6 +5101,58 @@ envoy_cc_library(
     ],
 )
 
+envoy_cc_library(
+    name = "quiche_simple_arena_lib",
+    srcs = ["quiche/common/quiche_simple_arena.cc"],
+    hdrs = ["quiche/common/quiche_simple_arena.h"],
+    repository = "@envoy",
+    tags = ["nofips"],
+    deps = [
+        ":quiche_common_platform_export",
+        ":quiche_common_platform_logging",
+    ],
+)
+
+envoy_cc_library(
+    name = "quiche_http_header_storage_lib",
+    srcs = ["quiche/common/http/http_header_storage.cc"],
+    hdrs = ["quiche/common/http/http_header_storage.h"],
+    repository = "@envoy",
+    tags = ["nofips"],
+    deps = [
+        ":quiche_common_platform_export",
+        ":quiche_common_platform_logging",
+        ":quiche_simple_arena_lib",
+    ],
+)
+
+envoy_cc_library(
+    name = "quiche_http_header_block_lib",
+    srcs = ["quiche/common/http/http_header_block.cc"],
+    hdrs = ["quiche/common/http/http_header_block.h"],
+    repository = "@envoy",
+    tags = ["nofips"],
+    deps = [
+        ":quiche_common_lib",
+        ":quiche_common_platform_export",
+        ":quiche_common_platform_logging",
+        ":quiche_common_text_utils_lib",
+        ":quiche_http_header_storage_lib",
+    ],
+)
+
+envoy_cc_test(
+    name = "quiche_http_header_block_test",
+    srcs = ["quiche/common/http/http_header_block_test.cc"],
+    repository = "@envoy",
+    tags = ["nofips"],
+    deps = [
+        ":quiche_common_platform_test",
+        ":quiche_http_header_block_lib",
+        ":spdy_test_tools_test_utils_lib",
+    ],
+)
+
 envoy_cc_library(
     name = "quiche_common_structured_headers_lib",
     srcs = ["quiche/common/structured_headers.cc"],
@@ -5186,19 +5217,6 @@ envoy_cc_library(
     ],
 )
 
-envoy_cc_test(
-    name = "spdy_core_http2_header_block_test",
-    srcs = ["quiche/spdy/core/http2_header_block_test.cc"],
-    copts = quiche_copts,
-    coverage = False,
-    repository = "@envoy",
-    tags = ["nofips"],
-    deps = [
-        ":spdy_core_http2_header_block_lib",
-        ":spdy_test_tools_test_utils_lib",
-    ],
-)
-
 envoy_cc_test(
     name = "quic_core_batch_writer_batch_writer_test",
     srcs = select({
diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
index af10692c44f3..5ba73ed199fe 100644
--- a/bazel/repository_locations.bzl
+++ b/bazel/repository_locations.bzl
@@ -1123,12 +1123,12 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         project_name = "QUICHE",
         project_desc = "QUICHE (QUIC, HTTP/2, Etc) is Google‘s implementation of QUIC and related protocols",
         project_url = "https://github.com/google/quiche",
-        version = "7db381c8d8ba3f334ca1ec95a86f2a45b11c5948",
-        sha256 = "9e74805d23fd81736b9601ada2735c6532a3abadb8f809fe2cd7e07a40817056",
+        version = "5cdf937c378cdf08ff55ea9e86cfbf05bec54df2",
+        sha256 = "d7e9019d3bac864050cc3b2bbaac16c4dfd4f78af7991941f97ec88c90c50b0b",
         urls = ["https://github.com/google/quiche/archive/{version}.tar.gz"],
         strip_prefix = "quiche-{version}",
         use_category = ["controlplane", "dataplane_core"],
-        release_date = "2023-09-21",
+        release_date = "2023-09-27",
         cpe = "N/A",
         license = "BSD-3-Clause",
         license_url = "https://github.com/google/quiche/blob/{version}/LICENSE",