diff --git a/configs/gosdn.toml b/configs/gosdn.toml
index 229a018b6f844719e7fbb98a3ff18f4f672b6d0d..fe17c7f6c72bd74dce8681c495555e6d6b9ddd37 100644
--- a/configs/gosdn.toml
+++ b/configs/gosdn.toml
@@ -1,4 +1,4 @@
-CliSocket = "localhost:55055"
+CliSocket = ":55055"
 db.socket = "bolt://172.17.0.4:7687"
 db.user = ""
 db.password = ""
diff --git a/nucleus/controller.go b/nucleus/controller.go
index 6c237be25c98da4e161413ed2507338338b0c894..38b2eeef162d337565bc01d498f3ea82c5cde0d7 100644
--- a/nucleus/controller.go
+++ b/nucleus/controller.go
@@ -28,7 +28,7 @@ func (c *Core) Initialize(IsRunningChannel chan bool) error {
 	}
 
 	// Set config defaults
-	viper.SetDefault("socket", "localhost:55055")
+	viper.SetDefault("socket", ":55055")
 
 	// Set config path and read config
 	viper.SetConfigName("gosdn")
diff --git a/test_resources/terraform/main.tf b/test_resources/terraform/main.tf
index 292a719b3bab5777d952e9c8cf9c4b68ba9aaa94..9d83bb23bbb1393f120c403adb9d25d6367f627d 100644
--- a/test_resources/terraform/main.tf
+++ b/test_resources/terraform/main.tf
@@ -56,6 +56,11 @@ resource "docker_image" "ceos" {
 # Create a new docker network
 resource "docker_network" "danet" {
   name = "danet"
+
+  ipam_config {
+    subnet = "172.100.100.0/24"
+
+  }
 }
 
 # create controller container
@@ -71,6 +76,7 @@ resource "docker_container" "gosdn" {
   
   networks_advanced {
       name = docker_network.danet.name
+      ipv4_address = "172.100.100.10"
     }
 }
 
@@ -83,6 +89,7 @@ resource "docker_container" "ceos" {
   
   networks_advanced {
       name =  docker_network.danet.name
+      ipv4_address = "172.100.100.20"
     }
 
   command = ["/sbin/init",
@@ -92,7 +99,19 @@ resource "docker_container" "ceos" {
             "systemd.setenv=CEOS=1",
             "systemd.setenv=EOS_PLATFORM=ceoslab",
             "systemd.setenv=container=docker",
-            "systemd.setenv=MAPETH0=1",
+            "MGMT_INTF=eth0"]
+  
+  env =     ["INTFTYPE=eth",
+            "ETBA=4",
+            "SKIP_ZEROTOUCH_BARRIER_IN_SYSDBINIT=1",
+            "CEOS=1",
+            "EOS_PLATFORM=ceoslab",
+            "container=docker",
             "MGMT_INTF=eth0"]
   privileged = true
+
+  volumes {
+    host_path = "/usr/local/etc/terraform/arista"
+    container_path = "/mnt/flash"
+  }
 }