diff --git a/etc/openstack_deploy/openstack_user_config.yml.aio b/etc/openstack_deploy/openstack_user_config.yml.aio
index b0d5064973..6fd26c2ff3 100644
--- a/etc/openstack_deploy/openstack_user_config.yml.aio
+++ b/etc/openstack_deploy/openstack_user_config.yml.aio
@@ -115,6 +115,7 @@ storage_hosts:
           volume_group: cinder-volumes
           volume_driver: cinder.volume.drivers.lvm.LVMVolumeDriver
           volume_backend_name: LVM_iSCSI
+          iscsi_ip_address: "172.29.236.100"
 
 log_hosts:
   aio1:
diff --git a/etc/openstack_deploy/openstack_user_config.yml.example b/etc/openstack_deploy/openstack_user_config.yml.example
index 28635adf70..cb649a2109 100644
--- a/etc/openstack_deploy/openstack_user_config.yml.example
+++ b/etc/openstack_deploy/openstack_user_config.yml.example
@@ -575,6 +575,7 @@
 #           volume_backend_name: LVM_iSCSI
 #           volume_driver: cinder.volume.drivers.lvm.LVMVolumeDriver
 #           volume_group: cinder-volumes
+#           iscsi_ip_address: "{{ storage_address }}"
 #         limit_container_types: cinder_volume
 #
 # Example:
diff --git a/playbooks/os-cinder-install.yml b/playbooks/os-cinder-install.yml
index 22450de3e6..622b4b93be 100644
--- a/playbooks/os-cinder-install.yml
+++ b/playbooks/os-cinder-install.yml
@@ -157,7 +157,7 @@
       cinder_venv_tag: "{{ openstack_release }}"
       cinder_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/cinder-{{ openstack_release }}.tgz"
       cinder_galera_address: "{{ internal_lb_vip_address }}"
-      cinder_storage_address: "{{ container_address }}"
+      cinder_management_address: "{{ ansible_ssh_host }}"
       cinder_glance_host: "{{ internal_lb_vip_address }}"
       cinder_glance_service_port: "{{ glance_service_port }}"
       tags:
diff --git a/playbooks/roles/os_cinder/defaults/main.yml b/playbooks/roles/os_cinder/defaults/main.yml
index 42c180b484..3d9778e563 100644
--- a/playbooks/roles/os_cinder/defaults/main.yml
+++ b/playbooks/roles/os_cinder/defaults/main.yml
@@ -40,6 +40,7 @@ cinder_storage_availability_zone: nova
 cinder_default_availability_zone: "{{ cinder_storage_availability_zone }}"
 
 cinder_storage_address: 127.0.0.1
+cinder_management_address: 127.0.0.1
 
 cinder_nova_catalog_info: compute:nova:internalURL
 cinder_nova_catalog_admin_info: compute:nova:adminURL
diff --git a/playbooks/roles/os_cinder/templates/cinder.conf.j2 b/playbooks/roles/os_cinder/templates/cinder.conf.j2
index 9d7c9c94f7..c175067632 100644
--- a/playbooks/roles/os_cinder/templates/cinder.conf.j2
+++ b/playbooks/roles/os_cinder/templates/cinder.conf.j2
@@ -7,7 +7,7 @@
 verbose = {{ verbose }}
 debug = {{ debug }}
 fatal_deprecations = {{ cinder_fatal_deprecations }}
-my_ip = {{ cinder_storage_address }}
+my_ip = {{ cinder_management_address }}
 
 osapi_volume_workers = {{ cinder_osapi_volume_workers | default(api_threads) }}
 
@@ -79,7 +79,7 @@ default_availability_zone = {{ cinder_default_availability_zone }}
 
 iscsi_helper = {{ cinder_iscsi_helper }}
 iscsi_iotype = {{ cinder_iscsi_iotype }}
-iscsi_ip_address = $my_ip
+iscsi_ip_address = {{ cinder_storage_address }}
 iscsi_num_targets = {{ cinder_iscsi_num_targets }}
 iscsi_port = {{ cinder_iscsi_port }}