diff --git a/pkgs/bench6/default.nix b/pkgs/bench6/default.nix
index f6a908a..91c8a74 100644
--- a/pkgs/bench6/default.nix
+++ b/pkgs/bench6/default.nix
@@ -7,7 +7,7 @@
 , mpi
 , tampi
 , gitBranch ? "master"
-, gitURL ? "ssh://git@bscpm03.bsc.es/rarias/bench6.git"
+, gitURL ? "ssh://git@bscpm04.bsc.es/rarias/bench6.git"
 , gitCommit ? "1e6ce2aa8ad7b4eef38df1581d7ec48a8815f85d"
 }:
 
diff --git a/pkgs/cn6/default.nix b/pkgs/cn6/default.nix
index 5e3eaf5..e213bcf 100644
--- a/pkgs/cn6/default.nix
+++ b/pkgs/cn6/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   ] ++ optionals (enableTest) [ mpi clangOmpss2 tampi ];
 
   src = builtins.fetchGit {
-    url = "ssh://git@bscpm03.bsc.es/rarias/cn6.git";
+    url = "ssh://git@bscpm04.bsc.es/rarias/cn6.git";
     ref = "master";
     rev = "c72c3b66b720c2a33950f536fc819051c8f20a69";
   };
diff --git a/pkgs/llvm-ompss2/clang.nix b/pkgs/llvm-ompss2/clang.nix
index 02d140a..3302e64 100644
--- a/pkgs/llvm-ompss2/clang.nix
+++ b/pkgs/llvm-ompss2/clang.nix
@@ -14,7 +14,7 @@
 , gcc # needed to set the rpath of libstdc++ for clang-tblgen
 , enableDebug ? false
 , useGit ? false
-, gitUrl ? "ssh://git@bscpm03.bsc.es/llvm-ompss/llvm-mono.git"
+, gitUrl ? "ssh://git@bscpm04.bsc.es/llvm-ompss/llvm-mono.git"
 , gitBranch ? "master"
 , gitCommit ? "8c0d267c04d7fc3fb923078f510fcd5f4719a6cc"
 }:
diff --git a/pkgs/mcxx/git.nix b/pkgs/mcxx/git.nix
index 6106f3c..e417630 100644
--- a/pkgs/mcxx/git.nix
+++ b/pkgs/mcxx/git.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   };
 
   src = builtins.fetchGit {
-    url = "ssh://git@bscpm03.bsc.es/mercurium/mcxx";
+    url = "ssh://git@bscpm04.bsc.es/mercurium/mcxx";
     ref = "master";
   };
 
diff --git a/pkgs/mcxx/rarias.nix b/pkgs/mcxx/rarias.nix
index 32a18af..25ad8ea 100644
--- a/pkgs/mcxx/rarias.nix
+++ b/pkgs/mcxx/rarias.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   #src = /home/Computational/rarias/mcxx;
   src = builtins.fetchGit {
-    url = "ssh://git@bscpm03.bsc.es/rarias/mcxx";
+    url = "ssh://git@bscpm04.bsc.es/rarias/mcxx";
     rev = "44129a6ac05b8f78b06e9e2eff71438b5ca4d29f";
   };
 
diff --git a/pkgs/nanos6/default.nix b/pkgs/nanos6/default.nix
index fabb1e4..ef0f1a7 100644
--- a/pkgs/nanos6/default.nix
+++ b/pkgs/nanos6/default.nix
@@ -17,7 +17,7 @@
 , cachelineBytes ? 64
 , enableGlibcxxDebug ? false
 , useGit ? false
-, gitUrl ? "ssh://git@bscpm03.bsc.es/nanos6/nanos6"
+, gitUrl ? "ssh://git@bscpm04.bsc.es/nanos6/nanos6"
 , gitBranch ? "master"
 , gitCommit ? "9f54c988e0a8b9c011d9d526acdb8d76f18fcae4"
 }:
diff --git a/pkgs/nixtools/default.nix b/pkgs/nixtools/default.nix
index 7fb146d..76ea64b 100644
--- a/pkgs/nixtools/default.nix
+++ b/pkgs/nixtools/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   pname = "nixtools";
   version = "${src.shortRev}";
   src = builtins.fetchGit {
-    url = "ssh://git@bscpm03.bsc.es/rarias/nixtools";
+    url = "ssh://git@bscpm04.bsc.es/rarias/nixtools";
     ref = "master";
     rev = "a103e392048ace3ed88ce74648b32c9e6ed094da";
   };
diff --git a/pkgs/ovni/default.nix b/pkgs/ovni/default.nix
index 306e4e5..a888e71 100644
--- a/pkgs/ovni/default.nix
+++ b/pkgs/ovni/default.nix
@@ -6,7 +6,7 @@
 , fetchFromGitHub
 , useGit ? false
 , gitBranch ? "master"
-, gitUrl ? "ssh://git@bscpm03.bsc.es/rarias/ovni.git"
+, gitUrl ? "ssh://git@bscpm04.bsc.es/rarias/ovni.git"
 , gitCommit ? "a7103f8510d1ec124c3e01ceb47d1e443e98bbf4"
 , enableDebug ? false
 # Only enable MPI if the build is native (fails on cross-compilation)
diff --git a/pkgs/tampi/default.nix b/pkgs/tampi/default.nix
index a146521..37209e8 100644
--- a/pkgs/tampi/default.nix
+++ b/pkgs/tampi/default.nix
@@ -13,7 +13,7 @@
 , enableOvni ? true
 , ovni ? null
 , useGit ? false
-, gitUrl ? "ssh://git@bscpm03.bsc.es/interoperability/tampi.git"
+, gitUrl ? "ssh://git@bscpm04.bsc.es/interoperability/tampi.git"
 , gitBranch ? "master"
 , gitCommit ? "a5c93bf8ab045b71ad4a8d5e2c991ce774db5cbc"
 }: