diff --git a/pkgs/applications/blockchains/charge-lnd/default.nix b/pkgs/by-name/ch/charge-lnd/package.nix
similarity index 58%
rename from pkgs/applications/blockchains/charge-lnd/default.nix
rename to pkgs/by-name/ch/charge-lnd/package.nix
index 1ea8912a7535..88817c6e4b02 100644
--- a/pkgs/applications/blockchains/charge-lnd/default.nix
+++ b/pkgs/by-name/ch/charge-lnd/package.nix
@@ -1,4 +1,9 @@
-{ lib, fetchFromGitHub, python3Packages }:
+{
+  lib,
+  fetchFromGitHub,
+  python3Packages,
+  makeWrapper,
+}:
 
 python3Packages.buildPythonApplication rec {
   pname = "charge-lnd";
@@ -6,9 +11,9 @@ python3Packages.buildPythonApplication rec {
 
   src = fetchFromGitHub {
     owner = "accumulator";
-    repo = pname;
+    repo = "charge-lnd";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-mNU8bhiZqvYbNUU8vJNk9WbpAVrCTi9Fy3hlIpb06ac=";
+    hash = "sha256-mNU8bhiZqvYbNUU8vJNk9WbpAVrCTi9Fy3hlIpb06ac=";
   };
 
   propagatedBuildInputs = with python3Packages; [
@@ -21,20 +26,35 @@ python3Packages.buildPythonApplication rec {
     termcolor
   ];
 
+  nativeBuildInputs = [
+    makeWrapper
+  ];
+
   postInstall = ''
     install README.md -Dt $out/share/doc/charge-lnd
+
+    wrapProgram $out/bin/charge-lnd \
+      --set PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION "python"
   '';
 
   doInstallCheck = true;
+
   installCheckPhase = ''
     $out/bin/charge-lnd --help > /dev/null
   '';
 
-  meta = with lib; {
+  env = {
+    PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python";
+  };
+
+  meta = {
     description = "Simple policy-based fee manager for lightning network daemon";
     homepage = "https://github.com/accumulator/charge-lnd";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ mmilata mariaa144 ];
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [
+      mmilata
+      mariaa144
+    ];
     mainProgram = "charge-lnd";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e68ababd3ce9..e8703775673c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -33844,8 +33844,6 @@ with pkgs;
 
   btcpayserver-altcoins = callPackage ../applications/blockchains/btcpayserver { altcoinSupport = true; };
 
-  charge-lnd = callPackage ../applications/blockchains/charge-lnd { };
-
   cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { };
 
   dcrctl = callPackage ../applications/blockchains/dcrctl { };