diff --git a/create-gpgring.sh b/create-gpgring.sh
deleted file mode 100755
index eeeb4f9..0000000
--- a/create-gpgring.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-# syntax: $0 [-o <keyring outfile>] [--] <keyfiles...>
-
-# export a key from your keyring:
-# gpg -a --export --export-options export-minimal your@id
-
-set -e
-
-tmpdir=$(mktemp --tmpdir -d create-gpgring-XXXXXXX)
-trap 'rm -rf "${tmpdir}"' EXIT
-
-mygpg() {
-	gpg1 --homedir "${tmpdir}/.gnupg" --batch --no-tty --no-options --no-auto-check-trustdb --trustdb-name "${tmpdir}/trustdb.gpg" "$@"
-}
-
-unset INFILES
-INFILES=()
-
-OUTFILE=
-
-while [ $# -gt 0 ]; do
-	case "$1" in
-	-o)
-		shift
-		if [ $# -eq 0 ]; then
-			echo "Missing parameter value for -o" >&2
-			exit 2
-		fi
-		OUTFILE="$1"
-		;;
-	--)
-		shift
-		INFILES+=("$@")
-		shift $#
-		;;
-	-*)
-		echo "Uknown option: '$1'" >&2
-		exit 2
-		;;
-	*)
-		INFILES+=("$1")
-		;;
-	esac
-	shift || true
-done
-
-if [ -z "${OUTFILE}" -o "${OUTFILE}" = "-" ]; then
-	OUTFILE="${tmpdir}/stdout"
-fi
-
-if [ -z "${INFILES[*]}" -o "${INFILES[*]}" = "-" ]; then
-	INFILES=("${tmpdir}/stdin")
-	cat > "${INFILES[0]}"
-fi
-
-export HOME="${tmpdir}"
-
-KEYRING="${tmpdir}/keyring"
-
-mygpg --no-default-keyring --primary-keyring "${KEYRING}" --import -- "${INFILES[@]}"
-mygpg --no-default-keyring --primary-keyring "${KEYRING}" --list-keys
-
-mv "${KEYRING}" "${OUTFILE}"
-
-if [ -f "${tmpdir}/stdout" ]; then
-	cat "${tmpdir}/stdout"
-fi
diff --git a/refresh-obs-keys.sh b/refresh-obs-keys.sh
index bdcdbcb..d9a2c28 100755
--- a/refresh-obs-keys.sh
+++ b/refresh-obs-keys.sh
@@ -7,7 +7,7 @@ trap 'rm -rf "${tmpdir}"' EXIT
 
 self=`readlink -f "$0"`
 basedir=`dirname "${self}"`
-keyringdir="${basedir}/trusted.gpg.d"
+keydir="${basedir}/single-keys"
 
 cd "${tmpdir}"
 
@@ -18,12 +18,9 @@ obs_get() {
 	echo "Fetching key for ${proj}"
 	osc signkey --notravers "${proj}" > "public.key"
 
-	echo "Converting to keyring"
-	"${basedir}/create-gpgring.sh" -o "keyring.gpg" -- "public.key"
-
-	mv "keyring.gpg" "${target}"
+	mv "public.key" "${target}"
 }
 
-obs_get "home:stbuehler" "${keyringdir}/obs-home-stbuehler.gpg"
-obs_get "server:http" "${keyringdir}/obs-server-http.gpg"
-obs_get "openSUSE:Tools" "${keyringdir}/obs-openSUSE-Tools.gpg"
+obs_get "home:stbuehler" "${keydir}/obs-home-stbuehler.key"
+# obs_get "server:http" "${keydir}/obs-server-http.key"
+# obs_get "openSUSE:Tools" "${keydir}/obs-openSUSE-Tools.key"
diff --git a/single-keys/jenkins-lighttpd.net.key b/single-keys/jenkins-lighttpd.net.key
new file mode 100644
index 0000000..66e99c7
--- /dev/null
+++ b/single-keys/jenkins-lighttpd.net.key
@@ -0,0 +1,41 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFP7qd4BCADazNVw/aXuNXBbfTlOF1wBqPpkFZVACAsQXdWw6wTccF22yMJG
+6YT/U+4mgC5YDb/OhIfVC+Q0HtHO1ZFk1eFZ0LXBckdDLfD4VM48gqtWYdqnL1vX
+WLWl9XqkLYqo31AnnZIE8F3nWDV1fEV8RLDYzlATEIWMhviLQoFDLiMRv3gQUlJw
+ZLjzox4C5uitfVXn1f0VBDKp6XVhJ/hlUgIz0Viauw2fhviDCpQ1lPGS1NvYugbZ
+OO55pLj9MUtXGAQsDunXssKvNJZ7JgQMkhmrUKdiY0Y6fR48YV070qDrgiyWqaBF
+5dHW+nfWJSpy34CR1rvHM6MHyyn0M+2qsmcDABEBAAG0LEplbmtpbnMgKGF1dG9i
+dWlsZGVyKSA8amVua2luc0BsaWdodHRwZC5uZXQ+iQE4BBMBAgAiBQJT+6neAhsD
+BgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRBNzNqKx0Y169EPCACUcCbUsw33
+ZoiAC+zUbGn/p6sSpmKuyjIEfZeneAm8DFQ90g4RViEo0CVITealfg9a9Su/eK1W
+EbdcVIlAome4+gs09snaiG0RepOsldNs4hY/YNjEq8rzQnHl9AmmV7NFw27GRLvy
+W8FYT3HFVw/+HuJjN5X6dFbQ9NvNrWFQySTWHh8nKndsEEZvXFiASwEbJ3eKqWEN
+gljuMDZIMcPcgXlwG/7fc63EKqtT+ffjWzC2tyamlUlPtP6dAt7M22r1ukxbqR4C
+HooDIsiTOuCmR/XqsDOMi4dBHYEWU9CF9S0MKvjOgbR/v3Cw3XDxmQhmJLztPh7A
+7ygO2yGX+fG3iQIcBBABCAAGBQJT+6qfAAoJEODn0BcelbrXFTwP/jQh11Pu89+m
+5rLC8q8IoHhc7IryeBMeiW2i6i+wXecHFQZj6ZlKdm0Z4ZsN2mLaNo+bG+I70huM
+jU9suH5nba8R6kFhqNT5MdMsi0xayWTyMWdHb2EnOFvoVJNBm2I9lXk8Wy7L0gNI
+KcRbvxG7aT9ImQGvM5nkVafm6wdcr6EViDkJTG/m8epgYwzmHhubQho+O59VpAf/
+VQbLKqePhpWGmv2xlZt11WCQKOxitwIx+Ja5SqXCgM9wdyj5Kh1ho+DVwnhN9XL1
+GpHECZ7GE2eEHwqiLGvsOMzS5y6KlRJR+I6qU2OxTo1nkSSB3T0vYWstH6/yHZZu
+6NaFr6jI0gRFPbNRCglxL1E8tJCAg4MjTQqWJ9+/FPn+ZA8hwwL27U0Vsar/pOaA
+Ni165H/c/wz4jxoEGKHHkJfUyDwx0DLIq9qMW46/LGdvekOi1I2gcp2ieWjTiZ1U
+SysRGnPL0tsIqjAmh4UzfSQgwoiSZ0TAw/POnzLhUZilf0FSel3kPYfz89ehA/R9
+FZ+ovSoux5dU4xj4bISC8tREwZ/WzGgN4xjvYBBhuSr0hFgTNXSjHYISDxvTD4Nf
+HmYEOYdwv6DnYddBh/2waV6AIOXOb1tMWcheHfjp8aEJXd8M4a+iEoGcYoRms0Jx
+Gc1Ah83OasHud7C6foU/lpdQhKUvcRvZuQENBFP7qd4BCADYK9cP2I21kcjAJ9LK
+ONBFRhO/GaKi3cNCCASkP7vkLoy0vCo7ogElvSJVuT7SekwaiDrtbPhkR99Os+5+
+xfh4gjrb9XurOCrz6FW5YyUOJ/mQh9z7H6u/wDje2ESOjZSM794wKsHTlE5DB8kB
+UX6iux2PVTcijaMNjU4iNDWP3Hdyk7N1otGpUN8INzXV4WPY7/Ydwd5Ew5xwwdmM
+OciefcjghwAiPrexZuUz/hnaCfI4G1b2xXA/XM2XLkiAs89tNNH/8Jo5mB7Yhg7m
+V6ZVsmD0johkfqhGk5NBovxCdzZiT59KtNgr1UISj2aXj70htLvKlbRHdEti/eP6
+3GspABEBAAGJAR8EGAECAAkFAlP7qd4CGwwACgkQTczaisdGNeuU/ggAk6FhjrRE
++HF2RFMDZB0ERDhrjbNN7Yk31n4STqWwD098KIN3DxcentxzCGLLFNPjRV2Ur5kp
+/yM59ITDA/GoRWPvkmqpmiRzxYz0PlxsTXdl8BrnXjGuv+xg+4p/ajXWaKDZMcmg
+GZ/wlH+zac6BQW/uijsubc82L0/YyG4WymnBAqXVnyjkvcXwHVSlbYcZVzdGcHVL
+SGhv0EDQQD3hreYJJ/Os9sLXdOjPY/Cki/Rm71ixsRobTiCgnEbmtFoK+ktDn88w
+SZaPymcAv8jwMLWJ5zPCXZbYU+CNbZTVbG3adFxU7VcpWkPUIWG7giF4xh0hp8+D
+V48/wSdtr9KgSg==
+=GRsU
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/single-keys/jenkins.io.key b/single-keys/jenkins.io.key
new file mode 100644
index 0000000..bab880e
--- /dev/null
+++ b/single-keys/jenkins.io.key
@@ -0,0 +1,144 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQGiBEmFQG0RBACXScOxb6BTV6rQE/tcJopAEWsdvmE0jNIRWjDDzB7HovX6Anrq
+n7+Vq4spAReSFbBVaYiiOx2cGDymj2dyx2i9NAI/9/cQXJOU+RPdDzHVlO1Edksp
+5rKn0cGPWY5sLxRf8s/tO5oyKgwCVgTaB5a8gBHaoGms3nNC4YYf+lqlpwCgjbti
+3u1iMIx6Rs+dG0+xw1oi5FUD/2tLJMx7vCUQHhPRupeYFPoD8vWpcbGb5nHfHi4U
+8/x4qZspAIwvXtGw0UBHildGpqe9onp22Syadn/7JgMWhHoFw5Ke/rTMlxREL7pa
+TiXuagD2G84tjJ66oJP1FigslJzrnG61y85V7THL61OFqDg6IOP4onbsdqHby4VD
+zZj9A/9uQxIn5250AGLNpARStAcNPJNJbHOQuv0iF3vnG8uO7/oscB0TYb8/juxr
+hs9GdSN0U0BxENR+8KWy5lttpqLMKlKRknQYy34UstQiyFgAQ9Epncu9uIbVDgWt
+y7utnqXN033EyYkcWx5EhLAgHkC7wSzeSWABV3JSXN7CeeOif7QiS29oc3VrZSBL
+YXdhZ3VjaGkgPGtrQGtvaHN1a2Uub3JnPohjBBMRAgAjAhsDBgsJCAcDAgQVAggD
+BBYCAwECHgECF4AFAko/7vYCGQEACgkQm30y8tUFguabhgCgi54IQR4rpJZ/uUHe
+ZB879zUWTQwAniQDBO+Zly7Fsvm0Mcvqvl02UzxCiGAEExECACAFAkmFQG0CGwMG
+CwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRCbfTLy1QWC5qtXAJ9hPRisOhkexWXJ
+nXQMl9cOTvm4LgCdGint1TONoZ2I4JtOiFzOmeP3ju3RzcvNyQEQAAEBAAAAAAAA
+AAAAAAAA/9j/4AAQSkZJRgABAQEAYABgAAD/4QBgRXhpZgAASUkqAAgAAAAEADEB
+AgAZAAAAPgAAABBRAQABAAAAAUOQABFRBAABAAAAEgsAABJRBAABAAAAEgsAAAAA
+AABNYWNyb21lZGlhIEZpcmV3b3JrcyA0LjAAAP/bAEMACAYGBwYFCAcHBwkJCAoM
+FA0MCwsMGRITDxQdGh8eHRocHCAkLicgIiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0
+Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy
+MjIyMjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAK4AlgMBIgACEQEDEQH/xAAfAAAB
+BQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0B
+AgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygp
+KjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImK
+kpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj
+5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJ
+Cgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGh
+scEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZ
+WmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1
+tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEA
+AhEDEQA/APcBI/8Afb86XzH/AL7fnUYpwqRknmN/fP50u9v7x/OmCgUASb2/vH86
+Xe394/nTBS0AP3t/eP50u4+p/OmUopgO3H1NO3H1NR5xThQA7cfWlyfU0ylFMQ/J
+9aXPvTKdQAuaM0lLQAtJmiigAzRSdqKAKApwpopc1mUOpRSUopgKKWkFLQAueKzr
+zXbCwk2Tzxq3cFwK8v8Aih8V30aaTQ9DKtegYnuTyIvZR3b+VfP1/q17fzvLc3Ms
+sjHJZ2JJNGr2HZdT6j8U/FbR/DcKsM3VxLkpGh6AetcI37Ql4Zcx6LAYx2aUgmvD
+1ju7obgJHA7nmmmG4TqjDHtS+ZXL1sfVPhT4yeH/ABFNHaXYbS71zhVnYGNz6B+n
+4HFejK2RmvhJJSDiTj6ivYvht8XptE8rSPEEklxpxwkFyTue39j6p+op3a3Javsf
+RuacDVaC4juIUmhkWSKRQyspyGB7ipgasgfmlpoNLmgBaKSigBaKM0UAUBS0lKKz
+KFFLSUooAdWR4o1qLw/4bvtSmZVEMRK57t2H51rCvJPj7etD4WsbQMQJ7jkDuFBN
+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
+=fBn8
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/single-keys/microsoft.key b/single-keys/microsoft.key
new file mode 100644
index 0000000..6e319d4
--- /dev/null
+++ b/single-keys/microsoft.key
@@ -0,0 +1,19 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+mQENBFYxWIwBCADAKoZhZlJxGNGWzqV+1OG1xiQeoowKhssGAKvd+buXCGISZJwT
+LXZqIcIiLP7pqdcZWtE9bSc7yBY2MalDp9Liu0KekywQ6VVX1T72NPf5Ev6x6DLV
+7aVWsCzUAF+eb7DC9fPuFLEdxmOEYoPjzrQ7cCnSV4JQxAqhU4T6OjbvRazGl3ag
+OeizPXmRljMtUUttHQZnRhtlzkmwIrUivbfFPD+fEoHJ1+uIdfOzZX8/oKHKLe2j
+H632kvsNzJFlROVvGLYAk2WRcLu+RjjggixhwiB+Mu/A8Tf4V6b+YppS44q8EvVr
+M+QvY7LNSOffSO6Slsy9oisGTdfE39nC7pVRABEBAAG0N01pY3Jvc29mdCAoUmVs
+ZWFzZSBzaWduaW5nKSA8Z3Bnc2VjdXJpdHlAbWljcm9zb2Z0LmNvbT6JATUEEwEC
+AB8FAlYxWIwCGwMGCwkIBwMCBBUCCAMDFgIBAh4BAheAAAoJEOs+lK2+EinPGpsH
+/32vKy29Hg51H9dfFJMx0/a/F+5vKeCeVqimvyTM04C+XENNuSbYZ3eRPHGHFLqe
+MNGxsfb7C7ZxEeW7J/vSzRgHxm7ZvESisUYRFq2sgkJ+HFERNrqfci45bdhmrUsy
+7SWw9ybxdFOkuQoyKD3tBmiGfONQMlBaOMWdAsic965rvJsd5zYaZZFI1UwTkFXV
+KJt3bp3Ngn1vEYXwijGTa+FXz6GLHueJwF0I7ug34DgUkAFvAs8Hacr2DRYxL5RJ
+XdNgj4Jd2/g6T9InmWT0hASljur+dJnzNiNCkbn9KbX7J/qK1IbR8y560yRmFsU+
+NdCFTW7wY0Fb1fWJ+/KTsC4=
+=J6gs
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/single-keys/obs-home-stbuehler.key b/single-keys/obs-home-stbuehler.key
new file mode 100644
index 0000000..7eb2ace
--- /dev/null
+++ b/single-keys/obs-home-stbuehler.key
@@ -0,0 +1,21 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+mQENBFhKivUBCADK5d5wKS8o2UvVFpSkfic/kiqiYweviSwLmUSifcaMwVQ8Hm1W
+SXFpvX2CrQcGXzElk3LQYL17fZDDp5106tK/b3D8iOV9Ok0qAob98IbSYvQOFNWd
+RcOHfcwP2pzaWOEkDMpGQRHD+zTZM70f4IF3zR1nWIhSnroYVYGNzLoDMKDve7uo
+hDYZmvGifHGhbAmaJBwN0+FX5x6y7IFqqa0f1AGUTIgxKKUX2GrWE6Mu0/3KkW4B
+aUOukqjSm01G16xE8gNf9/REHLflzOV6Q2yyt5fZYpUgvSih3gN8H4vVX2hFD3sM
+gct04Ph8tGDspe7jMlfzH8055d5mN3G1mUrfABEBAAG0PmhvbWU6c3RidWVobGVy
+IE9CUyBQcm9qZWN0IDxob21lOnN0YnVlaGxlckBidWlsZC5vcGVuc3VzZS5vcmc+
+iQE+BBMBAgAoBQJYSor1AhsDBQkEHrAABgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIX
+gAAKCRCB29eT1l6HwF1QCAC1ZbClP9h3P8zsxaVIDBqvSzoy7gPA+aJYN630SJYZ
+QilN9xkxJjJFO1d7digLt4PaQwDEAM328BIg1KI6P/CVrre2SS2IPGZoIooYtckh
+vqGgallkNLXIC08HvOi5r9DyEhXNYYUl18F+I/WbGiAVRpxHuMH8ijWliuUMi4Rd
+HzrVzX+cPCS9IQxXfSx93D26HuDzVhEagCgclyR8k1jLFo4tTGLN3hkXDpjfrMBO
+f/z3sQd5J8DBSDm6n2EsyCd5ESJrb/z7ijDG/IsR4fjy++1d4aVO07vcilKiwSlr
+G6bg106xVyC/mH64erHlwXhQxuyvkMP/pQtWMN5FP/uFiEYEExECAAYFAlhKivUA
+CgkQOzARt2udZSN7/QCfY7uoV2hP5ZAQTmTyCf3RLhSHhhMAoI0SMrZzBjPOC0jt
+P9EF1GDKmaLS
+=/BbD
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/sources.list.d/jenkins-ci.org.list b/sources.list.d/jenkins-ci.org.list
deleted file mode 100644
index 5d28261..0000000
--- a/sources.list.d/jenkins-ci.org.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://pkg.jenkins-ci.org/debian binary/
diff --git a/sources.list.d/jenkins.io.sources b/sources.list.d/jenkins.io.sources
new file mode 100644
index 0000000..3bb2b18
--- /dev/null
+++ b/sources.list.d/jenkins.io.sources
@@ -0,0 +1,4 @@
+Types: deb
+URIs: https://pkg.jenkins.io/debian
+Suites: binary/
+Signed-By: /etc/apt/single-keys/jenkins.io.key
diff --git a/sources.list.d/lighttpd2-stretch-nightlies.list b/sources.list.d/lighttpd2-stretch-nightlies.list
deleted file mode 100644
index 2961c91..0000000
--- a/sources.list.d/lighttpd2-stretch-nightlies.list
+++ /dev/null
@@ -1,5 +0,0 @@
-deb http://debian.lighttpd.net/lighttpd2-nightlies stretch main
-deb http://debian.lighttpd.net/lighttpd2 stretch main
-
-# deb http://debian.lighttpd.net/lighttpd-utils-nightlies stretch main
-deb http://debian.lighttpd.net/lighttpd-utils stretch main
diff --git a/sources.list.d/lighttpd2-stretch-nightlies.sources b/sources.list.d/lighttpd2-stretch-nightlies.sources
new file mode 100644
index 0000000..de8ddb7
--- /dev/null
+++ b/sources.list.d/lighttpd2-stretch-nightlies.sources
@@ -0,0 +1,24 @@
+Types: deb
+URIs: http://debian.lighttpd.net/lighttpd2-nightlies
+Suites: stretch
+Components: main
+Signed-By: /etc/apt/single-keys/jenkins-lighttpd.net.key
+
+Types: deb
+URIs: http://debian.lighttpd.net/lighttpd2
+Suites: stretch
+Components: main
+Signed-By: /etc/apt/single-keys/jenkins-lighttpd.net.key
+
+Types: deb
+URIs: http://debian.lighttpd.net/lighttpd-utils-nightlies
+Suites: stretch
+Components: main
+Signed-By: /etc/apt/single-keys/jenkins-lighttpd.net.key
+Enabled: no
+
+Types: deb
+URIs: http://debian.lighttpd.net/lighttpd-utils
+Suites: stretch
+Components: main
+Signed-By: /etc/apt/single-keys/jenkins-lighttpd.net.key
diff --git a/sources.list.d/lighttpd2-stretch.list b/sources.list.d/lighttpd2-stretch.list
deleted file mode 100644
index e6d97d3..0000000
--- a/sources.list.d/lighttpd2-stretch.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://debian.lighttpd.net/lighttpd2 stretch main
-deb http://debian.lighttpd.net/lighttpd-utils stretch main
diff --git a/sources.list.d/lighttpd2-stretch.sources b/sources.list.d/lighttpd2-stretch.sources
new file mode 100644
index 0000000..3aa31a8
--- /dev/null
+++ b/sources.list.d/lighttpd2-stretch.sources
@@ -0,0 +1,11 @@
+Types: deb
+URIs: http://debian.lighttpd.net/lighttpd2
+Suites: stretch
+Components: main
+Signed-By: /etc/apt/single-keys/jenkins-lighttpd.net.key
+
+Types: deb
+URIs: http://debian.lighttpd.net/lighttpd-utils
+Suites: stretch
+Components: main
+Signed-By: /etc/apt/single-keys/jenkins-lighttpd.net.key
diff --git a/sources.list.d/microsoft-vscode.list b/sources.list.d/microsoft-vscode.list
deleted file mode 100644
index 3efeab3..0000000
--- a/sources.list.d/microsoft-vscode.list
+++ /dev/null
@@ -1 +0,0 @@
-deb [arch=amd64] https://packages.microsoft.com/repos/vscode stable main
diff --git a/sources.list.d/microsoft-vscode.sources b/sources.list.d/microsoft-vscode.sources
new file mode 100644
index 0000000..6f71ce2
--- /dev/null
+++ b/sources.list.d/microsoft-vscode.sources
@@ -0,0 +1,6 @@
+Types: deb
+URIs: https://packages.microsoft.com/repos/vscode
+Suites: stable
+Components: main
+Architectures: amd64
+Signed-By: /etc/apt/single-keys/microsoft.key
diff --git a/sources.list.d/obs-home-stbuehler-09-stretch.list b/sources.list.d/obs-home-stbuehler-09-stretch.list
deleted file mode 100644
index 9958a6f..0000000
--- a/sources.list.d/obs-home-stbuehler-09-stretch.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://download.opensuse.org/repositories/home:/stbuehler/Debian_9.0 ./
diff --git a/sources.list.d/obs-home-stbuehler-09-stretch.sources b/sources.list.d/obs-home-stbuehler-09-stretch.sources
new file mode 100644
index 0000000..041a257
--- /dev/null
+++ b/sources.list.d/obs-home-stbuehler-09-stretch.sources
@@ -0,0 +1,4 @@
+Types: deb
+URIs: http://download.opensuse.org/repositories/home:/stbuehler/Debian_9.0
+Suites: ./
+Signed-By: /etc/apt/single-keys/obs-home-stbuehler.key
diff --git a/sources.list.d/obs-home-stbuehler-gdbgui-09-stretch.list b/sources.list.d/obs-home-stbuehler-gdbgui-09-stretch.list
deleted file mode 100644
index 617b601..0000000
--- a/sources.list.d/obs-home-stbuehler-gdbgui-09-stretch.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://download.opensuse.org/repositories/home:/stbuehler:/gdbgui/Debian_9.0 ./
diff --git a/sources.list.d/obs-home-stbuehler-gdbgui-09-stretch.sources b/sources.list.d/obs-home-stbuehler-gdbgui-09-stretch.sources
new file mode 100644
index 0000000..1efbef9
--- /dev/null
+++ b/sources.list.d/obs-home-stbuehler-gdbgui-09-stretch.sources
@@ -0,0 +1,4 @@
+Types: deb
+URIs: http://download.opensuse.org/repositories/home:/stbuehler:/gdbgui/Debian_9.0
+Suites: ./
+Signed-By: /etc/apt/single-keys/obs-home-stbuehler.key
diff --git a/trusted.gpg.d/jenkins-ci.org.gpg b/trusted.gpg.d/jenkins-ci.org.gpg
deleted file mode 100644
index c14e43b..0000000
Binary files a/trusted.gpg.d/jenkins-ci.org.gpg and /dev/null differ
diff --git a/trusted.gpg.d/jenkins-lighttpd.net.gpg b/trusted.gpg.d/jenkins-lighttpd.net.gpg
deleted file mode 100644
index 31e4f34..0000000
Binary files a/trusted.gpg.d/jenkins-lighttpd.net.gpg and /dev/null differ
diff --git a/trusted.gpg.d/microsoft.gpg b/trusted.gpg.d/microsoft.gpg
deleted file mode 100644
index 0cffae0..0000000
Binary files a/trusted.gpg.d/microsoft.gpg and /dev/null differ
diff --git a/trusted.gpg.d/obs-home-stbuehler.gpg b/trusted.gpg.d/obs-home-stbuehler.gpg
deleted file mode 100644
index 8423ddb..0000000
Binary files a/trusted.gpg.d/obs-home-stbuehler.gpg and /dev/null differ
diff --git a/trusted.gpg.d/stbuehler.de.gpg b/trusted.gpg.d/stbuehler.de.gpg
deleted file mode 100644
index 79dfc37..0000000
Binary files a/trusted.gpg.d/stbuehler.de.gpg and /dev/null differ