diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 122e146..bcef8e6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,6 @@ stages:
 
 variables:
   CACHETAG: build-${VERSION}
-  DISTRO: stretch
   DOCKER_HOST: tcp://docker:2375
 
 services:
diff --git a/.gitlab-docker-armv7l.yml b/.gitlab-docker-armv7l.yml
index 3e6d64a..cc05174 100644
--- a/.gitlab-docker-armv7l.yml
+++ b/.gitlab-docker-armv7l.yml
@@ -1,6 +1,6 @@
 armv7l:build:
   variables:
-    VERSION: armv7l-${DISTRO}
+    VERSION: armv7l-stretch
   stage: build
   image: docker:latest
   script:
diff --git a/.gitlab-docker-x86_64.yml b/.gitlab-docker-x86_64.yml
index 9be1b6b..daa6029 100644
--- a/.gitlab-docker-x86_64.yml
+++ b/.gitlab-docker-x86_64.yml
@@ -1,6 +1,6 @@
 x86_64:build:
   variables:
-    VERSION: x86_64-${DISTRO}
+    VERSION: x86_64-stretch
   stage: build
   image: docker:latest
   script: