diff --git a/deployments/argo.nixops b/deployments/argo.nixops
index 2832ef027382d84a80576db37f4545c14696976c..19e729d773d5ea9746733b08798022873039907b 100644
Binary files a/deployments/argo.nixops and b/deployments/argo.nixops differ
diff --git a/deployments/ci.nix b/deployments/ci.nix
index eb281a07db915e29a2151d389911fdd33fa8e03c..23240b15274f6aab5dfc4471c1352da6e5a95c47 100644
--- a/deployments/ci.nix
+++ b/deployments/ci.nix
@@ -85,7 +85,7 @@ in
 
     gitlab-runner-physical =
     { ... }:
-    let ip = "140.221.10.9"; in 
+    let ip = "140.221.10.88"; in 
     {
       deployment.targetEnv = "none";
       deployment.targetHost = ip;
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 6f2b6430233cc56c74830ec979a35c2aa04b6e9a..4fb4e48968bea72934d94ef64ed844cbdfa609bc 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -99,11 +99,8 @@ let
 
     containers    = callPackage ./containers {src=containers-src;};
     libnrm        = callPackage ./libnrm     {src=libnrm-src;};
+    libnrm-pmpi   = callPackage ./libnrm/mpi.nix {src=libnrm-src;};
     libnrm-pinned = callPackage ./libnrm     {src=fetched libnrm/pin.json;};
-    libnrm-pmpi   = libnrm.overrideAttrs (oldAttrs: rec {
-      configureFlags = "--enable-pmpi";
-      buildInputs = oldAttrs.buildInputs ++ [ pkgs.mpich2 ];
-    });
 
     #jsonschema3 = pkgs.pythonPackages.jsonschema.overrideAttrs(o:{
       #src=pkgs.fetchurl{
@@ -228,7 +225,6 @@ let
         powerplots  = (self.callCabal2nix "powerplots"  powerplots-src  ) {};
 
         generic-aeson   = doJailbreak super.generic-aeson;
-        nrm-schema  = (self.callCabal2nix "nrm-schema"  nrm-schema-src ) {};
         zmcat = self.callPackage ./zmcat {};
 
       };
@@ -250,15 +246,6 @@ let
     inherit (haskellPackages) repoquality;
     #inherit (bleedingHaskellPackages) dhall dhall-lsp-server dhall-json;
 
-    nrm-schema = haskellPackages.nrm-schema.overrideAttrs (old:{
-      buildInputs = old.buildInputs ++ [
-        (pkgs.python.withPackages (ps: [
-          ps.warlock
-          ps.jsonschema
-        ]))
-      ];
-    });
-
     dhrun = bleedingHaskellPackages.dhrun.overrideAttrs (old:{
         installPhase = old.installPhase + ''
           mkdir -p $out/share/
diff --git a/pkgs/libnrm/mpi.nix b/pkgs/libnrm/mpi.nix
new file mode 100644
index 0000000000000000000000000000000000000000..75c57bdda9f84f6a7631bcc30b5cb54ef094b1fa
--- /dev/null
+++ b/pkgs/libnrm/mpi.nix
@@ -0,0 +1,8 @@
+{ stdenv, src, autoreconfHook, fetchgit, zeromq, gfortran, pkgconfig, mpich2 }:
+stdenv.mkDerivation {
+  inherit src;
+  name = "libnrm";
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ zeromq gfortran mpich2 ];
+  configureFlags = "--enable-pmpi";
+}