diff --git a/defaults/main.yml b/defaults/main.yml
index 942e5ed7..e329389f 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -200,11 +200,11 @@ cinder_osapi_volume_workers_max: 16
 cinder_osapi_volume_workers: "{{ [[ansible_processor_vcpus|default(2) // 2, 1] | max, cinder_osapi_volume_workers_max] | min }}"
 
 ## Cinder iscsi
-cinder_iscsi_helper_mapping:
+cinder_target_helper_mapping:
   RedHat: lioadm
   Debian: tgtadm
   Suse: tgtadm
-cinder_iscsi_helper: "{{ cinder_iscsi_helper_mapping[ansible_os_family] }}"
+cinder_target_helper: "{{ cinder_target_helper_mapping[ansible_os_family] }}"
 cinder_iscsi_iotype: fileio
 cinder_iscsi_num_targets: 100
 cinder_iscsi_port: 3260
diff --git a/releasenotes/notes/deprecated-iscsi_helper-98fd2aebfd72fdf6.yaml b/releasenotes/notes/deprecated-iscsi_helper-98fd2aebfd72fdf6.yaml
new file mode 100644
index 00000000..bcd14720
--- /dev/null
+++ b/releasenotes/notes/deprecated-iscsi_helper-98fd2aebfd72fdf6.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - The variable `cinder_iscsi_helper` has been replaced by the new variable
+    which is `cinder_target_helper` due to the fact that iscsi_helper has
+    been deprecated in Cinder.
diff --git a/tasks/cinder_post_install.yml b/tasks/cinder_post_install.yml
index cd6bf5b7..c17e65cb 100644
--- a/tasks/cinder_post_install.yml
+++ b/tasks/cinder_post_install.yml
@@ -51,7 +51,7 @@
   notify: Ensure tgt service restarted
   when:
     - "cinder_services['cinder-volume']['group'] in group_names"
-    - "cinder_iscsi_helper == 'tgtadm'"
+    - "cinder_target_helper == 'tgtadm'"
     - cinder_backend_lvm_inuse | bool
 
 - name: Create nfs shares export file
diff --git a/templates/cinder.conf.j2 b/templates/cinder.conf.j2
index 0dc27fc8..5fe1bcc5 100644
--- a/templates/cinder.conf.j2
+++ b/templates/cinder.conf.j2
@@ -75,7 +75,7 @@ volume_name_template = {{ cinder_volume_name_template }}
 storage_availability_zone = {{ cinder_storage_availability_zone }}
 default_availability_zone = {{ cinder_default_availability_zone }}
 
-iscsi_helper = {{ cinder_iscsi_helper }}
+target_helper = {{ cinder_target_helper }}
 iscsi_iotype = {{ cinder_iscsi_iotype }}
 iscsi_ip_address = {{ cinder_storage_address }}
 iscsi_num_targets = {{ cinder_iscsi_num_targets }}