diff --git a/src/com/mirantis/mk/KaasUtils.groovy b/src/com/mirantis/mk/KaasUtils.groovy
index b7c8bed..152152a 100644
--- a/src/com/mirantis/mk/KaasUtils.groovy
+++ b/src/com/mirantis/mk/KaasUtils.groovy
@@ -327,8 +327,6 @@
     }
     if (commitMsg ==~ /(?s).*\[aws-demo\].*/                 ||
         env.GERRIT_EVENT_COMMENT_TEXT ==~ /(?s).*aws-demo.*/ ||
-        attachBYO                                            ||
-        upgradeBYO                                           ||
         runBYOMatrix                                         ||
         seedMacOs                                            ||
         equinixOnAwsDemo                                     ||
@@ -373,12 +371,6 @@
         enableBMDemo = false
     }
 
-    // Projects may or may not have BM Core demo enabled by default
-    if (commitMsg ==~ /(?s).*\[disable-bm-core-demo\].*/ || env.GERRIT_EVENT_COMMENT_TEXT ==~ /(?s).*disable-bm-core-demo\.*/) {
-        enablebmCoreDemo = false
-        common.errorMsg('BM Core demo deployment will be aborted, VF -1 will be set')
-    }
-
     if (commitMsg ==~ /(?s).*\[disable-bm-core-cleanup\].*/ || env.GERRIT_EVENT_COMMENT_TEXT ==~ /(?s).*disable-bm-core-cleanup\\.*/) {
         bmCoreCleanup = false
     }
@@ -1129,6 +1121,7 @@
     ]
     def deployChild = triggers.deployChildEnabled
     def testUiVsphere = triggers.runUie2eEnabled || triggers.runUie2eNewEnabled
+    def vsphereByo = triggers.attachBYOEnabled
     def multiregionConfig = triggers.multiregionalConfiguration
     def runMultiregion = multiregionConfig.enabled
 
@@ -1165,7 +1158,7 @@
             break
         case 'vsphere':
             addToProviderNetMap(netMap, 'vsphere', 'mgmt')
-            if (deployChild || testUiVsphere) {
+            if (deployChild || testUiVsphere || vsphereByo) {
                 addToProviderNetMap(netMap, 'vsphere', 'child')
             }
             if (runMultiregion && multiregionConfig.managementLocation == 'vsphere' &&
@@ -1556,6 +1549,7 @@
         'DESTINATION_REGISTRY_TYPE': '-dst-repo-type',
         'SIGNED_IMAGES_PATH': '-signed-images-path',
         'DOCKER_CLEAN': '-cleanup',
+        'DOCKER_OLDER_THAN_DAYS': '-older-than-days',
         'DOCKER_REPO_PREFIX': '-docker-repo-prefix',
         'DOCKER_TAG': '-docker-tag',
         'FORCE': '-force',