diff --git a/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix b/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix
index ee083003ae7b..19c4618bb926 100644
--- a/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix
+++ b/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix
@@ -1,11 +1,9 @@
-{ buildGoPackage, fetchFromGitHub, lib, ... }:
+{ lib, buildGoModule, fetchFromGitHub, testers, amazon-ecr-credential-helper }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "amazon-ecr-credential-helper";
   version = "0.6.0";
 
-  goPackagePath = "github.com/awslabs/amazon-ecr-credential-helper";
-
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "amazon-ecr-credential-helper";
@@ -13,12 +11,26 @@ buildGoPackage rec {
     sha256 = "sha256-lkc8plWWmth8SjeWBCf1HTnCfg09QNIsN3xPePqnv6Y=";
   };
 
+  vendorSha256 = null;
+
+  modRoot = "./ecr-login";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/awslabs/amazon-ecr-credential-helper/ecr-login/version.Version=${version}"
+  ];
+
+  passthru.tests.version = testers.testVersion {
+    package = amazon-ecr-credential-helper;
+    command = "docker-credential-ecr-login -v";
+  };
+
   meta = with lib; {
     description = "The Amazon ECR Docker Credential Helper is a credential helper for the Docker daemon that makes it easier to use Amazon Elastic Container Registry";
     homepage = "https://github.com/awslabs/amazon-ecr-credential-helper";
     license = licenses.asl20;
     maintainers = with maintainers; [ kalbasit ];
     mainProgram = "docker-credential-ecr-login";
-    platforms = platforms.linux ++ platforms.darwin;
   };
 }