diff --git a/components/centos/centos-docker-base-setup/Vagrantfile b/components/centos/centos-docker-base-setup/Vagrantfile
index a9c769d..07caa44 100644
--- a/components/centos/centos-docker-base-setup/Vagrantfile
+++ b/components/centos/centos-docker-base-setup/Vagrantfile
@@ -64,8 +64,10 @@ Vagrant.configure(2) do |config|
   else
     config.vm.synced_folder ENV['HOME'], ENV['HOME'], type: 'sshfs', sshfs_opts_append: '-o umask=000 -o uid=1000 -o gid=1000'
   end
+
   config.vm.provision "shell", inline: <<-SHELL
     sudo setsebool -P virt_sandbox_use_fusefs 1
   SHELL
+
   # config.servicemanager.services = 'docker'
 end
diff --git a/components/centos/centos-k8s-singlenode-setup/Vagrantfile b/components/centos/centos-k8s-singlenode-setup/Vagrantfile
index b04a9c9..d692300 100644
--- a/components/centos/centos-k8s-singlenode-setup/Vagrantfile
+++ b/components/centos/centos-k8s-singlenode-setup/Vagrantfile
@@ -74,8 +74,5 @@ Vagrant.configure(2) do |config|
     sudo setsebool -P virt_sandbox_use_fusefs 1
   SHELL
 
-  # Explicitly enable and start kubernetes
-  config.vm.provision "shell", run: "always", inline: <<-SHELL
-    PROXY=#{PROXY} PROXY_USER=#{PROXY_USER} PROXY_PASSWORD=#{PROXY_PASSWORD} /usr/bin/sccli kubernetes
-  SHELL
+  config.servicemanager.services = 'kubernetes'
 end
diff --git a/components/centos/centos-openshift-setup/Vagrantfile b/components/centos/centos-openshift-setup/Vagrantfile
index 2aa3ca0..6fe314d 100644
--- a/components/centos/centos-openshift-setup/Vagrantfile
+++ b/components/centos/centos-openshift-setup/Vagrantfile
@@ -3,14 +3,6 @@
 
 BOX_NAME = 'projectatomic/adb'
 
-# The Docker registry from where we pull the OpenShift Docker image
-DOCKER_REGISTRY="docker.io"
-
-# The name of the OpenShift image available on dockerhub.
-IMAGE_NAME="openshift/origin"
-# Tag of the OpenShift image available on dockerhub.
-IMAGE_TAG="v1.2.0"
-
 # The top level domain for your VM and the created application routes
 TLD = 'adb'
 
@@ -92,6 +84,7 @@ Vagrant.configure(2) do |config|
   else
     config.vm.synced_folder ENV['HOME'], ENV['HOME'], type: 'sshfs', sshfs_opts_append: '-o umask=000 -o uid=1000 -o gid=1000'
   end
+
   config.vm.provision "shell", inline: <<-SHELL
     sudo setsebool -P virt_sandbox_use_fusefs 1
   SHELL
@@ -106,10 +99,10 @@ Vagrant.configure(2) do |config|
     sed -i.orig -e "s/OPENSHIFT_SUBDOMAIN=.*/OPENSHIFT_SUBDOMAIN='#{TLD}'/g" /etc/sysconfig/openshift_option
   SHELL
 
-  config.vm.provision "shell", run: "always", inline: <<-SHELL
-    PROXY=#{PROXY} PROXY_USER=#{PROXY_USER} PROXY_PASSWORD=#{PROXY_PASSWORD} \
-    DOCKER_REGISTRY=#{DOCKER_REGISTRY} IMAGE_TAG=#{IMAGE_TAG} IMAGE_NAME=#{IMAGE_NAME} /usr/bin/sccli openshift
-  SHELL
+  config.servicemanager.services = "openshift"
+  config.servicemanager.openshift_docker_registry = "docker.io"
+  config.servicemanager.openshift_image_name = "openshift/origin"
+  config.servicemanager.openshift_image_tag = "v1.2.0"
 
   config.vm.provision "shell", run: "always", privileged: false, inline: <<-SHELL
     echo "You can now access OpenShift console on: https://#{OPENSHIFT_HOSTNAME}:8443/console"
diff --git a/components/rhel/misc/rhel-k8s-singlenode-setup/Vagrantfile b/components/rhel/misc/rhel-k8s-singlenode-setup/Vagrantfile
index 24a8f08..3c634b7 100644
--- a/components/rhel/misc/rhel-k8s-singlenode-setup/Vagrantfile
+++ b/components/rhel/misc/rhel-k8s-singlenode-setup/Vagrantfile
@@ -15,7 +15,6 @@ unless errors.empty?
   fail Vagrant::Errors::VagrantError.new, msg
 end
 
-
 # Vagrantfile for single node k8s setup
 Vagrant.configure(2) do |config|
   config.vm.box = if ENV.key?('BOX')
@@ -73,12 +72,5 @@ Vagrant.configure(2) do |config|
     sudo setsebool -P virt_sandbox_use_fusefs 1
   SHELL
 
-  # prevent the automatic start of openshift via service-manager by just enabling Docker
-  config.servicemanager.services = "docker"
-
-  # Explicitly enable and start kubernetes
-  config.vm.provision "shell", run: "always", inline: <<-SHELL
-    PROXY=#{PROXY} PROXY_USER=#{PROXY_USER} PROXY_PASSWORD=#{PROXY_PASSWORD} /usr/bin/sccli kubernetes
-    echo "kubernetes single node cluster setup successfully"
-  SHELL
+  config.servicemanager.services = 'kubernetes'
 end
diff --git a/components/rhel/rhel-ose/Vagrantfile b/components/rhel/rhel-ose/Vagrantfile
index 1dadcc4..687e64e 100644
--- a/components/rhel/rhel-ose/Vagrantfile
+++ b/components/rhel/rhel-ose/Vagrantfile
@@ -86,13 +86,8 @@ Vagrant.configure(2) do |config|
     sudo setsebool -P virt_sandbox_use_fusefs 1
   SHELL
 
-  # prevent the automatic start of openshift via service-manager by just enabling Docker
-  config.servicemanager.services = "docker"
-
-  # explicitly enable and start OpenShift
-  config.vm.provision "shell", run: "always", inline: <<-SHELL
-    PROXY=#{PROXY} PROXY_USER=#{PROXY_USER} PROXY_PASSWORD=#{PROXY_PASSWORD} IMAGE_TAG=#{IMAGE_TAG} /usr/bin/sccli openshift
-  SHELL
+  config.servicemanager.services = "openshift"
+  config.servicemanager.openshift_image_tag = IMAGE_TAG unless IMAGE_TAG.empty?
 
   config.vm.provision "shell", run: "always", inline: <<-SHELL
     #Get the routable IP address of OpenShift