diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bcef8e6..0f5be25 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 stages:
-- build
+  - build
 
 variables:
   CACHETAG: build-${VERSION}
@@ -12,7 +12,7 @@ before_script:
 - docker info
 - docker version
 - echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" "$CI_REGISTRY" --password-stdin
-- env|sort
+# env|sort
 
 include:
   - .gitlab-docker-x86_64.yml
diff --git a/.gitlab-docker-armv7l.yml b/.gitlab-docker-armv7l.yml
index da35a4d..ae3fbe0 100644
--- a/.gitlab-docker-armv7l.yml
+++ b/.gitlab-docker-armv7l.yml
@@ -1,16 +1,16 @@
-armv7l:build:
+build:armv7l:
   variables:
-    VERSION: armv7l-buster
+    VERSION: armv7l
   stage: build
   image: docker:latest
   script:
-  - if [ -f init ]; then chmod 500 init; fi
-  - docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG} || true
-  - docker build --cache-from ${CI_REGISTRY_IMAGE}:${CACHETAG} -t ${CI_REGISTRY_IMAGE}:${VERSION} -t ${CI_REGISTRY_IMAGE}:${CACHETAG} .
-  - docker push ${CI_REGISTRY_IMAGE}:${VERSION}
-  - docker push ${CI_REGISTRY_IMAGE}:${CACHETAG}
+    - if [ -f init ]; then chmod 500 init; fi
+    - ([ -z "$REFRESH" ] && docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG}) || true
+    - docker build --cache-from ${CI_REGISTRY_IMAGE}:${CACHETAG} -t ${CI_REGISTRY_IMAGE}:${VERSION} -t ${CI_REGISTRY_IMAGE}:${CACHETAG} .
+    - docker push ${CI_REGISTRY_IMAGE}:${VERSION}
+    - docker push ${CI_REGISTRY_IMAGE}:${CACHETAG}
   tags:
-  - docker
-  - armv7l
+    - docker
+    - armv7l
   only:
-  - buster
+    - master
diff --git a/.gitlab-docker-x86_64.yml b/.gitlab-docker-x86_64.yml
index f925e2e..fdb464d 100644
--- a/.gitlab-docker-x86_64.yml
+++ b/.gitlab-docker-x86_64.yml
@@ -1,6 +1,6 @@
 x86_64:build:
   variables:
-    VERSION: x86_64-buster
+    VERSION: x86_64-bullseye
   stage: build
   image: docker:latest
   script:
@@ -13,4 +13,4 @@ x86_64:build:
   - docker
   - x86_64
   only:
-  - buster
+  - bullseye
diff --git a/Dockerfile b/Dockerfile
index 0c16421..c4edf9b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # NAME leenooks/ci-apt
-# VERSION buster-slim
+# VERSION bullseye-slim
 
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 RUN apt-get update && apt-get install -y git \
 	build-essential devscripts debhelper dh-make quilt \