diff --git a/helpers/make-filteraudio b/helpers/make-libtoxcore
similarity index 83%
rename from helpers/make-filteraudio
rename to helpers/make-libtoxcore
index 6e88ad2..b1fd0e2 100644
--- a/helpers/make-filteraudio
+++ b/helpers/make-libtoxcore
@@ -16,11 +16,11 @@
 #    along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 VERSION=1
-EXTERNAL='deb-src http://ppa.launchpad.net/i2p.packages/i2p/ubuntu $UPSTREAM main'
-REPOKEY=D1386E5F3FC3365C
+EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu disco main universe'
+REPOKEY=7638D0442B90D010
 
 . ./config
 
-changelog "Bring Tox to Trisquel from PPA"
+changelog "Bring Tox to Trisquel from disco"
 
 compile
diff --git a/helpers/make-qtox b/helpers/make-qtox
index 6e88ad2..b1fd0e2 100644
--- a/helpers/make-qtox
+++ b/helpers/make-qtox
@@ -16,11 +16,11 @@
 #    along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 VERSION=1
-EXTERNAL='deb-src http://ppa.launchpad.net/i2p.packages/i2p/ubuntu $UPSTREAM main'
-REPOKEY=D1386E5F3FC3365C
+EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu disco main universe'
+REPOKEY=7638D0442B90D010
 
 . ./config
 
-changelog "Bring Tox to Trisquel from PPA"
+changelog "Bring Tox to Trisquel from disco"
 
 compile
diff --git a/helpers/make-toxcore b/helpers/make-toxcore
deleted file mode 100644
index 646ac85..0000000
--- a/helpers/make-toxcore
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-#    Copyright (C) 2015 fr33domlover <fr33domlover@riseup.net>
-#
-#    This program is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation; either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-VERSION=1
-EXTERNAL='deb-src http://ppa.launchpad.net/i2p.packages/i2p/ubuntu $UPSTREAM main'
-REPOKEY="D1386E5F3FC3365C"
-
-. ./config
-
-changelog "Bring Tox to Trisquel from PPA"
-
-compile
diff --git a/helpers/make-toxic b/helpers/make-toxic
deleted file mode 100644
index 646ac85..0000000
--- a/helpers/make-toxic
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-#    Copyright (C) 2015 fr33domlover <fr33domlover@riseup.net>
-#
-#    This program is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation; either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-VERSION=1
-EXTERNAL='deb-src http://ppa.launchpad.net/i2p.packages/i2p/ubuntu $UPSTREAM main'
-REPOKEY="D1386E5F3FC3365C"
-
-. ./config
-
-changelog "Bring Tox to Trisquel from PPA"
-
-compile
diff --git a/helpers/make-utox b/helpers/make-utox
index 646ac85..b1fd0e2 100644
--- a/helpers/make-utox
+++ b/helpers/make-utox
@@ -16,11 +16,11 @@
 #    along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 VERSION=1
-EXTERNAL='deb-src http://ppa.launchpad.net/i2p.packages/i2p/ubuntu $UPSTREAM main'
-REPOKEY="D1386E5F3FC3365C"
+EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu disco main universe'
+REPOKEY=7638D0442B90D010
 
 . ./config
 
-changelog "Bring Tox to Trisquel from PPA"
+changelog "Bring Tox to Trisquel from disco"
 
 compile