diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5a7de9cb..f144385e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -36,7 +36,7 @@ jobs:
           ORG_GRADLE_PROJECT_WholphinExtensionsUsername: "${{ secrets.EXTENSIONS_USERNAME }}"
           ORG_GRADLE_PROJECT_WholphinExtensionsPassword: "${{ secrets.EXTENSIONS_PASSWORD }}"
         run: |
-          ./gradlew clean assembleDefaultRelease bundleAppstoreRelease --no-daemon
+          ./gradlew clean assembleDefaultRelease bundleAppstoreRelease bundleFiretvRelease --no-daemon
 
       - name: Verify signatures
         run: |
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 80a6b2e4..3504f887 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,3 +1,4 @@
+import com.android.build.api.dsl.ProductFlavor
 import com.google.protobuf.gradle.id
 import com.mikepenz.aboutlibraries.plugin.DuplicateMode
 import com.mikepenz.aboutlibraries.plugin.DuplicateRule
@@ -112,16 +113,34 @@ android {
     }
     flavorDimensions += "version"
     productFlavors {
+        val featureLeanback = "leanback"
+        val featureUpdate = "UPDATING_ENABLED"
+        val featureDiscover = "DISCOVER_ENABLED"
+
+        fun ProductFlavor.setFeatureFlag(
+            name: String,
+            enabled: Boolean,
+        ) {
+            this.buildConfigField("boolean", name, "Boolean.parseBoolean(\"${enabled}\")")
+        }
         create("default") {
             dimension = "version"
             isDefault = true
-            manifestPlaceholders += mapOf("leanback" to false)
-            buildConfigField("boolean", "UPDATING_ENABLED", "true")
+            manifestPlaceholders += mapOf(featureLeanback to false)
+            setFeatureFlag(featureUpdate, true)
+            setFeatureFlag(featureDiscover, true)
         }
         create("appstore") {
             dimension = "version"
-            manifestPlaceholders += mapOf("leanback" to true)
-            buildConfigField("boolean", "UPDATING_ENABLED", "false")
+            manifestPlaceholders += mapOf(featureLeanback to true)
+            setFeatureFlag(featureUpdate, false)
+            setFeatureFlag(featureDiscover, true)
+        }
+        create("firetv") {
+            dimension = "version"
+            manifestPlaceholders += mapOf(featureLeanback to true)
+            setFeatureFlag(featureUpdate, false)
+            setFeatureFlag(featureDiscover, false)
         }
     }
     compileOptions {
diff --git a/app/src/main/java/com/github/damontecres/wholphin/preferences/AppPreference.kt b/app/src/main/java/com/github/damontecres/wholphin/preferences/AppPreference.kt
index e88c1ffb..26e8e623 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/preferences/AppPreference.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/preferences/AppPreference.kt
@@ -5,6 +5,7 @@ import androidx.annotation.ArrayRes
 import androidx.annotation.StringRes
 import androidx.core.content.edit
 import androidx.preference.PreferenceManager
+import com.github.damontecres.wholphin.BuildConfig
 import com.github.damontecres.wholphin.R
 import com.github.damontecres.wholphin.WholphinApplication
 import com.github.damontecres.wholphin.services.UpdateChecker
@@ -1085,10 +1086,12 @@ val basicPreferences =
         PreferenceGroup(
             title = R.string.more,
             preferences =
-                listOf(
-                    AppPreference.SeerrIntegration,
-                    AppPreference.AdvancedSettings,
-                ),
+                buildList {
+                    if (BuildConfig.DISCOVER_ENABLED) {
+                        add(AppPreference.SeerrIntegration)
+                    }
+                    add(AppPreference.AdvancedSettings)
+                },
         ),
     )
 
diff --git a/app/src/main/java/com/github/damontecres/wholphin/services/SeerrApi.kt b/app/src/main/java/com/github/damontecres/wholphin/services/SeerrApi.kt
index 5c62655f..685b858c 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/services/SeerrApi.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/services/SeerrApi.kt
@@ -1,5 +1,6 @@
 package com.github.damontecres.wholphin.services
 
+import com.github.damontecres.wholphin.BuildConfig
 import com.github.damontecres.wholphin.api.seerr.SeerrApiClient
 import com.github.damontecres.wholphin.ui.isNotNullOrBlank
 import com.github.damontecres.wholphin.ui.setup.seerr.createSeerrApiUrl
@@ -19,7 +20,7 @@ class SeerrApi(
         )
         private set
 
-    val active: Boolean get() = api.baseUrl.isNotNullOrBlank()
+    val active: Boolean get() = api.baseUrl.isNotNullOrBlank() && BuildConfig.DISCOVER_ENABLED
 
     fun update(
         baseUrl: String,
diff --git a/app/src/main/java/com/github/damontecres/wholphin/services/SeerrServerRepository.kt b/app/src/main/java/com/github/damontecres/wholphin/services/SeerrServerRepository.kt
index 0f073af6..7096b833 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/services/SeerrServerRepository.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/services/SeerrServerRepository.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.asFlow
 import androidx.lifecycle.lifecycleScope
+import com.github.damontecres.wholphin.BuildConfig
 import com.github.damontecres.wholphin.api.seerr.SeerrApiClient
 import com.github.damontecres.wholphin.api.seerr.model.AuthJellyfinPostRequest
 import com.github.damontecres.wholphin.api.seerr.model.AuthLocalPostRequest
@@ -292,44 +293,46 @@ class UserSwitchListener
                 launchIO {
                     homeSettingsService.loadCurrentSettings(user.id)
                 }
-                // Check for seerr server
-                launchIO {
-                    seerrServerDao
-                        .getUsersByJellyfinUser(user.rowId)
-                        .lastOrNull()
-                        ?.let { seerrUser ->
-                            val server =
-                                seerrServerDao.getServer(seerrUser.serverId)?.server
-                            if (server != null) {
-                                Timber.i("Found a seerr user & server")
-                                try {
-                                    seerrApi.update(server.url, seerrUser.credential)
-                                    val userConfig =
-                                        if (seerrUser.authMethod != SeerrAuthMethod.API_KEY) {
-                                            login(
-                                                seerrApi.api,
-                                                seerrUser.authMethod,
-                                                seerrUser.username,
-                                                seerrUser.password,
-                                            )
-                                        } else {
-                                            seerrApi.api.usersApi.authMeGet()
-                                        }
-                                    seerrServerRepository.set(
-                                        server,
-                                        seerrUser,
-                                        userConfig,
-                                    )
-                                } catch (ex: Exception) {
-                                    Timber.w(
-                                        ex,
-                                        "Error logging into %s",
-                                        server.url,
-                                    )
-                                    seerrServerRepository.error(server, seerrUser, ex)
+                if (BuildConfig.DISCOVER_ENABLED) {
+                    // Check for seerr server
+                    launchIO {
+                        seerrServerDao
+                            .getUsersByJellyfinUser(user.rowId)
+                            .lastOrNull()
+                            ?.let { seerrUser ->
+                                val server =
+                                    seerrServerDao.getServer(seerrUser.serverId)?.server
+                                if (server != null) {
+                                    Timber.i("Found a seerr user & server")
+                                    try {
+                                        seerrApi.update(server.url, seerrUser.credential)
+                                        val userConfig =
+                                            if (seerrUser.authMethod != SeerrAuthMethod.API_KEY) {
+                                                login(
+                                                    seerrApi.api,
+                                                    seerrUser.authMethod,
+                                                    seerrUser.username,
+                                                    seerrUser.password,
+                                                )
+                                            } else {
+                                                seerrApi.api.usersApi.authMeGet()
+                                            }
+                                        seerrServerRepository.set(
+                                            server,
+                                            seerrUser,
+                                            userConfig,
+                                        )
+                                    } catch (ex: Exception) {
+                                        Timber.w(
+                                            ex,
+                                            "Error logging into %s",
+                                            server.url,
+                                        )
+                                        seerrServerRepository.error(server, seerrUser, ex)
+                                    }
                                 }
                             }
-                        }
+                    }
                 }
             }
     }
diff --git a/app/src/main/java/com/github/damontecres/wholphin/services/UpdateChecker.kt b/app/src/main/java/com/github/damontecres/wholphin/services/UpdateChecker.kt
index 40a04218..f2a0bd23 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/services/UpdateChecker.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/services/UpdateChecker.kt
@@ -65,7 +65,7 @@ class UpdateChecker
 
             private val NOTE_REGEX = Regex("<!-- app-note:(.+) -->")
 
-            const val ACTIVE = BuildConfig.UPDATING_ENABLED
+            val ACTIVE = BuildConfig.UPDATING_ENABLED
         }
 
         /**