diff --git a/compose/network-cfg-bbsim.json b/compose/network-cfg-bbsim.json
index 8e0baf3..fe21d4e 100644
--- a/compose/network-cfg-bbsim.json
+++ b/compose/network-cfg-bbsim.json
@@ -1,6 +1,6 @@
 {
   "devices" : {
-    "of:000000000a000001" : {
+    "of:00000000ac110001" : {
       "accessDevice" : {
         "uplink" : "65536",
         "vlan" : "1"
@@ -18,12 +18,11 @@
     },
     "org.opencord.aaa" : {
       "AAA" : {
-        "radiusIp" : "172.16.0.1",
-        "radiusServerPort" : "1645",
-        "radiusSecret" : "secret",
-        "nasIp" : "172.16.0.10",
-        "radiusConnectionType" : "socket",
-        "packetCustomizer" : "att"
+        "radiusIp" : "172.17.0.1",
+        "radiusServerPort" : "1812",
+        "radiusSecret" : "SECRET",
+        "nasIp" : "172.17.0.1",
+        "radiusConnectionType" : "socket"
       }
     },
     "org.opencord.sadis" : {
@@ -38,23 +37,23 @@
         "entries" : [ {
           "id" : "BBSIMOLT000",
           "uplinkPort" : 65536,
-          "hardwareIdentifier" : "00:00:0a:00:00:01",
-          "ipAddress" : "10.0.0.1",
-          "nasId" : "ATLEDGEVOLT1"
+          "hardwareIdentifier" : "00:00:ac:11:00:01",
+          "ipAddress" : "172.17.0.1",
+          "nasId" : "BBSIMOLT000"
         }, {
           "id" : "BBSM00000001-1",
           "cTag" : 900,
           "sTag" : 900,
           "nasPortId" : "BBSM00000001-1",
           "circuitId" : "BBSM00000001-1",
-          "remoteId" : "ATLEDGEVOLT1-RID"
+          "remoteId" : "BBSIMOLT000"
         }, {
           "id" : "BBSM00000002-1",
           "cTag" : 901,
           "sTag" : 901,
           "nasPortId" : "BBSM00000002-1",
           "circuitId" : "BBSM00000002-1",
-          "remoteId" : "ATLEDGEVOLT1-RID"
+          "remoteId" : "BBSIMOLT000"
         }]
       }
     }
diff --git a/compose/radius-clients.conf b/compose/radius-clients.conf
new file mode 100644
index 0000000..345c2ea
--- /dev/null
+++ b/compose/radius-clients.conf
@@ -0,0 +1,3 @@
+client 0.0.0.0/0 {
+  secret = SECRET
+}
diff --git a/compose/radius-users.conf b/compose/radius-users.conf
new file mode 100644
index 0000000..1e84143
--- /dev/null
+++ b/compose/radius-users.conf
@@ -0,0 +1 @@
+user Cleartext-Password := "password", MS-CHAP-Use-NTLM-Auth := 0
diff --git a/compose/system-test-bbsim.yml b/compose/system-test-bbsim.yml
index 46464c0..7739b92 100644
--- a/compose/system-test-bbsim.yml
+++ b/compose/system-test-bbsim.yml
@@ -160,6 +160,7 @@
       - "50062:50062"
     networks:
     - default
+    restart: unless-stopped
 
 
   adapter_openonu:
@@ -176,6 +177,7 @@
     ]
     networks:
     - default
+    restart: unless-stopped
 
 
   bbsim:
@@ -194,3 +196,22 @@
     - "50060:50060"
     networks:
     - default
+    restart: unless-stopped
+
+
+  radius:
+    image: "tpdock/freeradius:2.2.9"
+    environment:
+      RADIUS_LISTEN_IP: "*"
+      USERS_FILE: "/etc/raddb/users"
+      RADIUS_CLIENTS: "SECRET@0.0.0.0/0"
+    volumes:
+      - "./radius-clients.conf:/etc/raddb/clients.conf"
+      - "./radius-users.conf:/etc/raddb/users"
+    ports:
+     - "1812:1812/udp"
+     - "1813:1813"
+     - "18120:18120"
+    networks:
+    - default
+    restart: unless-stopped
diff --git a/compose/system-test.yml b/compose/system-test.yml
index 2f5c446..c5f016a 100644
--- a/compose/system-test.yml
+++ b/compose/system-test.yml
@@ -170,6 +170,7 @@
       - "50062:50062"
     networks:
     - default
+    restart: unless-stopped
 
 
   adapter_openonu:
@@ -186,3 +187,4 @@
     ]
     networks:
     - default
+    restart: unless-stopped