diff --git a/README b/README
index 1ddced1..08f3b32 100644
--- a/README
+++ b/README
@@ -77,16 +77,16 @@ ABSTRACT
 
   Then, configure it for use in the ~/.ssh/config file, adding:
 
-    Host bscpm02.bsc.es
+    Host bscpm03.bsc.es
       IdentityFile ~/.ssh/id_rsa
 
   Finally verify the SSH connection to the server works and you get a 
   greeting from the GitLab server with your username:
 
-    xeon07$ ssh git@bscpm02.bsc.es
+    xeon07$ ssh git@bscpm03.bsc.es
     PTY allocation request failed on channel 0
     Welcome to GitLab, @rarias!
-    Connection to bscpm02.bsc.es closed.
+    Connection to bscpm03.bsc.es closed.
 
   Verify that you can access nanos6/nanos6 repository (otherwise you 
   first need to ask to be granted read access), at:
@@ -96,7 +96,7 @@ ABSTRACT
   Finally, you should be able to download the nanos6/nanos6 git 
   repository without any password interaction by running:
 
-    xeon07$ git clone git@bscpm02.bsc.es:nanos6/nanos6.git
+    xeon07$ git clone git@bscpm03.bsc.es:nanos6/nanos6.git
 
   You will also need to access MareNostrum 4 from the xeon07 node, in 
   order to submit experiments. Add the following lines as well to the 
@@ -129,7 +129,7 @@ ABSTRACT
   Now you are ready to build and install packages with nix. Clone the 
   bscpkgs repository:
 
-    xeon07$ git clone git@bscpm02.bsc.es:rarias/bscpkgs.git
+    xeon07$ git clone git@bscpm03.bsc.es:rarias/bscpkgs.git
 
   Nix looks in the current folder for a file named "default.nix" for 
   packages, so go to the repo directory:
diff --git a/bsc/llvm-ompss2/clang-git.nix b/bsc/llvm-ompss2/clang-git.nix
index 40631e7..2a2959e 100644
--- a/bsc/llvm-ompss2/clang-git.nix
+++ b/bsc/llvm-ompss2/clang-git.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
 # and specify nanos6 at run time.
 
   src = builtins.fetchGit {
-    url = "ssh://git@bscpm02.bsc.es/llvm-ompss/llvm-mono.git";
+    url = "ssh://git@bscpm03.bsc.es/llvm-ompss/llvm-mono.git";
     ref = "master";
   };
 }
diff --git a/bsc/mcxx/rarias.nix b/bsc/mcxx/rarias.nix
index d44db2a..32a18af 100644
--- a/bsc/mcxx/rarias.nix
+++ b/bsc/mcxx/rarias.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   #src = /home/Computational/rarias/mcxx;
   src = builtins.fetchGit {
-    url = "ssh://git@bscpm02.bsc.es/rarias/mcxx";
+    url = "ssh://git@bscpm03.bsc.es/rarias/mcxx";
     rev = "44129a6ac05b8f78b06e9e2eff71438b5ca4d29f";
   };
 
diff --git a/bsc/nanos6/git.nix b/bsc/nanos6/git.nix
index 2959e1d..64b31c6 100644
--- a/bsc/nanos6/git.nix
+++ b/bsc/nanos6/git.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   branch = "master";
 
   src = builtins.fetchGit {
-    url = "ssh://git@bscpm02.bsc.es/nanos6/nanos6";
+    url = "ssh://git@bscpm03.bsc.es/nanos6/nanos6";
     ref = branch;
   };
 
diff --git a/bsc/nixtools/default.nix b/bsc/nixtools/default.nix
index 1e5ce4c..6d364bd 100644
--- a/bsc/nixtools/default.nix
+++ b/bsc/nixtools/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   pname = "nixtools";
   version = "${src.shortRev}";
   src = builtins.fetchGit {
-    url = "ssh://git@bscpm02.bsc.es/rarias/nixtools";
+    url = "ssh://git@bscpm03.bsc.es/rarias/nixtools";
     ref = "master";
   };
   buildInputs = [ glibc.static ];
diff --git a/bsc/tampi/git.nix b/bsc/tampi/git.nix
index 83f4614..c94fcee 100644
--- a/bsc/tampi/git.nix
+++ b/bsc/tampi/git.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   dontDisableStatic = true;
   makeFlags = [ "V=1" ];
   src = builtins.fetchGit {
-    url = "ssh://git@bscpm02.bsc.es/interoperability/tampi";
+    url = "ssh://git@bscpm03.bsc.es/interoperability/tampi";
     ref = "master";
   };
 }
diff --git a/garlic/apps/bigsort/default.nix b/garlic/apps/bigsort/default.nix
index e22097c..21c5aa2 100644
--- a/garlic/apps/bigsort/default.nix
+++ b/garlic/apps/bigsort/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   name = "bigsort";
 
   src = builtins.fetchGit {
-    url = "ssh://git@bscpm02.bsc.es/dalvare1/bigsort.git";
+    url = "ssh://git@bscpm03.bsc.es/dalvare1/bigsort.git";
     ref = "${gitBranch}";
   };
 
diff --git a/garlic/apps/bigsort/genseq.nix b/garlic/apps/bigsort/genseq.nix
index ca12edc..2071d51 100644
--- a/garlic/apps/bigsort/genseq.nix
+++ b/garlic/apps/bigsort/genseq.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   name = "genseq";
 
   src = builtins.fetchGit {
-    url = "ssh://git@bscpm02.bsc.es/dalvare1/bigsort.git";
+    url = "ssh://git@bscpm03.bsc.es/dalvare1/bigsort.git";
     ref = "garlic/mpi+send+omp+task";
   };
 
diff --git a/garlic/apps/bigsort/shuffle.nix b/garlic/apps/bigsort/shuffle.nix
index 55ac106..6262377 100644
--- a/garlic/apps/bigsort/shuffle.nix
+++ b/garlic/apps/bigsort/shuffle.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   name = "shuffle";
 
   src = builtins.fetchGit {
-    url = "ssh://git@bscpm02.bsc.es/dalvare1/bigsort.git";
+    url = "ssh://git@bscpm03.bsc.es/dalvare1/bigsort.git";
     ref = "garlic/mpi+send+omp+task";
   };
 
diff --git a/garlic/apps/creams/default.nix b/garlic/apps/creams/default.nix
index b1dd26e..a37bf02 100644
--- a/garlic/apps/creams/default.nix
+++ b/garlic/apps/creams/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   # src = /home/Computational/pmartin1/creams-simplified;
   src = builtins.fetchGit {
-    url = "ssh://git@bscpm02.bsc.es/pmartin1/creams-simplified.git";
+    url = "ssh://git@bscpm03.bsc.es/pmartin1/creams-simplified.git";
     ref = "${gitBranch}";
   };
 
diff --git a/garlic/apps/creams/input.nix b/garlic/apps/creams/input.nix
index 30da776..60d0801 100644
--- a/garlic/apps/creams/input.nix
+++ b/garlic/apps/creams/input.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   # src = /home/Computational/pmartin1/creams-simplified;
   src = builtins.fetchGit {
-    url = "ssh://git@bscpm02.bsc.es/pmartin1/creams-simplified.git";
+    url = "ssh://git@bscpm03.bsc.es/pmartin1/creams-simplified.git";
     ref = "${gitBranch}";
   };
 
diff --git a/garlic/apps/heat/default.nix b/garlic/apps/heat/default.nix
index 8fcf324..a00c2b3 100644
--- a/garlic/apps/heat/default.nix
+++ b/garlic/apps/heat/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   src = ~/heat;
   #src = builtins.fetchGit {
-  #  url = "ssh://git@bscpm02.bsc.es/garlic/apps/heat.git";
+  #  url = "ssh://git@bscpm03.bsc.es/garlic/apps/heat.git";
   #  ref = "garlic";
   #};
 
diff --git a/garlic/apps/hpccg/default.nix b/garlic/apps/hpccg/default.nix
index 55db352..0799aad 100644
--- a/garlic/apps/hpccg/default.nix
+++ b/garlic/apps/hpccg/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   name = "hpccg";
 
   src = builtins.fetchGit {
-    url = "ssh://git@bscpm02.bsc.es/mmaronas/HPCCG.git";
+    url = "ssh://git@bscpm03.bsc.es/mmaronas/HPCCG.git";
     ref = "mmaronas-development";
   };
 
diff --git a/garlic/apps/hpcg/default.nix b/garlic/apps/hpcg/default.nix
index 3f5737f..c864bb2 100644
--- a/garlic/apps/hpcg/default.nix
+++ b/garlic/apps/hpcg/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   name = "hpcg";
 
   src = builtins.fetchGit {
-    url = "ssh://git@bscpm02.bsc.es/rpenacob/garlic-hpcg.git";
+    url = "ssh://git@bscpm03.bsc.es/rpenacob/garlic-hpcg.git";
     ref = "${gitBranch}";
   };
 
diff --git a/garlic/apps/ifsker/default.nix b/garlic/apps/ifsker/default.nix
index 8a43fa0..812f630 100644
--- a/garlic/apps/ifsker/default.nix
+++ b/garlic/apps/ifsker/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   name = "ifsker";
 
   src = builtins.fetchGit {
-    url = "ssh://git@bscpm02.bsc.es/ksala/ifsker.git";
+    url = "ssh://git@bscpm03.bsc.es/ksala/ifsker.git";
     ref = "master";
   };
 
diff --git a/garlic/apps/lulesh/default.nix b/garlic/apps/lulesh/default.nix
index 7d8d487..d677161 100644
--- a/garlic/apps/lulesh/default.nix
+++ b/garlic/apps/lulesh/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   name = "lulesh";
 
   src = builtins.fetchGit {
-    url = "ssh://git@bscpm02.bsc.es/mmaronas/lulesh.git";
+    url = "ssh://git@bscpm03.bsc.es/mmaronas/lulesh.git";
     ref = "master";
   };
 
diff --git a/garlic/apps/miniamr/default.nix b/garlic/apps/miniamr/default.nix
index 844913f..cc0450b 100644
--- a/garlic/apps/miniamr/default.nix
+++ b/garlic/apps/miniamr/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   name = "miniamr";
 
   src = builtins.fetchGit {
-    url = "ssh://git@bscpm02.bsc.es/ksala/miniamr.git";
+    url = "ssh://git@bscpm03.bsc.es/ksala/miniamr.git";
     ref = "master";
   };
 
diff --git a/garlic/apps/nbody/default.nix b/garlic/apps/nbody/default.nix
index 57efb0c..32bcdfa 100644
--- a/garlic/apps/nbody/default.nix
+++ b/garlic/apps/nbody/default.nix
@@ -6,7 +6,7 @@
 , mcxx ? null
 , cflags ? null
 , gitBranch
-, gitURL ? "ssh://git@bscpm02.bsc.es/garlic/apps/nbody.git"
+, gitURL ? "ssh://git@bscpm03.bsc.es/garlic/apps/nbody.git"
 , blocksize ? 2048
 }:
 
diff --git a/garlic/apps/saiph/default.nix b/garlic/apps/saiph/default.nix
index 73f890c..616350e 100644
--- a/garlic/apps/saiph/default.nix
+++ b/garlic/apps/saiph/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   name = "saiph";
 
   src = builtins.fetchGit {
-    url = "ssh://git@bscpm02.bsc.es/DSLs/saiph.git";
+    url = "ssh://git@bscpm03.bsc.es/DSLs/saiph.git";
     ref = "${gitBranch}";
   };