diff --git a/iso/installer/install.sh b/iso/installer/install.sh
index 01a999ec..656eed9c 100755
--- a/iso/installer/install.sh
+++ b/iso/installer/install.sh
@@ -7,7 +7,7 @@
 
 myLSB=$(lsb_release -r | awk '{ print $2 }')
 myLSB_STABLE_SUPPORTED="9.6"
-myLSB_TESTING_SUPPORTED="testing"
+myLSB_TESTING_SUPPORTED="unstable"
 myINFO="\
 ##########################################
 ### T-Pot Installer for Debian testing ###
@@ -132,15 +132,20 @@ export DEBIAN_FRONTEND=noninteractive
 apt-get -y update
 apt-get -y install libpq-dev software-properties-common
 #add-apt-repository "deb http://ftp.debian.org/debian testing main contrib non-free"
+#tee /etc/apt/sources.list 2>&1>/dev/null <<EOF
+#deb http://deb.debian.org/debian testing main contrib non-free
+#deb-src http://deb.debian.org/debian testing main contrib non-free
+#
+#deb http://deb.debian.org/debian testing-updates main contrib non-free
+#deb-src http://deb.debian.org/debian testing-updates main contrib non-free
+#
+#deb http://security.debian.org/debian-security/ testing/updates main contrib non-free
+#deb-src http://security.debian.org/debian-security/ testing/updates main contrib non-free
+#EOF
+
 tee /etc/apt/sources.list 2>&1>/dev/null <<EOF
-deb http://deb.debian.org/debian testing main contrib non-free
-deb-src http://deb.debian.org/debian testing main contrib non-free
-
-deb http://deb.debian.org/debian testing-updates main contrib non-free
-deb-src http://deb.debian.org/debian testing-updates main contrib non-free
-
-deb http://security.debian.org/debian-security/ testing/updates main contrib non-free
-deb-src http://security.debian.org/debian-security/ testing/updates main contrib non-free
+deb http://deb.debian.org/debian unstable main contrib non-free
+deb-src http://deb.debian.org/debian unstable main contrib non-free
 EOF
 
 echo
diff --git a/iso/preseed/tpot.seed b/iso/preseed/tpot.seed
index 9ee026f3..0196e60e 100755
--- a/iso/preseed/tpot.seed
+++ b/iso/preseed/tpot.seed
@@ -78,7 +78,8 @@ d-i mirror/http/proxy string
 ###################
 # Suite to install
 ###################
-d-i mirror/suite string testing
+d-i mirror/suite string unstable
+#d-i mirror/suite string testing
 #d-i mirror/udeb/suite string testing
 
 ###########################
@@ -94,7 +95,7 @@ d-i lilo-installer/skip boolean true
 ######################
 ### Time Configuration
 ######################
-##d-i time/zone string Europe/Berlin
+#d-i time/zone string Europe/Berlin
 d-i clock-setup/utc boolean true
 d-i time/zone string UTC
 d-i clock-setup/ntp boolean true