diff --git a/cookbooks/gitea/gitea.container b/cookbooks/gitea/gitea.container
index 4defd44..15a63e5 100644
--- a/cookbooks/gitea/gitea.container
+++ b/cookbooks/gitea/gitea.container
@@ -12,7 +12,7 @@ PartOf=gitea.target
 
 [Container]
 ContainerName=gitea
-Image=docker.gitea.com/gitea:latest
+Image=gitea.image
 AutoUpdate=registry
 
 # Network configuration
diff --git a/cookbooks/gitea/gitea.image b/cookbooks/gitea/gitea.image
new file mode 100644
index 0000000..0ad02aa
--- /dev/null
+++ b/cookbooks/gitea/gitea.image
@@ -0,0 +1,6 @@
+[Unit]
+Description=podman pull docker.gitea.com/gitea
+Documentation=https://docs.gitea.com/
+
+[Image]
+Image=docker.gitea.com/gitea:latest
diff --git a/cookbooks/lego/lego-renew.container b/cookbooks/lego/lego-renew.container
index dd69345..9dbafb8 100644
--- a/cookbooks/lego/lego-renew.container
+++ b/cookbooks/lego/lego-renew.container
@@ -15,7 +15,7 @@ User=10023
 Group=10000
 
 # Image
-Image=docker.io/goacme/lego:latest
+Image=lego.image
 AutoUpdate=registry
 
 # Network configuration
diff --git a/cookbooks/lego/lego-run.container b/cookbooks/lego/lego-run.container
index 746f7bb..91efa1c 100644
--- a/cookbooks/lego/lego-run.container
+++ b/cookbooks/lego/lego-run.container
@@ -16,7 +16,7 @@ User=10023
 Group=10000
 
 # Image
-Image=docker.io/goacme/lego:latest
+Image=lego.image
 AutoUpdate=registry
 
 # Network configuration
diff --git a/cookbooks/lego/lego.image b/cookbooks/lego/lego.image
new file mode 100644
index 0000000..885955f
--- /dev/null
+++ b/cookbooks/lego/lego.image
@@ -0,0 +1,6 @@
+[Unit]
+Description=podman pull docker.io/goacme/lego
+Documentation=https://go-acme.github.io/lego/
+
+[Image]
+Image=docker.io/goacme/lego:latest
diff --git a/cookbooks/miniflux/miniflux.container b/cookbooks/miniflux/miniflux.container
index f9ba6b0..9aea2c7 100644
--- a/cookbooks/miniflux/miniflux.container
+++ b/cookbooks/miniflux/miniflux.container
@@ -11,7 +11,7 @@ PartOf=miniflux.target
 
 [Container]
 ContainerName=miniflux
-Image=ghcr.io/miniflux/miniflux:latest
+Image=miniflux.image
 AutoUpdate=registry
 
 # Network configuration
diff --git a/cookbooks/miniflux/miniflux.image b/cookbooks/miniflux/miniflux.image
new file mode 100644
index 0000000..0f9665f
--- /dev/null
+++ b/cookbooks/miniflux/miniflux.image
@@ -0,0 +1,6 @@
+[Unit]
+Description=podman pull ghcr.io/miniflux/miniflux
+Documentation=https://github.com/miniflux/v2
+
+[Image]
+Image=ghcr.io/miniflux/miniflux:latest
diff --git a/cookbooks/nextcloud/nextcloud-app.container b/cookbooks/nextcloud/nextcloud-app.container
index 7956f66..f9e44a4 100644
--- a/cookbooks/nextcloud/nextcloud-app.container
+++ b/cookbooks/nextcloud/nextcloud-app.container
@@ -14,7 +14,7 @@ PartOf=nextcloud.target
 
 [Container]
 ContainerName=nextcloud-app
-Image=docker.io/library/nextcloud:${NEXTCLOUD_MAJOR}-fpm-alpine
+Image=nextcloud.image
 
 # No need for root privileges
 User=www-data
diff --git a/cookbooks/nextcloud/nextcloud-collabora.container b/cookbooks/nextcloud/nextcloud-collabora.container
index 39fa068..3b28159 100644
--- a/cookbooks/nextcloud/nextcloud-collabora.container
+++ b/cookbooks/nextcloud/nextcloud-collabora.container
@@ -11,7 +11,7 @@ PartOf=nextcloud.target
 
 [Container]
 ContainerName=nextcloud-collabora
-Image=docker.io/collabora/code:latest
+Image=nextcloud-collabora.image
 
 # No need for root privileges
 User=1001
diff --git a/cookbooks/nextcloud/nextcloud-collabora.image b/cookbooks/nextcloud/nextcloud-collabora.image
new file mode 100644
index 0000000..af817a7
--- /dev/null
+++ b/cookbooks/nextcloud/nextcloud-collabora.image
@@ -0,0 +1,6 @@
+[Unit]
+Description=podman pull docker.io/collabora/code
+Documentation=https://hub.docker.com/r/collabora/code/
+
+[Image]
+Image=docker.io/collabora/code:latest
diff --git a/cookbooks/nextcloud/nextcloud-cron.container b/cookbooks/nextcloud/nextcloud-cron.container
index 63c2997..9845d2a 100644
--- a/cookbooks/nextcloud/nextcloud-cron.container
+++ b/cookbooks/nextcloud/nextcloud-cron.container
@@ -11,7 +11,7 @@ ConditionPathExists=/var/lib/virtiofs/data/nextcloud/config/config.php
 
 [Container]
 ContainerName=nextcloud-cron-job
-Image=docker.io/library/nextcloud:${NEXTCLOUD_MAJOR}-fpm-alpine
+Image=nextcloud.image
 
 # No need for root privileges
 User=www-data
diff --git a/cookbooks/nextcloud/nextcloud-init.container b/cookbooks/nextcloud/nextcloud-init.container
index 022a398..bbfd518 100644
--- a/cookbooks/nextcloud/nextcloud-init.container
+++ b/cookbooks/nextcloud/nextcloud-init.container
@@ -15,7 +15,7 @@ PartOf=nextcloud.target
 
 [Container]
 ContainerName=nextcloud-init-job
-Image=docker.io/library/nextcloud:${NEXTCLOUD_MAJOR}-fpm-alpine
+Image=nextcloud.image
 
 # No need for root privileges
 User=www-data
diff --git a/cookbooks/nextcloud/nextcloud-nginx.container b/cookbooks/nextcloud/nextcloud-nginx.container
index b01dc6d..2fb5c86 100644
--- a/cookbooks/nextcloud/nextcloud-nginx.container
+++ b/cookbooks/nextcloud/nextcloud-nginx.container
@@ -12,7 +12,7 @@ PartOf=nextcloud.target
 
 [Container]
 ContainerName=nextcloud-nginx
-Image=docker.io/nginxinc/nginx-unprivileged:${NGINX_MAJOR}-alpine
+Image=nextcloud-nginx.image
 
 # Network configuration
 Network=host
diff --git a/cookbooks/nextcloud/nextcloud-nginx.image b/cookbooks/nextcloud/nextcloud-nginx.image
new file mode 100644
index 0000000..c93db72
--- /dev/null
+++ b/cookbooks/nextcloud/nextcloud-nginx.image
@@ -0,0 +1,13 @@
+[Unit]
+Description=podman pull docker.io/nginxinc/nginx-unprivileged
+Documentation=https://hub.docker.com/r/nginxinc/nginx-unprivileged/
+
+# Only start if Nextcloud has been configured
+ConditionPathExists=/etc/quadlets/nextcloud/config.env
+
+[Image]
+Image=docker.io/nginxinc/nginx-unprivileged:${NGINX_MAJOR}-alpine
+
+[Service]
+# These environment variables are sourced to be used by systemd in the Exec* commands
+EnvironmentFile=/etc/quadlets/nextcloud/config.env
diff --git a/cookbooks/nextcloud/nextcloud-redis.container b/cookbooks/nextcloud/nextcloud-redis.container
index bc750d6..bc9abfd 100644
--- a/cookbooks/nextcloud/nextcloud-redis.container
+++ b/cookbooks/nextcloud/nextcloud-redis.container
@@ -11,7 +11,7 @@ PartOf=nextcloud.target
 
 [Container]
 ContainerName=nextcloud-redis
-Image=docker.io/library/redis:${REDIS_MAJOR}-alpine
+Image=nextcloud-redis.image
 
 # Network configuration
 Network=host
diff --git a/cookbooks/nextcloud/nextcloud-redis.image b/cookbooks/nextcloud/nextcloud-redis.image
new file mode 100644
index 0000000..23ecdfe
--- /dev/null
+++ b/cookbooks/nextcloud/nextcloud-redis.image
@@ -0,0 +1,13 @@
+[Unit]
+Description=podman pull docker.io/library/redis
+Documentation=https://hub.docker.com/_/redis/
+
+# Only start if Nextcloud has been configured
+ConditionPathExists=/etc/quadlets/nextcloud/config.env
+
+[Image]
+Image=docker.io/library/redis:${REDIS_MAJOR}-alpine
+
+[Service]
+# These environment variables are sourced to be used by systemd in the Exec* commands
+EnvironmentFile=/etc/quadlets/nextcloud/config.env
diff --git a/cookbooks/nextcloud/nextcloud-upgrade.container b/cookbooks/nextcloud/nextcloud-upgrade.container
index 3e672c3..ebb8f34 100644
--- a/cookbooks/nextcloud/nextcloud-upgrade.container
+++ b/cookbooks/nextcloud/nextcloud-upgrade.container
@@ -15,7 +15,7 @@ PartOf=nextcloud.target
 
 [Container]
 ContainerName=nextcloud-upgrade-to-${NEXTCLOUD_MAJOR}-job
-Image=docker.io/library/nextcloud:${NEXTCLOUD_MAJOR}-fpm-alpine
+Image=nextcloud.image
 
 # No need for root privileges
 User=www-data
diff --git a/cookbooks/nextcloud/nextcloud.image b/cookbooks/nextcloud/nextcloud.image
new file mode 100644
index 0000000..4c64ab3
--- /dev/null
+++ b/cookbooks/nextcloud/nextcloud.image
@@ -0,0 +1,13 @@
+[Unit]
+Description=podman pull docker.io/library/nextcloud
+Documentation=https://hub.docker.com/_/nextcloud/
+
+# Only start if Nextcloud has been configured
+ConditionPathExists=/etc/quadlets/nextcloud/config.env
+
+[Image]
+Image=docker.io/library/nextcloud:${NEXTCLOUD_MAJOR}-fpm-alpine
+
+[Service]
+# These environment variables are sourced to be used by systemd in the Exec* commands
+EnvironmentFile=/etc/quadlets/nextcloud/config.env
diff --git a/cookbooks/nginx/nginx-git.image b/cookbooks/nginx/nginx-git.image
new file mode 100644
index 0000000..2a4cb96
--- /dev/null
+++ b/cookbooks/nginx/nginx-git.image
@@ -0,0 +1,6 @@
+[Unit]
+Description=podman pull docker.io/alpine/git
+Documentation=https://hub.docker.com/r/alpine/git
+
+[Image]
+Image=docker.io/alpine/git:latest
diff --git a/cookbooks/nginx/nginx-init.container b/cookbooks/nginx/nginx-init.container
index faf39a1..55dad5d 100644
--- a/cookbooks/nginx/nginx-init.container
+++ b/cookbooks/nginx/nginx-init.container
@@ -14,7 +14,7 @@ PartOf=nginx.target
 
 [Container]
 ContainerName=nginx-init-job
-Image=docker.io/alpine/git:latest
+Image=nginx-git.image
 
 # Network configuration
 Network=host
diff --git a/cookbooks/nginx/nginx-server.container b/cookbooks/nginx/nginx-server.container
index 0e6b656..c375544 100644
--- a/cookbooks/nginx/nginx-server.container
+++ b/cookbooks/nginx/nginx-server.container
@@ -14,7 +14,7 @@ PartOf=nginx.target
 
 [Container]
 ContainerName=nginx-server
-Image=docker.io/library/nginx:mainline-alpine
+Image=nginx.image
 AutoUpdate=registry
 
 # Network configuration
diff --git a/cookbooks/nginx/nginx-update.container b/cookbooks/nginx/nginx-update.container
index 6114a6e..77933d3 100644
--- a/cookbooks/nginx/nginx-update.container
+++ b/cookbooks/nginx/nginx-update.container
@@ -14,7 +14,7 @@ PartOf=nginx.target
 
 [Container]
 ContainerName=nginx-update-job
-Image=docker.io/alpine/git:latest
+Image=nginx-git.image
 
 # Network configuration
 Network=host
diff --git a/cookbooks/nginx/nginx.image b/cookbooks/nginx/nginx.image
new file mode 100644
index 0000000..26209cc
--- /dev/null
+++ b/cookbooks/nginx/nginx.image
@@ -0,0 +1,6 @@
+[Unit]
+Description=podman pull docker.io/library/nginx
+Documentation=https://hub.docker.com/_/nginx
+
+[Image]
+Image=docker.io/library/nginx:mainline-alpine
diff --git a/cookbooks/restic-server/restic-server.container b/cookbooks/restic-server/restic-server.container
index 5d274a4..a3ec417 100644
--- a/cookbooks/restic-server/restic-server.container
+++ b/cookbooks/restic-server/restic-server.container
@@ -8,7 +8,7 @@ RequiresMountsFor=/var/lib/virtiofs/data /var
 ContainerName=restic
 
 # Image
-Image=docker.io/restic/rest-server:latest
+Image=restic-server.image
 AutoUpdate=registry
 
 # Security
diff --git a/cookbooks/restic-server/restic-server.image b/cookbooks/restic-server/restic-server.image
new file mode 100644
index 0000000..8e1bc03
--- /dev/null
+++ b/cookbooks/restic-server/restic-server.image
@@ -0,0 +1,5 @@
+[Unit]
+Description=podman pull docker.io/restic/rest-server
+
+[Image]
+Image=docker.io/restic/rest-server:latest
diff --git a/cookbooks/seedbox/flaresolverr.container b/cookbooks/seedbox/flaresolverr.container
index f723d8c..c8dda02 100644
--- a/cookbooks/seedbox/flaresolverr.container
+++ b/cookbooks/seedbox/flaresolverr.container
@@ -8,7 +8,7 @@ After=network-online.target
 ContainerName=flaresolverr
 
 # Image
-Image=ghcr.io/flaresolverr/flaresolverr:latest
+Image=flaresolverr.image
 AutoUpdate=registry
 
 # Security
diff --git a/cookbooks/seedbox/flaresolverr.image b/cookbooks/seedbox/flaresolverr.image
new file mode 100644
index 0000000..dbdf011
--- /dev/null
+++ b/cookbooks/seedbox/flaresolverr.image
@@ -0,0 +1,6 @@
+[Unit]
+Description=podman pull ghcr.io/flaresolverr/flaresolverr
+Documentation=https://github.com/FlareSolverr/FlareSolverr/
+
+[Image]
+Image=ghcr.io/flaresolverr/flaresolverr:latest
diff --git a/cookbooks/seedbox/jellyfin.container b/cookbooks/seedbox/jellyfin.container
index 0884b64..aa9a1b5 100644
--- a/cookbooks/seedbox/jellyfin.container
+++ b/cookbooks/seedbox/jellyfin.container
@@ -10,7 +10,7 @@ ConditionPathIsMountPoint=/var/lib/virtiofs/data
 ContainerName=jellyfin
 
 # Image
-Image=lscr.io/linuxserver/jellyfin:latest
+Image=jellyfin.image
 AutoUpdate=registry
 
 # Security
diff --git a/cookbooks/seedbox/jellyfin.image b/cookbooks/seedbox/jellyfin.image
new file mode 100644
index 0000000..8443571
--- /dev/null
+++ b/cookbooks/seedbox/jellyfin.image
@@ -0,0 +1,6 @@
+[Unit]
+Description=podman pull lscr.io/linuxserver/jellyfin
+Documentation=https://docs.linuxserver.io/images/docker-jellyfin/
+
+[Image]
+Image=lscr.io/linuxserver/jellyfin:latest
diff --git a/cookbooks/seedbox/lidarr.container b/cookbooks/seedbox/lidarr.container
index fd10453..1be350c 100644
--- a/cookbooks/seedbox/lidarr.container
+++ b/cookbooks/seedbox/lidarr.container
@@ -10,7 +10,7 @@ ConditionPathIsMountPoint=/var/lib/virtiofs/data
 ContainerName=lidarr
 
 # Image
-Image=lscr.io/linuxserver/lidarr:latest
+Image=lidarr.image
 AutoUpdate=registry
 
 # Security
diff --git a/cookbooks/seedbox/lidarr.image b/cookbooks/seedbox/lidarr.image
new file mode 100644
index 0000000..66087cd
--- /dev/null
+++ b/cookbooks/seedbox/lidarr.image
@@ -0,0 +1,6 @@
+[Unit]
+Description=podman pull lscr.io/linuxserver/lidarr
+Documentation=https://docs.linuxserver.io/images/docker-lidarr/
+
+[Image]
+Image=lscr.io/linuxserver/lidarr:latest
diff --git a/cookbooks/seedbox/prowlarr.container b/cookbooks/seedbox/prowlarr.container
index 7d4719b..3ef045b 100644
--- a/cookbooks/seedbox/prowlarr.container
+++ b/cookbooks/seedbox/prowlarr.container
@@ -10,7 +10,7 @@ ConditionPathIsMountPoint=/var/lib/virtiofs/data
 ContainerName=prowlarr
 
 # Image
-Image=lscr.io/linuxserver/prowlarr:latest
+Image=prowlarr.image
 AutoUpdate=registry
 
 # Security
diff --git a/cookbooks/seedbox/prowlarr.image b/cookbooks/seedbox/prowlarr.image
new file mode 100644
index 0000000..1cc84b1
--- /dev/null
+++ b/cookbooks/seedbox/prowlarr.image
@@ -0,0 +1,6 @@
+[Unit]
+Description=podman pull lscr.io/linuxserver/prowlarr
+Documentation=https://docs.linuxserver.io/images/docker-prowlarr/
+
+[Image]
+Image=lscr.io/linuxserver/prowlarr:latest
diff --git a/cookbooks/seedbox/qbittorrent.container b/cookbooks/seedbox/qbittorrent.container
index 4d955f3..004a760 100644
--- a/cookbooks/seedbox/qbittorrent.container
+++ b/cookbooks/seedbox/qbittorrent.container
@@ -9,7 +9,7 @@ ConditionPathIsMountPoint=/var/lib/virtiofs/data
 ContainerName=qbittorrent
 
 # Image
-Image=lscr.io/linuxserver/qbittorrent:latest
+Image=qbittorrent.image
 AutoUpdate=registry
 
 # Security
diff --git a/cookbooks/seedbox/qbittorrent.image b/cookbooks/seedbox/qbittorrent.image
new file mode 100644
index 0000000..066e0b4
--- /dev/null
+++ b/cookbooks/seedbox/qbittorrent.image
@@ -0,0 +1,5 @@
+[Unit]
+Description=podman pull lscr.io/linuxserver/qbittorrent
+
+[Image]
+Image=lscr.io/linuxserver/qbittorrent:latest
diff --git a/cookbooks/seedbox/radarr.container b/cookbooks/seedbox/radarr.container
index b8cd887..50d7443 100644
--- a/cookbooks/seedbox/radarr.container
+++ b/cookbooks/seedbox/radarr.container
@@ -10,7 +10,7 @@ ConditionPathIsMountPoint=/var/lib/virtiofs/data
 ContainerName=radarr
 
 # Image
-Image=lscr.io/linuxserver/radarr:latest
+Image=radarr.image
 AutoUpdate=registry
 
 # Security
diff --git a/cookbooks/seedbox/radarr.image b/cookbooks/seedbox/radarr.image
new file mode 100644
index 0000000..9b9c6e4
--- /dev/null
+++ b/cookbooks/seedbox/radarr.image
@@ -0,0 +1,6 @@
+[Unit]
+Description=podman pull lscr.io/linuxserver/radarr
+Documentation=https://docs.linuxserver.io/images/docker-radarr/
+
+[Image]
+Image=lscr.io/linuxserver/radarr:latest
diff --git a/cookbooks/seedbox/sonarr.container b/cookbooks/seedbox/sonarr.container
index 083650e..f76aaf4 100644
--- a/cookbooks/seedbox/sonarr.container
+++ b/cookbooks/seedbox/sonarr.container
@@ -10,7 +10,7 @@ ConditionPathIsMountPoint=/var/lib/virtiofs/data
 ContainerName=sonarr
 
 # Image
-Image=lscr.io/linuxserver/sonarr:latest
+Image=sonarr.image
 AutoUpdate=registry
 
 # Security
diff --git a/cookbooks/seedbox/sonarr.image b/cookbooks/seedbox/sonarr.image
new file mode 100644
index 0000000..d4783b2
--- /dev/null
+++ b/cookbooks/seedbox/sonarr.image
@@ -0,0 +1,6 @@
+[Unit]
+Description=podman pull lscr.io/linuxserver/sonarr
+Documentation=https://docs.linuxserver.io/images/docker-sonarr/
+
+[Image]
+Image=lscr.io/linuxserver/sonarr:latest
diff --git a/cookbooks/traefik/traefik.container b/cookbooks/traefik/traefik.container
index 83e1f93..4180219 100644
--- a/cookbooks/traefik/traefik.container
+++ b/cookbooks/traefik/traefik.container
@@ -11,7 +11,7 @@ PartOf=traefik.target
 ContainerName=traefik
 
 # Image
-Image=docker.io/library/traefik:v3.4
+Image=traefik.image
 AutoUpdate=registry
 
 # No need for root privileges
diff --git a/cookbooks/traefik/traefik.image b/cookbooks/traefik/traefik.image
new file mode 100644
index 0000000..e071abf
--- /dev/null
+++ b/cookbooks/traefik/traefik.image
@@ -0,0 +1,6 @@
+[Unit]
+Description=podman pull docker.io/library/traefik
+Documentation=https://github.com/traefik/traefik-library-image
+
+[Image]
+Image=docker.io/library/traefik:v3.4
diff --git a/cookbooks/unifi/unifi-app.container b/cookbooks/unifi/unifi-app.container
index 8d73a83..f9ebce1 100644
--- a/cookbooks/unifi/unifi-app.container
+++ b/cookbooks/unifi/unifi-app.container
@@ -12,7 +12,7 @@ PartOf=unifi.target
 
 [Container]
 ContainerName=unifi-app
-Image=lscr.io/linuxserver/unifi-network-application:latest
+Image=unifi-app.image
 AutoUpdate=registry
 
 # Network configuration
diff --git a/cookbooks/unifi/unifi-app.image b/cookbooks/unifi/unifi-app.image
new file mode 100644
index 0000000..38cd867
--- /dev/null
+++ b/cookbooks/unifi/unifi-app.image
@@ -0,0 +1,6 @@
+[Unit]
+Description=podman pull lscr.io/linuxserver/unifi-network-application
+Documentation=https://docs.linuxserver.io/images/docker-unifi-network-application/
+
+[Image]
+Image=lscr.io/linuxserver/unifi-network-application:latest
diff --git a/cookbooks/unifi/unifi-mongo.container b/cookbooks/unifi/unifi-mongo.container
index c53c5af..9505e81 100644
--- a/cookbooks/unifi/unifi-mongo.container
+++ b/cookbooks/unifi/unifi-mongo.container
@@ -11,7 +11,7 @@ PartOf=unifi.target
 
 [Container]
 ContainerName=unifi-mongo
-Image=docker.io/library/mongo:${MONGO_MAJOR}
+Image=unifi-mongo.image
 AutoUpdate=registry
 
 # Network configuration
diff --git a/cookbooks/unifi/unifi-mongo.image b/cookbooks/unifi/unifi-mongo.image
new file mode 100644
index 0000000..5ab5465
--- /dev/null
+++ b/cookbooks/unifi/unifi-mongo.image
@@ -0,0 +1,13 @@
+[Unit]
+Description=podman pull docker.io/library/mongo
+Documentation=https://hub.docker.com/_/mongo/
+
+# Only start if Unifi has been configured
+ConditionPathExists=/etc/quadlets/unifi/config.env
+
+[Image]
+Image=docker.io/library/mongo:${MONGO_MAJOR}
+
+[Service]
+# These environment variables are sourced to be used by systemd in the Exec* commands
+EnvironmentFile=/etc/quadlets/unifi/config.env
diff --git a/cookbooks/vaultwarden/vaultwarden.container b/cookbooks/vaultwarden/vaultwarden.container
index b88552e..ffb1a15 100644
--- a/cookbooks/vaultwarden/vaultwarden.container
+++ b/cookbooks/vaultwarden/vaultwarden.container
@@ -12,7 +12,7 @@ PartOf=vaultwarden.target
 
 [Container]
 ContainerName=vaultwarden
-Image=quay.io/vaultwarden/server:latest-alpine
+Image=vaultwarden.image
 AutoUpdate=registry
 
 # No need for root privileges
diff --git a/cookbooks/vaultwarden/vaultwarden.image b/cookbooks/vaultwarden/vaultwarden.image
new file mode 100644
index 0000000..10e8338
--- /dev/null
+++ b/cookbooks/vaultwarden/vaultwarden.image
@@ -0,0 +1,6 @@
+[Unit]
+Description=podman pull quay.io/vaultwarden/server
+Documentation=https://github.com/dani-garcia/vaultwarden
+
+[Image]
+Image=quay.io/vaultwarden/server:latest-alpine
diff --git a/cookbooks/vmagent/vmagent.container b/cookbooks/vmagent/vmagent.container
index 3db6523..7da5266 100644
--- a/cookbooks/vmagent/vmagent.container
+++ b/cookbooks/vmagent/vmagent.container
@@ -10,7 +10,7 @@ ConditionPathExists=/etc/quadlets/vmagent/vmagent.local.env
 ContainerName=vmagent
 
 # Image
-Image=quay.io/victoriametrics/vmagent:latest
+Image=vmagent.image
 AutoUpdate=registry
 
 # Security
diff --git a/cookbooks/vmagent/vmagent.image b/cookbooks/vmagent/vmagent.image
new file mode 100644
index 0000000..7e8132f
--- /dev/null
+++ b/cookbooks/vmagent/vmagent.image
@@ -0,0 +1,5 @@
+[Unit]
+Description=podman pull quay.io/victoriametrics/vmagent
+
+[Image]
+Image=quay.io/victoriametrics/vmagent:latest