diff --git a/pkgs/tools/networking/wiremock/default.nix b/pkgs/by-name/wi/wiremock/package.nix
similarity index 51%
rename from pkgs/tools/networking/wiremock/default.nix
rename to pkgs/by-name/wi/wiremock/package.nix
index bfa0f9adf248..380f3f1caa9d 100644
--- a/pkgs/tools/networking/wiremock/default.nix
+++ b/pkgs/by-name/wi/wiremock/package.nix
@@ -1,11 +1,12 @@
-{ lib, stdenv, fetchurl, jre, makeWrapper }:
+{ lib, stdenv, fetchurl, jre, makeWrapper, gitUpdater }:
 
 stdenv.mkDerivation rec {
   pname = "wiremock";
-  version = "2.35.0";
+  version = "3.2.0";
+
   src = fetchurl {
-    url = "mirror://maven/com/github/tomakehurst/wiremock-jre8-standalone/${version}/wiremock-jre8-standalone-${version}.jar";
-    hash = "sha256-rhVq4oEuPPpHDEftBzEA707HeSc3Kk4gPw471THz61c=";
+    url = "mirror://maven/org/wiremock/wiremock-standalone/${version}/wiremock-standalone-${version}.jar";
+    hash = "sha256-voO9UAxhxQlWWs4jMji93TBUCcFWht/4Cea+UpBmL3Q=";
   };
 
   dontUnpack = true;
@@ -20,10 +21,17 @@ stdenv.mkDerivation rec {
       --add-flags "-jar $out/share/wiremock/wiremock.jar"
   '';
 
+  passthru.updateScript = gitUpdater {
+    url = "https://github.com/wiremock/wiremock.git";
+    ignoredVersions = "(alpha|beta|rc).*";
+  };
+
   meta = {
     description = "A flexible tool for building mock APIs";
     homepage = "https://wiremock.org/";
-    maintainers = with lib.maintainers; [ bobvanderlinden ];
+    changelog = "https://github.com/wiremock/wiremock/releases/tag/${version}";
+    maintainers = with lib.maintainers; [ bobvanderlinden anthonyroussel ];
+    mainProgram = "wiremock";
     platforms = jre.meta.platforms;
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
     license = lib.licenses.asl20;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9ba5897359be..440c5b56961b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -41770,8 +41770,6 @@ with pkgs;
 
   wire-desktop = callPackage ../applications/networking/instant-messengers/wire-desktop { };
 
-  wiremock = callPackage ../tools/networking/wiremock { };
-
   wireworld = callPackage ../games/wireworld { };