diff --git a/attributes/default.rb b/attributes/default.rb
index 975bb8b..d9f2541 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -89,14 +89,14 @@ when 'rhel' # :pragma-foodcritic: ~FC024 - won't fix this
     'cinder_common_packages' => ['openstack-cinder'],
     'cinder_api_packages' => ['openstack-cinder'],
     'cinder_api_service' => 'openstack-cinder-api',
-    'cinder_volume_packages' => ['qemu-img-ev', 'scsi-target-utils'],
+    'cinder_volume_packages' => ['qemu-img-ev'],
     'cinder_volume_service' => 'openstack-cinder-volume',
     'cinder_scheduler_packages' => [],
     'cinder_scheduler_service' => 'openstack-cinder-scheduler',
     'cinder_backup_packages' => [],
     'cinder_backup_service' => 'openstack-cinder-backup',
     'cinder_iscsitarget_packages' => ['targetcli', 'dbus-python'],
-    'cinder_iscsitarget_service' => 'tgtd',
+    'cinder_iscsitarget_service' => 'target',
     'cinder_ceph_packages' => ['python-ceph', 'ceph-common'],
     'cinder_nfs_packages' => ['nfs-utils', 'nfs-utils-lib'],
     'cinder_emc_packages' => ['pywbem'],
@@ -118,7 +118,7 @@ when 'debian'
     'cinder_backup_packages' => ['cinder-backup'],
     'cinder_backup_service' => 'cinder-backup',
     'cinder_ceph_packages' => ['python-ceph', 'ceph-common'],
-    'cinder_iscsitarget_packages' => ['tgt'],
+    'cinder_iscsitarget_packages' => ['targetcli'],
     'cinder_iscsitarget_service' => 'tgt',
     'cinder_nfs_packages' => ['nfs-common'],
     'cinder_emc_packages' => ['python-pywbem'],
diff --git a/recipes/volume.rb b/recipes/volume.rb
index 01d81f5..7e06a98 100644
--- a/recipes/volume.rb
+++ b/recipes/volume.rb
@@ -65,7 +65,7 @@ service 'iscsitarget' do
   action :enable
 end
 
-template '/etc/tgt/targets.conf' do
+template '/etc/target/targets.conf' do
   source 'targets.conf.erb'
   mode 0o0600
   notifies :restart, 'service[iscsitarget]', :immediately
diff --git a/spec/volume_spec.rb b/spec/volume_spec.rb
index b5efa33..90e6a38 100644
--- a/spec/volume_spec.rb
+++ b/spec/volume_spec.rb
@@ -35,7 +35,7 @@ describe 'openstack-block-storage::volume' do
     end
 
     it 'starts iscsi target on boot' do
-      expect(chef_run).to enable_service 'tgt'
+      expect(chef_run).to enable_service 'iscsitarget'
     end
 
     it 'upgrades mysql python packages by default' do
@@ -43,11 +43,11 @@ describe 'openstack-block-storage::volume' do
     end
 
     it 'upgrades cinder iscsi package' do
-      expect(chef_run).to upgrade_package 'tgt'
+      expect(chef_run).to upgrade_package 'targetcli'
     end
 
     describe 'targets.conf' do
-      let(:file) { chef_run.template('/etc/tgt/targets.conf') }
+      let(:file) { chef_run.template('/etc/target/targets.conf') }
 
       it 'should create the targets.conf' do
         expect(chef_run).to create_template(file.name).with(