diff --git a/helpers/make-opendht b/helpers/make-opendht
index a93800e9a75ee390149199d256600f2275200fa4..f6a57361fe60add2e7ea81a490c2ea9d33f667cd 100644
--- a/helpers/make-opendht
+++ b/helpers/make-opendht
@@ -18,11 +18,11 @@
 #
 
 VERSION=1
-EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu bionic main universe'
+EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu cosmic main universe'
 REPOKEY=7638D0442B90D010
 
 . ./config
 
-changelog "Backported from bionic"
+changelog "Backported from cosmic"
 
 compile
diff --git a/helpers/make-ring b/helpers/make-ring
index 98ea8ae6b68c119d9379a75a230bb92faf2c05c4..065dca65899e8e0a481858348b3e7e18f575f4e5 100644
--- a/helpers/make-ring
+++ b/helpers/make-ring
@@ -32,11 +32,13 @@
 #   softhsm2
 
 VERSION=1
-EXTERNAL='deb-src http://ftp.us.debian.org/debian testing main'
-REPOKEY="04EE7237B7D453EC"
+EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu cosmic main universe'
+REPOKEY=7638D0442B90D010
 
 . ./config
 
-changelog "Backported from debian testing"
+sed 's/--disable-downloads/--disable-downloads --disable-nettle/' -i debian/rules
+
+changelog "Backported from cosmic"
 
 compile