diff --git a/Containerfile b/Containerfile
index ef7b067..080c833 100644
--- a/Containerfile
+++ b/Containerfile
@@ -9,7 +9,7 @@ RUN mkdir -p /app/data && \
     cd server && \
     go build -o ../rdio-scanner && \
     cd .. && \
-    rm -fr server && \
+    rm -fr server /root/.cache /root/go && \
     apk del .build && \
     apk --no-cache --no-progress add ffmpeg tzdata
 VOLUME [ "/app/data" ]
diff --git a/Makefile b/Makefile
index 0b39e4c..587a0f7 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,8 @@ clean:
 	@rm -fr client/node_modules dist server/webapp
 
 container: webapp linux-amd64
-	@podman build --format docker --platform linux/amd64,linux/arm,linux/arm64 --manifest rdio-scanner:latest-beta .
+	@podman build --platform linux/amd64,linux/arm,linux/arm64 --manifest rdio-scanner:latest-beta .
+	@podman manifest push --format v2s2 localhost/rdio-scanner:latest-beta docker://docker.io/chuot/rdio-scanner:latest-beta
 
 dist: darwin freebsd linux windows