diff --git a/sources.list.d/lighttpd2-jessie-nightlies.list b/sources.list.d/lighttpd2-jessie-nightlies.list
new file mode 100644
index 0000000..49a2386
--- /dev/null
+++ b/sources.list.d/lighttpd2-jessie-nightlies.list
@@ -0,0 +1,4 @@
+deb http://debian.lighttpd.net/lighttpd2-nightlies jessie main
+deb http://debian.lighttpd.net/lighttpd2 jessie main
+
+deb http://download.opensuse.org/repositories/home:/stbuehler:/lighttpd-utils/Debian_8.0 ./
diff --git a/sources.list.d/lighttpd2-jessie.list b/sources.list.d/lighttpd2-jessie.list
index 3d484e3..ccd0f7d 100644
--- a/sources.list.d/lighttpd2-jessie.list
+++ b/sources.list.d/lighttpd2-jessie.list
@@ -3,7 +3,4 @@
 
 deb http://debian.lighttpd.net/lighttpd2 jessie main
 
-## there should be no need for nightly helpers
-## deb http://download.opensuse.org/repositories/home:/stbuehler:/lighttpd2-nightlies/Debian_8.0 ./
-
-deb http://download.opensuse.org/repositories/home:/stbuehler:/lighttpd2/Debian_8.0 ./
+deb http://download.opensuse.org/repositories/home:/stbuehler:/lighttpd-utils/Debian_8.0 ./
diff --git a/sources.list.d/lighttpd2-stretch-nightlies.list b/sources.list.d/lighttpd2-stretch-nightlies.list
new file mode 100644
index 0000000..09f608c
--- /dev/null
+++ b/sources.list.d/lighttpd2-stretch-nightlies.list
@@ -0,0 +1,5 @@
+deb http://debian.lighttpd.net/lighttpd2-nightlies stretch main
+deb http://debian.lighttpd.net/lighttpd2 stretch main
+
+# use helpers from debian 8 (jessie)
+deb http://download.opensuse.org/repositories/home:/stbuehler:/lighttpd-utils/Debian_8.0 ./
diff --git a/sources.list.d/lighttpd2-stretch.list b/sources.list.d/lighttpd2-stretch.list
index 92a1da1..7c18257 100644
--- a/sources.list.d/lighttpd2-stretch.list
+++ b/sources.list.d/lighttpd2-stretch.list
@@ -3,8 +3,5 @@
 
 deb http://debian.lighttpd.net/lighttpd2 stretch main
 
-## there should be no need for nightly helpers
-## deb http://download.opensuse.org/repositories/home:/stbuehler:/lighttpd2-nightlies/Debian_8.0 ./
-
 # use helpers from debian 8 (jessie)
-deb http://download.opensuse.org/repositories/home:/stbuehler:/lighttpd2/Debian_8.0 ./
+deb http://download.opensuse.org/repositories/home:/stbuehler:/lighttpd-utils/Debian_8.0 ./