diff --git a/shell.nix b/shell.nix
index d9b6f5adf..221796a6b 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,4 +1,4 @@
-{ pkgs ? import <nixpkgs> {} }:
+{ pkgs ? import <nixpkgs> { overlays = [ (import ./vespa-cli-overlay.nix) ]; } }:
 
 pkgs.mkShell {
   buildInputs = with pkgs; [
@@ -6,6 +6,7 @@ pkgs.mkShell {
     cargo
     tree
     poetry
+    vespa-cli
   ];
   shellHook = ''
     cat <<'EOF'
diff --git a/shell.old b/shell.old
new file mode 100644
index 000000000..d9b6f5adf
--- /dev/null
+++ b/shell.old
@@ -0,0 +1,26 @@
+{ pkgs ? import <nixpkgs> {} }:
+
+pkgs.mkShell {
+  buildInputs = with pkgs; [
+    just
+    cargo
+    tree
+    poetry
+  ];
+  shellHook = ''
+    cat <<'EOF'
+               .-.
+                  `-'
+    ___          LoRA
+  .´   `'.     _...._
+ :  LLAMA  :  .'      '.
+  '._____.' /`(o)    (o)`\
+  _|_______|/  :      :  \
+[_____________/ '------'  \
+  /  o                    /
+  `"`"|"`"`"`"`"`"`"`""=""===""`
+EOF
+
+    echo "gm gm ⟁"
+  '';
+}
diff --git a/vespa-cli-overlay.nix b/vespa-cli-overlay.nix
index 1f54b5b05..13c1f79fb 100644
--- a/vespa-cli-overlay.nix
+++ b/vespa-cli-overlay.nix
@@ -11,6 +11,9 @@ self: super:
     };
 
     buildInputs = [];
+
+    nativeBuildInputs = [ super.makeWrapper ];
+
     dontBuild = true;
 
     unpackPhase = ''
@@ -21,8 +24,7 @@ self: super:
       mkdir -p $out/bin
       cp vespa-cli_${version}_darwin_arm64/bin/vespa $out/bin
       chmod +x $out/bin/vespa
-      # Add an exception to allow the vespa binary to run
-      xattr -r -d com.apple.quarantine $out/bin/vespa
+      # Wrap the vespa binary to remove quarantine attribute
     '';
   };
 }