diff --git a/modules/wireguard/pub.solar.nix b/modules/wireguard/pub.solar.nix
index ba1913a..270c936 100644
--- a/modules/wireguard/pub.solar.nix
+++ b/modules/wireguard/pub.solar.nix
@@ -33,19 +33,77 @@ in {
         privateKeyFile = cfg.privateKeyFile;
         peers = [
           {
-            endpoint = "flora-6.pub.solar:51820";
-            publicKey = "jtSR5G2P/nm9s8WrVc26Xc/SQLupRxyXE+5eIeqlsTU=";
-            allowedIPs = ["10.7.6.2/32" "fd00:fae:fae:fae:fae:2::/96"];
+            endpoint = "nachtigall.pub.solar:51820";
+            publicKey = "qzNywKY9RvqTnDO8eLik75/SHveaSk9OObilDzv+xkk=";
+            allowedIPs = [
+              "10.7.6.1/32"
+              "fd00:fae:fae:fae:fae:1::/96"
+            ];
             persistentKeepalive = 15;
             dynamicEndpointRefreshSeconds = 30;
           }
           {
-            endpoint = "nachtigall.pub.solar:51820";
-            publicKey = "qzNywKY9RvqTnDO8eLik75/SHveaSk9OObilDzv+xkk=";
-            allowedIPs = ["10.7.6.1/32" "fd00:fae:fae:fae:fae:1::/96"];
+            endpoint = "flora-6.pub.solar:51820";
+            publicKey = "jtSR5G2P/nm9s8WrVc26Xc/SQLupRxyXE+5eIeqlsTU=";
+            allowedIPs = [
+              "10.7.6.2/32"
+              "fd00:fae:fae:fae:fae:2::/96"
+            ];
             persistentKeepalive = 15;
             dynamicEndpointRefreshSeconds = 30;
           }
+          {
+            # metronom.pub.solar
+            endpoint = "49.13.236.167:51820";
+            publicKey = "zOSYGO7MfnOOUnzaTcWiKRQM0qqxR3JQrwx/gtEtHmo=";
+            allowedIPs = [
+              "10.7.6.3/32"
+              "fd00:fae:fae:fae:fae:3::/96"
+            ];
+            persistentKeepalive = 15;
+          }
+          {
+            # tankstelle.pub.solar
+            endpoint = "80.244.242.5:51820";
+            publicKey = "iRTlY1lB7nPXf2eXzX8ZZDkfMmXyGjff5/joccbP8Cg=";
+            allowedIPs = [
+              "10.7.6.4/32"
+              "fd00:fae:fae:fae:fae:4::/96"
+            ];
+          }
+          {
+            # trinkgenossin.pub.solar
+            publicKey = "QWgHovHxtqiQhnHLouSWiT6GIoQDmuvnThYL5c/rvU4=";
+            allowedIPs = [
+              "10.7.6.5/32"
+              "fd00:fae:fae:fae:fae:5::/96"
+            ];
+            #endpoint = "80.244.242.5:51820";
+            endpoint = "[2a01:239:35d:f500::1]:51820";
+            persistentKeepalive = 15;
+          }
+          {
+            # delite.pub.solar
+            publicKey = "ZT2qGWgMPwHRUOZmTQHWCRX4m14YwOsiszjsA5bpc2k=";
+            allowedIPs = [
+              "10.7.6.6/32"
+              "fd00:fae:fae:fae:fae:6::/96"
+            ];
+            #endpoint = "80.244.242.5:51820";
+            endpoint = "[2a04:52c0:124:9d8c::2]:51820";
+            persistentKeepalive = 15;
+          }
+          {
+            # blue-shell.pub.solar
+            publicKey = "bcrIpWrKc1M+Hq4ds3aN1lTaKE26f2rvXhd+93QrzR8=";
+            allowedIPs = [
+              "10.7.6.7/32"
+              "fd00:fae:fae:fae:fae:7::/96"
+            ];
+            #endpoint = "80.244.242.5:51820";
+            endpoint = "[2a03:4000:43:24e::1]:51820";
+            persistentKeepalive = 15;
+          }
         ];
       };
     };
diff --git a/users/b12f/ssh.nix b/users/b12f/ssh.nix
index 43b78b4..f1afba5 100644
--- a/users/b12f/ssh.nix
+++ b/users/b12f/ssh.nix
@@ -127,6 +127,31 @@ in {
           user = "barkeeper";
           hostname = "10.7.6.2";
         };
+
+        "metronom.pub.solar" = {
+          user = "barkeeper";
+          hostname = "10.7.6.3";
+        };
+
+        "tankstelle.pub.solar" = {
+          user = "barkeeper";
+          hostname = "10.7.6.4";
+        };
+
+        "trinkgenossin.pub.solar" = {
+          user = "barkeeper";
+          hostname = "10.7.6.5";
+        };
+
+        "delite.pub.solar" = {
+          user = "barkeeper";
+          hostname = "10.7.6.6";
+        };
+
+        "blue-shell.pub.solar" = {
+          user = "barkeeper";
+          hostname = "10.7.6.7";
+        };
       };
     };
   };