diff --git a/morph/grid/local/arion-compose.nix b/morph/grid/local/arion-compose.nix
index 1f8eb2092e1aa66d1d95a2b41760ef198323ac70..b8c7f87913074cdbd928ce019019e88c4264b41f 100644
--- a/morph/grid/local/arion-compose.nix
+++ b/morph/grid/local/arion-compose.nix
@@ -27,7 +27,11 @@ let
   node = { monitor-ip, public-ip }: { pkgs, lib, ...}: {
     image.name = "localhost/nixos-test";
     nixos.useSystemd = true;
-    service.useHostStore = true;
+
+    #service.useHostStore = true;
+    image.includeStorePaths = false;
+    service.volumes = ["nix:/nix:ro"];
+
     out.service = {
       networks.privatestorage.ipv4_address = public-ip;
     };
@@ -43,16 +47,17 @@ let
       config = {
         system.stateVersion = lib.mkDefault "19.09";
         monitoringvpnIPv4 = monitor-ip;
+	services.openssh.enable = lib.mkForce false;
       };
     };
   };
-  
+    
   storage-node = { monitor-ip, public-ip }@args: { pkgs, lib, ...}: {
     imports = [ (node args) ];
     nixos.configuration = {
       imports = [
         gridlib.storage
-        (gridlib.customize-storage config)
+          (gridlib.customize-storage config)
       ];
     };
   };
@@ -62,13 +67,20 @@ in
   services.storage2 = storage-node { monitor-ip = "172.23.23.13"; public-ip = "10.88.2.31"; };
   services.payment = { pkgs, lib, ...}: {
     imports = [ (node { monitor-ip = "172.23.23.11"; public-ip = "10.88.2.32"; }) ];
-    nixos.configuration = {
+    nixos.configuration = {config, ...}: {
       imports = [
         gridlib.issuer
-          (gridlib.customize-issuer (config // {
+          (gridlib.customize-issuer (rawConfig // {
             monitoringvpnIPv4 = "172.23.23.11";
             }))
       ];
+      environment.etc = {
+        "secrets/payments-localdev-ssl" = {
+          mode = "direct-symlink";
+          source = "${config.deployment.privateKeyPath}/payments-localdev-ssl";
+        };
+      };
+      services.private-storage-issuer.tls = lib.mkForce false;
     };
   };
   docker-compose.raw = {
diff --git a/nixpkgs-2105.nix b/nixpkgs-2105.nix
index 536d913b89ba6a57d8d683381ea1c8f40e026b4f..dd54dfd569e458f370b9a5d839873f2fc4871515 100644
--- a/nixpkgs-2105.nix
+++ b/nixpkgs-2105.nix
@@ -1 +1,3 @@
-import (builtins.fetchTarball (builtins.fromJSON (builtins.readFile ./nixpkgs-2105.json)))
+let pkgs = import <nixpkgs> {};
+in
+import (pkgs.fetchzip (pkgs.lib.importJSON ./nixpkgs-2105.json))
diff --git a/nixpkgs-ps.json b/nixpkgs-ps.json
index 58add30734e8f7b9b2840a9be38693ceb6a4249d..651237d6844f573bde6880b40a7862ddf77d2890 100644
--- a/nixpkgs-ps.json
+++ b/nixpkgs-ps.json
@@ -1,4 +1,4 @@
 { "name": "nixpkgs"
-, "url": "https://github.com/PrivateStorageio/nixpkgs/archive/5ebd5af2d5c6caf23735c8c0e6bc27357fa8d2a8.tar.gz"
-, "sha256": "1g2bvs8prqjskzv8s1qmh36k7rmj98jib0syqbrq02xxzw5dpqb4"
+, "url": "https://github.com/tp-la/nixpkgs/archive/f0dbe36042a70e3601f287a887274fe82e3a95fd.tar.gz"
+, "sha256": "1lvmc1d5c36hsl4hir1z1bv4y7yvik6wky7dzzan2bscgbvnsm7x"
 }
diff --git a/nixpkgs-ps.nix b/nixpkgs-ps.nix
index d98a53843052fda824f4ed7e34db50524df36ce2..4048abb14707c42ecb5e124907d9a6a5532bd7cd 100644
--- a/nixpkgs-ps.nix
+++ b/nixpkgs-ps.nix
@@ -1 +1,3 @@
-import (builtins.fetchTarball (builtins.fromJSON (builtins.readFile ./nixpkgs-ps.json)))
+let pkgs = import <nixpkgs> {};
+in
+import (pkgs.fetchzip (pkgs.lib.importJSON ./nixpkgs-ps.json))
diff --git a/shell.nix b/shell.nix
index 09a5746626e0818e7910b178e2d2767696744c48..1cdd35c2de63c75b163227e1f962680a360a9cc9 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,13 +1,15 @@
 let
   release2105 = import ./nixpkgs-2105.nix { };
 in
-{ pkgs ? release2105 }:
+{ pkgs ? release2105
+, vagrant ? true
+}:
 pkgs.mkShell {
   NIX_PATH = "nixpkgs=${pkgs.path}";
   buildInputs = [
     pkgs.arion
     pkgs.jp
+    pkgs.just
     pkgs.morph
-    pkgs.vagrant
-  ];
+  ] ++ pkgs.lib.optional vagrant pkgs.vagrant;
 }