diff --git a/share/templates.d/99-generic/config_files/common/90-anaconda-no-auto-default.conf b/share/templates.d/99-generic/config_files/common/90-anaconda-no-auto-default.conf
new file mode 100644
index 00000000..06b53d81
--- /dev/null
+++ b/share/templates.d/99-generic/config_files/common/90-anaconda-no-auto-default.conf
@@ -0,0 +1,2 @@
+[main]
+no-auto-default=*
diff --git a/share/templates.d/99-generic/runtime-postinstall.tmpl b/share/templates.d/99-generic/runtime-postinstall.tmpl
index 535e5b18..1d019d1c 100644
--- a/share/templates.d/99-generic/runtime-postinstall.tmpl
+++ b/share/templates.d/99-generic/runtime-postinstall.tmpl
@@ -76,6 +76,7 @@ mkdir etc/NetworkManager/conf.d
 install ${configdir}/91-anaconda-autoconnect-slaves.conf etc/NetworkManager/conf.d
 install ${configdir}/vconsole.conf etc
 install ${configdir}/92-anaconda-loglevel-debug.conf etc/NetworkManager/conf.d
+install ${configdir}/90-anaconda-no-auto-default.conf etc/NetworkManager/conf.d
 
 ## set up sshd
 install ${configdir}/sshd_config.anaconda etc/ssh