diff --git a/nixos/hosts/hades/_template/configuration.nix b/nixos/hosts/hades/_template/configuration.nix
index 0947f38..b1c2ee4 100644
--- a/nixos/hosts/hades/_template/configuration.nix
+++ b/nixos/hosts/hades/_template/configuration.nix
@@ -13,7 +13,7 @@
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "23.05"; # Did you read the comment?
+  system.stateVersion = "23.11"; # Did you read the comment?
 
   # Additional packages
   environment.systemPackages = with pkgs; [ ];
diff --git a/nixos/hosts/hades/default.nix b/nixos/hosts/hades/default.nix
index 6945a4e..875312e 100644
--- a/nixos/hosts/hades/default.nix
+++ b/nixos/hosts/hades/default.nix
@@ -107,7 +107,10 @@
     mac = "A2:2C:65:32:54:8A";
     profile = "plex";
   };
-  # ip = "192.168.0.121";
+  "garage" = {
+    ip = "192.168.0.121";
+    mac = "3A:19:32:A2:F8:96";
+  };
   "nginx" = {
     ip = "192.168.0.122";
     mac = "52:8E:72:31:AE:AC";
diff --git a/nixos/hosts/hades/garage/configuration.nix b/nixos/hosts/hades/garage/configuration.nix
new file mode 100644
index 0000000..2a7bd6b
--- /dev/null
+++ b/nixos/hosts/hades/garage/configuration.nix
@@ -0,0 +1,50 @@
+# Edit this configuration file to define what should be installed on
+# your system.  Help is available in the configuration.nix(5) man page
+# and in the NixOS manual (accessible by running ‘nixos-help’).
+
+{ pkgs, ... }:
+
+{
+  imports = [ ];
+
+  # This value determines the NixOS release from which the default
+  # settings for stateful data, like file locations and database versions
+  # on your system were taken. It‘s perfectly fine and recommended to leave
+  # this value at the release version of the first install of this system.
+  # Before changing this value read the documentation for this option
+  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+  system.stateVersion = "23.11"; # Did you read the comment?
+
+  # Additional packages
+  environment.systemPackages = with pkgs; [ ];
+
+  networking.firewall.allowedTCPPorts = [ ];
+
+  # See also: https://github.com/NixOS/nixpkgs/tree/master/nixos/tests/garage
+  services.garage = {
+    enable = false;
+    package = pkgs.garage_0_8;
+    settings = {
+      # rpc_bind_addr = "[::]:3901"
+      # rpc_public_addr = "127.0.0.1:3901"
+      # rpc_secret = "$(openssl rand -hex 32)"
+
+      # [s3_api]
+      # s3_region = "garage"
+      # api_bind_addr = "[::]:3900"
+      # root_domain = ".s3.garage.localhost"
+
+      # [s3_web]
+      # bind_addr = "[::]:3902"
+      # root_domain = ".web.garage.localhost"
+      # index = "index.html"
+
+      # [k2v_api]
+      # api_bind_addr = "[::]:3904"
+
+      # [admin]
+      # api_bind_addr = "0.0.0.0:3903"
+      # admin_token = "$(openssl rand -base64 32)"
+    };
+  };
+}
diff --git a/nixos/hosts/hades/mastodon/configuration.nix b/nixos/hosts/hades/mastodon/configuration.nix
index 1c84540..822d671 100644
--- a/nixos/hosts/hades/mastodon/configuration.nix
+++ b/nixos/hosts/hades/mastodon/configuration.nix
@@ -7,17 +7,9 @@ in {
   # Use DHCP with static leases
   networking.interfaces.eth0.useDHCP = true;
 
-  nixpkgs.config.permittedInsecurePackages = [
-    "openssl-1.1.1t"
-  ];
-
   # Better cache hits
   environment.noXlibs = lib.mkForce false;
 
-  networking.hosts = {
-    "192.168.0.122" = [ "xirion.net" "o.xirion.net" ];
-  };
-
   services.elasticsearch = {
     enable = true;
     cluster_name = "mastodon-es";
@@ -25,7 +17,7 @@ in {
   };
 
   vault-secrets.secrets.mastodon = {
-    services = [ "mastodon-init-dirs" "mastodon" "mastodon-media-prune" ];
+    services = [ "mastodon-init-dirs" "mastodon" "mastodon-media-autoremove" ];
     inherit (cfg) user group;
   };
 
@@ -49,12 +41,12 @@ in {
     mediaAutoRemove = {
       enable = true;
       olderThanDays = 30;
-      startAt = "weekly";
+      startAt = "daily";
     };
 
     configureNginx = false;
 
-    redis = { createLocally = true; };
+    redis.createLocally = true;
 
     elasticsearch = {
       host = "127.0.0.1";
diff --git a/nixos/hosts/olympus/_template/configuration.nix b/nixos/hosts/olympus/_template/configuration.nix
index 0947f38..b1c2ee4 100644
--- a/nixos/hosts/olympus/_template/configuration.nix
+++ b/nixos/hosts/olympus/_template/configuration.nix
@@ -13,7 +13,7 @@
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "23.05"; # Did you read the comment?
+  system.stateVersion = "23.11"; # Did you read the comment?
 
   # Additional packages
   environment.systemPackages = with pkgs; [ ];