diff --git a/images/bats/Dockerfile b/images/bats/Dockerfile
index 1ac5f2883a89414e029a4fbb9ce25cfa65a18ac6..de00fb1d1cde979cc27fc5779d91786f282c9dde 100644
--- a/images/bats/Dockerfile
+++ b/images/bats/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.hub.docker.com/library/alpine:3.14
+FROM registry.hub.docker.com/library/alpine:3.17
 # hadolint ignore=DL3018
 RUN apk add --update --no-cache \
         bats \
@@ -7,5 +7,6 @@ RUN apk add --update --no-cache \
         git \
         openssh-client-default \
         openssl \
+        podman \
     && \
     rm -rf /var/cache/apk/* /tmp/* /var/tmp/*
diff --git a/images/docker/Dockerfile b/images/docker/Dockerfile
index e1c2bf87bf6c5ea06f38380b87faef8f2a70c8d2..8b3ed2f7dace3153b560b57eb2d212dd9f9e66e8 100644
--- a/images/docker/Dockerfile
+++ b/images/docker/Dockerfile
@@ -1,10 +1,13 @@
 FROM docker:20.10
 # hadolint ignore=DL3018
 RUN apk add --update-cache --no-cache \
+        buildah \
         docker-compose \
         docker-py \
+        podman \
         py3-dotenv \
         py3-pip \
+        skopeo \
     && \
     python3 -m pip install --no-cache-dir --progress-bar=off deepclean && \
     rm -rf /root/.cache /tmp/* /var/tmp/*