diff --git a/roles/fabric-switch/tasks/main.yml b/roles/fabric-switch/tasks/main.yml
index e9e2873..4e718f9 100644
--- a/roles/fabric-switch/tasks/main.yml
+++ b/roles/fabric-switch/tasks/main.yml
@@ -26,7 +26,7 @@
 
 - name: Utilities Scripts
   template:
-    src: files/{{ item }}
+    src: "{{ item }}"
     dest: /root
     owner: root
     group: root
diff --git a/roles/fabric-switch/files/connect b/roles/fabric-switch/templates/connect
similarity index 100%
rename from roles/fabric-switch/files/connect
rename to roles/fabric-switch/templates/connect
diff --git a/roles/fabric-switch/files/killit b/roles/fabric-switch/templates/killit
similarity index 100%
rename from roles/fabric-switch/files/killit
rename to roles/fabric-switch/templates/killit
diff --git a/roles/fabric-switch/files/purge b/roles/fabric-switch/templates/purge
similarity index 100%
rename from roles/fabric-switch/files/purge
rename to roles/fabric-switch/templates/purge
diff --git a/roles/fabric-switch/files/reset b/roles/fabric-switch/templates/reset
similarity index 100%
rename from roles/fabric-switch/files/reset
rename to roles/fabric-switch/templates/reset
diff --git a/roles/maas/templates/automation-compose.yml.j2 b/roles/maas/templates/automation-compose.yml.j2
index f9d997a..f8c468e 100644
--- a/roles/maas/templates/automation-compose.yml.j2
+++ b/roles/maas/templates/automation-compose.yml.j2
@@ -159,9 +159,11 @@
       - "lab.solution=CORD"
       - "lab.component=generator"
     environment:
-      - "CONFIGGEN_PORT=8181"
-      - "CONFIGGEN_IP=onos-fabric"
-      - "CONFIGGEN_CONFIGSERVERPORT=4245"
-      - "CONFIGGEN_CONFIGSERVERIP=0.0.0.0"
+      - "CONFIGGEN_PORT=4245"
+      - "CONFIGGEN_LISTEN=0.0.0.0"
+      - "CONFIGGEN_CONTROLLER=http://%s:%s@onos-fabric:8181"
+      - "CONFIGGEN_USERNAME=karaf"
+      - "CONFIGGEN_PASSWORD=karaf"
+      - "CONFIGGEN_LOG_LEVEL=warn"
     restart: unless-stopped