diff --git a/images/alpine.dockerfile b/images/alpine.dockerfile
index b400a89..f1c73b3 100644
--- a/images/alpine.dockerfile
+++ b/images/alpine.dockerfile
@@ -9,6 +9,6 @@ RUN cd beaver && bash build.sh build install
 
 # Remove build dependencies & clean
 RUN gem uninstall rake
-RUN apk remove git bash ruby-dev gcc musl-dev
+RUN apk del git bash ruby-dev gcc musl-dev
 RUN apk cache clean
 
diff --git a/images/make.rb b/images/make.rb
index 5433304..0a072ca 100644
--- a/images/make.rb
+++ b/images/make.rb
@@ -29,11 +29,14 @@
 
 def build_image(name, os, tag, platforms, file)
   sh "#{CONTAINER_MANAGER} buildx build " +
-    "#{$beaver.options[:push] ? "--push" : ""} " +
+    "#{($beaver.options[:push] && CONTAINER_MANAGER != "podman") ? "--push" : ""} " +
     "--platform #{platforms.join(",")} " +
     "--tag jomy10/#{name}:#{os}-#{tag} " +
     "-f #{file} " +
     "."
+  if CONTAINER_MANAGER == "podman"
+    sh "buildah push"
+  end
 end
 
 cmd :build do