diff --git a/services/media.hcl b/services/media.hcl
index 051c53f..0372335 100644
--- a/services/media.hcl
+++ b/services/media.hcl
@@ -12,6 +12,7 @@ job "media" {
       port "bazarr" { to = 6767 }
       port "prowlarr" { static = 9696 }
       port "jellyseerr" { static = 5055 }
+      port "flaresolverr" { static = 8191 }
       port "pms" { static = 32400 }
       port "qbt_ui" { static = 8080 }
       port "qbt_torrent" { static = 51413 }
@@ -36,7 +37,7 @@ job "media" {
       }
 
       resources {
-        cpu = 200
+        cpu = 1000
       }
 
       service {
@@ -70,7 +71,8 @@ job "media" {
       }
 
       resources {
-        cpu = 200
+        cpu = 1000
+        memory = 500
       }
 
       service {
@@ -85,39 +87,40 @@ job "media" {
       }
     }
 
-    task "bazarr" {
-      driver = "docker"
-
-      config {
-        image = "ghcr.io/hotio/bazarr:latest"
-        ports = [ "bazarr" ]
-        volumes = [
-          "/data/services/media/bazarr:/config",
-          "/data/media/media:/data/media",
-        ]
-      }
-
-      env {
-        PUID = 1000
-        PGID = 1000
-        TZ = "Europe/Lisbon"
-      }
-
-      resources {
-        cpu = 200
-      }
-
-      service {
-        name = "bazarr"
-        port = "bazarr"
-
-        tags = [
-          "traefik.enable=true",
-          "traefik.http.routers.bazarr.entryPoints=websecure",
-          "traefik.http.routers.bazarr.middlewares=oidc-auth@file",
-        ]
-      }
-    }
+#    task "bazarr" {
+#      driver = "docker"
+#
+#      config {
+#        image = "ghcr.io/hotio/bazarr:latest"
+#        ports = [ "bazarr" ]
+#        volumes = [
+#          "/data/services/media/bazarr:/config",
+#          "/data/media/media:/data/media",
+#        ]
+#      }
+#
+#      env {
+#        PUID = 1000
+#        PGID = 1000
+#        TZ = "Europe/Lisbon"
+#      }
+#
+#      resources {
+#        cpu = 200
+#        memory = 500
+#      }
+#
+#      service {
+#        name = "bazarr"
+#        port = "bazarr"
+#
+#        tags = [
+#          "traefik.enable=true",
+#          "traefik.http.routers.bazarr.entryPoints=websecure",
+#          "traefik.http.routers.bazarr.middlewares=oidc-auth@file",
+#        ]
+#      }
+#    }
 
     task "prowlarr" {
       driver = "docker"
@@ -183,6 +186,30 @@ job "media" {
       }
     }
 
+    task "flaresolverr" {
+      driver = "docker"
+
+      config {
+        image = "ghcr.io/flaresolverr/flaresolverr:latest"
+        ports = [ "flaresolverr" ]
+      }
+
+      env {
+        LOG_LEVEL = "info"
+        TZ = "Europe/Lisbon"
+      }
+
+      resources {
+        cpu = 500
+        memory = 1024
+      }
+
+      service {
+        name = "flaresolverr"
+        port = "flaresolverr"
+      }
+    }
+
     task "recyclarr" {
       driver = "docker"
 
@@ -264,7 +291,7 @@ job "media" {
 
       resources {
         cpu = 2000
-        memory = 1000
+        memory = 1500
       }
 
       service {