diff --git a/jjb/pipeline/voltha/bbsim-tests.groovy b/jjb/pipeline/voltha/bbsim-tests.groovy
index 398e32d..d1ed9b7 100644
--- a/jjb/pipeline/voltha/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/bbsim-tests.groovy
@@ -189,7 +189,8 @@
     String  workflow,                         // dt
     String  testLogging,                      // 'True'
     Boolean teardown,                         // true
-    String  testSpecificHelmFlags=''
+    String  testSpecificHelmFlags='',
+    Boolean  vgcEnabled
 ) {
     String infraNamespace  = 'default'
     String volthaNamespace = 'voltha'
@@ -318,6 +319,7 @@
                         localCharts: localCharts,
                         bbsimReplica: olts.toInteger(),
                         dockerRegistry: registry,
+                        vgcEnabled: vgcEnabled,
                     ])
                     leave('volthaDeploy')
                 } // script
@@ -725,6 +727,7 @@
                         Boolean teardown    = test['teardown'].toBoolean()
                         Boolean logging     = test['logging'].toBoolean()
                         String  testLogging = (logging) ? 'True' : 'False'
+                        Boolean vgcEnabled = test['vgcEnabled'] != null ? test['vgcEnabled'].toBoolean() : false
 
                         print("""
 ** -----------------------------------------------------------------------
@@ -734,7 +737,7 @@
 
                         try {
                             enter("execute_test (target=$target)")
-                            execute_test(target, workflow, testLogging, teardown, flags)
+                            execute_test(target, workflow, testLogging, teardown, flags, vgcEnabled)
                         }
                         // groovylint-disable-next-line CatchException
                         catch (Exception err) {
diff --git a/vars/volthaDeploy.groovy b/vars/volthaDeploy.groovy
index defcaf6..af013c7 100644
--- a/vars/volthaDeploy.groovy
+++ b/vars/volthaDeploy.groovy
@@ -82,6 +82,7 @@
         stackName        : 'voltha',
         stackId: 1,
         workflow         : 'att',
+        vgcEnabled       : false,
         withMacLearning: false,
         withFttb: false,
         extraHelmFlags   : '',
diff --git a/vars/volthaStackDeploy.groovy b/vars/volthaStackDeploy.groovy
index 22d63f6..89881d9 100644
--- a/vars/volthaStackDeploy.groovy
+++ b/vars/volthaStackDeploy.groovy
@@ -50,20 +50,35 @@
 void deployVolthaStack(Map cfg) {
     enter('deployVolthaStack')
 
-    sh(label  : "Create VOLTHA Stack ${cfg.stackName}, (namespace=${cfg.volthaNamespace})",
-       script : """
-
+    if (cfg.vgcEnabled) {
+        sh(label: "Create VOLTHA Stack ${cfg.stackName}, (namespace=${cfg.volthaNamespace}), (flowController=VGC)",
+           script: """
 helm upgrade --install --create-namespace \
           -n ${cfg.volthaNamespace} ${cfg.stackName} ${cfg.volthaStackChart} \
           --set global.stack_name=${cfg.stackName} \
           --set global.voltha_infra_name=voltha-infra \
-          --set voltha.onos_classic.replicas=${cfg.onosReplica} \
+          --set voltha-go-controller.enabled=true \
           --set voltha.ingress.enabled=true \
           --set voltha.ingress.hosts[0].host=voltha.${cfg.cluster} \
           --set voltha.ingress.hosts[0].paths[0]='/voltha.VolthaService/' \
           --set global.voltha_infra_namespace=${cfg.infraNamespace} \
           ${cfg.extraHelmFlags}
 """)
+    } else {
+        sh(label: "Create VOLTHA Stack ${cfg.stackName}, (namespace=${cfg.volthaNamespace})",
+           script: """
+helm upgrade --install --create-namespace \
+    -n ${cfg.volthaNamespace} ${cfg.stackName} ${cfg.volthaStackChart} \
+    --set global.stack_name=${cfg.stackName} \
+    --set global.voltha_infra_name=voltha-infra \
+    --set voltha.onos_classic.replicas=${cfg.onosReplica} \
+    --set voltha.ingress.enabled=true \
+    --set voltha.ingress.hosts[0].host=voltha.${cfg.cluster} \
+    --set voltha.ingress.hosts[0].paths[0]='/voltha.VolthaService/' \
+    --set global.voltha_infra_namespace=${cfg.infraNamespace} \
+    ${cfg.extraHelmFlags}
+""")
+    }
 
     for (int i = 0; i < cfg.bbsimReplica; i++) {
         // NOTE we don't need to update the tag for DT
@@ -330,6 +345,7 @@
         onosReplica:     1,
         adaptersToWait:  2,
         cluster: 'voltha.local',
+        vgcEnabled: 'false',
     ]
 
     Map cfg = defaultConfig + config