diff --git a/preseed/debian/stretch/preseed.cfg b/preseed/debian/stretch/preseed.cfg
index ca4adff..bb135c4 100644
--- a/preseed/debian/stretch/preseed.cfg
+++ b/preseed/debian/stretch/preseed.cfg
@@ -90,7 +90,7 @@ d-i   mirror/suite                                string
 ## Account
 #####################################################################
 # Allow login as root?
-user-setup-udeb  passwd/root-login                boolean  true
+d-i   passwd/root-login                           boolean  true
 # Root password in clear text
 #d-i   passwd/root-password                        password r00tme
 #d-i   passwd/root-password-again                  password r00tme
@@ -277,7 +277,7 @@ d-i   apt-setup/contrib                           boolean     true
 
 # Additional repositories, local[0-9] available
 d-i   apt-setup/local0/repository                 string      \
-       http://apt.puppetlabs.com jessie main dependencies
+       http://apt.puppetlabs.com stretch main dependencies
 #d-i   apt-setup/local0/comment                    string      local server
 # Enable deb-src lines
 d-i   apt-setup/local0/source                     boolean     true
diff --git a/preseed/debian/stretch/preseed_cinnamon.cfg b/preseed/debian/stretch/preseed_cinnamon.cfg
index 45beddc..874b373 100644
--- a/preseed/debian/stretch/preseed_cinnamon.cfg
+++ b/preseed/debian/stretch/preseed_cinnamon.cfg
@@ -90,7 +90,7 @@ d-i   mirror/suite                                string
 ## Account
 #####################################################################
 # Allow login as root?
-user-setup-udeb  passwd/root-login                boolean  true
+d-i   passwd/root-login                           boolean  true
 # Root password in clear text
 #d-i   passwd/root-password                        password r00tme
 #d-i   passwd/root-password-again                  password r00tme
@@ -268,7 +268,7 @@ d-i   apt-setup/contrib                           boolean     true
 
 # Additional repositories, local[0-9] available
 d-i   apt-setup/local0/repository                 string      \
-       http://apt.puppetlabs.com jessie main dependencies
+       http://apt.puppetlabs.com stretch main dependencies
 #d-i   apt-setup/local0/comment                    string      local server
 # Enable deb-src lines
 d-i   apt-setup/local0/source                     boolean     true
diff --git a/preseed/debian/stretch/preseed_gnome.cfg b/preseed/debian/stretch/preseed_gnome.cfg
index a3f269e..4ad3245 100644
--- a/preseed/debian/stretch/preseed_gnome.cfg
+++ b/preseed/debian/stretch/preseed_gnome.cfg
@@ -90,7 +90,7 @@ d-i   mirror/suite                                string
 ## Account
 #####################################################################
 # Allow login as root?
-user-setup-udeb  passwd/root-login                boolean  true
+d-i   passwd/root-login                           boolean  true
 # Root password in clear text
 #d-i   passwd/root-password                        password r00tme
 #d-i   passwd/root-password-again                  password r00tme
@@ -268,7 +268,7 @@ d-i   apt-setup/contrib                           boolean     true
 
 # Additional repositories, local[0-9] available
 d-i   apt-setup/local0/repository                 string      \
-       http://apt.puppetlabs.com jessie main dependencies
+       http://apt.puppetlabs.com stretch main dependencies
 #d-i   apt-setup/local0/comment                    string      local server
 # Enable deb-src lines
 d-i   apt-setup/local0/source                     boolean     true
diff --git a/preseed/debian/stretch/preseed_mate.cfg b/preseed/debian/stretch/preseed_mate.cfg
index 6ac70b9..2a88941 100644
--- a/preseed/debian/stretch/preseed_mate.cfg
+++ b/preseed/debian/stretch/preseed_mate.cfg
@@ -90,7 +90,7 @@ d-i   mirror/suite                                string
 ## Account
 #####################################################################
 # Allow login as root?
-user-setup-udeb  passwd/root-login                boolean  true
+d-i   passwd/root-login                           boolean  true
 # Root password in clear text
 #d-i   passwd/root-password                        password r00tme
 #d-i   passwd/root-password-again                  password r00tme
@@ -268,7 +268,7 @@ d-i   apt-setup/contrib                           boolean     true
 
 # Additional repositories, local[0-9] available
 d-i   apt-setup/local0/repository                 string      \
-       http://apt.puppetlabs.com jessie main dependencies
+       http://apt.puppetlabs.com stretch main dependencies
 #d-i   apt-setup/local0/comment                    string      local server
 # Enable deb-src lines
 d-i   apt-setup/local0/source                     boolean     true