diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/by-name/aw/awsebcli/package.nix
similarity index 80%
rename from pkgs/tools/virtualization/awsebcli/default.nix
rename to pkgs/by-name/aw/awsebcli/package.nix
index f76545e60b0d0..21a20ad7dd168 100644
--- a/pkgs/tools/virtualization/awsebcli/default.nix
+++ b/pkgs/by-name/aw/awsebcli/package.nix
@@ -1,12 +1,19 @@
-{ lib, python3, fetchFromGitHub, glibcLocales, git }:
+{
+  lib,
+  python3,
+  fetchFromGitHub,
+  git,
+}:
 
 let
-  changeVersion = overrideFunc: version: hash: overrideFunc (oldAttrs: rec {
-    inherit version;
-    src = oldAttrs.src.override {
-      inherit version hash;
-    };
-  });
+  changeVersion =
+    overrideFunc: version: hash:
+    overrideFunc (oldAttrs: rec {
+      inherit version;
+      src = oldAttrs.src.override {
+        inherit version hash;
+      };
+    });
 
   localPython = python3.override {
     self = localPython;
@@ -33,16 +40,9 @@ localPython.pkgs.buildPythonApplication rec {
 
   postPatch = ''
     # https://github.com/aws/aws-elastic-beanstalk-cli/pull/469
-    substituteInPlace setup.py --replace "scripts=['bin/eb']," ""
+    substituteInPlace setup.py --replace-fail "scripts=['bin/eb']," ""
   '';
 
-  nativeBuildInputs = with localPython.pkgs; [
-  ];
-
-  buildInputs = [
-    glibcLocales
-  ];
-
   propagatedBuildInputs = with localPython.pkgs; [
     blessed
     botocore
@@ -95,7 +95,7 @@ localPython.pkgs.buildPythonApplication rec {
     homepage = "https://aws.amazon.com/elasticbeanstalk/";
     description = "Command line interface for Elastic Beanstalk";
     changelog = "https://github.com/aws/aws-elastic-beanstalk-cli/blob/${version}/CHANGES.rst";
-    maintainers = with maintainers; [ eqyiel kirillrdy ];
+    maintainers = with maintainers; [ kirillrdy ];
     license = licenses.asl20;
     mainProgram = "eb";
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7db8390e79645..f3525c586c1ea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3155,8 +3155,6 @@ with pkgs;
 
   okta-aws-cli = callPackage ../tools/admin/okta-aws-cli { };
 
-  awsebcli = callPackage ../tools/virtualization/awsebcli { };
-
   awslimitchecker = callPackage ../tools/admin/awslimitchecker { };
 
   awslogs = callPackage ../tools/admin/awslogs { };