diff --git a/Ansible/roles/kvm/tasks/add_local_storage.yml b/Ansible/roles/kvm/tasks/add_local_storage.yml
index 3bea596148..5a986144fb 100644
--- a/Ansible/roles/kvm/tasks/add_local_storage.yml
+++ b/Ansible/roles/kvm/tasks/add_local_storage.yml
@@ -1,14 +1,14 @@
 ---
 
 - name: Create new partition
-  shell: parted /dev/sdb mklabel gpt mkpart primary 1 100% -s
+  shell: parted /dev/sda mklabel gpt mkpart primary 1 100% -s
   ignore_errors: true
   tags:
     - kvm
     - local_storage
 
 - name: Format new partition
-  shell: mkfs.ext4 /dev/sdb1
+  shell: mkfs.ext4 /dev/sda1
   tags:
     - kvm
     - local_storage
@@ -22,7 +22,7 @@
 - name: update FSTAB
   mount: 
     name: "{{ kvm_localstorage_mount }}"
-    src: /dev/sdb1
+    src: /dev/sda1
     fstype: ext4
     state: mounted
   tags:
diff --git a/Ansible/templates/nestedgroupvars.j2 b/Ansible/templates/nestedgroupvars.j2
index b12835d5d7..184eaff3ab 100644
--- a/Ansible/templates/nestedgroupvars.j2
+++ b/Ansible/templates/nestedgroupvars.j2
@@ -386,9 +386,9 @@ cks_images_location: "{{ cks_images_location | default ( def_cks_images_location
 {% if run_smoke_tests is not defined %}{% set run_smoke_tests = no %}{% endif %}run_smoke_tests: {{ run_smoke_tests }}
 {% if baseurl_marvin is not defined %}
 {% if rooturl_cloudstack is defined %}
-{% set marvinbaseurl = rooturl_cloudstack~"centos7"~"/"~env_repo_version_var~"/" %}
+{% set marvinbaseurl = rooturl_cloudstack~baseurl_mgmt_suffix~"/"~env_repo_version_var~"/" %}
 {% else %}
-{% set marvinbaseurl = def_rooturl_cloudstack~"centos7"~"/"~env_repo_version_var~"/" %}
+{% set marvinbaseurl = def_rooturl_cloudstack~baseurl_mgmt_suffix~"/"~env_repo_version_var~"/" %}
 {% endif %}
 {% else %}
 {% set marvinbaseurl = baseurl_marvin %}