diff --git a/roles/arr/templates/compose.yaml.jinja b/roles/arr/templates/compose.yaml.jinja
index c7fdde7..1caff10 100644
--- a/roles/arr/templates/compose.yaml.jinja
+++ b/roles/arr/templates/compose.yaml.jinja
@@ -1,7 +1,7 @@
 services:
   sonarr:
     container_name: sonarr
-    image: lscr.io/linuxserver/sonarr:latest
+    image: "lscr.io/linuxserver/sonarr:{{ arrstack_sonarr_version }}"
     networks:
       - caddy
     environment:
@@ -21,7 +21,7 @@ services:
 
   radarr:
     container_name: radarr
-    image: lscr.io/linuxserver/radarr:latest
+    image: "lscr.io/linuxserver/radarr:{{ arrstack_radarr_version }}"
     networks:
       - caddy
     environment:
@@ -41,7 +41,7 @@ services:
 
   lidarr:
     container_name: lidarr
-    image: lscr.io/linuxserver/lidarr:latest
+    image: "lscr.io/linuxserver/lidarr:{{ arrstack_lidarr_version }}"
     networks:
       - caddy
     environment:
@@ -66,7 +66,7 @@ services:
 
   readarr:
     container_name: readarr
-    image: lscr.io/linuxserver/readarr:develop
+    image: "lscr.io/linuxserver/readarr:{{ arrstack_readarr_version }}"
     networks:
       - caddy
     environment:
@@ -86,7 +86,7 @@ services:
 
   prowlarr:
     container_name: prowlarr
-    image: lscr.io/linuxserver/prowlarr:develop
+    image: "lscr.io/linuxserver/prowlarr:{{ arrstack_prowlarr_version }}"
     networks:
       - caddy
     environment:
@@ -102,7 +102,7 @@ services:
       caddy.reverse_proxy: "{{ '{{' }}upstreams 9696{{ '}}'}}"
 
   beets:
-    image: lscr.io/linuxserver/beets:latest
+    image: "lscr.io/linuxserver/beets:{{ arrstack_beets_version }}"
     container_name: beets
     networks:
       - caddy
@@ -123,7 +123,7 @@ services:
       caddy.reverse_proxy: "{{ '{{' }}upstreams 8337{{ '}}'}}"
 
   tdarr:
-    image: ghcr.io/haveagitgat/tdarr
+    image: "ghcr.io/haveagitgat/tdarr:{{ arrstack_tdarr_version }}"
     container_name: tdarr
     networks:
       - caddy
@@ -158,7 +158,7 @@ services:
       caddy.reverse_proxy: "{{ '{{' }}upstreams 8265{{ '}}'}}"
 
   bazarr:
-    image: lscr.io/linuxserver/bazarr:latest
+    image: "lscr.io/linuxserver/bazarr:{{ arrstack_bazarr_version }}"
     container_name: bazarr
     networks:
       - caddy
@@ -180,7 +180,7 @@ services:
 
   sabnzbd:
     container_name: sabnzbd
-    image: lscr.io/linuxserver/sabnzbd:latest
+    image: "lscr.io/linuxserver/sabnzbd:{{ arrstack_sabnzbd_version }}"
     networks:
       - caddy
     environment:
@@ -198,7 +198,7 @@ services:
 
   vpn:
     container_name: vpn
-    image: qmcgaw/gluetun:v3
+    image: "qmcgaw/gluetun:{{ arrstack_gluetun_version }}"
     networks:
       - caddy
     environment:
@@ -232,7 +232,7 @@ services:
       caddy: "{{ arrstack_qbit_subdomain }}"
       caddy.reverse_proxy: "{{ '{{' }}upstreams 8888{{ '}}'}}"
   qbittorrent:
-    image: linuxserver/qbittorrent
+    image: "linuxserver/qbittorrent:{{ arrstack_qbittorrent_version }}"
     container_name: qbittorrent
     environment:
       - PUID={{ arrstack_puid }}
@@ -250,7 +250,7 @@ services:
     restart: unless-stopped
 
   homarr:
-    image: ghcr.io/ajnart/homarr:latest
+    image: "ghcr.io/ajnart/homarr:{{ arrstack_homarr_version }}"
     container_name: homarr
     networks:
       - caddy
@@ -265,7 +265,7 @@ services:
       caddy.reverse_proxy: "{{ '{{' }}upstreams 7575{{ '}}'}}"
 
   jellyseerr:
-    image: fallenbagel/jellyseerr:latest
+    image: "fallenbagel/jellyseerr:{{ arrstack_jellyseerr_version }}"
     container_name: jellyseerr
     networks:
       - caddy
@@ -283,7 +283,7 @@ services:
 
   audiobookshelf:
     container_name: audiobookshelf
-    image: ghcr.io/advplyr/audiobookshelf:latest
+    image: "ghcr.io/advplyr/audiobookshelf:{{ arrstack_audiobookshelf_version }}"
     networks:
       - caddy
     environment:
@@ -302,7 +302,7 @@ services:
       caddy.reverse_proxy: "{{ '{{' }}upstreams 80{{ '}}'}}"
 
   jellyfin:
-    image: lscr.io/linuxserver/jellyfin:latest
+    image: "lscr.io/linuxserver/jellyfin:{{ arrstack_jellyfin_version }}"
     container_name: jellyfin
     networks:
       - caddy
@@ -334,7 +334,7 @@ services:
       caddy.reverse_proxy: "{{ '{{' }}upstreams 8096{{ '}}'}}"
 
   gonic:
-    image: sentriz/gonic:latest
+    image: "sentriz/gonic:{{ arrstack_gonic_version }}"
     networks:
       - caddy
     environment:
@@ -354,7 +354,7 @@ services:
 
 {% if restic_enable|d(False) == True and arrstack_restic_enable|d(False) == True %}
   backup:
-    image: mazzolino/restic
+    image: "mazzolino/restic:{{ arrstack_restic_version }}"
     hostname: "{{ ansible_hostname | default() }}"
     environment:
       TZ: "{{ restic_tz }}"
diff --git a/roles/arr/vars/main.yaml b/roles/arr/vars/main.yaml
index c17c9bb..d392c4c 100644
--- a/roles/arr/vars/main.yaml
+++ b/roles/arr/vars/main.yaml
@@ -1,2 +1,20 @@
 ---
-# vars file for arr
+
+arrstack_sonarr_version: latest
+arrstack_radarr_version: latest
+arrstack_lidarr_version: latest
+arrstack_readarr_version: develop
+arrstack_prowlarr_version: develop
+arrstack_beets_version: latest
+arrstack_tdarr_version: latest
+arrstack_bazarr_version: latest
+arrstack_sabnzbd_version: latest
+arrstack_gluetun_version: v3
+arrstack_qbittorrent_version: latest
+arrstack_homarr_version: latest
+arrstack_jellyseerr_version: latest
+arrstack_audiobookshelf_version: latest
+arrstack_jellyfin_version: latest
+arrstack_gonic_version: latest
+
+arrstack_restic_version: latest # TODO: Should maybe be set in restic role instead?