diff --git a/nixos/modules/issuer.nix b/nixos/modules/issuer.nix
index 00e9c0c8c79e6d1a9c07ee1550dd0e4abfdf44bb..605cb93b1831b9303b91607725d43ddaa4f0c0b2 100644
--- a/nixos/modules/issuer.nix
+++ b/nixos/modules/issuer.nix
@@ -6,7 +6,7 @@ in {
   options = {
     services.private-storage-issuer.enable = lib.mkEnableOption "PrivateStorage ZKAP Issuer Service";
     services.private-storage-issuer.package = lib.mkOption {
-      default = ourpkgs.zkapissuer.components.exes."PaymentServer-exe";
+      default = ourpkgs.zkapissuer;
       type = lib.types.package;
       example = lib.literalExample "pkgs.zkapissuer.components.exes.\"PaymentServer-exe\"";
       description = ''
@@ -192,7 +192,7 @@ in {
             "--stripe-endpoint-scheme ${cfg.stripeEndpointScheme} " +
             "--stripe-endpoint-port ${toString cfg.stripeEndpointPort}";
         in
-          "${cfg.package}/bin/PaymentServer-exe ${originArgs} ${issuerArgs} ${databaseArgs} ${httpArgs} ${stripeArgs}";
+          "${cfg.package.exePath} ${originArgs} ${issuerArgs} ${databaseArgs} ${httpArgs} ${stripeArgs}";
     };
 
     # PaymentServer runs as this user and group by default
diff --git a/nixos/pkgs/zkapissuer/default.nix b/nixos/pkgs/zkapissuer/default.nix
index 27f5fa3ddf67f44800ab927aee8c23943a57cc96..b4f90d3582cd686fbdf62a6267cb1070c05e9c57 100644
--- a/nixos/pkgs/zkapissuer/default.nix
+++ b/nixos/pkgs/zkapissuer/default.nix
@@ -1,5 +1,6 @@
 { callPackage }:
 let
   repo = callPackage ./repo.nix { };
+  PaymentServer = (import "${repo}/nix").PaymentServer;
 in
-  (import "${repo}/nix").PaymentServer
+  PaymentServer.components.exes."PaymentServer-exe"