diff --git a/auto/config b/auto/config
index 787d051..1989619 100755
--- a/auto/config
+++ b/auto/config
@@ -18,6 +18,13 @@ else
   echo "Using flavor: $FLAVOR"
 fi
 
+if [ -z "$SUITE" ]; then
+  SUITE="amber"
+  echo "Using default suite: $SUITE"
+else
+  echo "Using suite: $SUITE"
+fi
+
 UI_TYPE=$(echo $FLAVOR | cut -f1 -d-)
 IMAGE_TYPE=$(echo $FLAVOR | cut -f2 -d-)
 
@@ -26,27 +33,36 @@ CURRENT_DATE=$(date +%Y%m%d)
 export SOURCE_DATE_EPOCH=$(date +%s)
 
 # repository URL
-PUREOS_REPO="https://repo.pureos.net/pureos"
+PUREOS_REPO="https://repo.pureos.net/pureos/"
 
 # current architecture
 arch=$(dpkg --print-architecture)
 
 # options
 lb_opts=""
-dist="amber"
-dist_version="8.0"
 dist_reltag=""
 
+case "$SUITE" in
+  amber)
+    dist_version="8"
+    lb_opts="$lb_opts --security true --updates true"
+  ;;
+  *)
+    echo "WARNING: Suite $SUITE is unknown" >&2
+    dist_version="0.0"
+  ;;
+esac
 VERSION_PRETTY=$dist_version
 
+
 # live-build doesn't work if --parent-debian-distribution is unknown of
 # debian-cd => we have to put a symlink so that it deals with Tanglu like jessie/sid
-if [ ! -e "/usr/share/live/build/data/debian-cd/$dist" ]; then
+if [ ! -e "/usr/share/live/build/data/debian-cd/$SUITE" ]; then
   if [ -w /usr/share/live/build/data/debian-cd ]; then
-    ln -sf sid "/usr/share/live/build/data/debian-cd/$dist"
+    ln -sf sid "/usr/share/live/build/data/debian-cd/$SUITE"
   else
     echo "ERROR: Run this first:"
-    echo "ln -sf sid /usr/share/live/build/data/debian-cd/$dist"
+    echo "ln -sf sid /usr/share/live/build/data/debian-cd/$SUITE"
     exit 1
   fi
 fi
@@ -55,8 +71,6 @@ fi
 mkdir -p config/package-lists
 mkdir -p config/includes.chroot
 
-lb_opts="$lb_opts --security true --updates true"
-
 # FIXME: should be fixed in the live-build autodetection
 case "$arch" in
   amd64)
@@ -156,7 +170,7 @@ sed -e s/@FLAVOR@/"$FLAVOR"/g config/bootloaders/grub-efi.cfg.in > config/bootlo
 IMAGE_FILENAME=pureos-${dist_version}-${FLAVOR}_${CURRENT_DATE}
 
 lb config noauto \
-    --distribution "$dist" \
+    --distribution "$SUITE" \
     --mode pureos \
     --binary-images iso-hybrid \
     --archive-areas "main" \