diff --git a/preseed/debian/stretch/preseed.cfg b/preseed/debian/stretch/preseed.cfg
index e8e0652..655f0de 100644
--- a/preseed/debian/stretch/preseed.cfg
+++ b/preseed/debian/stretch/preseed.cfg
@@ -7,7 +7,7 @@
 #    menu label Debian GNU/Linux ^Stretch 64 bits WITH PRESEED
 #    kernel installer/debian/stretch/amd64/linux
 #    IPAPPEND 2
-#    APPEND vga=normal initrd=installer/debian/stretch/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/installer/debian/stretch/amd64/preseed.cfg 
+#    APPEND vga=normal initrd=installer/debian/stretch/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/installer/debian/stretch/amd64/preseed.cfg
 
 
 
@@ -300,6 +300,13 @@ d-i   pkgsel/upgrade                              select      full-upgrade
 # Participate to Popularity Contest (disable for an unconnected server)
 d-i   popularity-contest/participate              boolean     true
 
+## For CD/DVD case
+# Don't scan for additional CD/DVD
+d-i  apt-setup/cdrom/set-first                    boolean     false
+d-i  apt-setup/cdrom/set-double                   boolean     false
+d-i  apt-setup/cdrom/set-next                     boolean     false
+d-i  apt-setup/cdrom/set-failed                   boolean     false
+
 
 
 #####################################################################
diff --git a/preseed/debian/stretch/preseed.cinnamon.uefi.cfg b/preseed/debian/stretch/preseed.cinnamon.uefi.cfg
index 445f85d..99ab2b6 100644
--- a/preseed/debian/stretch/preseed.cinnamon.uefi.cfg
+++ b/preseed/debian/stretch/preseed.cinnamon.uefi.cfg
@@ -315,6 +315,13 @@ d-i   pkgsel/upgrade                              select      full-upgrade
 # Participate to Popularity Contest (disable for an unconnected server)
 d-i   popularity-contest/participate              boolean     true
 
+## For CD/DVD case
+# Don't scan for additional CD/DVD
+d-i  apt-setup/cdrom/set-first                    boolean     false
+d-i  apt-setup/cdrom/set-double                   boolean     false
+d-i  apt-setup/cdrom/set-next                     boolean     false
+d-i  apt-setup/cdrom/set-failed                   boolean     false
+
 
 
 #####################################################################
diff --git a/preseed/debian/stretch/preseed.gnome.uefi.cfg b/preseed/debian/stretch/preseed.gnome.uefi.cfg
index 705c279..e3fe990 100644
--- a/preseed/debian/stretch/preseed.gnome.uefi.cfg
+++ b/preseed/debian/stretch/preseed.gnome.uefi.cfg
@@ -315,6 +315,13 @@ d-i   pkgsel/upgrade                              select      full-upgrade
 # Participate to Popularity Contest (disable for an unconnected server)
 d-i   popularity-contest/participate              boolean     true
 
+## For CD/DVD case
+# Don't scan for additional CD/DVD
+d-i  apt-setup/cdrom/set-first                    boolean     false
+d-i  apt-setup/cdrom/set-double                   boolean     false
+d-i  apt-setup/cdrom/set-next                     boolean     false
+d-i  apt-setup/cdrom/set-failed                   boolean     false
+
 
 
 #####################################################################
diff --git a/preseed/debian/stretch/preseed_cinnamon.cfg b/preseed/debian/stretch/preseed_cinnamon.cfg
index 1df94e3..9f231eb 100644
--- a/preseed/debian/stretch/preseed_cinnamon.cfg
+++ b/preseed/debian/stretch/preseed_cinnamon.cfg
@@ -290,6 +290,13 @@ d-i   pkgsel/upgrade                              select      full-upgrade
 # Participate to Popularity Contest (disable for an unconnected server)
 d-i   popularity-contest/participate              boolean     true
 
+## For CD/DVD case
+# Don't scan for additional CD/DVD
+d-i  apt-setup/cdrom/set-first                    boolean     false
+d-i  apt-setup/cdrom/set-double                   boolean     false
+d-i  apt-setup/cdrom/set-next                     boolean     false
+d-i  apt-setup/cdrom/set-failed                   boolean     false
+
 
 
 #####################################################################
diff --git a/preseed/debian/stretch/preseed_computenode.cfg b/preseed/debian/stretch/preseed_computenode.cfg
index 0f950ef..f8475dd 100644
--- a/preseed/debian/stretch/preseed_computenode.cfg
+++ b/preseed/debian/stretch/preseed_computenode.cfg
@@ -283,6 +283,13 @@ d-i   pkgsel/upgrade                              select      full-upgrade
 # Participate to Popularity Contest (disable for an unconnected server)
 d-i   popularity-contest/participate              boolean     true
 
+## For CD/DVD case
+# Don't scan for additional CD/DVD
+d-i  apt-setup/cdrom/set-first                    boolean     false
+d-i  apt-setup/cdrom/set-double                   boolean     false
+d-i  apt-setup/cdrom/set-next                     boolean     false
+d-i  apt-setup/cdrom/set-failed                   boolean     false
+
 
 
 #####################################################################
diff --git a/preseed/debian/stretch/preseed_mate.cfg b/preseed/debian/stretch/preseed_mate.cfg
index 6c6170c..cbb9bf7 100644
--- a/preseed/debian/stretch/preseed_mate.cfg
+++ b/preseed/debian/stretch/preseed_mate.cfg
@@ -291,6 +291,13 @@ d-i   pkgsel/upgrade                              select      full-upgrade
 # Participate to Popularity Contest (disable for an unconnected server)
 d-i   popularity-contest/participate              boolean     true
 
+## For CD/DVD case
+# Don't scan for additional CD/DVD
+d-i  apt-setup/cdrom/set-first                    boolean     false
+d-i  apt-setup/cdrom/set-double                   boolean     false
+d-i  apt-setup/cdrom/set-next                     boolean     false
+d-i  apt-setup/cdrom/set-failed                   boolean     false
+
 
 
 #####################################################################