diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ca7ec75d..5d822f11 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -67,7 +67,7 @@ job_win32:
 job_atari:
     stage: build
     before_script:
-        - apt-get update -qq && apt-get install -y -qq zip dos2unix
+        - apt-get update -qq && apt-get install -y -qq zip dos2unix lsb-release
         - "sh ./.install-cross-mint.sh"
     script:
         - "ATARICROSS=1 make 3rdparty -j2 || exit 1"
diff --git a/.install-cross-mint.sh b/.install-cross-mint.sh
index 7eff5203..985b316b 100755
--- a/.install-cross-mint.sh
+++ b/.install-cross-mint.sh
@@ -49,15 +49,15 @@ EOF
 if echo "$DISTRIB" | grep Ubuntu ; then
 	$SUDO add-apt-repository -y ppa:vriviere/ppa
 else
-	# assume Debian/Stretch (9.x)
+	CODENAME=$(lsb_release -c -s)
 	if [ -z "$SUDO" ] ; then
-		echo "deb http://vincent.riviere.free.fr/apt/ stretch contrib" >> /etc/apt/sources.list
-		echo "deb-src http://vincent.riviere.free.fr/apt/ stretch contrib" >> /etc/apt/sources.list
+		echo "deb http://vincent.riviere.free.fr/apt/ ${CODENAME} contrib" >> /etc/apt/sources.list
+		echo "deb-src http://vincent.riviere.free.fr/apt/ ${CODENAME} contrib" >> /etc/apt/sources.list
 	else
-		echo "deb http://vincent.riviere.free.fr/apt/ stretch contrib" | $SUDO tee -a /etc/apt/sources.list
-		echo "deb-src http://vincent.riviere.free.fr/apt/ stretch contrib" | $SUDO tee -a /etc/apt/sources.list
+		echo "deb http://vincent.riviere.free.fr/apt/ ${CODENAME} contrib" | $SUDO tee -a /etc/apt/sources.list
+		echo "deb-src http://vincent.riviere.free.fr/apt/ ${CODENAME} contrib" | $SUDO tee -a /etc/apt/sources.list
 	fi
 fi
 
-$SUDO apt-get update -ym
-$SUDO apt-get install -ym cross-mint-essential
+$SUDO apt-get update -ym || exit 1
+$SUDO apt-get install -ym cross-mint-essential || exit 1