diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup
index 544eefc17..5da116e05 100755
--- a/salt/manager/tools/sbin/soup
+++ b/salt/manager/tools/sbin/soup
@@ -763,6 +763,9 @@ up_to_2.4.130() {
   # Integrations policies need to be updated
   rm -f /opt/so/state/eaintegrations.txt
 
+  # Ensure override exists to allow nmcli access to other devices
+  touch /etc/NetworkManager/conf.d/10-globally-managed-devices.conf
+
   INSTALLEDVERSION=2.4.130
 }
 
diff --git a/setup/so-functions b/setup/so-functions
index fa7e8a043..5c4da25ba 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -167,17 +167,14 @@ check_manager_connection() {
 }
 
 check_network_manager_conf() {
-	local gmdconf="/usr/lib/NetworkManager/conf.d/10-globally-managed-devices.conf"
-	local nmconf="/etc/NetworkManager/NetworkManager.conf"
+	local gmdconf="/etc/NetworkManager/conf.d/10-globally-managed-devices.conf"
 	local preupdir="/etc/NetworkManager/dispatcher.d/pre-up.d"
 
-	if test -f "$gmdconf" && ! test -f "${gmdconf}.bak"; then
-		{
-			mv "$gmdconf" "${gmdconf}.bak"
-			touch "$gmdconf"
-			systemctl restart NetworkManager
-		} >> "$setup_log" 2>&1
-	fi
+	{
+		[[ -f $gmdconf ]] && mv "$gmdconf" "${gmdconf}.bak"
+		touch "$gmdconf"
+		systemctl restart NetworkManager
+	} >> "$setup_log" 2>&1
 
 	if [[ ! -d "$preupdir" ]]; then
 		mkdir "$preupdir" >> "$setup_log" 2>&1