diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 590be4a..bcef8e6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,36 +14,6 @@ before_script:
 - echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" "$CI_REGISTRY" --password-stdin
 - env|sort
 
-x86_64:build:
-  variables:
-    VERSION: x86_64
-  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}
-  tags:
-  - docker
-  - x86_64
-  only:
-  - master
-
-armv7l:build:
-  variables:
-    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}
-  tags:
-  - docker
-  - armv7l
-  only:
-  - master
+include:
+  - .gitlab-docker-x86_64.yml
+  - .gitlab-docker-armv7l.yml
diff --git a/.gitlab-docker-armv7l.yml b/.gitlab-docker-armv7l.yml
new file mode 100644
index 0000000..da35a4d
--- /dev/null
+++ b/.gitlab-docker-armv7l.yml
@@ -0,0 +1,16 @@
+armv7l:build:
+  variables:
+    VERSION: armv7l-buster
+  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}
+  tags:
+  - docker
+  - armv7l
+  only:
+  - buster
diff --git a/.gitlab-docker-x86_64.yml b/.gitlab-docker-x86_64.yml
new file mode 100644
index 0000000..7a80415
--- /dev/null
+++ b/.gitlab-docker-x86_64.yml
@@ -0,0 +1,16 @@
+x86_64:build:
+  variables:
+    VERSION: x86_64
+  stage: build
+  image: docker:latest
+  script:
+  - if [ -f init ]; then chmod 500 init; fi
+  - ([ -z "$REFRESH" ] && docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG}) || echo "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
+  - x86_64
+  only:
+  - master
diff --git a/Dockerfile b/Dockerfile
index c38e369..8a2e7e9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,7 +23,7 @@ RUN echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/so
 EXPOSE 80 443
 
 COPY renew.sh /usr/local/sbin
-LABEL cron.container.weekly root:/usr/local/sbin/renew.sh
+LABEL cron.container.weekly root#/usr/local/sbin/renew.sh
 
 # Expose our web root and log directories log.
 #VOLUME [ "/etc/nginx/conf.d", "/etc/nginx/default.d" ]