diff --git a/config/brokers.toml b/config/brokers.toml
index 1c6d9c29..adee409e 100644
--- a/config/brokers.toml
+++ b/config/brokers.toml
@@ -12,7 +12,19 @@ api_key = ""
 secret = ""
 
 [ib]
-host = "127.0.0.1"
+hosts = [
+    "127.0.0.1",
+]
+# XXX: the order in which ports will be scanned
+# (by the `brokerd` daemon-actor)
+# is determined # by the line order here.
+# TODO: when we eventually spawn gateways in our
+# container, we can just dynamically allocate these
+# using IBC.
+ports = [
+    4002,  # gw
+    7497,  # tws
+]
 
 # when clients are being scanned this determines
 # which clients are preferred to be used for data
@@ -24,16 +36,10 @@ prefer_data_account = [
     'ira',
 ]
 
-# the order in which ports will be scanned
-# (by the `brokerd` daemon-actor)
-# is determined # by the line order here.
-ports.gw = 4002
-ports.tws = 7497
-ports.order = ["gw", "tws",]
-
+[ib.accounts]
 # the order in which accounts will be selectable
 # in the order mode UI (if found via clients during
 # API-app scanning)when a new symbol is loaded.
-accounts.paper = "XX0000000"
-accounts.margin = "X0000000"
-accounts.ira = "X0000000"
+paper = "XX0000000"
+margin = "X0000000"
+ira = "X0000000"