diff --git a/devices/nos/modules/subtitles/default.nix b/devices/nos/modules/subtitles/default.nix
index 5386484..647f8a4 100644
--- a/devices/nos/modules/subtitles/default.nix
+++ b/devices/nos/modules/subtitles/default.nix
@@ -2,20 +2,22 @@
   config,
   pkgs,
   ...
-}: let
+} @ inputs: let
   inherit (config.vars) mainUser;
 
   convertMkv = pkgs.callPackage ./convert.nix {inherit pkgs;};
-  exportSubs = pkgs.callPackage ./extract-subs {inherit pkgs;};
+  extractSubs = pkgs.callPackage ./extract-subs {inherit pkgs;};
   sub-clean = pkgs.callPackage ./cleanup.nix {inherit pkgs;};
+  bazarr-bulk = pkgs.callPackage ./syncing.nix inputs;
 in {
-  imports = [
-    ./syncing.nix
-    # TODO:
-    # - Improve cleanup
-    # - Sync with bazarr-bulk
-    # - figure out bazarr postprocessing with subsync
+  # TODO:
+  # - Improve cleanup
+  # - figure out bazarr postprocessing with subsync
+
+  environment.systemPackages = [
+    bazarr-bulk
   ];
+
   systemd = {
     services.manage-subs = {
       serviceConfig = {
@@ -26,8 +28,9 @@ in {
 
       path = [
         convertMkv
-        exportSubs
+        extractSubs
         sub-clean
+        bazarr-bulk
       ];
 
       script = ''
@@ -40,15 +43,17 @@ in {
 
         # Remove ads and stuff in subs
         find /data/{anime,history,movies,tv} -name '*.srt' -exec sub-clean "{}" \;
+
+        # Bulk sync everything
+        bb movies sync
+        bb tv-shows sync
       '';
     };
 
-    /*
-    timers.sub-clean = {
+    timers.manage-subs = {
       wantedBy = ["timers.target"];
       partOf = ["manage-subs.service"];
       timerConfig.OnCalendar = ["0:00:00"];
     };
-    */
   };
 }
diff --git a/devices/nos/modules/subtitles/syncing.nix b/devices/nos/modules/subtitles/syncing.nix
index 42d7b38..0e023c2 100644
--- a/devices/nos/modules/subtitles/syncing.nix
+++ b/devices/nos/modules/subtitles/syncing.nix
@@ -6,13 +6,10 @@
   ...
 }: let
   bbPkg = bazarr-bulk.packages.${pkgs.system}.default;
-in {
-  environment.systemPackages = [
-    (pkgs.writeShellApplication {
-      name = "bb";
-      text = ''
-        exec ${lib.getExe bbPkg} --config ${config.sops.secrets.bazarr-bulk.path} "$@"
-      '';
-    })
-  ];
-}
+in
+  pkgs.writeShellApplication {
+    name = "bb";
+    text = ''
+      exec ${lib.getExe bbPkg} --config ${config.sops.secrets.bazarr-bulk.path} "$@"
+    '';
+  }
diff --git a/flake.lock b/flake.lock
index 20e29d2..6366544 100644
--- a/flake.lock
+++ b/flake.lock
@@ -122,11 +122,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1716002154,
-        "narHash": "sha256-dsjUnHsumQIfZ/HqWizx1wQkCqQXL0LzT8DOKqMWeVA=",
+        "lastModified": 1716075802,
+        "narHash": "sha256-FOsceX6qDdhQs7Pe0W61kem5NOcsKCscJyB8e9XaMsI=",
         "owner": "matt1432",
         "repo": "bazarr-bulk",
-        "rev": "bf8dc575ea39c64fa6b0261cb760094c1cdca754",
+        "rev": "ae0ec433ff22600fb36c1a747aa4182eed997bd8",
         "type": "github"
       },
       "original": {
@@ -2002,11 +2002,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1716003430,
-        "narHash": "sha256-QPW2z616smURIQmOIzfRUCBkbHDCDAn38SDB9WiObTs=",
+        "lastModified": 1716069733,
+        "narHash": "sha256-80esrChLmwUiWa/j7oJ8JwSW+6k2IMTjiRLTA0cNfJg=",
         "ref": "refs/heads/main",
-        "rev": "acfa72202dd120c9ab82eb5507369d4a0a373079",
-        "revCount": 65,
+        "rev": "1750659f6783859f22ee02b0fa1987fe4809229c",
+        "revCount": 66,
         "type": "git",
         "url": "ssh://git@git.nelim.org/matt1432/nixos-secrets"
       },