diff --git a/samples/of/ctrl-localrc b/samples/of/ctrl-localrc
index 7254bb4bf4..d3e5dd58f8 100644
--- a/samples/of/ctrl-localrc
+++ b/samples/of/ctrl-localrc
@@ -79,5 +79,5 @@ REGIONS=${REGIONS}
 
 # JANUS
 SDI_ENABLED_ENABLED_SERVICES=$ENABLED_SERVICES,janus,whale,w-sync,w-api,neo4j
-#SDI_ENABLED_JANUS_API_HOST=${PUBLIC_SERVICE_HOST}
-#SDI_ENABLED_JANUS_API_PORT=8091
+SDI_ENABLED_JANUS_API_HOST=${PUBLIC_SERVICE_HOST}
+SDI_ENABLED_JANUS_API_PORT=8091
diff --git a/samples/of/gen-local.sh b/samples/of/gen-local.sh
index 43da006089..895b2eea11 100755
--- a/samples/of/gen-local.sh
+++ b/samples/of/gen-local.sh
@@ -282,18 +282,15 @@ if [[ "$USE_OF" == "y" || "$USE_OF" == "Y" ]]; then
 
     if [[ $AGENT == 0 ]]; then
         read -p "Do you want to use SDI Manager? ([y]/n) " SDI_ENABLED
-        if [[ "$SDI_ENABLED" == "n" || "$SDI_ENABLED" == "N" ]]; then
-            USE_SDI=false
-        else
-            USE_SDI=true
-        fi
     else
-        read -p "Is the SDI Manager in use on the controller node? ([n]/y)" SDI_ENABLED
-        if [[ "$SDI_ENABLED" == "n" || "$SDI_ENABLED" == "N" ]]; then
-            USE_SDI=false
-        else
-            USE_SDI=true
-        fi
+        read -p "Is the SDI Manager in use on the controller node? ([y]/n)" SDI_ENABLED
+    fi
+
+    if [[ "$SDI_ENABLED" == "n" || "$SDI_ENABLED" == "N" ]]; then
+        USE_SDI=false
+    else
+        USE_SDI=true
+        Q_PLUGIN=janus
     fi
     echo ''
 fi
diff --git a/samples/tr-edge-1/local.sh b/samples/tr-edge-1/local.sh
index d6626c33a1..0f3b7c96d0 100755
--- a/samples/tr-edge-1/local.sh
+++ b/samples/tr-edge-1/local.sh
@@ -243,7 +243,11 @@ is baremetal_pxe_vlan_per_host $BM_PXE_PER_NODE
 is baremetal_pxe_parent_interface $BM_PXE_INTERFACE
 is firewall_driver ""
 isb firewall_driver ""
-is baremetal_vif_driver nova.virt.baremetal.ryu.ryu_vif_driver.RyuVIFDriver
+if [[ "$Q_PLUGIN" = "ryu" ]]; then
+    is baremetal_vif_driver nova.virt.baremetal.ryu.ryu_vif_driver.RyuVIFDriver
+elif [[ "$Q_PLUGIN" = "janus" ]]; then
+    is baremetal_vif_driver nova.virt.baremetal.janus.janus_vif_driver.JanusVIFDriver
+fi
 is host $BMC_HOST
 isb host $BEE2_HOST
 iso host `hostname -f`
diff --git a/stack.sh b/stack.sh
index 6b775ce903..f127ece640 100755
--- a/stack.sh
+++ b/stack.sh
@@ -850,7 +850,7 @@ if is_service_enabled horizon; then
 fi
 
 if is_service_enabled q-agt; then
-    if [[ "$Q_PLUGIN" = "openvswitch" || "$Q_PLUGIN" = "ryu" ]]; then
+    if [[ "$Q_PLUGIN" = "openvswitch" || "$Q_PLUGIN" = "ryu" || "$Q_PLUGIN" = "janus" ]]; then
         # Install deps
         # FIXME add to files/apts/quantum, but don't install if not needed!
         if [[ "$os_PACKAGE" = "deb" ]]; then