diff --git a/nix/pkgs/heptapod-runner/default.nix b/nix/pkgs/heptapod-runner/default.nix
index 6196cd40ec..5c1fa858f5 100644
--- a/nix/pkgs/heptapod-runner/default.nix
+++ b/nix/pkgs/heptapod-runner/default.nix
@@ -4,20 +4,32 @@
 
 { pkgs, depot, ... }:
 let
-  version = "hpd-0.4.0";
+  version = "hpd-0.5.0";
   newSrc = pkgs.fetchhg {
     url = "https://mirror.octobus.net/heptapod/heptapod-runner";
-    rev = "8b729b09e365";
-    sha256 = "1769kcpgmhnibdmhvsdnylsdk8w08c7mgxi23vrx7vjfxgij1bdr";
+    rev = "5843be69a387";
+    sha256 = "sha256:15iyz7rgi6rb4nf1rjd96lsgdxn2l1ivzh05my7c9zpzvl7cnw25";
   };
 in
 {
-  heptapod-runner = pkgs.gitlab-runner.overrideAttrs (oldAttrs: rec {
+  heptapod-runner = pkgs.buildGoModule rec {
+    pname = "heptapod-runner";
     inherit version;
-    buildInputs = (oldAttrs.buildInputs or []) ++ [ pkgs.makeWrapper ];
+
+    commonPackagePath = "gitlab.com/gitlab-org/gitlab-runner/common";
+    ldflags = [
+      "-X ${commonPackagePath}.NAME=heptapod-runner"
+      "-X ${commonPackagePath}.VERSION=${version}"
+      "-X ${commonPackagePath}.REVISION=v${version}"
+    ];
+
     src = newSrc;
+    vendorSha256 = null;
+
     patches = [ ./fix-shell-path.patch ];
-  });
+
+    doCheck = false;
+  };
   heptapod-runner-mercurial = pkgs.symlinkJoin {
     name = pkgs.mercurial.name;
     paths = [ pkgs.mercurial ];