diff --git a/pkgs/servers/geospatial/mapproxy/default.nix b/pkgs/by-name/ma/mapproxy/package.nix
similarity index 54%
rename from pkgs/servers/geospatial/mapproxy/default.nix
rename to pkgs/by-name/ma/mapproxy/package.nix
index b27797883e0d..ef39151c0104 100644
--- a/pkgs/servers/geospatial/mapproxy/default.nix
+++ b/pkgs/by-name/ma/mapproxy/package.nix
@@ -1,21 +1,29 @@
-{ lib
-, python3
-, fetchPypi
+{
+  lib,
+  python3,
+  fetchFromGitHub,
 }:
 
 with python3.pkgs;
 buildPythonApplication rec {
-  pname = "MapProxy";
-  version = "2.2.0";
-  src = fetchPypi {
-  inherit pname version;
-  hash = "sha256-2FEgfdo8i/R5lU0G514zJcaIRe8y60Vm0jHOBEaoEwI=";
+  pname = "mapproxy";
+  version = "3.0.1";
+
+  src = fetchFromGitHub {
+    owner = "mapproxy";
+    repo = "mapproxy";
+    rev = version;
+    hash = "sha256-74hUJIy1+DaKjUsCgd4+2MdMPGqqDUuHDrhBCFNn8Dk=";
   };
+
   prePatch = ''
     substituteInPlace mapproxy/util/ext/serving.py --replace "args = [sys.executable] + sys.argv" "args = sys.argv"
   '';
-  propagatedBuildInputs = [
+
+  dependencies = [
     boto3 # needed for caches service
+    future
+    jsonschema
     pillow
     pyyaml
     pyproj
@@ -23,6 +31,7 @@ buildPythonApplication rec {
     gdal
     lxml
     setuptools
+    werkzeug
   ];
   # Tests are disabled:
   # 1) Dependency list is huge.
@@ -32,10 +41,11 @@ buildPythonApplication rec {
   #    https://github.com/NixOS/nixpkgs/issues/33876
   #    https://github.com/NixOS/nixpkgs/pull/56480
   doCheck = false;
-  meta = with lib; {
-  description = "Open source proxy for geospatial data";
-  homepage = "https://mapproxy.org/";
-  license = licenses.asl20;
-  maintainers = with maintainers; [ rakesh4g ];
+
+  meta = {
+    description = "Open source proxy for geospatial data";
+    homepage = "https://mapproxy.org/";
+    license = lib.licenses.asl20;
+    maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ rakesh4g ]);
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 41fde36629d7..d4e6490162f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25965,8 +25965,6 @@ with pkgs;
 
   fit-trackee = callPackage ../servers/geospatial/fit-trackee { };
 
-  mapproxy = callPackage ../servers/geospatial/mapproxy { };
-
   martin = callPackage ../servers/geospatial/martin {
     inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
   };