diff --git a/docker/got.tf b/docker/got.tf
index f9b0328..fb4cd74 100644
--- a/docker/got.tf
+++ b/docker/got.tf
@@ -8,7 +8,7 @@ data "docker_registry_image" "gotviz" {
 # }
 # resource "docker_container" "gotviz" {
 #   name  = "gotviz"
-#   image = "${docker_image.gotviz.latest}"
+#   image = "${docker_image.gotviz.image_id}"
 #   labels = "${merge(
 #     local.traefik_common_labels, map(
 #       "traefik.port", 8080,
diff --git a/docker/lychee.tf b/docker/lychee.tf
index dedc70a..d728138 100644
--- a/docker/lychee.tf
+++ b/docker/lychee.tf
@@ -1,6 +1,6 @@
 # resource "docker_container" "lychee" {
 #   name  = "lychee"
-#   image = "${docker_image.lychee.latest}"
+#   image = "${docker_image.lychee.image_id}"
 #   restart               = "unless-stopped"
 #   destroy_grace_seconds = 10
 #   must_run              = true
diff --git a/docker/ubooquity.tf b/docker/ubooquity.tf
index d0bc92d..5e73d33 100644
--- a/docker/ubooquity.tf
+++ b/docker/ubooquity.tf
@@ -7,7 +7,7 @@ locals {
 
 resource "docker_container" "ubooquity" {
   name  = "ubooquity"
-  image = docker_image.ubooquity.latest
+  image = docker_image.ubooquity.image_id
 
   restart               = "unless-stopped"
   destroy_grace_seconds = 30
diff --git a/media/emby.tf b/media/emby.tf
index 9c673cd..b48052a 100644
--- a/media/emby.tf
+++ b/media/emby.tf
@@ -9,7 +9,7 @@ locals {
 
 resource "docker_container" "emby" {
   name  = "emby"
-  image = docker_image.emby.latest
+  image = docker_image.emby.image_id
 
   volumes {
     host_path      = "/mnt/xwing/config/emby"
@@ -36,10 +36,7 @@ resource "docker_container" "emby" {
   destroy_grace_seconds = 10
   must_run              = true
 
-  devices {
-    host_path      = "/dev/dri"
-    container_path = "/dev/dri"
-  }
+  gpus = "all"
 
   # Running as lounge:tatooine
   env = [
diff --git a/media/lidarr.tf b/media/lidarr.tf
index 62e4ea6..e92402e 100644
--- a/media/lidarr.tf
+++ b/media/lidarr.tf
@@ -16,7 +16,7 @@ locals {
 
 resource "docker_container" "lidarr" {
   name  = "lidarr"
-  image = docker_image.lidarr.latest
+  image = docker_image.lidarr.image_id
 
   dynamic "labels" {
     for_each = local.lidarr_labels
diff --git a/media/transmission.tf b/media/transmission.tf
index b030816..2ea54f4 100644
--- a/media/transmission.tf
+++ b/media/transmission.tf
@@ -7,7 +7,7 @@ locals {
 
 resource "docker_container" "transmission" {
   name  = "transmission"
-  image = docker_image.transmission.latest
+  image = docker_image.transmission.image_id
 
   dynamic "labels" {
     for_each = local.transmission_labels
diff --git a/modules/container/main.tf b/modules/container/main.tf
index ffa8e04..19c7c93 100644
--- a/modules/container/main.tf
+++ b/modules/container/main.tf
@@ -1,6 +1,6 @@
 resource "docker_container" "container" {
   name  = var.name
-  image = docker_image.image.latest
+  image = docker_image.image.image_id
 
   dynamic "ports" {
     for_each = var.ports
diff --git a/modules/image/main.tf b/modules/image/main.tf
index cb6d11a..562f0f4 100644
--- a/modules/image/main.tf
+++ b/modules/image/main.tf
@@ -12,6 +12,6 @@ resource "docker_image" "image" {
 }
 
 output "image" {
-  value = docker_image.image.latest
+  value = docker_image.image.image_id
 }
 
diff --git a/modules/outline/redis.tf b/modules/outline/redis.tf
index 01adddd..b4ac498 100644
--- a/modules/outline/redis.tf
+++ b/modules/outline/redis.tf
@@ -1,6 +1,6 @@
 resource "docker_container" "redis" {
   name  = "outline-redis"
-  image = "${docker_image.redis.latest}"
+  image = "${docker_image.redis.image_id}"
 
   volumes {
     host_path      = "/mnt/xwing/cache/outline"
diff --git a/monitoring/act.tf b/monitoring/act.tf
index c27d865..9570a6c 100644
--- a/monitoring/act.tf
+++ b/monitoring/act.tf
@@ -4,7 +4,7 @@ data "docker_registry_image" "act-exporter" {
 
 resource "docker_container" "act-exporter" {
   name  = "act-exporter"
-  image = docker_image.act-exporter.latest
+  image = docker_image.act-exporter.image_id
 
   entrypoint = ["/usr/local/bin/node", "server.js"]
 
diff --git a/monitoring/prometheus.tf b/monitoring/prometheus.tf
index 1831270..1b562f2 100644
--- a/monitoring/prometheus.tf
+++ b/monitoring/prometheus.tf
@@ -1,6 +1,6 @@
 resource "docker_container" "prometheus" {
   name  = "prometheus"
-  image = docker_image.prometheus.latest
+  image = docker_image.prometheus.image_id
 
   # prometheus:prometheus
   user = "985:983"
diff --git a/timemachine/main.tf b/timemachine/main.tf
index 8c47918..e09a22f 100644
--- a/timemachine/main.tf
+++ b/timemachine/main.tf
@@ -9,7 +9,7 @@ resource "docker_image" "timemachine" {
 
 resource "docker_container" "timemachine" {
   name  = "timemachine"
-  image = docker_image.timemachine.latest
+  image = docker_image.timemachine.image_id
 
   volumes {
     host_path      = "/mnt/xwing/data/timemachine"