diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 019c533..a37d3aa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,6 +4,7 @@ stages:
 
 variables:
   VERSION: "0.59.1"
+  DISTRO: "buster"
 
 before_script:
   - env|sort
diff --git a/.gitlab-deb-armv7l.yml b/.gitlab-deb-armv7l.yml
index 6d440f7..7b4be21 100644
--- a/.gitlab-deb-armv7l.yml
+++ b/.gitlab-deb-armv7l.yml
@@ -1,5 +1,5 @@
 build:armv7l:
-  image: ${CI_REGISTRY}/leenooks/ci-apt:armv7l
+  image: ${CI_REGISTRY}/leenooks/ci-apt:armv7l-${DISTRO}
   stage: build
   script:
     - apt-get update
@@ -29,6 +29,6 @@ deploy:armv7l:
   only:
     - master
   script:
-    - reprepro.exp -- -b /apt includedeb $(awk -F"[)(]+" '/VERSION=/ {print $2}' /etc/os-release) build/${CI_PROJECT_NAME}_${VERSION}*.deb build/${CI_PROJECT_NAME}-common_${VERSION}*.deb
+    - reprepro.exp -- -b /apt includedeb ${DISTRO} build/${CI_PROJECT_NAME}_${VERSION}*.deb
   tags:
     - reprepro
diff --git a/.gitlab-deb-x86_64.yml b/.gitlab-deb-x86_64.yml
index 719bb38..6e46f5f 100644
--- a/.gitlab-deb-x86_64.yml
+++ b/.gitlab-deb-x86_64.yml
@@ -1,5 +1,5 @@
 build:x86_64:
-  image: ${CI_REGISTRY}/leenooks/ci-apt:x86_64
+  image: ${CI_REGISTRY}/leenooks/ci-apt:x86_64-${DISTRO}
   stage: build
   script:
     - apt-get update
@@ -29,6 +29,6 @@ deploy:x86_64:
   only:
     - master
   script:
-    - reprepro.exp -- -b /apt includedeb $(awk -F"[)(]+" '/VERSION=/ {print $2}' /etc/os-release) build/${CI_PROJECT_NAME}_${VERSION}*.deb build/${CI_PROJECT_NAME}-common_${VERSION}*.deb
+    - reprepro.exp -- -b /apt includedeb ${DISRO} build/${CI_PROJECT_NAME}_${VERSION}*.deb build/${CI_PROJECT_NAME}-common_${VERSION}*.deb
   tags:
     - reprepro