diff --git a/locations/emma.yml b/locations/emma.yml
index 1c4dd1b0e..9b46bfdf5 100644
--- a/locations/emma.yml
+++ b/locations/emma.yml
@@ -29,6 +29,10 @@ snmp_devices:
     address: 10.31.11.5
     snmp_profile: edgeswitch
 
+  - hostname: emma-wsw-60ghz
+    address: 10.31.11.17
+    snmp_profile: mikrotik_60g
+
   - hostname: emma-ssw-uplink
     address: 10.31.11.18
     snmp_profile: mikrotik_60g
@@ -61,6 +65,10 @@ snmp_devices:
     address: 10.31.11.25
     snmp_profile: airos_8
 
+  - hostname: emma-nnw-60ghz
+    address: 10.31.11.29
+    snmp_profile: mikrotik_60g
+
 airos_dfs_reset:
   - name: "emma-oso-5ghz"
     target: "10.31.11.19"
@@ -123,7 +131,9 @@ networks:
       emma-switch-nw: 5
 
       # Router OS
+      emma-wsw-60ghz: 17    # Fenster 4
       emma-ssw-uplink: 18   # Fenster 2
+      emma-nnw-60ghz: 29    # Fenster 5
 
       # Airos 8, 5 GHz
       emma-oso-5ghz: 19     # Fenster 8, 20 MHz, center frequency 5580 MHz
@@ -196,6 +206,20 @@ networks:
     prefix: 10.31.11.40/32
     ipv6_subprefix: -17
 
+  - vid: 18
+    role: mesh
+    name: mesh_wsw_60ghz
+    prefix: 10.31.11.41/32
+    ipv6_subprefix: -18
+    ptp: true
+
+  - vid: 19
+    role: mesh
+    name: mesh_nnw_60ghz
+    prefix: 10.31.11.42/32
+    ipv6_subprefix: -19
+    ptp: true
+
 location__ssh_keys__to_merge:
   - comment: Vinet
     key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCRpRJcexdB2N11gsbbKhXGu8sNQIAShohJpjobhSXtcUWTfRlX2SwSF0QuoHP4Bcb8IGCQc8+TK1RSc+owc1bD68gHIGQZ6b3u2sDv1JMoexqtY9PRIhOiUkPMdSJH7ay4WS7p6FHCZ8z1lrf5GaWpA+E0FNvE7sSaA7jHegYZ6D/qru9XddatItWkMgaKqVzaK+W0TldlqqORwQJg0JGPA71vakJCj/H+SsCZyn9HJ/bbq08kBqaBGU7JLFfwKpw8VGn2pwENzHQgzjb6Bfmj1XmbDvXtZjJTF7nhrxemXo9oJDDq8pVveD46cvSffvAAUFRrMlaV+v0qsYK0ir3MDGuguBn3t2+DR0K8JGufYU7i52vTwCuu3d3PRNIwyEYG4vySXpA9m7YSJEHIkasrSADGy47P+Q+jXQZoR5JS0ZtZnqA4JvnYyKd/OeLpNX7MXaDpVAI7pNrDig/4VD7LO70kPPCMAjn40qwF8lcI8U+alrqHG1RIrkugnsGs9g7tselqIi2pAUMml3as778h5Qx+p8FiD3lLPbjJfTBBgl8LfySRWxLgWTMI0TqtMvqNbsUaAB0ThN2FiJE9PrVO2dzUrBUZnaOpT+8B/zW4cGyFqqNZCjpvXkIPzp6jbPDG1aithV0C9mPOGAgq5wUIBgS+Vx95JhA3TArTz4DOdw== Vinet