diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c0c8185..7f93a15 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,6 +5,7 @@
 
 variables:
   DEBIAN_VERSION: jessie-20170723
+  DEVUAN_SUITE: jessie
   TZ: UTC
   LC_ALL: C
 
diff --git a/bootstrap.sh b/bootstrap.sh
index 4a3cda6..b96ebd4 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -11,11 +11,12 @@ apt-get update
 apt-get install debootstrap -q -y
 
 rootfs=$PWD/rootfs
+suite=$1
 
 debootstrap \
     --force-check-gpg \
     --no-merged-usr \
-    --variant=minbase jessie $rootfs
+    --variant=minbase $suite $rootfs
 
 mount -t devpts devpts $rootfs/dev/pts
 
diff --git a/build.sh b/build.sh
index cdea0dd..ad8b736 100755
--- a/build.sh
+++ b/build.sh
@@ -5,6 +5,7 @@
 # License: GPL-3.0+
 
 MIGRATED_IMAGE=$CI_REGISTRY_IMAGE/debian-$DEBIAN_VERSION/migrated
+SUITE=$DEVUAN_SUITE
 
 rm -rf rootfs || true
 
@@ -13,7 +14,7 @@ docker run --rm \
        --cap-add SYS_ADMIN \
        --volume $PWD:/devuan \
        --workdir /devuan \
-       $MIGRATED_IMAGE ./bootstrap.sh
+       $MIGRATED_IMAGE ./bootstrap.sh $SUITE
 
 IMAGE=$CI_REGISTRY_IMAGE
 STAMP=$(date +%F)
@@ -27,7 +28,7 @@ EOF
 docker build -t $IMAGE:$STAMP .
 
 docker push $IMAGE:$STAMP
-docker tag  $IMAGE:$STAMP $IMAGE:jessie
-docker push $IMAGE:jessie
-docker tag  $IMAGE:jessie $IMAGE
+docker tag  $IMAGE:$STAMP $IMAGE:$SUITE
+docker push $IMAGE:$SUITE
+docker tag  $IMAGE:$SUITE $IMAGE
 docker push $IMAGE
diff --git a/derive.sh b/derive.sh
index 7900663..da9d53e 100755
--- a/derive.sh
+++ b/derive.sh
@@ -4,7 +4,8 @@
 #
 # License: GPL-3.0+
 
-BASE_IMAGE=$CI_REGISTRY_IMAGE:jessie
+SUITE=$DEVUAN_SUITE
+BASE_IMAGE=$CI_REGISTRY_IMAGE:$SUITE
 
 IMAGE=$CI_REGISTRY_IMAGE/builder
 STAMP=$(date +%F)
@@ -15,7 +16,7 @@ docker build \
        --file $(basename $IMAGE).df .
 
 docker push $IMAGE:$STAMP
-docker tag  $IMAGE:$STAMP $IMAGE:jessie
-docker push $IMAGE:jessie
-docker tag  $IMAGE:jessie $IMAGE
+docker tag  $IMAGE:$STAMP $IMAGE:$SUITE
+docker push $IMAGE:$SUITE
+docker tag  $IMAGE:$SUITE $IMAGE
 docker push $IMAGE
diff --git a/migrate.df b/migrate.df
index 0cd5c89..437708d 100644
--- a/migrate.df
+++ b/migrate.df
@@ -9,10 +9,11 @@ LABEL maintainer="Olaf Meeuwissen <paddy-hack@member.fsf.org>"
 
 COPY ./repository@devuan.org.asc /tmp/
 
+ARG SUITE
 RUN url=http://auto.mirror.devuan.org/merged \
-    && echo "deb $url jessie          main" >  /etc/apt/sources.list \
-    && echo "deb $url jessie-updates  main" >> /etc/apt/sources.list \
-    && echo "deb $url jessie-security main" >> /etc/apt/sources.list \
+    && echo "deb $url $SUITE          main" >  /etc/apt/sources.list \
+    && echo "deb $url $SUITE-updates  main" >> /etc/apt/sources.list \
+    && echo "deb $url $SUITE-security main" >> /etc/apt/sources.list \
     && find /etc/apt/sources.list.d -type f -delete \
     && apt-key add /tmp/repository@devuan.org.asc \
     && apt-get update -q \
diff --git a/migrate.sh b/migrate.sh
index c222635..b2c67e1 100755
--- a/migrate.sh
+++ b/migrate.sh
@@ -10,6 +10,7 @@ STAMP=$(date +%F)
 docker pull $IMAGE || true
 docker build \
        --build-arg VERSION=$DEBIAN_VERSION \
+       --build-arg SUITE=$DEVUAN_SUITE \
        --tag $IMAGE:$STAMP \
        --file migrate.df .