diff --git a/modules/dd-trace-cpp/2.0.0.envoy/MODULE.bazel b/modules/dd-trace-cpp/2.0.0.envoy/MODULE.bazel
deleted file mode 100644
index 9c31964..0000000
--- a/modules/dd-trace-cpp/2.0.0.envoy/MODULE.bazel
+++ /dev/null
@@ -1,10 +0,0 @@
-module(
-    name = "dd-trace-cpp",
-    version = "2.0.0.envoy",
-    compatibility_level = 0,
-)
-
-bazel_dep(name = "abseil-cpp", version = "20250814.1", repo_name = "com_google_absl")
-bazel_dep(name = "bazel_skylib", version = "1.9.0")
-bazel_dep(name = "platforms", version = "1.0.0")
-bazel_dep(name = "rules_cc", version = "0.2.16")
diff --git a/modules/dd-trace-cpp/2.0.0.envoy/presubmit.yml b/modules/dd-trace-cpp/2.0.0.envoy/presubmit.yml
deleted file mode 100644
index f80059c..0000000
--- a/modules/dd-trace-cpp/2.0.0.envoy/presubmit.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-matrix:
-  platform:
-  - debian11
-  - ubuntu2404
-  - macos
-  bazel:
-  - 8.x
-
-tasks:
-  verify_targets:
-    name: Verify build targets
-    platform: ${{ platform }}
-    bazel: ${{ bazel }}
-    build_targets:
-    - "@dd-trace-cpp//..."
diff --git a/modules/dd-trace-cpp/2.0.0.envoy/source.json b/modules/dd-trace-cpp/2.0.0.envoy/source.json
deleted file mode 100644
index 5e115de..0000000
--- a/modules/dd-trace-cpp/2.0.0.envoy/source.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "url": "https://github.com/DataDog/dd-trace-cpp/archive/v2.0.0.tar.gz",
-    "integrity": "sha256-5KDavD4YbOmccWhReESPk8UBV3ECzcUN2/EsuqulRxM=",
-    "strip_prefix": "dd-trace-cpp-2.0.0"
-}
diff --git a/modules/dd-trace-cpp/metadata.json b/modules/dd-trace-cpp/metadata.json
index 00cefeb..9689cf6 100644
--- a/modules/dd-trace-cpp/metadata.json
+++ b/modules/dd-trace-cpp/metadata.json
@@ -5,7 +5,6 @@
     "github:DataDog/dd-trace-cpp"
   ],
   "versions": [
-    "2.0.0.envoy",
     "2.1.1.envoy"
   ],
   "yanked_versions": {}
diff --git a/modules/ipp-crypto/1.3.0.envoy/MODULE.bazel b/modules/ipp-crypto/1.3.0.envoy/MODULE.bazel
deleted file mode 100644
index d88eac0..0000000
--- a/modules/ipp-crypto/1.3.0.envoy/MODULE.bazel
+++ /dev/null
@@ -1,11 +0,0 @@
-module(
-    name = "ipp-crypto",
-    version = "1.3.0.envoy",
-    compatibility_level = 1,
-    bazel_compatibility = [">=7.2.1"],
-)
-
-bazel_dep(name = "bazel_skylib", version = "1.8.1")
-bazel_dep(name = "boringssl", version = "0.20241024.0")
-bazel_dep(name = "platforms", version = "1.0.0")
-bazel_dep(name = "rules_cc", version = "0.2.8")
diff --git a/modules/ipp-crypto/1.3.0.envoy/overlay/BUILD.bazel b/modules/ipp-crypto/1.3.0.envoy/overlay/BUILD.bazel
deleted file mode 100644
index 498bebc..0000000
--- a/modules/ipp-crypto/1.3.0.envoy/overlay/BUILD.bazel
+++ /dev/null
@@ -1,38 +0,0 @@
-load("@rules_cc//cc:defs.bzl", "cc_library")
-
-label_flag(
-    name = "crypto_lib",
-    build_setting_default = "@boringssl//:crypto",
-    visibility = ["//visibility:public"],
-)
-
-cc_library(
-    name = "crypto_mb",
-    srcs = glob(
-        ["sources/ippcp/crypto_mb/src/**/*.c"],
-        exclude = [
-            # Exclude dispatcher - it needs generated headers
-            "sources/ippcp/crypto_mb/src/dispatcher/**",
-            # Exclude fips cert code if not needed
-            "sources/ippcp/crypto_mb/src/fips_cert/**",
-        ],
-    ),
-    hdrs = glob(["sources/ippcp/crypto_mb/include/**/*.h"]),
-    textual_hdrs = glob(["sources/ippcp/crypto_mb/src/**/*.h"]),
-    includes = ["sources/ippcp/crypto_mb/include"],
-    visibility = ["//visibility:public"],
-    deps = [":crypto_lib"],
-    copts = [
-        "-O3",
-        "-fPIC",
-        "-mavx512f",
-        "-mavx512dq",
-        "-mavx512ifma",
-    ],
-    # Single-CPU build without dispatcher
-    local_defines = ["SIMD_LEN=512"],
-    target_compatible_with = [
-        "@platforms//os:linux",
-        "@platforms//cpu:x86_64",
-    ],
-)
diff --git a/modules/ipp-crypto/1.3.0.envoy/source.json b/modules/ipp-crypto/1.3.0.envoy/source.json
deleted file mode 100644
index 3229663..0000000
--- a/modules/ipp-crypto/1.3.0.envoy/source.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "url": "https://github.com/intel/cryptography-primitives/archive/refs/tags/v1.3.0.tar.gz",
-    "integrity": "sha256-odh8s7kP5HGGCeTp3YND/UUxu4FeabrZAaxrRvmLO1M=",
-    "strip_prefix": "cryptography-primitives-1.3.0",
-    "overlay": {
-        "BUILD.bazel": "sha256-2GNMWDzmzAn2ussS6xJ+oQM/xBi5ctS2rfOuDqC36aQ="
-    }
-}
diff --git a/modules/ipp-crypto/metadata.json b/modules/ipp-crypto/metadata.json
index 1493abd..ccbf604 100644
--- a/modules/ipp-crypto/metadata.json
+++ b/modules/ipp-crypto/metadata.json
@@ -5,7 +5,6 @@
         "github:intel/cryptography-primitives"
     ],
     "versions": [
-        "1.3.0.envoy",
         "2.2.0.envoy"
     ],
     "yanked_versions": {}
diff --git a/modules/kafka/3.9.1.envoy/MODULE.bazel b/modules/kafka/3.9.1.envoy/MODULE.bazel
deleted file mode 100644
index fe31f95..0000000
--- a/modules/kafka/3.9.1.envoy/MODULE.bazel
+++ /dev/null
@@ -1,8 +0,0 @@
-"""Kafka protocol message definitions from Apache Kafka."""
-
-module(
-    name = "kafka",
-    version = "3.9.1.envoy",
-    bazel_compatibility = [">=7.2.1"],  # need support for "overlay" directory
-    compatibility_level = 1,
-)
diff --git a/modules/kafka/3.9.1.envoy/overlay/BUILD.bazel b/modules/kafka/3.9.1.envoy/overlay/BUILD.bazel
deleted file mode 100644
index 40cd145..0000000
--- a/modules/kafka/3.9.1.envoy/overlay/BUILD.bazel
+++ /dev/null
@@ -1,28 +0,0 @@
-"""Kafka protocol message definitions.
-
-This module provides Kafka protocol message definitions (JSON files) from Apache Kafka.
-Used by Envoy's Kafka filter for protocol message parsing and code generation.
-"""
-
-licenses(["notice"])  # Apache 2.0
-
-# Kafka protocol request message definitions
-filegroup(
-    name = "request_protocol_files",
-    srcs = glob(["*Request.json"]),
-    visibility = ["//visibility:public"],
-)
-
-# Kafka protocol response message definitions
-filegroup(
-    name = "response_protocol_files",
-    srcs = glob(["*Response.json"]),
-    visibility = ["//visibility:public"],
-)
-
-# All Kafka protocol message definitions
-filegroup(
-    name = "all_protocol_files",
-    srcs = glob(["*.json"]),
-    visibility = ["//visibility:public"],
-)
diff --git a/modules/kafka/3.9.1.envoy/presubmit.yml b/modules/kafka/3.9.1.envoy/presubmit.yml
deleted file mode 100644
index 61d3afa..0000000
--- a/modules/kafka/3.9.1.envoy/presubmit.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-matrix:
-  platform:
-  - debian11
-  - debian10
-  - ubuntu2004
-  - ubuntu2204
-  - macos
-  bazel:
-  - 8.x
-  - 7.x
-tasks:
-  verify_targets:
-    name: Verify kafka protocol files
-    platform: ${{ platform }}
-    bazel: ${{ bazel }}
-    build_targets:
-    - '@kafka//:request_protocol_files'
-    - '@kafka//:response_protocol_files'
-    - '@kafka//:all_protocol_files'
diff --git a/modules/kafka/3.9.1.envoy/source.json b/modules/kafka/3.9.1.envoy/source.json
deleted file mode 100644
index 1339ae8..0000000
--- a/modules/kafka/3.9.1.envoy/source.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "url": "https://github.com/apache/kafka/archive/3.9.1.zip",
-    "integrity": "sha256-wVuClAz7n2f86QnYYA3IvPxC0nldosJsFJ0Dpif4UjQ=",
-    "strip_prefix": "kafka-3.9.1/clients/src/main/resources/common/message",
-    "overlay": {
-        "BUILD.bazel": "sha256-4l4zD8+GCfZlGeAE7pmPvhbmQNZNviJOcqxVO1m7zG8="
-    }
-}
diff --git a/modules/kafka/metadata.json b/modules/kafka/metadata.json
index be70f73..2dbf20d 100644
--- a/modules/kafka/metadata.json
+++ b/modules/kafka/metadata.json
@@ -11,7 +11,6 @@
         "github:apache/kafka"
     ],
     "versions": [
-        "3.9.1.envoy",
         "3.9.2.envoy"
     ],
     "yanked_versions": {}
diff --git a/modules/libmaxminddb/metadata.json b/modules/libmaxminddb/metadata.json
index aadb864..5bf8386 100644
--- a/modules/libmaxminddb/metadata.json
+++ b/modules/libmaxminddb/metadata.json
@@ -10,7 +10,6 @@
         "github:maxmind/libmaxminddb"
     ],
     "versions": [
-        "1.10.0",
         "1.13.3.envoy"
     ],
     "yanked_versions": {}
diff --git a/modules/libprotobuf-mutator/metadata.json b/modules/libprotobuf-mutator/metadata.json
index 7008152..7420f5f 100644
--- a/modules/libprotobuf-mutator/metadata.json
+++ b/modules/libprotobuf-mutator/metadata.json
@@ -10,7 +10,6 @@
         "github:google/libprotobuf-mutator"
     ],
     "versions": [
-        "1.3",
         "1.5.envoy"
     ],
     "yanked_versions": {}
diff --git a/modules/liburing/2.13.envoy/MODULE.bazel b/modules/liburing/2.13.envoy/MODULE.bazel
deleted file mode 100644
index f080cab..0000000
--- a/modules/liburing/2.13.envoy/MODULE.bazel
+++ /dev/null
@@ -1,8 +0,0 @@
-module(
-    name = "liburing",
-    version = "2.13.envoy",
-    bazel_compatibility = [">=7.2.1"],  # need support for "overlay" directory
-    compatibility_level = 1,
-)
-
-bazel_dep(name = "rules_cc", version = "0.1.1")
diff --git a/modules/liburing/2.13.envoy/overlay/BUILD.bazel b/modules/liburing/2.13.envoy/overlay/BUILD.bazel
deleted file mode 100644
index 68900d1..0000000
--- a/modules/liburing/2.13.envoy/overlay/BUILD.bazel
+++ /dev/null
@@ -1,101 +0,0 @@
-# SPDX-License-Identifier:Apache-2.0
-
-VERSION_MAJOR = 2
-VERSION_MINOR = 13
-
-genrule(
-    name = "io_uring_version_h",
-    outs = ["src/include/liburing/io_uring_version.h"],
-    cmd = """
-cat > $@ << 'EOF'
-/* SPDX-License-Identifier:MIT */
-#ifndef LIBURING_VERSION_H
-#define LIBURING_VERSION_H
-
-#define IO_URING_VERSION_MAJOR {major}
-#define IO_URING_VERSION_MINOR {minor}
-
-#endif
-EOF
-""".format(major = VERSION_MAJOR, minor = VERSION_MINOR),
-)
-
-genrule(
-    name = "config_host_h",
-    outs = ["config-host.h"],
-    cmd = """
-cat > $@ << 'EOF'
-/* SPDX-License-Identifier:MIT */
-/* Automatically generated by Bazel - do not modify */
-/* Using libc (not nolibc) */
-EOF
-""",
-)
-
-genrule(
-    name = "compat_h",
-    outs = ["src/include/liburing/compat.h"],
-    cmd = """
-cat > $@ << 'EOF'
-/* SPDX-License-Identifier:MIT */
-#ifndef LIBURING_COMPAT_H
-#define LIBURING_COMPAT_H
-
-#include <linux/time_types.h>
-#define UAPI_LINUX_IO_URING_H_SKIP_LINUX_TIME_TYPES_H 1
-
-#include <linux/openat2.h>
-
-#include <sys/stat.h>
-
-#include <linux/futex.h>
-
-#include <sys/wait.h>
-
-#include <sys/ioctl.h>
-
-#ifndef BLOCK_URING_CMD_DISCARD
-#define BLOCK_URING_CMD_DISCARD _IO(0x12, 0)
-#endif
-
-#endif
-EOF
-""",
-)
-
-cc_library(
-    name = "uring",
-    srcs = [
-        "config-host.h",
-        "src/include/liburing/compat.h",
-        "src/include/liburing/io_uring_version.h",
-        "src/queue.c",
-        "src/register.c",
-        "src/setup.c",
-        "src/syscall.c",
-        "src/version.c",
-    ] + glob([
-        "src/arch/**/*.h",
-        "src/*.h",
-    ]),
-    hdrs = glob(["src/include/**/*.h"]),
-    copts = [
-        "-D_GNU_SOURCE",
-        "-D_LARGEFILE_SOURCE",
-        "-D_FILE_OFFSET_BITS=64",
-        "-DLIBURING_INTERNAL",
-        "-O3",
-        "-Wall",
-        "-Wextra",
-        "-fno-stack-protector",
-        "-include config-host.h",
-    ],
-    includes = ["src/include"],
-    visibility = ["//visibility:public"],
-)
-
-alias(
-    name = "liburing",
-    actual = ":uring",
-    visibility = ["//visibility:public"],
-)
diff --git a/modules/liburing/2.13.envoy/overlay/MODULE.bazel b/modules/liburing/2.13.envoy/overlay/MODULE.bazel
deleted file mode 100644
index 13e9403..0000000
--- a/modules/liburing/2.13.envoy/overlay/MODULE.bazel
+++ /dev/null
@@ -1,8 +0,0 @@
-module(
-    name = "liburing",
-    version = "2.13",
-    bazel_compatibility = [">=7.2.1"],  # need support for "overlay" directory
-    compatibility_level = 1,
-)
-
-bazel_dep(name = "rules_cc", version = "0.1.1")
diff --git a/modules/liburing/2.13.envoy/patches/liburing.patch b/modules/liburing/2.13.envoy/patches/liburing.patch
deleted file mode 100644
index 2b9a47b..0000000
--- a/modules/liburing/2.13.envoy/patches/liburing.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/src/Makefile b/src/Makefile
-index 7febcf3c..c6ce2180 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -45,6 +45,22 @@ else
- endif
- LINK_FLAGS+=$(LDFLAGS)
- 
-+AR ?= ar
-+RANLIB ?= ranlib
-+
-+ifdef EXT_BUILD_ROOT
-+    ifneq ($(findstring /,$(AR)),)
-+        ifeq ($(filter /%,$(AR)),)
-+            AR := $(EXT_BUILD_ROOT)/$(AR)
-+        endif
-+    endif
-+    ifneq ($(findstring /,$(RANLIB)),)
-+        ifeq ($(filter /%,$(RANLIB)),)
-+            RANLIB := $(EXT_BUILD_ROOT)/$(RANLIB)
-+        endif
-+    endif
-+endif
-+
- all: $(all_targets)
- 
- liburing_srcs := setup.c queue.c register.c syscall.c version.c
-@@ -83,8 +99,6 @@ liburing_ffi_sobjs := ffi.os
- 
- -include $(liburing_objs:%=%.d) $(liburing_sobjs:%=%.d) $(liburing_ffi_objs:%=%.d) $(liburing_ffi_sobjs:%=%.d)
- 
--AR ?= ar
--RANLIB ?= ranlib
- liburing.a: $(liburing_objs)
- 	@rm -f liburing.a
- 	$(QUIET_AR)$(AR) r liburing.a $^
diff --git a/modules/liburing/2.13.envoy/presubmit.yml b/modules/liburing/2.13.envoy/presubmit.yml
deleted file mode 100644
index 8e5cb1f..0000000
--- a/modules/liburing/2.13.envoy/presubmit.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-matrix:
-  platform:
-  - debian11
-  - debian10
-  - fedora39
-  - ubuntu2004
-  - ubuntu2204
-  - ubuntu2404
-  bazel:
-  - 8.x
-  - 7.x
-tasks:
-  verify_targets:
-    name: Verify build targets
-    platform: ${{ platform }}
-    bazel: ${{ bazel }}
-    build_targets:
-    - '@liburing'
diff --git a/modules/liburing/2.13.envoy/source.json b/modules/liburing/2.13.envoy/source.json
deleted file mode 100644
index ba90d4d..0000000
--- a/modules/liburing/2.13.envoy/source.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "url": "https://github.com/axboe/liburing/archive/refs/tags/liburing-2.13.tar.gz",
-    "integrity": "sha256-YY402+pAj8njPXxLq9dGA2297ff84klrEXjO0Pm1s1c=",
-    "strip_prefix": "liburing-liburing-2.13",
-    "overlay": {
-        "BUILD.bazel": "sha256-6NehVjTTRXsLx4ydgDO4IH+cNZOVRiSKFLFrY78YXm0=",
-        "MODULE.bazel": "sha256-hqGEmZhDwXDzHdpjBS5IWp6IloyiKYt70kPPEUCF3ZQ="
-    },
-    "patch_strip": 1,
-    "patches": {
-        "liburing.patch": "sha256-xTx/VyNO9vhzuQ+ZSl5chkTgj7HclpEGzRC0QNeMXqA="
-    }
-}
diff --git a/modules/liburing/metadata.json b/modules/liburing/metadata.json
index 8ae2819..872b08b 100644
--- a/modules/liburing/metadata.json
+++ b/modules/liburing/metadata.json
@@ -12,9 +12,6 @@
         "github:axboe/liburing"
     ],
     "versions": [
-        "2.5",
-        "2.10",
-        "2.13.envoy",
         "2.15.envoy"
     ],
     "yanked_versions": {}
diff --git a/modules/lz4/metadata.json b/modules/lz4/metadata.json
index 4229ebb..7319684 100644
--- a/modules/lz4/metadata.json
+++ b/modules/lz4/metadata.json
@@ -5,11 +5,6 @@
         "github:lz4/lz4"
     ],
     "versions": [
-        "1.9.4",
-        "1.9.4.bcr.1",
-        "1.9.4.bcr.2",
-        "1.10.0",
-        "1.10.0.bcr.1",
         "1.10.0.bcr.2.envoy"
     ],
     "yanked_versions": {
diff --git a/modules/opentelemetry-cpp/1.24.0.envoy/MODULE.bazel b/modules/opentelemetry-cpp/1.24.0.envoy/MODULE.bazel
deleted file mode 100644
index a157f8e..0000000
--- a/modules/opentelemetry-cpp/1.24.0.envoy/MODULE.bazel
+++ /dev/null
@@ -1,22 +0,0 @@
-module(
-    name = "opentelemetry-cpp",
-    version = "1.24.0.envoy",
-    compatibility_level = 0,
-    repo_name = "io_opentelemetry_cpp",
-    bazel_compatibility = [">=7.2.1"],
-)
-
-bazel_dep(name = "abseil-cpp", version = "20240116.1", repo_name = "com_google_absl")
-bazel_dep(name = "bazel_skylib", version = "1.7.1")
-bazel_dep(name = "curl", version = "8.8.0")
-bazel_dep(name = "grpc", version = "1.66.0.bcr.2", repo_name = "com_github_grpc_grpc")
-bazel_dep(name = "nlohmann_json", version = "3.12.0", repo_name = "github_nlohmann_json")
-bazel_dep(name = "opentelemetry-proto", version = "1.8.0", repo_name = "com_github_opentelemetry_proto")
-bazel_dep(name = "opentracing-cpp", version = "1.6.0", repo_name = "com_github_opentracing")
-bazel_dep(name = "platforms", version = "0.0.11")
-bazel_dep(name = "prometheus-cpp", version = "1.3.0", repo_name = "com_github_jupp0r_prometheus_cpp")
-bazel_dep(name = "protobuf", version = "29.0", repo_name = "com_google_protobuf")
-bazel_dep(name = "rapidyaml", version = "0.9.0")
-bazel_dep(name = "rules_cc", version = "0.2.9")
-bazel_dep(name = "rules_proto", version = "7.0.2")
-bazel_dep(name = "zlib", version = "1.3.1.bcr.5")
diff --git a/modules/opentelemetry-cpp/1.24.0.envoy/presubmit.yml b/modules/opentelemetry-cpp/1.24.0.envoy/presubmit.yml
deleted file mode 100644
index f0013cc..0000000
--- a/modules/opentelemetry-cpp/1.24.0.envoy/presubmit.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-matrix:
-  platform:
-  - debian11
-  - ubuntu2204
-  - macos
-  - macos_arm64
-  - windows
-  bazel:
-  - 7.x
-  - 8.x
-tasks:
-  verify_targets:
-    name: Verify build targets
-    platform: ${{ platform }}
-    bazel: ${{ bazel }}
-    build_targets:
-    - '@opentelemetry-cpp//api:api'
-    - '@opentelemetry-cpp//sdk:headers'
-    - '@opentelemetry-cpp//exporters/ostream:ostream_log_record_exporter'
-    - '@opentelemetry-cpp//exporters/ostream:ostream_metric_exporter'
diff --git a/modules/opentelemetry-cpp/1.24.0.envoy/source.json b/modules/opentelemetry-cpp/1.24.0.envoy/source.json
deleted file mode 100644
index 99689a6..0000000
--- a/modules/opentelemetry-cpp/1.24.0.envoy/source.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "url": "https://github.com/open-telemetry/opentelemetry-cpp/archive/refs/tags/v1.24.0.tar.gz",
-    "integrity": "sha256-e46Wav/KHa8ZBicvTZg2McrYX7bqYPtvVdzRgRpzBgQ=",
-    "strip_prefix": "opentelemetry-cpp-1.24.0"
-}
diff --git a/modules/opentelemetry-cpp/metadata.json b/modules/opentelemetry-cpp/metadata.json
index dca985a..d5d69c5 100644
--- a/modules/opentelemetry-cpp/metadata.json
+++ b/modules/opentelemetry-cpp/metadata.json
@@ -5,7 +5,6 @@
     "github:open-telemetry/opentelemetry-cpp"
   ],
   "versions": [
-    "1.24.0.envoy",
     "1.28.0.envoy"
   ],
   "yanked_versions": {}
diff --git a/modules/perfetto/53.0.envoy/MODULE.bazel b/modules/perfetto/53.0.envoy/MODULE.bazel
deleted file mode 100644
index 7d22742..0000000
--- a/modules/perfetto/53.0.envoy/MODULE.bazel
+++ /dev/null
@@ -1,11 +0,0 @@
-module(
-    name = "perfetto",
-    version = "53.0.envoy",
-    bazel_compatibility = [">=7.2.1"],
-    compatibility_level = 1,
-)
-
-bazel_dep(name = "rules_cc", version = "0.1.1")
-bazel_dep(name = "bazel_skylib", version = "1.7.1")
-bazel_dep(name = "platforms", version = "0.0.10")
-bazel_dep(name = "protobuf", version = "28.3", repo_name = "com_google_protobuf")
diff --git a/modules/perfetto/53.0.envoy/overlay/BUILD.bazel b/modules/perfetto/53.0.envoy/overlay/BUILD.bazel
deleted file mode 100644
index ec8d9f3..0000000
--- a/modules/perfetto/53.0.envoy/overlay/BUILD.bazel
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file is intentionally minimal. The perfetto repository already contains
-# comprehensive BUILD files. This overlay just ensures proper visibility for
-# external consumers.
-
-package(default_visibility = ["//visibility:public"])
-
-exports_files(["MODULE.bazel"])
diff --git a/modules/perfetto/53.0.envoy/overlay/MODULE.bazel b/modules/perfetto/53.0.envoy/overlay/MODULE.bazel
deleted file mode 100644
index 908fcba..0000000
--- a/modules/perfetto/53.0.envoy/overlay/MODULE.bazel
+++ /dev/null
@@ -1,11 +0,0 @@
-module(
-    name = "perfetto",
-    version = "53.0",
-    bazel_compatibility = [">=7.2.1"],
-    compatibility_level = 1,
-)
-
-bazel_dep(name = "rules_cc", version = "0.1.1")
-bazel_dep(name = "bazel_skylib", version = "1.7.1")
-bazel_dep(name = "platforms", version = "0.0.10")
-bazel_dep(name = "protobuf", version = "28.3", repo_name = "com_google_protobuf")
diff --git a/modules/perfetto/53.0.envoy/presubmit.yml b/modules/perfetto/53.0.envoy/presubmit.yml
deleted file mode 100644
index 61d09c3..0000000
--- a/modules/perfetto/53.0.envoy/presubmit.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-matrix:
-  platform:
-  - debian11
-  - ubuntu2004
-  - ubuntu2204
-  - ubuntu2404
-  bazel:
-  - 8.x
-  - 7.x
-tasks:
-  verify_targets:
-    name: Verify build targets
-    platform: ${{ platform }}
-    bazel: ${{ bazel }}
-    build_targets:
-    - '@perfetto//:perfetto'
diff --git a/modules/perfetto/53.0.envoy/source.json b/modules/perfetto/53.0.envoy/source.json
deleted file mode 100644
index 383bbe2..0000000
--- a/modules/perfetto/53.0.envoy/source.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "url": "https://github.com/google/perfetto/archive/refs/tags/v53.0.tar.gz",
-    "integrity": "sha256-slAj8ygRZaGn183p8+0t/PzgIv/XJ+d/ZYmVHgumr5o=",
-    "strip_prefix": "perfetto-53.0",
-    "overlay": {
-        "BUILD.bazel": "sha256-pL5SKNc/cX8S54KSRdlQCP1wojW9nRUIwaOuPk3d7/w=",
-        "MODULE.bazel": "sha256-9nv2E8FDYu++Setv8MaHXtmyus8baO9Zc4BS+LkENsE="
-    }
-}
diff --git a/modules/perfetto/metadata.json b/modules/perfetto/metadata.json
index 974d846..97d2c5a 100644
--- a/modules/perfetto/metadata.json
+++ b/modules/perfetto/metadata.json
@@ -5,7 +5,6 @@
     "github:google/perfetto"
   ],
   "versions": [
-    "53.0.envoy",
     "57.2.envoy"
   ],
   "yanked_versions": {}
diff --git a/modules/qatlib/25.08.0.envoy/MODULE.bazel b/modules/qatlib/25.08.0.envoy/MODULE.bazel
deleted file mode 100644
index 328c481..0000000
--- a/modules/qatlib/25.08.0.envoy/MODULE.bazel
+++ /dev/null
@@ -1,12 +0,0 @@
-module(
-    name = "qatlib",
-    version = "25.08.0.envoy",
-    compatibility_level = 1,
-    bazel_compatibility = [">=7.2.1"],
-)
-
-bazel_dep(name = "bazel_skylib", version = "1.8.1")
-bazel_dep(name = "boringssl", version = "0.20250514.0")
-bazel_dep(name = "numactl", version = "2.0.19")
-bazel_dep(name = "platforms", version = "1.0.0")
-bazel_dep(name = "rules_cc", version = "0.2.8")
diff --git a/modules/qatlib/25.08.0.envoy/overlay/BUILD.bazel b/modules/qatlib/25.08.0.envoy/overlay/BUILD.bazel
deleted file mode 100644
index f9bb30e..0000000
--- a/modules/qatlib/25.08.0.envoy/overlay/BUILD.bazel
+++ /dev/null
@@ -1,213 +0,0 @@
-load("@rules_cc//cc:defs.bzl", "cc_library")
-
-label_flag(
-    name = "crypto_lib",
-    build_setting_default = "@boringssl//:crypto",
-    visibility = ["//visibility:public"],
-)
-
-cc_library(
-    name = "osal",
-    srcs = glob(["quickassist/utilities/osal/src/linux/user_space/*.c"]),
-    hdrs = glob([
-        "quickassist/utilities/osal/include/*.h",
-        "quickassist/utilities/osal/src/linux/user_space/include/*.h",
-    ]),
-    includes = [
-        "quickassist/utilities/osal/include",
-        "quickassist/utilities/osal/src/linux/user_space/include",
-    ],
-    copts = ["-fPIC"],
-    visibility = ["//visibility:public"],
-    deps = [
-        ":crypto_lib",
-        "@numactl//:numa",
-    ],
-)
-
-cc_library(
-    name = "adf",
-    srcs = glob(["quickassist/utilities/adf_ctl/*.c"]),
-    hdrs = glob([
-        "quickassist/utilities/adf_ctl/*.h",
-    ]),
-    includes = [
-        "quickassist/utilities/adf_ctl",
-        "quickassist/utilities/libusdm_drv",
-    ],
-    copts = ["-fPIC"],
-    visibility = ["//visibility:public"],
-)
-
-cc_library(
-    name = "usdm",
-    srcs = [
-        # Exact files from Makefile.am (without ICP_THREAD_SPECIFIC_USDM)
-        "quickassist/utilities/libusdm_drv/user_space/vfio/qae_mem_utils_vfio.c",
-        "quickassist/utilities/libusdm_drv/user_space/qae_mem_utils_common.c",
-        "quickassist/utilities/libusdm_drv/user_space/vfio/qae_mem_hugepage_utils_vfio.c",
-        "quickassist/utilities/libusdm_drv/user_space/qae_mem_common.c",
-    ],
-    hdrs = glob([
-        "quickassist/utilities/libusdm_drv/*.h",
-        "quickassist/utilities/libusdm_drv/include/*.h",
-        "quickassist/utilities/libusdm_drv/user_space/*.h",
-    ]),
-    includes = [
-        "quickassist/utilities/libusdm_drv",
-        "quickassist/utilities/libusdm_drv/include",
-        "quickassist/utilities/libusdm_drv/user_space",
-    ],
-    copts = ["-fPIC"],
-    visibility = ["//visibility:public"],
-    alwayslink = True,
-    deps = [
-        ":osal",
-        "@numactl//:numa",
-    ],
-)
-
-genrule(
-    name = "qat_hdrs_gen",
-    srcs = [
-        "quickassist/include/cpa.h",
-        "quickassist/include/cpa_types.h",
-        "quickassist/include/cpa_dev.h",
-        "quickassist/include/lac/cpa_cy_rsa.h",
-        "quickassist/include/lac/cpa_cy_im.h",
-        "quickassist/include/lac/cpa_cy_common.h",
-        "quickassist/include/lac/cpa_cy_sym.h",
-        "quickassist/include/lac/cpa_cy_dh.h",
-        "quickassist/include/lac/cpa_cy_dsa.h",
-        "quickassist/include/lac/cpa_cy_ecdh.h",
-        "quickassist/include/lac/cpa_cy_ecdsa.h",
-        "quickassist/include/lac/cpa_cy_ec.h",
-        "quickassist/include/lac/cpa_cy_key.h",
-        "quickassist/include/lac/cpa_cy_ln.h",
-        "quickassist/include/lac/cpa_cy_prime.h",
-        "quickassist/include/dc/cpa_dc.h",
-        "quickassist/include/dc/cpa_dc_dp.h",
-        "quickassist/include/dc/cpa_dc_chain.h",
-        "quickassist/utilities/libusdm_drv/qae_mem.h",
-        "quickassist/lookaside/access_layer/include/icp_sal_poll.h",
-        "quickassist/lookaside/access_layer/include/icp_sal_user.h",
-        "quickassist/lookaside/access_layer/include/icp_sal.h",
-        "quickassist/lookaside/access_layer/include/icp_sal_versions.h",
-    ],
-    outs = [
-        "qat/cpa.h",
-        "qat/cpa_types.h",
-        "qat/cpa_dev.h",
-        "qat/cpa_cy_rsa.h",
-        "qat/cpa_cy_im.h",
-        "qat/cpa_cy_common.h",
-        "qat/cpa_cy_sym.h",
-        "qat/cpa_cy_dh.h",
-        "qat/cpa_cy_dsa.h",
-        "qat/cpa_cy_ecdh.h",
-        "qat/cpa_cy_ecdsa.h",
-        "qat/cpa_cy_ec.h",
-        "qat/cpa_cy_key.h",
-        "qat/cpa_cy_ln.h",
-        "qat/cpa_cy_prime.h",
-        "qat/cpa_dc.h",
-        "qat/cpa_dc_dp.h",
-        "qat/cpa_dc_chain.h",
-        "qat/qae_mem.h",
-        "qat/icp_sal_poll.h",
-        "qat/icp_sal_user.h",
-        "qat/icp_sal.h",
-        "qat/icp_sal_versions.h",
-    ],
-    cmd = """
-    mkdir -p $(@D)/qat
-    for src in $(SRCS); do
-        cp $$src $(@D)/qat/
-    done
-    """,
-)
-
-cc_library(
-    name = "qat_public_hdrs",
-    hdrs = [":qat_hdrs_gen"],
-    includes = ["."],
-    visibility = ["//visibility:public"],
-)
-
-cc_library(
-    name = "qat",
-    srcs = glob(
-        ["quickassist/lookaside/access_layer/src/**/*.c"],
-        exclude = ["quickassist/lookaside/access_layer/src/sample_code/**"],
-    ),
-    hdrs = glob(
-        [
-            "quickassist/include/*.h",
-            "quickassist/include/**/*.h",
-            "quickassist/lookaside/access_layer/include/*.h",
-            "quickassist/lookaside/access_layer/src/**/*.h",
-            "quickassist/lookaside/firmware/include/*.h",
-        ],
-        exclude = ["quickassist/lookaside/access_layer/src/sample_code/**"],
-    ),
-    includes = [
-        # Public includes
-        "quickassist/include",
-        "quickassist/include/lac",
-        "quickassist/include/dc",
-        "quickassist/include/rl",
-        "quickassist/lookaside/access_layer/include",
-        # Firmware includes
-        "quickassist/lookaside/firmware/include",
-        # Common
-        "quickassist/lookaside/access_layer/src/common/include",
-        "quickassist/lookaside/access_layer/src/common/compression/include",
-        "quickassist/lookaside/access_layer/src/common/crypto/include",
-        # Symmetric crypto
-        "quickassist/lookaside/access_layer/src/common/crypto/sym",
-        "quickassist/lookaside/access_layer/src/common/crypto/sym/include",
-        "quickassist/lookaside/access_layer/src/common/crypto/sym/qat",
-        # Asymmetric crypto
-        "quickassist/lookaside/access_layer/src/common/crypto/asym/include",
-        # QAT direct
-        "quickassist/lookaside/access_layer/src/qat_direct",
-        "quickassist/lookaside/access_layer/src/qat_direct/include",
-        "quickassist/lookaside/access_layer/src/qat_direct/common",
-        "quickassist/lookaside/access_layer/src/qat_direct/common/include",
-        "quickassist/lookaside/access_layer/src/qat_direct/src/include",
-        "quickassist/lookaside/access_layer/src/qat_direct/vfio",
-        "quickassist/lookaside/access_layer/src/qat_direct/adf_io",
-        "quickassist/lookaside/access_layer/src/qat_direct/adf_io/include",
-        "quickassist/lookaside/access_layer/src/qat_direct/adf_io/vfio",
-        "quickassist/lookaside/access_layer/src/qat_direct/io",
-        # User space
-        "quickassist/lookaside/access_layer/src/user",
-        # Utilities
-        "quickassist/utilities/libusdm_drv",
-        "quickassist/utilities/libusdm_drv/include",
-        "quickassist/utilities/libusdm_drv/user_space",
-        "quickassist/utilities/osal/include",
-    ],
-    copts = [
-        "-fPIC",
-        "-O3",
-        "-D_GNU_SOURCE",
-        "-DUSER_SPACE",
-        "-DLAC_BYTE_ORDER=__LITTLE_ENDIAN",
-        "-mcx16",
-    ],
-    local_defines = [
-        "USE_CCODE_CRC",
-    ],
-    visibility = ["//visibility:public"],
-    deps = [
-        ":adf",
-        ":osal",
-        ":qat_public_hdrs",
-        ":usdm",
-    ],
-    target_compatible_with = [
-        "@platforms//os:linux",
-        "@platforms//cpu:x86_64",
-    ],
-)
diff --git a/modules/qatlib/25.08.0.envoy/source.json b/modules/qatlib/25.08.0.envoy/source.json
deleted file mode 100644
index 9df1459..0000000
--- a/modules/qatlib/25.08.0.envoy/source.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "url": "https://github.com/intel/qatlib/archive/refs/tags/25.08.0.tar.gz",
-    "integrity": "sha256-eGEBaDtIF97XLI6lEgShkKom4LWsggXuGZx6lDgTh3A=",
-    "strip_prefix": "qatlib-25.08.0",
-    "overlay": {
-        "BUILD.bazel": "sha256-THIEwoOPkX6BFelDHl0KCrPQc5OhLclnkt7n8vuIDEQ="
-    }
-}
diff --git a/modules/qatlib/metadata.json b/modules/qatlib/metadata.json
index 2ed6174..043fe45 100644
--- a/modules/qatlib/metadata.json
+++ b/modules/qatlib/metadata.json
@@ -5,7 +5,6 @@
         "github:intel/qatlib"
     ],
     "versions": [
-        "25.08.0.envoy",
         "26.02.0.envoy"
     ],
     "yanked_versions": {}
diff --git a/modules/qatzip/1.3.1.envoy/MODULE.bazel b/modules/qatzip/1.3.1.envoy/MODULE.bazel
deleted file mode 100644
index 7afa95d..0000000
--- a/modules/qatzip/1.3.1.envoy/MODULE.bazel
+++ /dev/null
@@ -1,13 +0,0 @@
-module(
-    name = "qatzip",
-    version = "1.3.1.envoy",
-    compatibility_level = 1,
-    bazel_compatibility = [">=7.2.1"],
-)
-
-bazel_dep(name = "bazel_skylib", version = "1.8.1")
-bazel_dep(name = "lz4", version = "1.10.0.bcr.2.envoy")
-bazel_dep(name = "platforms", version = "1.0.0")
-bazel_dep(name = "qatlib", version = "25.08.0.envoy")
-bazel_dep(name = "rules_cc", version = "0.2.8")
-bazel_dep(name = "zlib-ng", version = "2.3.2.envoy")
diff --git a/modules/qatzip/1.3.1.envoy/overlay/BUILD.bazel b/modules/qatzip/1.3.1.envoy/overlay/BUILD.bazel
deleted file mode 100644
index 770b119..0000000
--- a/modules/qatzip/1.3.1.envoy/overlay/BUILD.bazel
+++ /dev/null
@@ -1,51 +0,0 @@
-load("@rules_cc//cc:defs.bzl", "cc_library")
-
-label_flag(
-    name = "zlib_lib",
-    build_setting_default = "@zlib-ng",
-    visibility = ["//visibility:public"],
-)
-
-cc_library(
-    name = "qatzip",
-    srcs = [
-        "src/qatzip.c",
-        "src/qatzip_counter.c",
-        "src/qatzip_gzip.c",
-        "src/qatzip_internal.h",
-        "src/qatzip_lz4.c",
-        "src/qatzip_mem.c",
-        "src/qatzip_page_table.h",
-        "src/qatzip_stream.c",
-        "src/qatzip_sw.c",
-        "src/qatzip_utils.c",
-        "src/xxhash.c",
-        "src/xxhash.h",
-    ],
-    hdrs = [
-        "include/qatzip.h",
-        "include/qz_utils.h",
-    ],
-    includes = ["src"],
-    strip_include_prefix = "include",
-    visibility = ["//visibility:public"],
-    deps = [
-        "@lz4",
-        "@lz4//foreign_cc",
-        "@qatlib//:qat",
-        ":zlib_lib",
-    ],
-    copts = [
-        "-Wall",
-        "-Werror",
-        "-O3",
-        "-fPIC",
-        "-DSAL_DEV_API",
-        "-D_GNU_SOURCE",
-        "-DXXH_NAMESPACE=QATZIP_",
-    ],
-    target_compatible_with = [
-        "@platforms//os:linux",
-        "@platforms//cpu:x86_64",
-    ],
-)
diff --git a/modules/qatzip/1.3.1.envoy/patches/cast.patch b/modules/qatzip/1.3.1.envoy/patches/cast.patch
deleted file mode 100644
index 6fe9559..0000000
--- a/modules/qatzip/1.3.1.envoy/patches/cast.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/include/qatzip.h b/include/qatzip.h
-index 4cbd4a5..0a45624 100755
---- a/include/qatzip.h
-+++ b/include/qatzip.h
-@@ -361,14 +361,14 @@ typedef enum QzSoftwareComponentType_E {
- #define QZ_NOT_SUPPORTED        (-200)
- /**< Request not supported */
- 
--#define QZ_MAX_ALGORITHMS  ((int)255)
--#define QZ_DEFLATE         ((unsigned char)8)
-+#define QZ_MAX_ALGORITHMS  (255)
-+#define QZ_DEFLATE         (8)
- /**< used in gzip header to indicate deflate blocks */
- /**< and in session params */
--#define QZ_LZ4             ((unsigned char)'4')
--#define QZ_LZ4_BLOCK       ((unsigned char)'B')
--#define QZ_LZ4s            ((unsigned char)'s')
--#define QZ_ZSTD            ((unsigned char)'Z')
-+#define QZ_LZ4             ('4')
-+#define QZ_LZ4_BLOCK       ('B')
-+#define QZ_LZ4s            ('s')
-+#define QZ_ZSTD            ('Z')
- 
- #ifndef MIN
- #define MIN(a,b) (((a)<(b))?(a):(b))
diff --git a/modules/qatzip/1.3.1.envoy/source.json b/modules/qatzip/1.3.1.envoy/source.json
deleted file mode 100644
index d438783..0000000
--- a/modules/qatzip/1.3.1.envoy/source.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "url": "https://github.com/intel/QATzip/archive/refs/tags/v1.3.1.tar.gz",
-    "integrity": "sha256-deblf0nac50KUJIgJj6dq7MLHoyUvhHICa7MCt9O4tw=",
-    "strip_prefix": "QATzip-1.3.1",
-    "overlay": {
-        "BUILD.bazel": "sha256-2BXtP9fCuO1Bis5JqwxxsOtfYZ4avcy2jWXvKKgSF54="
-    },
-    "patch_strip": 1,
-    "patches": {
-        "cast.patch": "sha256-C8JIf2PKvgX9PM6Mo/xb8gmjIklVHoll3rXuOHH4CpU="
-    }
-}
diff --git a/modules/qatzip/metadata.json b/modules/qatzip/metadata.json
index 1804cf2..831ceb3 100644
--- a/modules/qatzip/metadata.json
+++ b/modules/qatzip/metadata.json
@@ -5,7 +5,6 @@
         "github:intel/QATzip"
     ],
     "versions": [
-        "1.3.1.envoy",
         "1.3.2.envoy"
     ],
     "yanked_versions": {}
diff --git a/modules/su-exec/metadata.json b/modules/su-exec/metadata.json
index 85d7f4d..dc2035a 100644
--- a/modules/su-exec/metadata.json
+++ b/modules/su-exec/metadata.json
@@ -10,7 +10,6 @@
         "github:ncopa/su-exec"
     ],
     "versions": [
-        "0.0.0-20221219-4c3bb42",
         "0.3.envoy"
     ],
     "yanked_versions": {}
diff --git a/modules/tcmalloc/0.0.0-20241022-5da4a88.envoy/MODULE.bazel b/modules/tcmalloc/0.0.0-20241022-5da4a88.envoy/MODULE.bazel
deleted file mode 100644
index a704885..0000000
--- a/modules/tcmalloc/0.0.0-20241022-5da4a88.envoy/MODULE.bazel
+++ /dev/null
@@ -1,16 +0,0 @@
-module(
-    name = "tcmalloc",
-    version = "0.0.0-20241022-5da4a88.envoy",
-    compatibility_level = 0,
-    repo_name = "com_google_tcmalloc",
-)
-
-bazel_dep(name = "abseil-cpp", version = "20240722.0", repo_name = "com_google_absl")
-bazel_dep(name = "bazel_skylib", version = "1.7.1")
-bazel_dep(name = "fuzztest", version = "20241028.0", repo_name = "com_google_fuzztest")
-bazel_dep(name = "google_benchmark", version = "1.8.3", repo_name = "com_github_google_benchmark")
-bazel_dep(name = "googletest", version = "1.13.0", repo_name = "com_google_googletest")
-bazel_dep(name = "protobuf", version = "27.5", repo_name = "com_google_protobuf")
-bazel_dep(name = "re2", version = "2024-02-01", repo_name = "com_googlesource_code_re2")
-bazel_dep(name = "rules_cc", version = "0.0.9")
-bazel_dep(name = "rules_fuzzing", version = "0.5.2")
diff --git a/modules/tcmalloc/0.0.0-20241022-5da4a88.envoy/patches/tcmalloc.patch b/modules/tcmalloc/0.0.0-20241022-5da4a88.envoy/patches/tcmalloc.patch
deleted file mode 100644
index 7ce1a2f..0000000
--- a/modules/tcmalloc/0.0.0-20241022-5da4a88.envoy/patches/tcmalloc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/tcmalloc/BUILD b/tcmalloc/BUILD
---- a/tcmalloc/BUILD	2025-01-28 16:41:20.424424728 +0000
-+++ b/tcmalloc/BUILD	2025-01-28 16:41:09.408433981 +0000
-@@ -21,7 +21,7 @@
- load("//tcmalloc:copts.bzl", "TCMALLOC_DEFAULT_COPTS")
- load("//tcmalloc:variants.bzl", "create_tcmalloc_benchmark", "create_tcmalloc_libraries", "create_tcmalloc_testsuite")
- 
--package(default_visibility = ["//visibility:private"])
-+package(default_visibility = ["//visibility:public"])
- 
- licenses(["notice"])
- 
\ No newline at end of file
diff --git a/modules/tcmalloc/0.0.0-20241022-5da4a88.envoy/presubmit.yml b/modules/tcmalloc/0.0.0-20241022-5da4a88.envoy/presubmit.yml
deleted file mode 100644
index ca3bdd3..0000000
--- a/modules/tcmalloc/0.0.0-20241022-5da4a88.envoy/presubmit.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-matrix:
-  platform:
-  - debian10
-  - ubuntu2004
-  - macos
-  - macos_arm64
-tasks:
-  verify_targets:
-    name: Verify build targets
-    platform: ${{ platform }}
-    build_targets:
-    - '@tcmalloc//tcmalloc'
diff --git a/modules/tcmalloc/0.0.0-20241022-5da4a88.envoy/source.json b/modules/tcmalloc/0.0.0-20241022-5da4a88.envoy/source.json
deleted file mode 100644
index 2f5f655..0000000
--- a/modules/tcmalloc/0.0.0-20241022-5da4a88.envoy/source.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "integrity": "sha256-/ZLWTYMC8Wd1cP3/hE6BUsMU5Vmmx4jGv8OESVTQ2r0=",
-    "strip_prefix": "tcmalloc-5da4a882003102fba0c0c0e8f6372567057332eb",
-    "url": "https://github.com/google/tcmalloc/archive/5da4a882003102fba0c0c0e8f6372567057332eb.tar.gz",
-    "patch_strip": 1,
-    "patches": {
-        "tcmalloc.patch": "sha256-1WmNb5vORRCGN3KhaK/xlwOyV+ki7RXdYayFfYZ0+O0="
-    }
-}
diff --git a/modules/tcmalloc/metadata.json b/modules/tcmalloc/metadata.json
index ef7c4e7..310d011 100644
--- a/modules/tcmalloc/metadata.json
+++ b/modules/tcmalloc/metadata.json
@@ -11,7 +11,6 @@
     "github:google/tcmalloc"
   ],
   "versions": [
-    "0.0.0-20241022-5da4a88.envoy",
     "0.0.0-250926-12f2552.envoy"
   ],
   "yanked_versions": {}
diff --git a/modules/toolchains_llvm/1.8.0.envoy/MODULE.bazel b/modules/toolchains_llvm/1.8.0.envoy/MODULE.bazel
deleted file mode 100644
index 0a14f26..0000000
--- a/modules/toolchains_llvm/1.8.0.envoy/MODULE.bazel
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2023 The Bazel Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-module(
-    name = "toolchains_llvm",
-    version = "1.8.0.envoy",
-    bazel_compatibility = [">=7.0.0"],
-    compatibility_level = 0,
-)
-
-bazel_dep(name = "bazel_features", version = "1.38.0")
-bazel_dep(name = "bazel_skylib", version = "1.8.2")
-bazel_dep(name = "aspect_bazel_lib", version = "2.19.3")
-bazel_dep(name = "rules_cc", version = "0.2.17")
-bazel_dep(name = "platforms", version = "1.0.0")
-bazel_dep(name = "helly25_bzl", version = "0.4.3")
-
-llvm_distributions_ext = use_extension(
-    "//toolchain/extensions:distributions.bzl",
-    "llvm_distributions",
-)
-use_repo(llvm_distributions_ext, "llvm_distributions_data")
-
-bazel_dep(name = "tar.bzl", version = "0.6.0")
-
-tar_toolchains = use_extension("@tar.bzl//tar:extensions.bzl", "toolchains")
-use_repo(
-    tar_toolchains,
-    "bsd_tar_toolchains_darwin_amd64",
-    "bsd_tar_toolchains_darwin_arm64",
-    "bsd_tar_toolchains_linux_amd64",
-    "bsd_tar_toolchains_linux_arm64",
-    "bsd_tar_toolchains_windows_amd64",
-    "bsd_tar_toolchains_windows_arm64",
-)
-
-# TODO: Remove when protobuf is released with a version of rules_python that supports 8.x
-bazel_dep(name = "rules_python", version = "1.0.0", dev_dependency = True)
diff --git a/modules/toolchains_llvm/1.8.0.envoy/patches/allow_nonroot.patch b/modules/toolchains_llvm/1.8.0.envoy/patches/allow_nonroot.patch
deleted file mode 100644
index 7e7fa43..0000000
--- a/modules/toolchains_llvm/1.8.0.envoy/patches/allow_nonroot.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -Naur s0/toolchain/extensions/llvm.bzl s1/toolchain/extensions/llvm.bzl
---- a/toolchain/extensions/llvm.bzl	2026-07-24 08:48:16.980412222 +0000
-+++ b/toolchain/extensions/llvm.bzl	2026-07-24 08:48:16.989412366 +0000
-@@ -51,13 +51,16 @@
-     return constraints
- 
- def _llvm_impl_(module_ctx):
-+    # Track registered toolchain names (first module wins)
-+    registered_toolchain_names = {}
-     for mod in module_ctx.modules:
--        if not mod.is_root:
--            fail("Only the root module can use the 'llvm' extension")
--        toolchain_names = []
-+        # REMOVED: Root module check to allow non-root modules to use the extension
-         for toolchain_attr in mod.tags.toolchain:
-             name = toolchain_attr.name
--            toolchain_names.append(name)
-+            # Skip if already registered by another module
-+            if name in registered_toolchain_names:
-+                continue
-+            registered_toolchain_names[name] = mod.name
-             attrs = {
-                 key: getattr(toolchain_attr, key)
-                 for key in dir(toolchain_attr)
-@@ -81,22 +84,24 @@
-                 **attrs
-             )
- 
--        # Check that every defined toolchain_root or sysroot has a corresponding toolchain.
-+        # Check that every defined toolchain_root or sysroot has a corresponding toolchain
-+        # Only validate for the current module's tags
-+        toolchain_names_for_module = [t.name for t in mod.tags.toolchain]
-         for root in mod.tags.toolchain_root:
--            if root.name not in toolchain_names:
--                fail("toolchain_root '%s' does not have a corresponding toolchain" % root.name)
-+            if root.name not in toolchain_names_for_module:
-+                fail("toolchain_root '%s' does not have a corresponding toolchain in module '%s'" % (root.name, mod.name))
-         for root in mod.tags.target_toolchain_root:
--            if root.name not in toolchain_names:
--                fail("target_toolchain_root '%s' does not have a corresponding toolchain" % root.name)
-+            if root.name not in toolchain_names_for_module:
-+                fail("target_toolchain_root '%s' does not have a corresponding toolchain in module '%s'" % (root.name, mod.name))
-         for root in mod.tags.sysroot:
--            if root.name not in toolchain_names:
--                fail("sysroot '%s' does not have a corresponding toolchain" % root.name)
-+            if root.name not in toolchain_names_for_module:
-+                fail("sysroot '%s' does not have a corresponding toolchain in module '%s'" % (root.name, mod.name))
-         for tag in mod.tags.extra_compiler_files:
--            if tag.name not in toolchain_names:
--                fail("extra_compiler_files '%s' does not have a corresponding toolchain" % tag.name)
-+            if tag.name not in toolchain_names_for_module:
-+                fail("extra_compiler_files '%s' does not have a corresponding toolchain in module '%s'" % (tag.name, mod.name))
-         for tag in mod.tags.extra_linker_files:
--            if tag.name not in toolchain_names:
--                fail("extra_linker_files '%s' does not have a corresponding toolchain" % tag.name)
-+            if tag.name not in toolchain_names_for_module:
-+                fail("extra_linker_files '%s' does not have a corresponding toolchain in module '%s'" % (tag.name, mod.name))
- 
-     if bazel_features.external_deps.extension_metadata_has_reproducible:
-         return module_ctx.extension_metadata(reproducible = True)
diff --git a/modules/toolchains_llvm/1.8.0.envoy/patches/redacted_dates_abspath.patch b/modules/toolchains_llvm/1.8.0.envoy/patches/redacted_dates_abspath.patch
deleted file mode 100644
index 79e3743..0000000
--- a/modules/toolchains_llvm/1.8.0.envoy/patches/redacted_dates_abspath.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/toolchain/cc_wrapper.sh.tpl
-+++ b/toolchain/cc_wrapper.sh.tpl
-@@ -85,6 +85,14 @@
-   toolchain_path_prefix="$(dirname_shim "$(dirname_shim "${script_dir}")")/${toolchain_path_prefix#external/}"
- fi
- 
-+# Absolute exec-root so that exec-root-relative toolchain paths (e.g.
-+# -imacros, -resource-dir, -B) resolve correctly when the action cwd is not
-+# the exec root (e.g. rules_rust CargoBuildScriptRun).
-+exec_root_abs=""
-+if [[ "${script_dir}" == /* ]]; then
-+  exec_root_abs="$(dirname_shim "$(dirname_shim "$(dirname_shim "${script_dir}")")")"
-+fi
-+
- if [[ ! -f ${toolchain_path_prefix}bin/clang ]]; then
-   echo >&2 "ERROR: could not find clang; PWD=\"${PWD}\"; PATH=\"${PATH}\"; toolchain_path_prefix=${toolchain_path_prefix}."
-   exit 5
-@@ -111,6 +119,12 @@
-     parts=(${opt/=/ }) # Split flag name and value into array.
-     # shellcheck disable=SC2312
-     printf "%s" "${parts[0]}=$(dirname_shim "$(dirname_shim "$(dirname_shim "${script_dir}")")")/${parts[1]}"
-+  elif [[ ${opt} == external/* ]] && [[ -n "${exec_root_abs}" ]] && [[ -e "${exec_root_abs}/${opt}" ]]; then
-+    # Standalone bare exec-root-relative path token (e.g. -resource-dir, -imacros value).
-+    printf "%s" "${exec_root_abs}/${opt}"
-+  elif [[ ${opt} == -Bexternal/* ]] && [[ -n "${exec_root_abs}" ]] && [[ -e "${exec_root_abs}/${opt#-B}" ]]; then
-+    # Attached -B flag with bare exec-root-relative path (e.g. -Bexternal/.../bin/).
-+    printf "%s" "-B${exec_root_abs}/${opt#-B}"
-   else
-     printf "%s" "${opt}"
-   fi
diff --git a/modules/toolchains_llvm/1.8.0.envoy/patches/x_compile.patch b/modules/toolchains_llvm/1.8.0.envoy/patches/x_compile.patch
deleted file mode 100644
index 9128542..0000000
--- a/modules/toolchains_llvm/1.8.0.envoy/patches/x_compile.patch
+++ /dev/null
@@ -1,230 +0,0 @@
-diff -Naur a/toolchain/cc_toolchain_config.bzl b/toolchain/cc_toolchain_config.bzl
---- a/toolchain/cc_toolchain_config.bzl	2026-07-25 16:35:52.121480568 +0000
-+++ b/toolchain/cc_toolchain_config.bzl	2026-07-25 16:48:59.125550596 +0000
-@@ -586,7 +586,12 @@
-         else:
-             fail("Invalid stdlib: " + stdlib)
-     elif stdlib == "libc":
--        pass
-+        libunwind_link_flags = [
-+            "-l:libunwind.a",
-+            # To support libunwind.
-+            "-lpthread",
-+            "-ldl",
-+        ]
-     elif stdlib == "none":
-         cxx_flags = [
-             "-nostdlib",
-@@ -600,8 +605,6 @@
-     # On macOS the libc++ headers come from the SDK (see above), not the
-     # toolchain, so do not add the toolchain's libc++ include paths.
-     use_toolchain_libcxx_paths = stdlib in ["builtin-libc++", "libc++"] and target_os != "darwin"
--    if use_toolchain_libcxx_paths:
--        cpp_system_includes = toolchain_cpp_system_includes
- 
-     if major_llvm_version >= 14:
-         # With C++20, Clang defaults to using C++ rather than Clang modules,
-diff -Naur a/toolchain/extensions/llvm.bzl b/toolchain/extensions/llvm.bzl
---- a/toolchain/extensions/llvm.bzl	2026-07-25 16:35:52.122480588 +0000
-+++ b/toolchain/extensions/llvm.bzl	2026-07-25 16:48:59.120550502 +0000
-@@ -77,6 +77,16 @@
-                 name,
-             )
- 
-+            cxx_cross_lib = {}
-+            for cl in mod.tags.cxx_cross_lib:
-+                if cl.name != name:
-+                    continue
-+                for target in cl.targets:
-+                    if cxx_cross_lib.get(target):
-+                        fail("duplicate target '%s' for cxx_cross_lib with name '%s'" % (target, name))
-+                    cxx_cross_lib[target] = str(cl.label)
-+            attrs["cxx_cross_lib"] = cxx_cross_lib
-+
-             llvm_toolchain(
-                 **attrs
-             )
-@@ -116,6 +126,7 @@
- _attrs.pop("sysroot", None)
- _attrs.pop("extra_compiler_files_dict", None)
- _attrs.pop("extra_linker_files_dict", None)
-+_attrs.pop("cxx_cross_lib", None)
- 
- llvm = module_extension(
-     implementation = _llvm_impl_,
-@@ -208,5 +219,12 @@
-                 "constraints": attr.label_list(doc = "List of extra constraints to add to target_compatible_with for the generated toolchains."),
-             },
-         ),
-+        "cxx_cross_lib": tag_class(
-+            attrs = {
-+                "name": attr.string(doc = "Name of the toolchain this cxx_cross_lib applies to; must match a toolchain tag name.", default = "llvm_toolchain"),
-+                "targets": attr.string_list(doc = "Target pairs, e.g. linux-aarch64, linux-x86_64."),
-+                "label": attr.label(doc = "Label of a repo containing include/ and lib/ for the C++ standard library."),
-+            },
-+        ),
-     },
- )
-diff -Naur a/toolchain/internal/configure.bzl b/toolchain/internal/configure.bzl
---- a/toolchain/internal/configure.bzl	2026-07-25 16:35:52.122480588 +0000
-+++ b/toolchain/internal/configure.bzl	2026-07-25 16:48:59.124550577 +0000
-@@ -256,6 +256,57 @@
-         use_absolute_paths_sysroot,
-     )
- 
-+    # Resolve cross-compile C++ standard library paths.
-+    cxx_cross_lib_include_dirs = {}
-+    cxx_cross_lib_link_flags = {}
-+    cxx_cross_lib_cxx_flags = {}
-+    exec_pair = _os_arch_pair(os, arch)
-+    for target_pair, cxx_cross_lib_label_str in rctx.attr.cxx_cross_lib.items():
-+        if target_pair == exec_pair:
-+            continue
-+        cxx_cross_lib_label = Label(cxx_cross_lib_label_str)
-+        cxx_cross_lib_path = _pkg_path_from_label(cxx_cross_lib_label)
-+        cxx_cross_lib_include_dirs[target_pair] = [
-+            "%workspace%/" + cxx_cross_lib_path + "/include",
-+        ]
-+        cxx_cross_lib_link_flags[target_pair] = [
-+            "-L" + cxx_cross_lib_path + "/lib",
-+            "-l:libc++.a",
-+            "-l:libc++abi.a",
-+        ]
-+        cxx_cross_lib_cxx_flags[target_pair] = [
-+            "-nostdinc++",
-+            "-isystem",
-+            paths.join(target_llvm_repo_paths.get(target_pair, llvm_dist_path_prefix), "include/c++/v1"),
-+            "-isystem",
-+            cxx_cross_lib_path + "/include",
-+        ]
-+
-+    # Merge cxx_cross_lib paths into include dirs, link flags, and cxx flags.
-+    merged_include_dirs = dict(rctx.attr.cxx_builtin_include_directories)
-+    for k, v in cxx_cross_lib_include_dirs.items():
-+        merged_include_dirs[k] = merged_include_dirs.get(k, []) + v
-+
-+    merged_extra_link_flags = dict(rctx.attr.extra_link_flags)
-+    for k, v in cxx_cross_lib_link_flags.items():
-+        merged_extra_link_flags[k] = merged_extra_link_flags.get(k, []) + v
-+
-+    merged_extra_cxx_flags = dict(rctx.attr.extra_cxx_flags)
-+    for k, v in cxx_cross_lib_cxx_flags.items():
-+        merged_extra_cxx_flags[k] = merged_extra_cxx_flags.get(k, []) + v
-+
-+    # Auto-set stdlib to "libc++" for target pairs that have cxx_cross_lib configured
-+    # but no explicit stdlib override. This prevents the builtin-libc++ ->
-+    # stdc++ cross-compile fallback in cc_toolchain_config.bzl from kicking in,
-+    # since the user has provided the actual libc++ libraries via cxx_cross_lib.
-+    merged_stdlib = dict(rctx.attr.stdlib)
-+    for target_pair in rctx.attr.cxx_cross_lib.keys():
-+        if target_pair not in merged_stdlib:
-+            if target_pair == exec_pair:
-+                merged_stdlib[target_pair] = "libc++"
-+            else:
-+                merged_stdlib[target_pair] = "libc"
-+
-     workspace_name = rctx.name
-     toolchain_info = struct(
-         os = os,
-@@ -269,8 +320,8 @@
-         multiarch_dict = rctx.attr.multiarch,
-         cxx_include_layout_dict = rctx.attr.cxx_include_layout,
-         target_settings_dict = rctx.attr.target_settings,
--        additional_include_dirs_dict = rctx.attr.cxx_builtin_include_directories,
--        stdlib_dict = rctx.attr.stdlib,
-+        additional_include_dirs_dict = merged_include_dirs,
-+        stdlib_dict = merged_stdlib,
-         cxx_standard_dict = rctx.attr.cxx_standard,
-         compile_flags_dict = rctx.attr.compile_flags,
-         conly_flags_dict = rctx.attr.conly_flags,
-@@ -290,6 +341,7 @@
-         toolchain_root = toolchain_root,
-         unfiltered_compile_flags_dict = rctx.attr.unfiltered_compile_flags,
-         llvm_version = llvm_version,
-+        cxx_cross_lib_dict = rctx.attr.cxx_cross_lib,
-         extra_compiler_files = rctx.attr.extra_compiler_files,
-         extra_linker_files = rctx.attr.extra_linker_files,
-         extra_compiler_files_dict = rctx.attr.extra_compiler_files_dict,
-@@ -297,8 +349,8 @@
-         extra_exec_compatible_with = rctx.attr.extra_exec_compatible_with,
-         extra_target_compatible_with = rctx.attr.extra_target_compatible_with,
-         extra_compile_flags_dict = rctx.attr.extra_compile_flags,
--        extra_cxx_flags_dict = rctx.attr.extra_cxx_flags,
--        extra_link_flags_dict = rctx.attr.extra_link_flags,
-+        extra_cxx_flags_dict = merged_extra_cxx_flags,
-+        extra_link_flags_dict = merged_extra_link_flags,
-         extra_archive_flags_dict = rctx.attr.extra_archive_flags,
-         extra_link_libs_dict = rctx.attr.extra_link_libs,
-         extra_opt_compile_flags_dict = rctx.attr.extra_opt_compile_flags,
-@@ -514,6 +566,12 @@
-     if not use_absolute_paths_llvm:
-         target_toolchain_include_path_prefix = "%workspace%/" + target_toolchain_include_path_prefix
- 
-+    cxx_cross_lib_label = toolchain_info.cxx_cross_lib_dict.get(target_pair)
-+    if cxx_cross_lib_label and not (exec_os == target_os and exec_arch == target_arch):
-+        cxx_cross_lib_label_str = '"%s",' % cxx_cross_lib_label
-+    else:
-+        cxx_cross_lib_label_str = ""
-+
-     # C++ built-in include directories:
-     resource_dir_version = llvm_version if major_llvm_version < 16 else major_llvm_version
-     cxx_builtin_include_directories = [
-@@ -673,6 +731,7 @@
-     srcs = [
-         ":sysroot-components-{suffix}",
-         "redacted_dates.h",
-+        {cxx_cross_lib_label_str}
-         {extra_compiler_files}
-     ],
- )
-@@ -681,6 +740,7 @@
-     name = "linker-components-{suffix}",
-     srcs = [
-         ":sysroot-components-{suffix}",
-+        {cxx_cross_lib_label_str}
-         {extra_linker_files}
-     ],
- )
-@@ -720,6 +780,7 @@
-         "{llvm_dist_label_prefix}extra_config_site",
-         "{toolchain_root}:clang",
-         "redacted_dates.h",
-+        {cxx_cross_lib_label_str}
-         {extra_compiler_files}
-     ],
- )
-@@ -732,6 +793,7 @@
-         "{toolchain_root}:ld",
-         "{toolchain_root}:ar",
-         "{target_toolchain_root}:{lib_label}",
-+        {cxx_cross_lib_label_str}
-         {extra_linker_files}
-     ],
- )
-@@ -878,6 +940,7 @@
-         extra_compiler_files = ("\"%s\"," % _extra_compiler_label) if _extra_compiler_label else "",
-         llvm_version = llvm_version,
-         extra_linker_files = ("\"%s\"," % _extra_linker_label) if _extra_linker_label else "",
-+        cxx_cross_lib_label_str = cxx_cross_lib_label_str,
-         extra_exec_compatible_with_specific = toolchain_info.extra_exec_compatible_with.get(target_pair, []),
-         extra_target_compatible_with_specific = toolchain_info.extra_target_compatible_with.get(target_pair, []),
-         extra_exec_compatible_with_all_targets = toolchain_info.extra_exec_compatible_with.get("", []),
-diff -Naur a/toolchain/internal/repo.bzl b/toolchain/internal/repo.bzl
---- a/toolchain/internal/repo.bzl	2026-07-25 16:35:52.123480607 +0000
-+++ b/toolchain/internal/repo.bzl	2026-07-25 16:48:59.121550521 +0000
-@@ -153,6 +153,15 @@
-                "containing the files and the sysroot path will be taken as the path to the " +
-                "package of this label."),
-     ),
-+    "cxx_cross_lib": attr.string_dict(
-+        mandatory = False,
-+        doc = ("Cross-compile C++ standard library paths, keyed by target pair " +
-+               "({}). ".format(_target_pairs) +
-+               "Value is a label pointing to a repo containing prebuilt C++ standard " +
-+               "library headers in include/ and libraries in lib/. The include/ directory " +
-+               "will be added to cxx_builtin_include_directories and lib/ will be added to " +
-+               "the linker search path via extra_link_flags for the specified target."),
-+    ),
-     "multiarch": attr.string_dict(
-         mandatory = False,
-         doc = ("Multiarch triple used to construct sysroot include and library paths " +
diff --git a/modules/toolchains_llvm/1.8.0.envoy/presubmit.yml b/modules/toolchains_llvm/1.8.0.envoy/presubmit.yml
deleted file mode 100644
index 10d4881..0000000
--- a/modules/toolchains_llvm/1.8.0.envoy/presubmit.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-matrix:
-  platform:
-  - debian11
-  - macos
-  - ubuntu2404
-  bazel:
-  - 8.x
-
-tasks:
-  verify_targets:
-    platform: ${{ platform }}
-    bazel: ${{ bazel }}
-    build_targets:
-    - "@toolchains_llvm//..."
diff --git a/modules/toolchains_llvm/1.8.0.envoy/source.json b/modules/toolchains_llvm/1.8.0.envoy/source.json
deleted file mode 100644
index ee1e515..0000000
--- a/modules/toolchains_llvm/1.8.0.envoy/source.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "integrity": "sha256-OwWCbyVgQPkcJNyq1nPrHJHkzJP0BD0CBfJRIydkAgU=",
-    "strip_prefix": "toolchains_llvm-v1.8.0",
-    "url": "https://github.com/bazel-contrib/toolchains_llvm/releases/download/v1.8.0/toolchains_llvm-v1.8.0.tar.gz",
-    "patch_strip": 1,
-    "patches": {
-        "allow_nonroot.patch": "sha256-UsaKxle4Mz5hR2K3JLdXVjBgLTGo8+73Q8zylbgsDVk=",
-        "x_compile.patch": "sha256-4lFBcAsu83OuPGjQTdMjn2qQLPpZgq5LpXoPOVDndOA=",
-        "redacted_dates_abspath.patch": "sha256-CA/Gc/2ZJE/lcENwCJfLaRbcYsEvZ77B6S/CoPqrkHQ="
-    }
-}
diff --git a/modules/toolchains_llvm/metadata.json b/modules/toolchains_llvm/metadata.json
index ffb0bdc..8d09fc6 100644
--- a/modules/toolchains_llvm/metadata.json
+++ b/modules/toolchains_llvm/metadata.json
@@ -5,7 +5,6 @@
         "github:bazel-contrib/toolchains_llvm"
     ],
     "versions": [
-        "1.8.0.envoy",
         "1.9.0.envoy"
     ],
     "yanked_versions": {}