diff --git a/config/bffh/bffh.dhall b/config/bffh/bffh.dhall
index 3c02259..b878055 100644
--- a/config/bffh/bffh.dhall
+++ b/config/bffh/bffh.dhall
@@ -91,9 +91,32 @@
     },
 
     machines = {
+        MachineB1 = {
+            name = "Schließfach",
+            description = "Schließfach ohne elektrische Steuerung",
+            wiki = "https://fab-access.readthedocs.io",
+            category = "CategoryB",
+            
+            disclose = "TestEnv.Disclose",
+            read = "TestEnv.Read",
+            write = "TestEnv.Write",
+            manage = "TestEnv.Manage"
+        },
+        MachineB2 = {
+            name = "Fabulaser",
+            description = "Fabulaser - compact, yet powerful",
+            wiki = "https://fab-access.readthedocs.io",
+            category = "CategoryB",
+            
+            disclose = "TestEnv.Disclose",
+            read = "TestEnv.Read",
+            write = "TestEnv.Write",
+            manage = "TestEnv.Manage"
+        },
+
         MachineA1 = {
-            name = "MachineA1",
-            description = "Description of MachineA1",
+            name = "Machine Oben",
+            description = "Maschine mit QR-Code zum scannen",
             wiki = "https://fab-access.readthedocs.io",
             category = "CategoryA",
             
@@ -103,8 +126,8 @@
             manage = "TestEnv.Manage"
         },
         MachineA2 = {
-            name = "MachineA2",
-            description = "Description of MachineA2",
+            name = "Machine Mitte",
+            description = "Maschine mit NFC Reader für DESFire Karten",
             wiki = "https://fab-access.readthedocs.io",
             category = "CategoryA",
             
@@ -114,8 +137,30 @@
             manage = "TestEnv.Manage"
         },
         MachineA3 = {
-            name = "MachineA3",
-            description = "Description of MachineA3",
+            name = "Machine Unten",
+            description = "Maschine für weitere Dinge",
+            wiki = "https://fab-access.readthedocs.io",
+            category = "CategoryA",
+            
+            disclose = "TestEnv.Disclose",
+            read = "TestEnv.Read",
+            write = "TestEnv.Write",
+            manage = "TestEnv.Manage"
+        },
+        MachineA4 = {
+            name = "Machine Drehstrom",
+            description = "Maschine mit Drehstromanschluss",
+            wiki = "https://fab-access.readthedocs.io",
+            category = "CategoryA",
+            
+            disclose = "TestEnv.Disclose",
+            read = "TestEnv.Read",
+            write = "TestEnv.Write",
+            manage = "TestEnv.Manage"
+        },
+        MachineA5 = {
+            name = "Machine Drehstrom Anlaufschutz",
+            description = "Maschine mit Drehstromanschluss und Wiederanlaufschutz",
             wiki = "https://fab-access.readthedocs.io",
             category = "CategoryA",
             
@@ -140,6 +185,8 @@
         { machine = "MachineA1", actor = "shellyplug-s-6E6ED9" },
         { machine = "MachineA2", actor = "shellyplug-s-C18903" },
         { machine = "MachineA3", actor = "shellyplug-s-B4C8B9" },
+        { machine = "MachineA4", actor = "shelly1-DDDDDDDDDDDD" },
+        { machine = "MachineA5", actor = "shelly1-DDDDDDDDDDDD" },
     ],
 
     initiators = {=},