diff --git a/justfile b/justfile
index c0cc37ad52..bf6dfabe11 100644
--- a/justfile
+++ b/justfile
@@ -6,7 +6,7 @@ push target:
     #!/usr/bin/env bash
     set -euo pipefail
     mkdir -p {{ workspace_dir }}
-    pushedImg=$(nix run .#containers.push-{{ target }} -- "$container_registry/contrast/{{ target }}")
+    pushedImg=$(nix run -L .#containers.push-{{ target }} -- "$container_registry/contrast/{{ target }}")
     printf "ghcr.io/edgelesssys/contrast/%s:latest=%s\n" "{{ target }}" "$pushedImg" >> {{ workspace_dir }}/just.containerlookup
 
 # Build the coordinator, containerize and push it.
diff --git a/packages/by-name/kata/kata-image/package.nix b/packages/by-name/kata/kata-image/package.nix
index 70103668cd..2cd345520d 100644
--- a/packages/by-name/kata/kata-image/package.nix
+++ b/packages/by-name/kata/kata-image/package.nix
@@ -162,6 +162,8 @@ stdenv.mkDerivation rec {
       --bind /build/var /var \
       --dev-bind /dev/null /dev/null \
       fakeroot bash -c "bash $(pwd)/rootfs.sh -r /build/root ${distro} && \
+        echo '++ rootfs built ++' && \
+        ls -laH /build/root/usr/lib && \
         tar \
           --exclude='./usr/lib/systemd/system/systemd-coredump@*' \
           --exclude='./usr/lib/systemd/system/systemd-journald*' \
diff --git a/packages/by-name/kata/runtime-class-files/package.nix b/packages/by-name/kata/runtime-class-files/package.nix
index 5c65db9f27..c6c253bbbc 100644
--- a/packages/by-name/kata/runtime-class-files/package.nix
+++ b/packages/by-name/kata/runtime-class-files/package.nix
@@ -55,7 +55,6 @@ stdenvNoCC.mkDerivation {
   buildPhase = ''
     mkdir -p $out
     sha256sum ${image} ${kernel} ${qemu-snp.bin} ${qemu-tdx.bin} ${containerd-shim-contrast-cc-v2} ${ovmf-snp} ${ovmf-tdx} | sha256sum | cut -d " " -f 1 > $out/launch-digest.hex
-    printf "contrast-cc-%s" "$(cat $out/launch-digest.hex | head -c 32)" > $out/runtime-handler
   '';
 
   passthru = {
diff --git a/packages/by-name/microsoft/runtime-class-files/package.nix b/packages/by-name/microsoft/runtime-class-files/package.nix
index 19aa1a9b4d..c895cd060a 100644
--- a/packages/by-name/microsoft/runtime-class-files/package.nix
+++ b/packages/by-name/microsoft/runtime-class-files/package.nix
@@ -24,8 +24,6 @@ stdenvNoCC.mkDerivation {
   buildPhase = ''
     mkdir -p $out
     igvmmeasure -b ${igvm} | dd conv=lcase > $out/launch-digest.hex
-    echo -n "contrast-cc-" > $out/runtime-handler
-    cat $out/launch-digest.hex | head -c 32 >> $out/runtime-handler
   '';
 
   passthru = {