diff --git a/VERSION b/VERSION
index 7958174a..51e5a6ef 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1.0-build5
+2.1.0-build6
diff --git a/defaults/both/streaming.yml b/defaults/both/streaming.yml
index d15406d2..a6a4ec87 100644
--- a/defaults/both/streaming.yml
+++ b/defaults/both/streaming.yml
@@ -49,10 +49,6 @@ templates:
         conditions:
           - originals_only: false
             value: 0
-      discover_count:
-        conditions:
-          - originals_only: false
-            value: 100
       allowed_streaming:
         conditions:
           - originals_only: true
@@ -72,7 +68,7 @@ templates:
       limit: "500"
       sync_mode: sync
       sync_mode_<<key>>: <<sync_mode>>
-      sort_by: release.desc
+      sort_by: popularity.desc
       sort_by_<<key>>: <<sort_by>>
     run_definition:
       - <<use_<<key>>>>
@@ -87,7 +83,6 @@ templates:
     tmdb_discover:
       limit: <<discover_limit>>
       with_watch_providers: <<discover_with>>
-      vote_count.gte: <<discover_count>>
       watch_region: <<discover_region>>
       sort_by: <<discover_sort>>
 
diff --git a/defaults/overlays/streaming.yml b/defaults/overlays/streaming.yml
index c8f60310..bc6e55e8 100644
--- a/defaults/overlays/streaming.yml
+++ b/defaults/overlays/streaming.yml
@@ -69,10 +69,10 @@ templates:
         conditions:
           - originals_only: false
             library_type: movie
-            value: primary_release_date.desc
+            value: popularity.desc
           - originals_only: false
             library_type: show
-            value: first_air_date.desc
+            value: popularity.desc
       originals:
         conditions:
           - originals_only: true
@@ -81,10 +81,6 @@ templates:
         conditions:
           - originals_only: false
             value: 0
-      discover_count:
-        conditions:
-          - originals_only: false
-            value: 100
       discover_with:
         conditions:
           - originals_only: false
@@ -117,7 +113,6 @@ templates:
     tmdb_discover:
       limit: <<discover_limit>>
       with_watch_providers: <<discover_with>>
-      vote_count.gte: <<discover_count>>
       watch_region: <<discover_region>>
       sort_by: <<discover_sort>>