diff --git a/container/build-images.sh b/container/build-images.sh
index 0501c2e6f..865f2b534 100755
--- a/container/build-images.sh
+++ b/container/build-images.sh
@@ -36,7 +36,7 @@ for architecture in "${ARCHITECTURES[@]}"; do
         sed -i'' 's/amd64/arm64/g' "$SOURCE-$architecture" # for tini
     fi
 
-    buildah build-using-dockerfile -f "$SOURCE-$architecture" -t "$TAG:$architecture" .
+    docker build -f "$SOURCE-$architecture" -t "$TAG:$architecture" .
 
     rm "$SOURCE-$architecture"
 done
diff --git a/container/pull-containers.sh b/container/pull-containers.sh
index ab16e3efc..1a9a3a313 100755
--- a/container/pull-containers.sh
+++ b/container/pull-containers.sh
@@ -6,8 +6,8 @@ architectures=('arm64v8' 'arm32v7' 'amd64')
 
 for architecture in "${architectures[@]}"; do
     if [ "$1" == "" ]; then
-        podman pull "$architecture/ubuntu:18.04"
+        docker pull "$architecture/ubuntu:18.04"
     else
-        podman pull "$1:$architecture"
+        docker pull "$1:$architecture"
     fi
 done
diff --git a/container/push-containers.sh b/container/push-containers.sh
index fe951d56c..613a5ec13 100755
--- a/container/push-containers.sh
+++ b/container/push-containers.sh
@@ -19,5 +19,5 @@ require_input "$TAG" "container tag"
 ARCHITECTURES=('arm64v8' 'arm32v7' 'amd64')
 
 for arch in "${ARCHITECTURES[@]}"; do
-    podman push "$TAG:$arch" "docker://docker.io/$TAG:$arch"
+    docker push "$TAG:$arch"
 done