diff --git a/Dockerfile b/Dockerfile
index 1e39b196..92b2c604 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,6 +7,8 @@ ARG ARCH
 
 WORKDIR /app
 
+RUN pacman -Syyu --overwrite=* --noconfirm
+
 COPY . .
 
 RUN make release VERSION=${VERSION} PREFIX=${PREFIX} ARCH=${ARCH}
\ No newline at end of file
diff --git a/ci.Dockerfile b/ci.Dockerfile
index 191d5622..d9d74813 100644
--- a/ci.Dockerfile
+++ b/ci.Dockerfile
@@ -1,15 +1,18 @@
-FROM docker.io/ljmf00/archlinux:devel
+FROM docker.io/gmanka/archlinuxarm:base-devel
 LABEL maintainer="Jguer,docker@jguer.space"
 
 ENV GO111MODULE=on
 WORKDIR /app
 
-RUN sed -i '/^\[community\]/,/^\[/ s/^/#/' /etc/pacman.conf
-
 COPY go.mod .
 
-RUN pacman-key --init && pacman -Sy && pacman -S --overwrite=* --noconfirm archlinux-keyring && \
-    pacman -Su --overwrite=* --needed --noconfirm pacman doxygen meson asciidoc go git gcc make sudo base-devel && \
-    rm -rfv /var/cache/pacman/* /var/lib/pacman/sync/* && \
-    curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v2.4.0 && \
-    go mod download 
+ARG EXTRA_PKGS=""
+RUN set -eux; \
+    pacman-key --init; \
+    pacman -Syu --noconfirm --needed archlinux-keyring pacman go git gcc make base-devel sudo; \
+    if [ -n "${EXTRA_PKGS}" ]; then pacman -S --noconfirm --needed ${EXTRA_PKGS}; fi; \
+    curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v2.4.0; \
+    go mod download; \
+    rm -rf /var/lib/pacman/sync/* /var/cache/pacman/* /tmp/* /var/tmp/*; \
+    rm -rf /usr/share/man/* /usr/share/doc/* || true; \
+    yes | pacman -Scc >/dev/null 2>&1 || true