diff --git a/marvin/kvm.cfg b/marvin/kvm.cfg
index 1d6a7ed..1421e3e 100644
--- a/marvin/kvm.cfg
+++ b/marvin/kvm.cfg
@@ -4,6 +4,8 @@
             "name": "DC",
             "guestcidraddress": "10.1.1.0/24",
             "dns1": "8.8.8.8",
+            "localstorageenabled": "false",
+            "securitygroupenabled": "false",
             "physical_networks": [
                 {
                     "broadcastdomainrange": "Zone",
diff --git a/marvin/vmw.cfg b/marvin/vmw.cfg
index 1537786..9bb3d25 100644
--- a/marvin/vmw.cfg
+++ b/marvin/vmw.cfg
@@ -4,6 +4,8 @@
             "name": "DC",
             "guestcidraddress": "10.1.1.0/24",
             "dns1": "8.8.8.8",
+            "localstorageenabled": "false",
+            "securitygroupenabled": "false",
             "physical_networks": [
                 {
                     "broadcastdomainrange": "Zone",
diff --git a/marvin/xen.cfg b/marvin/xen.cfg
index 45fe3e0..915113b 100644
--- a/marvin/xen.cfg
+++ b/marvin/xen.cfg
@@ -4,6 +4,8 @@
             "name": "DC",
             "guestcidraddress": "10.1.1.0/24",
             "dns1": "8.8.8.8",
+            "localstorageenabled": "false",
+            "securitygroupenabled": "false",
             "physical_networks": [
                 {
                     "broadcastdomainrange": "Zone",
diff --git a/mbx b/mbx
index bcf5a70..26581d2 100755
--- a/mbx
+++ b/mbx
@@ -215,10 +215,10 @@ deploy() {
     fi
   done
 
-  # FIXME: configure provided rpm/deb repo on hosts
-
   # Setup Management Server
   msip=$(getent hosts $env-mgmt1 | awk '{ print $1 }')
+  # Fix CentOS7 repo
+  sshpass -p 'P@ssword123' ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" root@$msip "sed -i '/^baseurl=.*/d' /etc/yum.repos.d/cloudstack.repo && echo baseurl=$repo >> /etc/yum.repos.d/cloudstack.repo"
   sshpass -p 'P@ssword123' ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" root@$msip systemctl enable --now mariadb
   sshpass -p 'P@ssword123' ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" root@$msip yum install -y cloudstack-management cloudstack-usage cloudstack-common cloudstack-integration-tests cloudstack-marvin
   sshpass -p 'P@ssword123' ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" root@$msip "cloudstack-setup-databases cloud:cloud@localhost --deploy-as=root: -i $msip"
@@ -227,8 +227,12 @@ deploy() {
 
   # Setup KVM hosts
   if [[ $hypervisor == "kvm" ]]; then
+    # Fix CentOS7 repo
+    sshpass -p 'P@ssword123' ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" root@$env-host1 "sed -i '/^baseurl=.*/d' /etc/yum.repos.d/cloudstack.repo && echo baseurl=$repo >> /etc/yum.repos.d/cloudstack.repo"
     sshpass -p 'P@ssword123' ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" root@$env-host1 yum install -y cloudstack-agent
     sshpass -p 'P@ssword123' ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" root@$env-host1 "echo host.reserved.mem.mb=512 >> /etc/cloudstack/agent/agent.properties"
+    # Fix CentOS7 repo
+    sshpass -p 'P@ssword123' ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" root@$env-host2 "sed -i '/^baseurl=.*/d' /etc/yum.repos.d/cloudstack.repo && echo baseurl=$repo >> /etc/yum.repos.d/cloudstack.repo"
     sshpass -p 'P@ssword123' ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" root@$env-host2 yum install -y cloudstack-agent
     sshpass -p 'P@ssword123' ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" root@$env-host2 "echo host.reserved.mem.mb=512 >> /etc/cloudstack/agent/agent.properties"
   fi