diff --git a/.drone.yml b/.drone.yml
index 8b4d562..9a8a36e 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -21,6 +21,15 @@ steps:
     commands:
       - nix build .#nixos-runner
       - nix run .#push-container -- result
+      - podman load --input result | sed -n -e "s/Loaded image:.\\(.*\\)/\\1/p" > loaded-image
+      - cat loaded-image
+      - podman images
+      - podman tag "$(<loaded-image)" "${REGISTRY}/${REPOSITORY}:${GITHUB_RUN_NUMBER}-${GITHUB_SHA:0:8}"
+      - podman tag "$(<loaded-image)" "${REGISTRY}/${REPOSITORY}:latest"
+      - podman images
+      - podman push "${REGISTRY}/${REPOSITORY}:${GITHUB_RUN_NUMBER}-${GITHUB_SHA:0:8}"
+      - podman push "${REGISTRY}/${REPOSITORY}:latest"
+      - podman logout "${REGISTRY}"
     settings:
       registry: docker.io
       repository: jcollie/nixos-runner