diff --git a/etc/openstack_deploy/openstack_user_config.yml.aio.j2 b/etc/openstack_deploy/openstack_user_config.yml.aio.j2
index 1573648015..d01e98feff 100644
--- a/etc/openstack_deploy/openstack_user_config.yml.aio.j2
+++ b/etc/openstack_deploy/openstack_user_config.yml.aio.j2
@@ -206,6 +206,8 @@ global_overrides:
           - nova_compute
           - manila_share
           - swift_proxy
+          - ceph-mon
+          - ceph-osd
 
 # keystone
 identity_hosts:
diff --git a/etc/openstack_deploy/openstack_user_config.yml.prod-ceph.example b/etc/openstack_deploy/openstack_user_config.yml.prod-ceph.example
index 7100e1b5d8..16d1111aa6 100644
--- a/etc/openstack_deploy/openstack_user_config.yml.prod-ceph.example
+++ b/etc/openstack_deploy/openstack_user_config.yml.prod-ceph.example
@@ -73,6 +73,7 @@ global_overrides:
           - manila_share
           - nova_compute
           - ceph-mon
+          - ceph-osd
 
 ###
 ### Infrastructure
diff --git a/etc/openstack_deploy/user_variables.yml.prod-ceph.example b/etc/openstack_deploy/user_variables.yml.prod-ceph.example
index b55a98dc43..ca4bbfd43c 100644
--- a/etc/openstack_deploy/user_variables.yml.prod-ceph.example
+++ b/etc/openstack_deploy/user_variables.yml.prod-ceph.example
@@ -15,8 +15,8 @@ fsid: 116f14c4-7fe1-40e4-94eb-9240b63de5c1 # Replace with your generated UUID
 ## ceph-ansible settings
 ## See https://github.com/ceph/ceph-ansible/tree/master/group_vars for
 ## additional configuration options available.
-monitor_address_block: "{{ cidr_networks.container }}"
-public_network: "{{ cidr_networks.container }}"
+monitor_address_block: "{{ cidr_networks.storage }}"
+public_network: "{{ cidr_networks.storage }}"
 cluster_network: "{{ cidr_networks.storage }}"
 journal_size: 10240 # size in MB
 # ceph-ansible automatically creates pools & keys for OpenStack services
diff --git a/tests/roles/bootstrap-host/templates/user_variables_ceph.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables_ceph.yml.j2
index 2cbfdd1fb6..45693a95e6 100644
--- a/tests/roles/bootstrap-host/templates/user_variables_ceph.yml.j2
+++ b/tests/roles/bootstrap-host/templates/user_variables_ceph.yml.j2
@@ -16,8 +16,8 @@
 ## ceph-ansible AIO settings
 is_hci: true
 common_single_host_mode: true
-monitor_interface: "{{ ('metal' in bootstrap_host_scenarios_expanded) | ternary('br-mgmt', 'eth1') }}" # Management network in the AIO
-public_network: "{{ (mgmt_range ~ '.0/' ~ netmask) | ansible.utils.ipaddr('net') }}"
+monitor_interface: "{{ ('metal' in bootstrap_host_scenarios_expanded) | ternary('br-storage', 'eth2') }}" # Storage network in the AIO
+public_network: "{{ (storage_range ~ '.0/' ~ netmask) | ansible.utils.ipaddr('net') }}"
 journal_size: 100
 osd_scenario: collocated
 ceph_conf_overrides_custom: