diff --git a/multi-node-aio/playbooks/group_vars/cinder_hosts.yml b/multi-node-aio/playbooks/group_vars/cinder_hosts.yml
index 0f15f9e2..999752b1 100644
--- a/multi-node-aio/playbooks/group_vars/cinder_hosts.yml
+++ b/multi-node-aio/playbooks/group_vars/cinder_hosts.yml
@@ -16,7 +16,7 @@
 ansible_os_family: "{{ images[default_vm_image]['image_type'] }}"
 
 server_domain_name: 'openstack.local'
-server_vm: true
+server_vm: "{{ osa_enable_block_storage | bool }}"
 server_vm_ram: '{{ cinder_vm_server_ram | default(2048) }}'
 server_vm_vcpus: '{{ cinder_vm_server_vcpus | default(2) }}'
 server_vm_primary_network: 'dhcp'
diff --git a/multi-node-aio/playbooks/group_vars/compute_hosts.yml b/multi-node-aio/playbooks/group_vars/compute_hosts.yml
index 7a34ae28..4d7d8ff5 100644
--- a/multi-node-aio/playbooks/group_vars/compute_hosts.yml
+++ b/multi-node-aio/playbooks/group_vars/compute_hosts.yml
@@ -16,7 +16,7 @@
 ansible_os_family: "{{ images[default_vm_image]['image_type'] }}"
 
 server_domain_name: 'openstack.local'
-server_vm: true
+server_vm: "{{ osa_enable_compute | bool }}"
 server_vm_ram: '{{ compute_vm_server_ram | default(8192) }}'
 server_vm_vcpus: '{{ compute_vm_server_vcpus | default(4) }}'
 server_vm_primary_network: 'dhcp'
diff --git a/multi-node-aio/playbooks/group_vars/swift_hosts.yml b/multi-node-aio/playbooks/group_vars/swift_hosts.yml
index 18a0f1c4..592a1f7d 100644
--- a/multi-node-aio/playbooks/group_vars/swift_hosts.yml
+++ b/multi-node-aio/playbooks/group_vars/swift_hosts.yml
@@ -16,7 +16,7 @@
 ansible_os_family: "{{ images[default_vm_image]['image_type'] }}"
 
 server_domain_name: 'openstack.local'
-server_vm: true
+server_vm: "{{ osa_enable_object_storage | bool }}"
 server_vm_ram: '{{ swift_vm_server_ram | default(1024) }}'
 server_vm_vcpus: '{{ swift_vm_server_vcpus | default(2) }}'
 server_vm_primary_network: 'dhcp'
diff --git a/multi-node-aio/playbooks/osa/openstack_user_config.yml b/multi-node-aio/playbooks/osa/openstack_user_config.yml
index af3073f3..6c21c2e3 100644
--- a/multi-node-aio/playbooks/osa/openstack_user_config.yml
+++ b/multi-node-aio/playbooks/osa/openstack_user_config.yml
@@ -83,7 +83,7 @@ global_overrides:
           - "octavia-worker"
           - "octavia-housekeeping"
           - "octavia-health-monitor"
-
+{% if osa_enable_object_storage | bool %}
   swift:
     part_power: 8
     storage_network: 'br-storage'
@@ -98,12 +98,14 @@ global_overrides:
           name: default
           index: 0
           default: True
+{% endif %}
 
 ###
 ### Anchors
 ###
+{% if osa_enable_block_storage | bool %}
 cinder_block: &cinder_block
-{% for host in groups['cinder_hosts'] %}
+{%   for host in groups['cinder_hosts'] %}
   {{ hostvars[host]['server_hostname'] }}:
     ip: {{ hostvars[host]['server_networks']['mgmt']['address'].split('/')[0] }}
     container_vars:
@@ -115,16 +117,19 @@ cinder_block: &cinder_block
           volume_driver: cinder.volume.drivers.lvm.LVMVolumeDriver
           volume_backend_name: LVM_iSCSI
           iscsi_ip_address: {{ hostvars[host]['server_networks']['storage']['address'].split('/')[0] }}
-{% endfor %}
+{%   endfor %}
+{% endif %}
 
 
+{% if osa_enable_compute | bool %}
 compute_block: &compute_block
-{% for host in groups['compute_hosts'] %}
+{%   for host in groups['compute_hosts'] %}
   {{ hostvars[host]['server_hostname'] }}:
     ip: {{ hostvars[host]['server_networks']['mgmt']['address'].split('/')[0] }}
     container_vars:
       container_tech: "{{ default_container_tech }}"
-{% endfor %}
+{%   endfor %}
+{% endif %}
 
 
 infra_block: &infra_block
@@ -154,13 +159,15 @@ log_block: &log_block
 {% endfor %}
 
 
+{% if osa_enable_object_storage | bool %}
 swift_block: &swift_block
-{% for host in groups['swift_hosts'] %}
+{%   for host in groups['swift_hosts'] %}
   {{ hostvars[host]['server_hostname'] }}:
     ip: {{ hostvars[host]['server_networks']['mgmt']['address'].split('/')[0] }}
     container_vars:
       container_tech: "{{ default_container_tech }}"
-{% endfor %}
+{%   endfor %}
+{% endif %}
 
 
 ###