diff --git a/m/apex/configuration.nix b/m/apex/configuration.nix
index e0877dfb..fdddb676 100644
--- a/m/apex/configuration.nix
+++ b/m/apex/configuration.nix
@@ -58,7 +58,7 @@
 
   # Use SSH tunnel to reach internal hosts
   programs.ssh.extraConfig = ''
-    Host bscpm04.bsc.es gitlab-internal.bsc.es knights3.bsc.es
+    Host knights3.bsc.es
       ProxyCommand nc -X connect -x localhost:23080 %h %p
     Host tent
       ProxyJump raccoon
diff --git a/m/apex/wireguard.nix b/m/apex/wireguard.nix
index 672b5db6..f972d6c7 100644
--- a/m/apex/wireguard.nix
+++ b/m/apex/wireguard.nix
@@ -37,5 +37,7 @@
   networking.hosts = {
     "10.106.0.1" = [ "fox" ];
     "10.106.0.236" = [ "raccoon" ];
+    "192.168.11.12" = [ "bscpm04.bsc.es" ];
+    "192.168.11.15" = [ "gitlab-internal.bsc.es" ];
   };
 }
diff --git a/m/common/ssf/ssh.nix b/m/common/ssf/ssh.nix
index b73abd79..c2f0d71e 100644
--- a/m/common/ssf/ssh.nix
+++ b/m/common/ssf/ssh.nix
@@ -8,9 +8,5 @@
     Host raccoon knights3.bsc.es
       HostName knights3.bsc.es
       ProxyCommand=ssh apex 'nc -X connect -x localhost:23080 %h %p'
-
-    # Make sure we can reach gitlab even if we don't have SSH access to raccoon
-    Host bscpm04.bsc.es gitlab-internal.bsc.es
-      ProxyCommand=ssh apex 'nc -X connect -x localhost:23080 %h %p'
   '';
 }