diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b59b583fa232504bb9615a2c2dcd9b0e16c36451..5600c41e5c5e572bc403afc63a56d0a9bc91bdaa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -137,6 +137,23 @@ test:ubuntu-artful-aegir3-apt:
 
   script: "scripts/ci-aegir-dev-install-apt-ubuntu-artful.sh"
 
+
+test:debian-stretch-aegir3-cluster-slave-apt:
+  stage: test
+  image: debian:stretch
+  allow_failure: false
+  dependencies:
+    - build:deb
+
+  before_script:
+    - apt-get update
+    # Avoid ERROR: invoke-rc.d: policy-rc.d denied execution of start.
+    - echo "#!/bin/sh" > /usr/sbin/policy-rc.d
+    - echo "exit 0" >> /usr/sbin/policy-rc.d
+    - apt-get install --yes sudo curl
+
+  script: "scripts/ci-aegir-dev-install-apt-debian9-cluster-slave.sh"
+
 test:behat:
   stage: test
   image: aegir/hostmaster:packaging_base
diff --git a/debian/aegir3-cluster-slave.postinst b/debian/aegir3-cluster-slave.postinst
index 448e31ad8b52dfd9516e5b2bd93cef46b699084a..840e2428c9d9f47c69ead0e7c1ee5ce3777cde1d 100644
--- a/debian/aegir3-cluster-slave.postinst
+++ b/debian/aegir3-cluster-slave.postinst
@@ -41,7 +41,7 @@ case "$1" in
         adduser --quiet aegir www-data
 
         if [ -d /etc/sudoers.d ]; then
-            ucf --debconf-ok /usr/share/doc/aegir-cluster-slave2/examples/example.sudoers /etc/sudoers.d/aegir
+            ucf --debconf-ok /usr/share/doc/aegir3-cluster-slave/examples/example.sudoers /etc/sudoers.d/aegir
             ucfr aegir-provision /etc/sudoers.d/aegir
             chmod 440 /etc/sudoers.d/aegir
         else
@@ -54,7 +54,14 @@ case "$1" in
         # make sure we have apache configs settled in, for remote headless aegir servers
         touch $VARLIB/config/apache.conf
         chown aegir:aegir "$VARLIB/config/apache.conf"
-        ln -sf $VARLIB/config/apache.conf /etc/apache2/conf.d/aegir.conf
+        if [ -d /etc/apache2/conf-enabled ]; then
+            # Apache 2.4
+            ln -sf $VARLIB/config/apache.conf /etc/apache2/conf-enabled/aegir.conf
+        else
+            # Apache 2.2
+            ln -sf $VARLIB/config/apache.conf /etc/apache2/conf.d/aegir.conf
+        fi
+
         a2enmod ssl rewrite
         apache2ctl graceful
 
diff --git a/debian/control b/debian/control
index af4f11d8238ca379715aa27c17899eaffe49a4c1..1e86f42eac1b833c36637f11a8c235e9e4b96312 100644
--- a/debian/control
+++ b/debian/control
@@ -73,7 +73,7 @@ Depends: ${misc:Depends}, php5-mysql | php7.0-mysql | php7.1-mysql, sudo, apache
 Recommends: php5-gd | php7.0-gd | php7.1-gd, php5 | php7.0 | php7.1
 Conflicts: aegir-cluster-slave, aegir-cluster-slave2, aegir2-cluster-slave, aegir3
 Replaces: aegir-cluster-slave, aegir-cluster-slave2, aegir2-cluster-slave
-Description: web frontend for the Aegir hosting system
+Description: mass Drupal hosting system - slave backend
  Configuration of lightweight slave servers for the Aegir "pack"
  clustering system.
  .
diff --git a/scripts/ci-aegir-dev-install-apt-debian9-cluster-slave.sh b/scripts/ci-aegir-dev-install-apt-debian9-cluster-slave.sh
new file mode 100755
index 0000000000000000000000000000000000000000..741cfbd48558a84b65af28743d60aa99934b3a7a
--- /dev/null
+++ b/scripts/ci-aegir-dev-install-apt-debian9-cluster-slave.sh
@@ -0,0 +1,38 @@
+#
+# Install Aegir debian packages located in the 'build/' directory.
+# These are provided by the GitLab CI build stage.
+#
+# This script is tuned for Debian 9 - Stretch.
+#
+
+echo "[CI] Updating APT"
+sudo apt-get update
+
+echo "[CI] Setting debconf settings"
+echo "debconf debconf/frontend select Noninteractive" | sudo debconf-set-selections
+
+
+sudo debconf-set-selections <<EOF
+aegir3-hostmaster aegir/db_password string PASSWORD
+aegir3-hostmaster aegir/db_password seen  true
+aegir3-hostmaster aegir/db_user string aegir_root
+aegir3-hostmaster aegir/db_host string localhost
+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
+
+set -x
+echo "[CI] Pre-installing dependencies"
+sudo apt-get install --yes php7.0-mysql php7.0-cli
+
+
+echo "[CI] Installing .deb files .. will fail on missing packages"
+sudo DPKG_DEBUG=developer dpkg --install build/aegir3-cluster-slave_*.deb
+
+echo "[CI] Installing remaining packages and configuring our debs"
+sudo apt-get install --fix-broken --yes
+
+
+