diff --git a/pkgs/by-name/ed/edgedb/0001-dynamically-patchelf-binaries.patch b/pkgs/by-name/ge/gel/0001-dynamically-patchelf-binaries.patch
similarity index 67%
rename from pkgs/by-name/ed/edgedb/0001-dynamically-patchelf-binaries.patch
rename to pkgs/by-name/ge/gel/0001-dynamically-patchelf-binaries.patch
index 5b7b720fc7e7..b232b589ac99 100644
--- a/pkgs/by-name/ed/edgedb/0001-dynamically-patchelf-binaries.patch
+++ b/pkgs/by-name/ge/gel/0001-dynamically-patchelf-binaries.patch
@@ -1,14 +1,14 @@
-diff --git a/src/portable/install.rs b/src/portable/install.rs
-index 15944e4..f873349 100644
---- a/src/portable/install.rs
-+++ b/src/portable/install.rs
-@@ -134,8 +134,16 @@ fn unpack_package(cache_file: &Path, target_dir: &Path) -> anyhow::Result<()> {
+diff --git a/src/portable/server/install.rs b/src/portable/server/install.rs
+index feb47f1..157d17a 100644
+--- a/src/portable/server/install.rs
++++ b/src/portable/server/install.rs
+@@ -229,8 +229,16 @@ fn unpack_package(cache_file: &Path, target_dir: &Path) -> anyhow::Result<()> {
      for entry in arch.entries()? {
          let mut entry = entry?;
          let path = entry.path()?;
 +        let is_inside_bin = {
 +            let mut path_iter = path.iter();
-+            path_iter.next(); // discards first folder
++            path_iter.next(); // discards first path
 +            path_iter.as_path().starts_with("bin")
 +        };
          if let Some(path) = build_path(&target_dir, &path)? {
@@ -20,9 +20,9 @@ index 15944e4..f873349 100644
          }
      }
      bar.finish_and_clear();
-@@ -222,3 +230,11 @@ pub fn package(pkg_info: &PackageInfo) -> anyhow::Result<InstallInfo> {
- 
-     Ok(info)
+@@ -244,3 +252,12 @@ fn unlink_cache(cache_file: &Path) {
+         })
+         .ok();
  }
 +
 +fn nix_patchelf_if_needed(dest_path: &Path) {
@@ -32,3 +32,4 @@ index 15944e4..f873349 100644
 +        .arg(dest_path)
 +        .output();
 +}
++
diff --git a/pkgs/by-name/ed/edgedb/package.nix b/pkgs/by-name/ge/gel/package.nix
similarity index 69%
rename from pkgs/by-name/ed/edgedb/package.nix
rename to pkgs/by-name/ge/gel/package.nix
index 9348ca320028..f82431586d1d 100644
--- a/pkgs/by-name/ed/edgedb/package.nix
+++ b/pkgs/by-name/ge/gel/package.nix
@@ -11,24 +11,24 @@
   xz,
   replaceVars,
   # for passthru.tests:
-  edgedb,
+  gel,
   testers,
 }:
 rustPlatform.buildRustPackage rec {
-  pname = "edgedb";
-  version = "6.1.2";
+  pname = "gel";
+  version = "7.0.3";
 
   src = fetchFromGitHub {
-    owner = "edgedb";
-    repo = "edgedb-cli";
+    owner = "geldata";
+    repo = "gel-cli";
     tag = "v${version}";
-    hash = "sha256-7epi7cF6u3Y/Fomcd1+lQfIIRKzuqL6Qk3gTZGZnjv8=";
+    hash = "sha256-QP4LtLgF2OWCsPCFzpLR8k/RetfEevSd8Uv/PciHCwk=";
     fetchSubmodules = true;
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-Iq960LU3Xxu5LHBENsZ48diPVJrdTHxtChtSp7yghCw=";
+    hash = "sha256-s8UKYZs4GorM0qvAvE+HL+Qma2x05IDtuqYebMDrZHk=";
   };
 
   nativeBuildInputs = [
@@ -60,16 +60,21 @@ rustPlatform.buildRustPackage rec {
     OPENSSL_NO_VENDOR = true;
   };
 
+  # cli warns when edgedb found but gel doesn't
+  postInstall = ''
+    mv $out/bin/edgedb $out/bin/gel
+  '';
+
   doCheck = false;
 
   passthru.tests.version = testers.testVersion {
-    package = edgedb;
-    command = "edgedb --version";
+    package = gel;
+    command = "gel --version";
   };
 
   meta = {
-    description = "EdgeDB cli";
-    homepage = "https://www.edgedb.com/docs/cli/index";
+    description = "Gel cli";
+    homepage = "https://docs.geldata.com/reference/cli";
     license = with lib.licenses; [
       asl20
       # or
@@ -79,6 +84,6 @@ rustPlatform.buildRustPackage rec {
       ahirner
       kirillrdy
     ];
-    mainProgram = "edgedb";
+    mainProgram = "gel";
   };
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a902583045ee..edb2b0fcc4f5 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -351,6 +351,7 @@ mapAliases {
   ec2-utils = amazon-ec2-utils; # Added 2022-02-01
 
   edUnstable = throw "edUnstable was removed; use ed instead"; # Added 2024-07-01
+  edgedb = throw "edgedb replaced to gel because of change of upstream"; # Added 2025-02-24
   elasticsearch7Plugins = elasticsearchPlugins;
   electronplayer = throw "'electronplayer' has been removed as it had been discontinued upstream since October 2024"; # Added 2024-12-17