diff --git a/basice2e/server-1.yaml b/basice2e/server-1.yaml
index c5fd5f8556b83d1c324f46723b1a8c04615437b7..c619debd4acd7a264422dec7d013976e443e0e1d 100644
--- a/basice2e/server-1.yaml
+++ b/basice2e/server-1.yaml
@@ -16,31 +16,16 @@ node:
         cert: "../keys/cmix.rip.crt"
         key:  "../keys/cmix.rip.key"
         log:  "results/servers/server-1.log"
-    addresses:
-        - "127.0.0.1:50000"
-        - "127.0.0.1:50001"
-        - "127.0.0.1:50002"
-        - "127.0.0.1:50003"
-        - "127.0.0.1:50004"
+    address: "127.0.0.1:50000"
 database:
     name: "node1"
     username: "cmix_server"
     password: ""
-    addresses:
-        - ""
-        - ""
-        - ""
-        - ""
-        - ""
-gateways:
+    address: ""
+gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-    addresses:
-        - "127.0.0.1:8440"
-        - "127.0.0.1:8441"
-        - "127.0.0.1:8442"
-        - "127.0.0.1:8443"
-        - "127.0.0.1:8444"
+    address: "127.0.0.1:8440"
 permissioning:
   paths:
     cert: "../keys/cmix.rip.crt"
diff --git a/basice2e/server-2.yaml b/basice2e/server-2.yaml
index 2b74ef9e091dd1304dcf2f6f77f78b08326f5dca..b629d5ff98f91bee6281e7266b097fc0a1097590 100644
--- a/basice2e/server-2.yaml
+++ b/basice2e/server-2.yaml
@@ -16,32 +16,16 @@ node:
         cert: "../keys/cmix.rip.crt"
         key:  "../keys/cmix.rip.key"
         log:  "results/servers/server-2.log"
-    addresses:
-      - "127.0.0.1:50000"
-      - "127.0.0.1:50001"
-      - "127.0.0.1:50002"
-      - "127.0.0.1:50003"
-      - "127.0.0.1:50004"
-      - "127.0.0.1:50005"
+    address: "127.0.0.1:50001"
 database:
     name: "node2"
     username: "cmix_server"
     password: ""
-    addresses:
-        - ""
-        - ""
-        - ""
-        - ""
-        - ""
-gateways:
+    address: ""
+gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-    addresses:
-        - "127.0.0.1:8440"
-        - "127.0.0.1:8441"
-        - "127.0.0.1:8442"
-        - "127.0.0.1:8443"
-        - "127.0.0.1:8444"
+    address: "127.0.0.1:8441"
 permissioning:
   paths:
     cert: "../keys/cmix.rip.crt"
diff --git a/basice2e/server-3.yaml b/basice2e/server-3.yaml
index 7aa772c6e59cfb5efe5b7b5a92ebdf93c1e6c735..69e24bbc444bd2114ca7fdd783a021b3689443cf 100644
--- a/basice2e/server-3.yaml
+++ b/basice2e/server-3.yaml
@@ -16,32 +16,16 @@ node:
         cert: "../keys/cmix.rip.crt"
         key:  "../keys/cmix.rip.key"
         log:  "results/servers/server-3.log"
-    addresses:
-      - "127.0.0.1:50000"
-      - "127.0.0.1:50001"
-      - "127.0.0.1:50002"
-      - "127.0.0.1:50003"
-      - "127.0.0.1:50004"
-      - "127.0.0.1:50005"
+    address: "127.0.0.1:50002"
 database:
     name: "node3"
     username: "cmix_server"
     password: ""
-    addresses:
-        - ""
-        - ""
-        - ""
-        - ""
-        - ""
-gateways:
+    address: ""
+gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-    addresses:
-        - "127.0.0.1:8440"
-        - "127.0.0.1:8441"
-        - "127.0.0.1:8442"
-        - "127.0.0.1:8443"
-        - "127.0.0.1:8444"
+    address: "127.0.0.1:8442"
 permissioning:
   paths:
     cert: "../keys/cmix.rip.crt"
diff --git a/basice2e/server-4.yaml b/basice2e/server-4.yaml
index 9af44006fb723d1f13f98d6cf540aaadf2ff49fb..8737657c19cc9988f436d39948998064e8442dfe 100644
--- a/basice2e/server-4.yaml
+++ b/basice2e/server-4.yaml
@@ -16,32 +16,16 @@ node:
         cert: "../keys/cmix.rip.crt"
         key:  "../keys/cmix.rip.key"
         log:  "results/servers/server-4.log"
-    addresses:
-      - "127.0.0.1:50000"
-      - "127.0.0.1:50001"
-      - "127.0.0.1:50002"
-      - "127.0.0.1:50003"
-      - "127.0.0.1:50004"
-      - "127.0.0.1:50005"
+    address: "127.0.0.1:50003"
 database:
     name: "node4"
     username: "cmix_server"
     password: ""
-    addresses:
-        - ""
-        - ""
-        - ""
-        - ""
-        - ""
-gateways:
+    address: ""
+gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-    addresses:
-        - "127.0.0.1:8440"
-        - "127.0.0.1:8441"
-        - "127.0.0.1:8442"
-        - "127.0.0.1:8443"
-        - "127.0.0.1:8444"
+    address: "127.0.0.1:8443"
 permissioning:
   paths:
     cert: "../keys/cmix.rip.crt"
diff --git a/basice2e/server-5.yaml b/basice2e/server-5.yaml
index 2f7f8ea62ff93f88a45a7a92f8128e5f3591de27..9817f3ac503018fa56ddfc3357df0cd1c11bc223 100644
--- a/basice2e/server-5.yaml
+++ b/basice2e/server-5.yaml
@@ -16,32 +16,16 @@ node:
         cert: "../keys/cmix.rip.crt"
         key:  "../keys/cmix.rip.key"
         log:  "results/servers/server-5.log"
-    addresses:
-      - "127.0.0.1:50000"
-      - "127.0.0.1:50001"
-      - "127.0.0.1:50002"
-      - "127.0.0.1:50003"
-      - "127.0.0.1:50004"
-      - "127.0.0.1:50005"
+    address: "127.0.0.1:50004"
 database:
     name: "node5"
     username: "cmix_server"
     password: ""
-    addresses:
-        - ""
-        - ""
-        - ""
-        - ""
-        - ""
-gateways:
+    address: ""
+gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-    addresses:
-        - "127.0.0.1:8440"
-        - "127.0.0.1:8441"
-        - "127.0.0.1:8442"
-        - "127.0.0.1:8443"
-        - "127.0.0.1:8444"
+    address: "127.0.0.1:8444"
 permissioning:
   paths:
     cert: "../keys/cmix.rip.crt"
diff --git a/smokeinfra/server-1.yaml b/smokeinfra/server-1.yaml
index 720758952d08d464bf558de42498e18b91f16956..ca4811c410c5942086b48d6125d1e804b7b412ea 100644
--- a/smokeinfra/server-1.yaml
+++ b/smokeinfra/server-1.yaml
@@ -14,25 +14,16 @@ node:
         cert: "../keys/cmix.rip.crt"
         key:  "../keys/cmix.rip.key"
         log:  "results/server-1.log"
-    addresses:
-        - "localhost:60000"
-        - "localhost:60001"
-        - "localhost:60002"
+    address: "localhost:60000"
 database:
     name: "node1"
     username: "cmix_server"
     password: ""
-    addresses:
-        - ""
-        - ""
-        - ""
-gateways:
+    address: ""
+gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-    addresses:
-        - "localhost:9440"
-        - "localhost:9441"
-        - "localhost:9442"
+    address: "localhost:9440"
 permissioning:
   paths:
     cert: "../keys/cmix.rip.crt"
diff --git a/smokeinfra/server-2.yaml b/smokeinfra/server-2.yaml
index dcfd879777b311069dae14c6751c077ae1ec19cb..ad83d9c14a06921ca1a7fdd4bb287656a5efe79f 100644
--- a/smokeinfra/server-2.yaml
+++ b/smokeinfra/server-2.yaml
@@ -14,25 +14,16 @@ node:
         cert: "../keys/cmix.rip.crt"
         key:  "../keys/cmix.rip.key"
         log:  "results/server-2.log"
-    addresses:
-        - "localhost:60000"
-        - "localhost:60001"
-        - "localhost:60002"
+    address: "localhost:60001"
 database:
     name: "node2"
     username: "cmix_server"
     password: ""
-    addresses:
-        - ""
-        - ""
-        - ""
-gateways:
+    address: ""
+gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-    addresses:
-        - "localhost:9440"
-        - "localhost:9441"
-        - "localhost:9442"
+    address: "localhost:9441"
 permissioning:
   paths:
     cert: "../keys/cmix.rip.crt"
diff --git a/smokeinfra/server-3.yaml b/smokeinfra/server-3.yaml
index 54d09227dd11e1271a62242672ec5df3e31f9c28..65f1ed7d07ee54e39d8d41efcd5970decd17bbce 100644
--- a/smokeinfra/server-3.yaml
+++ b/smokeinfra/server-3.yaml
@@ -14,25 +14,16 @@ node:
         cert: "../keys/cmix.rip.crt"
         key:  "../keys/cmix.rip.key"
         log:  "results/server-3.log"
-    addresses:
-        - "localhost:60000"
-        - "localhost:60001"
-        - "localhost:60002"
+    address: "localhost:60002"
 database:
     name: "node3"
     username: "cmix_server"
     password: ""
-    addresses:
-        - ""
-        - ""
-        - ""
-gateways:
+    address: ""
+gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-    addresses:
-        - "localhost:9440"
-        - "localhost:9441"
-        - "localhost:9442"
+    address: "localhost:9442"
 permissioning:
   paths:
     cert: "../keys/cmix.rip.crt"