diff --git a/modules/servers/baldur/crafty-controller.nix b/modules/servers/baldur/crafty-controller.nix
index 759f1c2..4914e0c 100644
--- a/modules/servers/baldur/crafty-controller.nix
+++ b/modules/servers/baldur/crafty-controller.nix
@@ -8,6 +8,9 @@
       "19132:19132"
       "25500-25600:25500-25600"
     ];
+    labels = {
+      "io.containers.autoupdate" = "registry";
+    };
     volumes = [
       "/var/lib/crafty-controller/backups:/crafty/backups"
       "/var/lib/crafty-controller/logs:/crafty/logs"
diff --git a/modules/servers/general/podman.nix b/modules/servers/general/podman.nix
index a4017a7..0e0bade 100644
--- a/modules/servers/general/podman.nix
+++ b/modules/servers/general/podman.nix
@@ -14,6 +14,13 @@
       defaultNetwork.settings.dns.enable = true;
     };
   };
+
+  # Enable system podman autoupdate timer
+  systemd.timers.podman-auto-update = {
+    enable = true;
+    wantedBy = ["timers.target"];
+  };
+
   environment.systemPackages = with pkgs; [
     podman-compose
     podman-tui
diff --git a/modules/servers/odin/syncyomi.nix b/modules/servers/odin/syncyomi.nix
index a55152a..6770c51 100644
--- a/modules/servers/odin/syncyomi.nix
+++ b/modules/servers/odin/syncyomi.nix
@@ -5,6 +5,9 @@
     ports = [
       "8282:8282"
     ];
+    labels = {
+      "io.containers.autoupdate" = "registry";
+    };
     volumes = [
       "/var/lib/syncyomi:/config"
     ];
diff --git a/modules/servers/odin/wallabag.nix b/modules/servers/odin/wallabag.nix
index 30c2e38..488a9c6 100644
--- a/modules/servers/odin/wallabag.nix
+++ b/modules/servers/odin/wallabag.nix
@@ -8,6 +8,9 @@
     environment = {
       "SYMFONY__ENV__DOMAIN_NAME" = "https://wallabag.cronyakatsuki.xyz";
     };
+    labels = {
+      "io.containers.autoupdate" = "registry";
+    };
     volumes = [
       "/var/lib/wallabag/data:/var/www/wallabag/data"
       "/var/lib/wallabag/images:/var/www/wallabag/web/assets/images"
diff --git a/modules/servers/odin/website.nix b/modules/servers/odin/website.nix
index 24f4e6b..5cbe688 100644
--- a/modules/servers/odin/website.nix
+++ b/modules/servers/odin/website.nix
@@ -5,6 +5,9 @@
     ports = [
       "8001:80"
     ];
+    labels = {
+      "io.containers.autoupdate" = "registry";
+    };
     volumes = [
       "/var/lib/website:/usr/share/nginx/html:ro"
     ];
diff --git a/modules/servers/tyr/home-assistant.nix b/modules/servers/tyr/home-assistant.nix
index d644257..4761bee 100644
--- a/modules/servers/tyr/home-assistant.nix
+++ b/modules/servers/tyr/home-assistant.nix
@@ -1,6 +1,6 @@
 {
   virtualisation.oci-containers.containers.homeassistant = {
-    image = "homeassistant/home-assistant:stable";
+    image = "docker.io/homeassistant/home-assistant:stable";
     autoStart = true;
     ports = [
       "8123:8123"
@@ -13,6 +13,9 @@
       NET_ADMIN = true;
       NET_RAW = true;
     };
+    labels = {
+      "io.containers.autoupdate" = "registry";
+    };
     extraOptions = ["--network=host"];
     volumes = [
       "/etc/localtime:/etc/localtime:ro"
diff --git a/modules/servers/tyr/wallos.nix b/modules/servers/tyr/wallos.nix
index b0eacf4..9cd1969 100644
--- a/modules/servers/tyr/wallos.nix
+++ b/modules/servers/tyr/wallos.nix
@@ -1,10 +1,13 @@
 {
   virtualisation.oci-containers.containers.wallos = {
-    image = "bellamy/wallos:latest";
+    image = "docker.io/bellamy/wallos:latest";
     autoStart = true;
     ports = [
       "8282:80/tcp"
     ];
+    labels = {
+      "io.containers.autoupdate" = "registry";
+    };
     volumes = [
       "/var/lib/wallos/db:/var/www/html/db"
       "/var/lib/wallos/logos:/var/www/html/images/uploads/logos"