diff --git a/roles/float-base-docker/tasks/podman.yml b/roles/float-base-docker/tasks/podman.yml
index 3168e9f2d5e1fae881830ab19b9876de01f2c0e0..461120585416df9fbebee2c48027df2e687bbeb8 100644
--- a/roles/float-base-docker/tasks/podman.yml
+++ b/roles/float-base-docker/tasks/podman.yml
@@ -17,7 +17,7 @@
 # Try to detect which podman version we're on based on source and
 # distribution.
 - set_fact:
-    podman_version: "{{ 3 if float_debian_dist in ('buster', 'bullseye') else 4 }}"
+    podman_version: "{{ podman_version_by_distro[float_debian_dist] }}"
   when: "podman_package_source == 'debian'"
 - set_fact:
     podman_version: 4
@@ -46,6 +46,7 @@
   copy:
     src: storage.conf
     dest: "/etc/containers/storage.conf"
+  when: "podman_version < 5"
 
 - file:
     path: "/etc/containers/certs.d"
diff --git a/roles/float-base-docker/vars/podman.yml b/roles/float-base-docker/vars/podman.yml
index 44168710c59aa552a70e2383206ba10a13713ee6..25cee186829b3a877aa45429f3407e21e595fb43 100644
--- a/roles/float-base-docker/vars/podman.yml
+++ b/roles/float-base-docker/vars/podman.yml
@@ -3,3 +3,9 @@
 podman_default_package_source_by_distro:
   stretch: ai
   buster: ai
+
+podman_version_by_distro:
+  buster: 3
+  bullseye: 3
+  bookworm: 4
+  trixie: 5