diff --git a/README.md b/README.md
index c345d77..472288f 100644
--- a/README.md
+++ b/README.md
@@ -18,10 +18,10 @@ Legend:
 | ✨ | `nixng-radicale` | |
 | ✨ | `nixng-jellyseerr` | |
 | ✨ | `nixng-radarr` | |
+| ✨ | `nixng-sonarr` | |
 | ✅ | `jellyfin/jellyfin` | |
 | ✅ | `linuxserver/deluge` | |
 | ✅ | `lscr.io/linuxserver/prowlarr` | |
-| ✅ | `lscr.io/linuxserver/sonarr` | |
 | ✅ | `lscr.io/linuxserver/bazarr` | |
 | ✅ | `ghcr.io/atuinsh/atuin` | |
 | ✅ | `postgres:14` | Database for Atuin |
diff --git a/flake.lock b/flake.lock
index 3a0c28b..74e51b0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -676,11 +676,11 @@
         "treefmt-nix": "treefmt-nix_2"
       },
       "locked": {
-        "lastModified": 1734784051,
-        "narHash": "sha256-YvlDvvnRZ75reaqiNSAibNS2ThoVhmegxJgCMbnyc/o=",
+        "lastModified": 1734963444,
+        "narHash": "sha256-uxPuuRnW0O8SC0IGo9jY+x3ghfSEfFcaSAVFb1ZxlWo=",
         "owner": "pizzapim",
         "repo": "NixNG",
-        "rev": "f321e5903925f760bf617f7a92c8e5cd7711d6d9",
+        "rev": "a16aa49f49eb559742ff71ad30cfa9985e2223df",
         "type": "github"
       },
       "original": {
diff --git a/modules/media.nix b/modules/media.nix
index fd0464c..af9d6e6 100644
--- a/modules/media.nix
+++ b/modules/media.nix
@@ -325,7 +325,7 @@
 
             spec = {
               containers.sonarr = {
-                image = globals.images.sonarr;
+                image = utils.mkNixNGImage "sonarr";
                 ports.web.containerPort = 8989;
                 imagePullPolicy = "IfNotPresent";
 
diff --git a/nixng-configurations/default.nix b/nixng-configurations/default.nix
index 5edd330..b6f4549 100644
--- a/nixng-configurations/default.nix
+++ b/nixng-configurations/default.nix
@@ -14,6 +14,7 @@ flake-utils.lib.eachDefaultSystem (system: let
     radicale = ./radicale.nix;
     jellyseerr = ./jellyseerr.nix;
     radarr = ./radarr.nix;
+    sonarr = ./sonarr.nix;
   };
 in {
   nixngConfigurations = builtins.mapAttrs (name: configFile:
diff --git a/nixng-configurations/sonarr.nix b/nixng-configurations/sonarr.nix
new file mode 100644
index 0000000..b98f9cf
--- /dev/null
+++ b/nixng-configurations/sonarr.nix
@@ -0,0 +1,9 @@
+{...}: {
+  dinit.enable = true;
+  init.services.sonarr.shutdownOnExit = true;
+
+  services.sonarr = {
+    enable = true;
+    dataDir = "/config";
+  };
+}