diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 55003c8f..e9422928 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -247,7 +247,7 @@ jobs:
           scenario_names | xargs -I % nix bundle --option sandbox false .#packages.x86_64-linux.%
 
           mkdir -p dist
-          scenario_names | xargs -I % cp % dist/
+          scenario_names | xargs -I % cp %-arx dist/%
 
       - name: Archive scenario bundles
         if: runner.os == 'Linux'
diff --git a/nix/modules/scenario.nix b/nix/modules/scenario.nix
index 708fdcec..1be3f8b1 100644
--- a/nix/modules/scenario.nix
+++ b/nix/modules/scenario.nix
@@ -24,7 +24,8 @@ in
         scenarioHapps = config.happHelper.mkHapps { configToml = ../../scenarios/${name}/Cargo.toml; };
       in
       pkgs.stdenv.mkDerivation {
-        inherit name;
+        pname = name;
+        inherit (scenarioBinary) version;
 
         # No sources to copy, everything comes from the build inputs
         unpackPhase = "true";
diff --git a/nix/modules/scenarios.nix b/nix/modules/scenarios.nix
index b2ec875a..cc543c3a 100644
--- a/nix/modules/scenarios.nix
+++ b/nix/modules/scenarios.nix
@@ -15,6 +15,4 @@ let
 in
 {
   packages = builtins.listToAttrs scenarios;
-
-  apps = builtins.listToAttrs (builtins.map ({ name, value }: { inherit name; value = { program = value; }; }) scenarios);
 }