diff --git a/alpine-3/Dockerfile b/alpine-3/Dockerfile
index dc0dd71..cbca616 100644
--- a/alpine-3/Dockerfile
+++ b/alpine-3/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.10
+FROM alpine:3
 
 RUN apk add --no-cache ansible curl \
     && curl -L https://github.com/aelsabbahy/goss/releases/latest/download/goss-linux-amd64 -o /usr/local/bin/goss \
diff --git a/arch/Dockerfile b/arch/Dockerfile
index 526a908..8568043 100644
--- a/arch/Dockerfile
+++ b/arch/Dockerfile
@@ -1,4 +1,4 @@
-FROM archlinux/base
+FROM archlinux
 
 RUN pacman -Syuu --noconfirm && pacman -S python ansible sshpass git python-passlib python-netaddr curl --noconfirm \
     && curl -L https://github.com/aelsabbahy/goss/releases/latest/download/goss-linux-amd64 -o /usr/local/bin/goss \
diff --git a/build-all.sh b/build-all.sh
index f93effb..f5d0196 100755
--- a/build-all.sh
+++ b/build-all.sh
@@ -2,9 +2,11 @@
 cd ubuntu-18.04 && docker buildx build -t lerentis/ansible:ubuntu-18.04 --platform=linux/arm,linux/arm64,linux/amd64 . --push
 cd ../ubuntu-16.04 && docker buildx build -t lerentis/ansible:ubuntu-16.04 --platform=linux/arm,linux/arm64,linux/amd64 . --push
 cd ../alpine-3 && docker buildx build -t lerentis/ansible:alpine-3 --platform=linux/arm,linux/arm64,linux/amd64 . --push
-cd ../ubuntu-14.04  && docker buildx build -t lerentis/ansible:ubuntu-14.04 --platform=linux/arm,linux/arm64,linux/amd64 . --push
-cd ../fedora-24 && docker buildx build -t lerentis/ansible:fedora-24 --platform=linux/arm,linux/arm64,linux/amd64 . --push
+cd ../ubuntu-20.04  && docker buildx build -t lerentis/ansible:ubuntu-20.04 --platform=linux/arm,linux/arm64,linux/amd64 . --push
+cd ../fedora-24 && docker buildx build -t lerentis/ansible:fedora-24 --platform=linux/amd64 . --push
+cd ../debian-9 && docker buildx build -t lerentis/ansible:debian-9 --platform=linux/arm,linux/amd64 . --push
 cd ../debian-8 && docker buildx build -t lerentis/ansible:debian-8 --platform=linux/arm,linux/amd64 . --push
-cd ../debian-7 && docker buildx build -t lerentis/ansible:debian-7 --platform=linux/arm,linux/amd64 . --push
-cd ../centos-7 && docker buildx build -t lerentis/ansible:centos-7 --platform=linux/arm,linux/arm64,linux/amd64 . --push
-cd ../arch && docker buildx build -t lerentis/ansible:arch --platform=linux/arm,linux/arm64,linux/amd64 . --push
+cd ../debian-10 && docker buildx build -t lerentis/ansible:debian-10 --platform=linux/arm64,linux/amd64 . --push
+cd ../centos-7 && docker buildx build -t lerentis/ansible:centos-7 --platform=linux/arm64,linux/amd64 . --push
+cd ../centos-8 && docker buildx build -t lerentis/ansible:centos-8 --platform=linux/arm64,linux/amd64 . --push
+cd ../arch && docker buildx build -t lerentis/ansible:arch --platform=linux/arm,linux/amd64 . --push
diff --git a/debian-10/Dockerfile b/debian-10/Dockerfile
index 7b454ef..969a3a3 100644
--- a/debian-10/Dockerfile
+++ b/debian-10/Dockerfile
@@ -13,6 +13,7 @@ RUN apt-get -q update \
       curl \
       ansible \
       python \
+      ca-certificates \
     && curl -L https://github.com/aelsabbahy/goss/releases/latest/download/goss-linux-amd64 -o /usr/local/bin/goss \
     && chmod +rx /usr/local/bin/goss \
     && apt-get clean