diff --git a/nixos-modules/docker-calibre-web.nix b/nixos-modules/docker-calibre-web.nix
index 2162fc7..1997b00 100644
--- a/nixos-modules/docker-calibre-web.nix
+++ b/nixos-modules/docker-calibre-web.nix
@@ -30,10 +30,7 @@
           swag_url = "calibre-web.icanttype.org";
           swag_port = "8083";
         };
-        extraOptions = [
-          "--pull=newer"
-          "--network=www"
-        ];
+        extraOptions = [ "--network=www" ];
       };
     };
   };
diff --git a/nixos-modules/docker-sonarr.nix b/nixos-modules/docker-sonarr.nix
index 1668324..3834ef6 100644
--- a/nixos-modules/docker-sonarr.nix
+++ b/nixos-modules/docker-sonarr.nix
@@ -1,16 +1,31 @@
+{ pkgs, ... }:
 {
   virtualisation = {
     containers.enable = true;
     podman.enable = true;
     oci-containers.containers = {
       sonarr = {
-        image = "lscr.io/linuxserver/sonarr:latest";
+        image = "my-sonarr:latest";
+        imageFile = pkgs.dockerTools.buildLayeredImage {
+          name = "my-sonarr";
+          tag = "latest";
+          contents = [ pkgs.busybox ];
+          config.Cmd = [
+            "${pkgs.sonarr}/bin/NzbDrone"
+            "-nobrowser"
+            "-data=/config"
+          ];
+        };
         volumes = [
           "sonarr-config:/config"
           "/video-data:/data"
         ];
         environment.TZ = "America/New_York";
-        labels.swag = "enable";
+        labels = {
+          swag = "enable";
+          swag_url = "sonarr.icanttype.org";
+          swag_port = "8989";
+        };
         extraOptions = [
           "--pull=newer"
           "--network=www"