diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup
index 46010da61..81e5b9c18 100755
--- a/salt/manager/tools/sbin/soup
+++ b/salt/manager/tools/sbin/soup
@@ -611,7 +611,7 @@ post_to_2.4.180() {
 
 post_to_2.4.190() {
     # Only need to update import / eval nodes
-    if [[ "$MINIONID" =~ "_import" ]] || [[ ! "$MINIONID" =~ "_eval" ]]; then
+    if [[ "${MINIONID##*_}" == "import" ]] || [[ "${MINIONID##*_}" == "eval" ]]; then
         update_import_fleet_output
     fi
 
@@ -1429,7 +1429,7 @@ main() {
   if [ "$is_hotfix" == "true" ]; then
     echo "Applying $HOTFIXVERSION hotfix"
     # since we don't run the backup.config_backup state on import we wont snapshot previous version states and pillars
-    if [[ ! "$MINIONID" =~ "_import" ]]; then
+    if [[ ! "${MINIONID##*_}" == "import" ]]; then
       backup_old_states_pillars
     fi
     copy_new_files
@@ -1492,7 +1492,7 @@ main() {
     fi
 
     # since we don't run the backup.config_backup state on import we wont snapshot previous version states and pillars
-    if [[ ! "$MINIONID" =~ "_import" ]]; then
+    if [[ ! "${MINIONID##*_}" == "import" ]]; then
       echo ""
       echo "Creating snapshots of default and local Salt states and pillars and saving to /nsm/backup/"
       backup_old_states_pillars