diff --git a/modules/hosts/nixos/nixnuc/audiobookshelf.nix b/modules/hosts/nixos/nixnuc/audiobookshelf.nix
new file mode 100644
index 0000000..7a77670
--- /dev/null
+++ b/modules/hosts/nixos/nixnuc/audiobookshelf.nix
@@ -0,0 +1,23 @@
+{ ... }: let
+  volume_base = "/orico/audiobookshelf";
+in {
+  # Audiobookshelf
+  virtualisation.oci-containers.containers = {
+    "audiobookshelf" = {
+      autoStart = true;
+      image = "ghcr.io/advplyr/audiobookshelf:latest";
+      environment = {
+        AUDIOBOOKSHELF_UID = "99";
+        AUDIOBOOKSHELF_GID = "100";
+      };
+      ports = [ "13378:80" ];
+      volumes = [
+        "${volume_base}/audiobooks:/audiobooks"
+        "${volume_base}/podcasts:/podcasts"
+        "${volume_base}/printbooks:/printbooks"
+        "${volume_base}/config:/config"
+        "${volume_base}/metadata:/metadata"
+      ];
+    };
+  };
+}
diff --git a/modules/hosts/nixos/nixnuc/default.nix b/modules/hosts/nixos/nixnuc/default.nix
index 0794864..5b90a09 100644
--- a/modules/hosts/nixos/nixnuc/default.nix
+++ b/modules/hosts/nixos/nixnuc/default.nix
@@ -1,6 +1,7 @@
 { inputs, config, hostname, pkgs, sops-nix, username,  ... }: {
   imports = [
     ./hardware-configuration.nix
+    ./audiobookshelf.nix
   ];
 
   system.stateVersion = "23.11";
@@ -118,9 +119,9 @@
       authKeyFile = config.sops.secrets.tailscale_key.path;
       extraUpFlags = [
         "--advertise-exit-node"
-        "--operator"
-        "${username}"
+        "--operator=${username}"
         "--ssh"
+        "--advertise-routes=192.168.20.0/22"
       ];
       useRoutingFeatures = "both";
     };