diff --git a/group_vars/iscsigws.yml.sample b/group_vars/iscsigws.yml.sample
index 4ab76d2c5..1614f2cfc 100644
--- a/group_vars/iscsigws.yml.sample
+++ b/group_vars/iscsigws.yml.sample
@@ -12,9 +12,58 @@ dummy:
 ###########
 # GENERAL #
 ###########
+# Whether or not to generate secure certificate to iSCSI gateway nodes
+#generate_crt: False
+
+#rbd_pool_size: "{{ osd_pool_default_size }}"
+
+##################
+# RBD-TARGET-API #
+##################
+# Optional settings related to the CLI/API service
+#api_user: admin
+#api_password: admin
+#api_port: 5000
+#api_secure: false
+#loop_delay: 1
+#trusted_ip_list: 192.168.122.1
+
+
+##########
+# DOCKER #
+##########
+
+# Resource limitation
+# For the whole list of limits you can apply see: docs.docker.com/engine/admin/resource_constraints
+# Default values are based from: https://access.redhat.com/documentation/en-us/red_hat_ceph_storage/2/html/red_hat_ceph_storage_hardware_guide/minimum_recommendations
+# These options can be passed using the 'ceph_mds_docker_extra_env' variable.
+
+# TCMU_RUNNER resource limitation
+#ceph_tcmu_runner_docker_memory_limit: "{{ ansible_memtotal_mb }}m"
+#ceph_tcmu_runner_docker_cpu_limit: 1
+
+# RBD_TARGET_GW resource limitation
+#ceph_rbd_target_gw_docker_memory_limit: "{{ ansible_memtotal_mb }}m"
+#ceph_rbd_target_gw_docker_cpu_limit: 1
+
+# RBD_TARGET_API resource limitation
+#ceph_rbd_target_api_docker_memory_limit: "{{ ansible_memtotal_mb }}m"
+#ceph_rbd_target_api_docker_cpu_limit: 1
+
+
+##################################
+# DEPRECIATED iSCSI TARGET SETUP #
+##################################
+
+# WARNING #
+
+# The following values are depreciated. To setup targets, gateways, LUNs, and
+# clients you should use gwcli or dashboard. If the following values are set,
+# the old ceph-iscsi-config/ceph-iscsi-cli packages will be used.
+
 # Specify the iqn for ALL gateways. This iqn is shared across the gateways, so an iscsi
 # client sees the gateway group as a single storage subsystem.
-#gateway_iqn: "iqn.2003-01.com.redhat.iscsi-gw:ceph-igw"
+#gateway_iqn: ""
 
 # gateway_ip_list provides a list of the IP Addrresses - one per gateway - that will be used
 # as an iscsi target portal ip. The list must be comma separated - and the order determines
@@ -60,42 +109,3 @@ dummy:
 
 #client_connections: {}
 
-
-# Whether or not to generate secure certificate to iSCSI gateway nodes
-#generate_crt: False
-
-#rbd_pool_size: "{{ osd_pool_default_size }}"
-
-##################
-# RBD-TARGET-API #
-##################
-# Optional settings related to the CLI/API service
-#api_user: admin
-#api_password: admin
-#api_port: 5000
-#api_secure: false
-#loop_delay: 1
-#trusted_ip_list: 192.168.122.1
-
-
-##########
-# DOCKER #
-##########
-
-# Resource limitation
-# For the whole list of limits you can apply see: docs.docker.com/engine/admin/resource_constraints
-# Default values are based from: https://access.redhat.com/documentation/en-us/red_hat_ceph_storage/2/html/red_hat_ceph_storage_hardware_guide/minimum_recommendations
-# These options can be passed using the 'ceph_mds_docker_extra_env' variable.
-
-# TCMU_RUNNER resource limitation
-#ceph_tcmu_runner_docker_memory_limit: "{{ ansible_memtotal_mb }}m"
-#ceph_tcmu_runner_docker_cpu_limit: 1
-
-# RBD_TARGET_GW resource limitation
-#ceph_rbd_target_gw_docker_memory_limit: "{{ ansible_memtotal_mb }}m"
-#ceph_rbd_target_gw_docker_cpu_limit: 1
-
-# RBD_TARGET_API resource limitation
-#ceph_rbd_target_api_docker_memory_limit: "{{ ansible_memtotal_mb }}m"
-#ceph_rbd_target_api_docker_cpu_limit: 1
-
diff --git a/roles/ceph-iscsi-gw/defaults/main.yml b/roles/ceph-iscsi-gw/defaults/main.yml
index 5ffd64bb7..e2944ed9e 100644
--- a/roles/ceph-iscsi-gw/defaults/main.yml
+++ b/roles/ceph-iscsi-gw/defaults/main.yml
@@ -4,9 +4,58 @@
 ###########
 # GENERAL #
 ###########
+# Whether or not to generate secure certificate to iSCSI gateway nodes
+generate_crt: False
+
+rbd_pool_size: "{{ osd_pool_default_size }}"
+
+##################
+# RBD-TARGET-API #
+##################
+# Optional settings related to the CLI/API service
+api_user: admin
+api_password: admin
+api_port: 5000
+api_secure: false
+loop_delay: 1
+trusted_ip_list: 192.168.122.1
+
+
+##########
+# DOCKER #
+##########
+
+# Resource limitation
+# For the whole list of limits you can apply see: docs.docker.com/engine/admin/resource_constraints
+# Default values are based from: https://access.redhat.com/documentation/en-us/red_hat_ceph_storage/2/html/red_hat_ceph_storage_hardware_guide/minimum_recommendations
+# These options can be passed using the 'ceph_mds_docker_extra_env' variable.
+
+# TCMU_RUNNER resource limitation
+ceph_tcmu_runner_docker_memory_limit: "{{ ansible_memtotal_mb }}m"
+ceph_tcmu_runner_docker_cpu_limit: 1
+
+# RBD_TARGET_GW resource limitation
+ceph_rbd_target_gw_docker_memory_limit: "{{ ansible_memtotal_mb }}m"
+ceph_rbd_target_gw_docker_cpu_limit: 1
+
+# RBD_TARGET_API resource limitation
+ceph_rbd_target_api_docker_memory_limit: "{{ ansible_memtotal_mb }}m"
+ceph_rbd_target_api_docker_cpu_limit: 1
+
+
+##################################
+# DEPRECIATED iSCSI TARGET SETUP #
+##################################
+
+# WARNING #
+
+# The following values are depreciated. To setup targets, gateways, LUNs, and
+# clients you should use gwcli or dashboard. If the following values are set,
+# the old ceph-iscsi-config/ceph-iscsi-cli packages will be used.
+
 # Specify the iqn for ALL gateways. This iqn is shared across the gateways, so an iscsi
 # client sees the gateway group as a single storage subsystem.
-gateway_iqn: "iqn.2003-01.com.redhat.iscsi-gw:ceph-igw"
+gateway_iqn: ""
 
 # gateway_ip_list provides a list of the IP Addrresses - one per gateway - that will be used
 # as an iscsi target portal ip. The list must be comma separated - and the order determines
@@ -51,42 +100,3 @@ rbd_devices: {}
 #  - { client: 'iqn.1991-05.com.microsoft:w2k12r2', image_list: 'rbd.ansible4', chap: 'w2k12r2/microsoft_w2k12', status: 'absent' }
 
 client_connections: {}
-
-
-# Whether or not to generate secure certificate to iSCSI gateway nodes
-generate_crt: False
-
-rbd_pool_size: "{{ osd_pool_default_size }}"
-
-##################
-# RBD-TARGET-API #
-##################
-# Optional settings related to the CLI/API service
-api_user: admin
-api_password: admin
-api_port: 5000
-api_secure: false
-loop_delay: 1
-trusted_ip_list: 192.168.122.1
-
-
-##########
-# DOCKER #
-##########
-
-# Resource limitation
-# For the whole list of limits you can apply see: docs.docker.com/engine/admin/resource_constraints
-# Default values are based from: https://access.redhat.com/documentation/en-us/red_hat_ceph_storage/2/html/red_hat_ceph_storage_hardware_guide/minimum_recommendations
-# These options can be passed using the 'ceph_mds_docker_extra_env' variable.
-
-# TCMU_RUNNER resource limitation
-ceph_tcmu_runner_docker_memory_limit: "{{ ansible_memtotal_mb }}m"
-ceph_tcmu_runner_docker_cpu_limit: 1
-
-# RBD_TARGET_GW resource limitation
-ceph_rbd_target_gw_docker_memory_limit: "{{ ansible_memtotal_mb }}m"
-ceph_rbd_target_gw_docker_cpu_limit: 1
-
-# RBD_TARGET_API resource limitation
-ceph_rbd_target_api_docker_memory_limit: "{{ ansible_memtotal_mb }}m"
-ceph_rbd_target_api_docker_cpu_limit: 1