diff --git a/overcloud.yaml b/overcloud.yaml
index 343b1bc297..106bce9525 100644
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@ -366,7 +366,7 @@ parameters:
     type: string
     hidden: true
   CinderISCSIHelper:
-    default: tgtadm
+    default: lioadm
     description: The iSCSI helper to use with cinder.
     type: string
   ControllerCount:
diff --git a/puppet/cinder-storage.yaml b/puppet/cinder-storage.yaml
index 09c4d3e3b3..0c22b57529 100644
--- a/puppet/cinder-storage.yaml
+++ b/puppet/cinder-storage.yaml
@@ -9,7 +9,7 @@ parameters:
     description: Whether to enable or not the Iscsi backend for Cinder
     type: boolean
   CinderISCSIHelper:
-    default: tgtadm
+    default: lioadm
     description: The iSCSI helper to use with cinder.
     type: string
   CinderLVMLoopDeviceSize:
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 494347ff64..f17385f677 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -57,7 +57,7 @@ parameters:
     description: Whether to enable or not the Rbd backend for Cinder
     type: boolean
   CinderISCSIHelper:
-    default: tgtadm
+    default: lioadm
     description: The iSCSI helper to use with cinder.
     type: string
   CinderLVMLoopDeviceSize: