diff --git a/pkgs/tools/admin/google-cloud-sdk/alpha__init__.py b/pkgs/by-name/go/google-cloud-sdk/alpha__init__.py
similarity index 100%
rename from pkgs/tools/admin/google-cloud-sdk/alpha__init__.py
rename to pkgs/by-name/go/google-cloud-sdk/alpha__init__.py
diff --git a/pkgs/tools/admin/google-cloud-sdk/beta__init__.py b/pkgs/by-name/go/google-cloud-sdk/beta__init__.py
similarity index 100%
rename from pkgs/tools/admin/google-cloud-sdk/beta__init__.py
rename to pkgs/by-name/go/google-cloud-sdk/beta__init__.py
diff --git a/pkgs/tools/admin/google-cloud-sdk/components.json b/pkgs/by-name/go/google-cloud-sdk/components.json
similarity index 100%
rename from pkgs/tools/admin/google-cloud-sdk/components.json
rename to pkgs/by-name/go/google-cloud-sdk/components.json
diff --git a/pkgs/tools/admin/google-cloud-sdk/components.nix b/pkgs/by-name/go/google-cloud-sdk/components.nix
similarity index 100%
rename from pkgs/tools/admin/google-cloud-sdk/components.nix
rename to pkgs/by-name/go/google-cloud-sdk/components.nix
diff --git a/pkgs/tools/admin/google-cloud-sdk/data.nix b/pkgs/by-name/go/google-cloud-sdk/data.nix
similarity index 100%
rename from pkgs/tools/admin/google-cloud-sdk/data.nix
rename to pkgs/by-name/go/google-cloud-sdk/data.nix
diff --git a/pkgs/tools/admin/google-cloud-sdk/gcloud-path.patch b/pkgs/by-name/go/google-cloud-sdk/gcloud-path.patch
similarity index 100%
rename from pkgs/tools/admin/google-cloud-sdk/gcloud-path.patch
rename to pkgs/by-name/go/google-cloud-sdk/gcloud-path.patch
diff --git a/pkgs/tools/admin/google-cloud-sdk/gsutil-disable-updates.patch b/pkgs/by-name/go/google-cloud-sdk/gsutil-disable-updates.patch
similarity index 100%
rename from pkgs/tools/admin/google-cloud-sdk/gsutil-disable-updates.patch
rename to pkgs/by-name/go/google-cloud-sdk/gsutil-disable-updates.patch
diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/by-name/go/google-cloud-sdk/package.nix
similarity index 99%
rename from pkgs/tools/admin/google-cloud-sdk/default.nix
rename to pkgs/by-name/go/google-cloud-sdk/package.nix
index 33a5e9a92dbb..4649fa57680c 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/by-name/go/google-cloud-sdk/package.nix
@@ -12,7 +12,7 @@
   lib,
   fetchurl,
   makeWrapper,
-  python3,
+  python312,
   openssl,
   jq,
   callPackage,
@@ -21,6 +21,7 @@
 }:
 
 let
+  python3 = python312;
   # include a compatible pyopenssl version: https://github.com/NixOS/nixpkgs/issues/379291
   # remove ASAP: https://github.com/googleapis/google-api-python-client/issues/2554
   pythonCustom = python3.override {
diff --git a/pkgs/tools/admin/google-cloud-sdk/update.sh b/pkgs/by-name/go/google-cloud-sdk/update.sh
similarity index 100%
rename from pkgs/tools/admin/google-cloud-sdk/update.sh
rename to pkgs/by-name/go/google-cloud-sdk/update.sh
diff --git a/pkgs/tools/admin/google-cloud-sdk/withExtraComponents.nix b/pkgs/by-name/go/google-cloud-sdk/withExtraComponents.nix
similarity index 100%
rename from pkgs/tools/admin/google-cloud-sdk/withExtraComponents.nix
rename to pkgs/by-name/go/google-cloud-sdk/withExtraComponents.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cb4e782ce3ae..f42984518a7e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3019,11 +3019,7 @@ with pkgs;
     isStereo = true;
   };
 
-  google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk {
-    python3 = python312;
-  };
   google-cloud-sdk-gce = google-cloud-sdk.override {
-    python3 = python312;
     with-gce = true;
   };