diff --git a/change-config.groovy b/change-config.groovy
index af1fe8b..44832ed 100644
--- a/change-config.groovy
+++ b/change-config.groovy
@@ -16,7 +16,6 @@
 def salt = new com.mirantis.mk.Salt()
 
 def saltMaster
-def targetAll = ['expression': TARGET_SERVERS, 'type': 'compound']
 def targetTestSubset
 def targetLiveSubset
 def targetLiveAll
@@ -39,7 +38,7 @@
         }
 
         stage('List target servers') {
-            minions = salt.getMinions(saltMaster, targetAll)
+            minions = salt.getMinions(saltMaster, TARGET_SERVERS)
             if (minions.isEmpty()) {
                 throw new Exception("No minion was targeted")
             }
diff --git a/openstack-compute-install.groovy b/openstack-compute-install.groovy
index d6b08c3..8d0eb55 100644
--- a/openstack-compute-install.groovy
+++ b/openstack-compute-install.groovy
@@ -12,7 +12,6 @@
 def salt = new com.mirantis.mk.Salt()
 
 def saltMaster
-def targetAll = ['expression': TARGET_SERVERS, 'type': 'compound']
 def minions
 def result
 def command
@@ -27,7 +26,7 @@
         }
 
         stage('List target servers') {
-            minions = salt.getMinions(saltMaster, targetAll)
+            minions = salt.getMinions(saltMaster, TARGET_SERVERS)
 
             if (minions.isEmpty()) {
                 throw new Exception("No minion was targeted")
diff --git a/openstack-compute-upgrade.groovy b/openstack-compute-upgrade.groovy
index 768f055..fcccebc 100644
--- a/openstack-compute-upgrade.groovy
+++ b/openstack-compute-upgrade.groovy
@@ -14,7 +14,6 @@
 def salt = new com.mirantis.mk.Salt()
 
 def saltMaster
-def targetAll = ['expression': TARGET_SERVERS, 'type': 'compound']
 def targetTestSubset
 def targetLiveSubset
 def targetLiveAll
@@ -33,7 +32,7 @@
         }
 
         stage('List target servers') {
-            minions = salt.getMinions(saltMaster, targetAll)
+            minions = salt.getMinions(saltMaster, TARGET_SERVERS)
 
             if (minions.isEmpty()) {
                 throw new Exception("No minion was targeted")
diff --git a/update-package.groovy b/update-package.groovy
index c6d008d..ea2259c 100644
--- a/update-package.groovy
+++ b/update-package.groovy
@@ -16,7 +16,6 @@
 def salt = new com.mirantis.mk.Salt()
 
 def saltMaster
-def targetAll = ['expression': TARGET_SERVERS, 'type': 'compound']
 def targetTestSubset
 def targetLiveSubset
 def targetLiveAll
@@ -34,7 +33,7 @@
         }
 
         stage('List target servers') {
-            minions = salt.getMinions(saltMaster, targetAll)
+            minions = salt.getMinions(saltMaster, TARGET_SERVERS)
 
             if (minions.isEmpty()) {
                 throw new Exception("No minion was targeted")