diff --git a/machines/levitation/configuration.nix b/machines/levitation/configuration.nix
index 0dcbb6e..b28ad9f 100644
--- a/machines/levitation/configuration.nix
+++ b/machines/levitation/configuration.nix
@@ -87,4 +87,18 @@
     cores = 8;
     max-jobs = 4;
   };
+
+  # Calibre
+  services.calibre-web = {
+    enable = true;
+    user = "nathan";
+    group = "users";
+    openFirewall = true;
+    listen = { ip = "100.95.223.6"; };
+    options = {
+      calibreLibrary = "/home/nathan/Books";
+      enableBookConversion = true;
+      enableBookUploading = true;
+    };
+  };
 }
diff --git a/machines/oracles/configuration.nix b/machines/oracles/configuration.nix
index 866fe19..08616ff 100644
--- a/machines/oracles/configuration.nix
+++ b/machines/oracles/configuration.nix
@@ -233,18 +233,6 @@
       ports = [ "8091:8080" ];
       volumes = [ "/var/searxng:/etc/searxng" ];
     };
-    "calibre" = {
-      image = "linuxserver/calibre-web";
-      autoStart = true;
-      ports = [ "8083:8083" ];
-      volumes = [ "/var/kavita/books:/books" "/var/kavita/config:/config" ];
-      environment = {
-        PUID = "1000";
-        GUID = "1000";
-        TZ = "Europe/London";
-        DOCKER_MODS = "linuxserver/mods:universal-calibre";
-      };
-    };
   };
   services.nginx.virtualHosts."searx-ng.mccarty.io" = {
     enableACME = true;
diff --git a/machines/tounge/configuration.nix b/machines/tounge/configuration.nix
index 51fdfd3..7af4902 100644
--- a/machines/tounge/configuration.nix
+++ b/machines/tounge/configuration.nix
@@ -144,7 +144,7 @@
         forceSSL = true;
         useACMEHost = "mccarty.io";
         locations."/" = {
-          proxyPass = "http://100.66.15.34:8083";
+          proxyPass = "http://100.95.223.6:8083";
           extraConfig = ''
             allow 100.64.0.0/10;
             deny all;