diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e8935a5..99d870e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,8 +12,8 @@ stages:
 lint:
   stage: lint
   image: hadolint/hadolint:latest
-  # DL3007: We use the latest tag for multistage build
-  script: hadolint --ignore DL3007 --ignore DL3020 Dockerfile.template
+  # DL3018: We don't need alpine version pins
+  script: hadolint --ignore DL3018 Dockerfile.template
   except:
     - releases
     - tags
diff --git a/Dockerfile.base b/Dockerfile.base
index f6d82e4..0211f0a 100644
--- a/Dockerfile.base
+++ b/Dockerfile.base
@@ -8,12 +8,13 @@
 # The second stage is for actually configuring the system a little bit.
 # Some templating is done in order to allow us to easily build different configurations and to
 # allow us to automate the releaes process.
-FROM archlinux:latest AS verify
+FROM alpine:3.12 AS verify
+RUN apk add --no-cache curl bash
 SHELL ["/bin/bash", "-c"]
-RUN ROOTFS="$(curl -OJL --continue-at - -w "%{filename_effective}" https://gitlab.archlinux.org/archlinux/archlinux-docker/-/package_files/113/download)" && \
-    sha256sum -c <<< "95d91387d32569bd1cef52ffcfbf60280fa8c1e6167db35b45b8ab447eba0c2a  base-20201102.0.8190.tar.xz" && \
+RUN ROOTFS="$(curl -sOJL --continue-at - -w "%{filename_effective}" https://gitlab.archlinux.org/archlinux/archlinux-docker/-/package_files/117/download)" && \
+    sha256sum -c <<< "058cf82bfadd1db804add93854025d2f411a5066c74826237b8aeb1812b1b1fb  base-20201102.0.8261.tar.xz" && \
     mkdir /rootfs && \
-    tar -C /rootfs --extract --auto-compress --file "${ROOTFS}"
+    tar -C /rootfs --extract --file "${ROOTFS}"
 
 FROM scratch AS root
 COPY --from=verify /rootfs/ /
diff --git a/Dockerfile.base-devel b/Dockerfile.base-devel
index 75da82e..31b4005 100644
--- a/Dockerfile.base-devel
+++ b/Dockerfile.base-devel
@@ -8,12 +8,13 @@
 # The second stage is for actually configuring the system a little bit.
 # Some templating is done in order to allow us to easily build different configurations and to
 # allow us to automate the releaes process.
-FROM archlinux:latest AS verify
+FROM alpine:3.12 AS verify
+RUN apk add --no-cache curl bash
 SHELL ["/bin/bash", "-c"]
-RUN ROOTFS="$(curl -OJL --continue-at - -w "%{filename_effective}" https://gitlab.archlinux.org/archlinux/archlinux-docker/-/package_files/115/download)" && \
-    sha256sum -c <<< "49c7e637fc49c1a1dd90a4718cccf2c51e20e3cd5f45ac3d45fe3d67ccdce00c  base-devel-20201102.0.8190.tar.xz" && \
+RUN ROOTFS="$(curl -sOJL --continue-at - -w "%{filename_effective}" https://gitlab.archlinux.org/archlinux/archlinux-docker/-/package_files/119/download)" && \
+    sha256sum -c <<< "e6b8e112de2c95fd0c52c39cd5b6b515af1073ee71feb04009b30639da64cefb  base-devel-20201102.0.8261.tar.xz" && \
     mkdir /rootfs && \
-    tar -C /rootfs --extract --auto-compress --file "${ROOTFS}"
+    tar -C /rootfs --extract --file "${ROOTFS}"
 
 FROM scratch AS root
 COPY --from=verify /rootfs/ /