diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a5eccfe46b04c236f9272d1d5926fab5abd59fc3..678eb4f46dd70f11b5d5b7541f6ddd459fb6959a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -252,9 +252,9 @@ publish:unstable-repo:
 #
 
 # Upgrade the latest stable Aegir to our unstable repo.
-upgradetest:debian-jessie-aegir3-apt-upgrade:
+upgradetest:debian-stretch-aegir3-apt-upgrade:
   stage: upgradetest
-  image: debian:jessie
+  image: debian:stretch
   dependencies:
     - publish:unstable-repo
 
@@ -271,7 +271,7 @@ upgradetest:debian-jessie-aegir3-apt-upgrade:
     - apt-get install --yes sudo curl cron
 
   script:
-    - "scripts/ci-aegir-stable-install-apt-debian8.sh"
+    - "scripts/ci-aegir-stable-install-apt-debian9.sh"
     # extra step to run the task queue.
     - sudo su aegir --login --command 'drush @hostmaster php-eval "echo hosting_task_count();"'
     - sudo su aegir --login --command 'drush @hostmaster hosting-tasks --force'
@@ -283,6 +283,6 @@ upgradetest:debian-jessie-aegir3-apt-upgrade:
     - sudo su aegir --login --command 'drush @hostmaster php-eval "echo hosting_task_count_running();"'
     # upgrade to the latest version from the unstable repo.
     - rm -v /etc/apt/sources.list.d/aegir-stable.list
-    - echo "deb http://debian.aegirproject.org unstable main" | sudo tee -a /etc/apt/sources.list.d/aegir-unstable.list
+    - echo "deb [signed-by=/usr/share/keyrings/aegir-archive-keyring.gpg] http://debian.aegirproject.org unstable main" | sudo tee -a /etc/apt/sources.list.d/aegir-unstable.list
     - sudo apt-get update
     - sudo apt-get --yes dist-upgrade
diff --git a/debian/aegir3-cluster-slave.examples b/debian/aegir3-cluster-slave.examples
deleted file mode 100644
index 4ce4ab07222824f85081636c89ff5a1a71fce8fe..0000000000000000000000000000000000000000
--- a/debian/aegir3-cluster-slave.examples
+++ /dev/null
@@ -1 +0,0 @@
-example.sudoers
diff --git a/debian/control b/debian/control
index e8254340b2c3237d90440bd2d5bb4634541e3d9f..3dd4ca07d79d43f2ebab9ecff746cab4093c94ef 100644
--- a/debian/control
+++ b/debian/control
@@ -69,7 +69,7 @@ Description: mass Drupal hosting system
 
 Package: aegir3-cluster-slave
 Architecture: all
-Depends: ${misc:Depends}, php5-mysql | php7.0-mysql | php7.1-mysql | php7.2-mysql | php-mysql, sudo, apache2, adduser, ucf, libapache2-mod-php5 | libapache2-mod-php7.0 | libapache2-mod-php7.1 | libapache2-mod-php7.2 | libapache2-mod-php, rsync, nfs-client, mysql-client
+Depends: ${misc:Depends}, php5-mysql | php7.0-mysql | php7.1-mysql | php7.2-mysql | php-mysql, sudo, apache2, adduser, ucf, libapache2-mod-php5 | libapache2-mod-php7.0 | libapache2-mod-php7.1 | libapache2-mod-php7.2 | libapache2-mod-php, rsync, nfs-client, mysql-client, aegir3-provision
 Recommends: php5-gd | php7.0-gd | php7.1-gd | php7.2-gd, php5 | php7.0 | php7.1 | php7.2 | php
 Conflicts: aegir-cluster-slave, aegir-cluster-slave2, aegir2-cluster-slave, aegir3
 Replaces: aegir-cluster-slave, aegir-cluster-slave2, aegir2-cluster-slave
diff --git a/scripts/ci-aegir-stable-install-apt-debian10.sh b/scripts/ci-aegir-stable-install-apt-debian10.sh
index 3fc790c94a926bc354eea6bc889e08c18ff0965d..280b209f6d7ca6fc18dad7d627be8d168d711cd8 100644
--- a/scripts/ci-aegir-stable-install-apt-debian10.sh
+++ b/scripts/ci-aegir-stable-install-apt-debian10.sh
@@ -17,12 +17,11 @@ sudo apt-get install --yes mariadb-server
 sudo /usr/bin/mysql -e "GRANT ALL ON *.* TO 'aegir_root'@'localhost' IDENTIFIED BY 'PASSWORD' WITH GRANT OPTION"
 
 
-debconf-set-selections <<EOF
+sudo debconf-set-selections <<EOF
 aegir3-hostmaster aegir/email string  aegir@example.com
 aegir3-hostmaster aegir/site  string  aegir.example.com
 postfix postfix/main_mailer_type select Local only
 
 EOF
 
-
 sudo DPKG_DEBUG=developer apt-get install --yes aegir3
diff --git a/scripts/ci-aegir-stable-install-apt-debian9.sh b/scripts/ci-aegir-stable-install-apt-debian9.sh
index f5b6ee4e65c6978368eb727b96c0ea73e5a7f1cd..b56db0be6b2fe5e084219e4fe9cfe0a6a18ff0b7 100755
--- a/scripts/ci-aegir-stable-install-apt-debian9.sh
+++ b/scripts/ci-aegir-stable-install-apt-debian9.sh
@@ -5,10 +5,10 @@
 #
 
 
-sudo apt-get install --yes curl
+sudo apt-get install --yes wget apt-transport-https
 
-echo "deb http://debian.aegirproject.org stable main" | sudo tee -a /etc/apt/sources.list.d/aegir-stable.list
-curl https://debian.aegirproject.org/key.asc | sudo apt-key add -
+sudo wget -O /usr/share/keyrings/aegir-archive-keyring.gpg https://debian.aegirproject.org/aegir-archive-keyring.gpg
+echo "deb [signed-by=/usr/share/keyrings/aegir-archive-keyring.gpg] https://debian.aegirproject.org stable main" | sudo tee -a /etc/apt/sources.list.d/aegir-stable.list
 sudo apt-get update
 echo "debconf debconf/frontend select Noninteractive" | sudo debconf-set-selections
 
@@ -29,5 +29,3 @@ postfix postfix/main_mailer_type select Local only
 EOF
 
 sudo DPKG_DEBUG=developer apt-get install --yes aegir3
-
-