diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
index 415242512..31a61959f 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
@@ -147,7 +147,7 @@ write_secrets (shvarFile *ifcfg,
 
 	if (!any_secrets)
 		(void) unlink (svFileGetName (keyfile));
-	else if (!svWriteFile (keyfile, 0600, &local)) {
+	else if (!svWriteFileWithoutDirtyWellknown (keyfile, 0600, &local)) {
 		g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_FAILED,
 		             "Failure to write secrets to '%s': %s", svFileGetName (keyfile), local->message);
 		return FALSE;
@@ -2747,7 +2747,7 @@ write_ip4_aliases (NMConnection *connection, const char *base_ifcfg_path)
 
 		svSetValueInt64 (ifcfg, "PREFIX", nm_ip_address_get_prefix(addr));
 
-		svWriteFile (ifcfg, 0644, NULL);
+		svWriteFileWithoutDirtyWellknown (ifcfg, 0644, NULL);
 		svCloseFile (ifcfg);
 	}
 }
@@ -3317,7 +3317,7 @@ do_write_to_disk (NMConnection *connection,
 	 * only. But we loaded the ifcfg files from disk, and managled our
 	 * new settings (in-memory). */
 
-	if (!svWriteFile (ifcfg, 0644, error))
+	if (!svWriteFileWithoutDirtyWellknown (ifcfg, 0644, error))
 		return FALSE;
 
 	write_ip4_aliases (connection, svFileGetName (ifcfg));
@@ -3336,7 +3336,7 @@ do_write_to_disk (NMConnection *connection,
 		else {
 			nm_assert (route_content_svformat || route_content);
 			if (route_content_svformat) {
-				if (!svWriteFile (route_content_svformat, 0644, error))
+				if (!svWriteFileWithoutDirtyWellknown (route_content_svformat, 0644, error))
 					return FALSE;
 			} else {
 				if (!g_file_set_contents (route_path, route_content->str, route_content->len, NULL)) {
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-b.cexpected b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-b.cexpected
index d4785ff5b..2e69c5e7f 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-b.cexpected
+++ b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-b.cexpected
@@ -1,6 +1,5 @@
 HWADDR=00:22:15:59:62:97
 TYPE=Ethernet
-BRIDGING_OPTS="priority=28 hairpin_mode=1"
 NAME="System test-bridge-component"
 UUID=${UUID}
 DEVICE=eth0
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1.cexpected b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1.cexpected
index 5dfdce4d0..87493ac2b 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1.cexpected
+++ b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1.cexpected
@@ -2,7 +2,6 @@ DNS1=192.0.2.1
 IPADDR=102.0.2.2
 GATEWAY=192.0.2.1
 NETMASK=255.254.0.0
-BOOTPROTO="static"
 DEVICE=eth1
 ONBOOT=yes
 IPV6INIT=yes