diff --git a/MODULE.bazel b/MODULE.bazel
index 4e2c19fb..db4f09b3 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -4,13 +4,8 @@ module(
     repo_name = "com_github_jupp0r_prometheus_cpp",
 )
 
-data_deps_ext = use_extension("//bazel:repositories.bzl", "data_deps_ext")
-use_repo(
-    data_deps_ext,
-    "civetweb",
-)
-
 bazel_dep(name = "boringssl", version = "0.0.0-20240530-2db0eb3")
+bazel_dep(name = "civetweb", version = "1.16")
 bazel_dep(name = "curl", version = "8.7.1", repo_name = "com_github_curl")
 bazel_dep(name = "platforms", version = "0.0.10")
 bazel_dep(name = "rules_cc", version = "0.0.9")
diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
index 2819f76b..4addd76e 100644
--- a/MODULE.bazel.lock
+++ b/MODULE.bazel.lock
@@ -1,6 +1,6 @@
 {
   "lockFileVersion": 6,
-  "moduleFileHash": "13fb26d51bb481693c74b4a5810775719edbfc27e37562b8525a1da84d58dc09",
+  "moduleFileHash": "21f937bd7b97fc69689f0f4136b60e8382940ca75ef728fbeac372fe3fc4c3fb",
   "flags": {
     "cmdRegistries": [
       "https://bcr.bazel.build/"
@@ -23,27 +23,10 @@
       "repoName": "com_github_jupp0r_prometheus_cpp",
       "executionPlatformsToRegister": [],
       "toolchainsToRegister": [],
-      "extensionUsages": [
-        {
-          "extensionBzlFile": "@com_github_jupp0r_prometheus_cpp//bazel:repositories.bzl",
-          "extensionName": "data_deps_ext",
-          "usingModule": "<root>",
-          "location": {
-            "file": "@@//:MODULE.bazel",
-            "line": 7,
-            "column": 30
-          },
-          "imports": {
-            "civetweb": "civetweb"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        }
-      ],
+      "extensionUsages": [],
       "deps": {
         "boringssl": "boringssl@0.0.0-20240530-2db0eb3",
+        "civetweb": "civetweb@1.16",
         "com_github_curl": "curl@8.7.1",
         "platforms": "platforms@0.0.10",
         "rules_cc": "rules_cc@0.0.9",
@@ -85,6 +68,37 @@
         }
       }
     },
+    "civetweb@1.16": {
+      "name": "civetweb",
+      "version": "1.16",
+      "key": "civetweb@1.16",
+      "repoName": "civetweb",
+      "executionPlatformsToRegister": [],
+      "toolchainsToRegister": [],
+      "extensionUsages": [],
+      "deps": {
+        "boringssl": "boringssl@0.0.0-20240530-2db0eb3",
+        "platforms": "platforms@0.0.10",
+        "bazel_tools": "bazel_tools@_",
+        "local_config_platform": "local_config_platform@_"
+      },
+      "repoSpec": {
+        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
+        "ruleClassName": "http_archive",
+        "attributes": {
+          "urls": [
+            "https://github.com/civetweb/civetweb/archive/v1.16.tar.gz"
+          ],
+          "integrity": "sha256-8ORxwb9OeASmz7QeqdE+fWI7K8x7weKk3VSVGiTWAoU=",
+          "strip_prefix": "civetweb-1.16",
+          "remote_patches": {
+            "https://bcr.bazel.build/modules/civetweb/1.16/patches/add_build_file.patch": "sha256-0R40p5wAtmQ/MLvqI9XzF9H5BRpxC85lUdXHlW1teIQ=",
+            "https://bcr.bazel.build/modules/civetweb/1.16/patches/module_dot_bazel.patch": "sha256-xbUEcDhFEMv7bJHQpFKzPdqDog1yLfH2f5+lt191on8="
+          },
+          "remote_patch_strip": 0
+        }
+      }
+    },
     "curl@8.7.1": {
       "name": "curl",
       "version": "8.7.1",
@@ -1397,35 +1411,6 @@
     }
   },
   "moduleExtensions": {
-    "//bazel:repositories.bzl%data_deps_ext": {
-      "general": {
-        "bzlTransitiveDigest": "ErvYzuGVMlYMPdcU195knGgSH/TtRksqNyimxwsEV7E=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "civetweb": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "strip_prefix": "civetweb-1.16",
-              "sha256": "f0e471c1bf4e7804a6cfb41ea9d13e7d623b2bcc7bc1e2a4dd54951a24d60285",
-              "urls": [
-                "https://github.com/civetweb/civetweb/archive/v1.16.tar.gz"
-              ],
-              "build_file": "@@//bazel:civetweb.BUILD"
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "",
-            "bazel_tools",
-            "bazel_tools"
-          ]
-        ]
-      }
-    },
     "@@apple_support~//crosstool:setup.bzl%apple_cc_configure_extension": {
       "general": {
         "bzlTransitiveDigest": "pMLFCYaRPkgXPQ8vtuNkMfiHfPmRBy6QJfnid4sWfv0=",
diff --git a/bazel/civetweb.BUILD b/bazel/civetweb.BUILD
index cfa2f3bd..f83c5365 100644
--- a/bazel/civetweb.BUILD
+++ b/bazel/civetweb.BUILD
@@ -48,7 +48,7 @@ DEPS = select({
 })
 
 cc_library(
-    name = "libcivetweb",
+    name = "civetweb",
     srcs = [
         "src/civetweb.c",
     ],
@@ -79,7 +79,7 @@ cc_library(
 )
 
 cc_library(
-    name = "civetweb",
+    name = "civetserver",
     srcs = [
         "src/CivetServer.cpp",
     ],
diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
index 7309a18d..6d619e65 100644
--- a/bazel/repositories.bzl
+++ b/bazel/repositories.bzl
@@ -1,7 +1,7 @@
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 
-def _legacy_and_bzlmod_repositories():
+def prometheus_cpp_repositories():
     maybe(
         http_archive,
         name = "civetweb",
@@ -13,9 +13,6 @@ def _legacy_and_bzlmod_repositories():
         build_file = "@com_github_jupp0r_prometheus_cpp//bazel:civetweb.BUILD",
     )
 
-def prometheus_cpp_repositories():
-    _legacy_and_bzlmod_repositories()
-
     # These legacy style repos have bzlmod support, they are re-added here for legacy support
     maybe(
         http_archive,
@@ -75,9 +72,3 @@ def prometheus_cpp_repositories():
         build_file = "@com_github_jupp0r_prometheus_cpp//bazel:zlib.BUILD",
     )
 
-def _data_deps_extension_impl(ctx):
-    _legacy_and_bzlmod_repositories()
-
-data_deps_ext = module_extension(
-    implementation = _data_deps_extension_impl,
-)