diff --git a/common/params_keys.h b/common/params_keys.h
index dd58462a9..d8485be15 100644
--- a/common/params_keys.h
+++ b/common/params_keys.h
@@ -154,6 +154,7 @@ inline static std::unordered_map<std::string, ParamKeyAttributes> keys = {
     {"IntelligentCruiseButtonManagement", {PERSISTENT | BACKUP , BOOL}},
     {"InteractivityTimeout", {PERSISTENT | BACKUP, INT, "0"}},
     {"IsDevelopmentBranch", {CLEAR_ON_MANAGER_START, BOOL}},
+    {"IsReleaseSpBranch", {CLEAR_ON_MANAGER_START, BOOL}},
     {"LastGPSPositionLLK", {PERSISTENT, STRING}},
     {"LeadDepartAlert", {PERSISTENT | BACKUP, BOOL, "0"}},
     {"MaxTimeOffroad", {PERSISTENT | BACKUP, INT, "1800"}},
diff --git a/selfdrive/ui/qt/offroad/developer_panel.h b/selfdrive/ui/qt/offroad/developer_panel.h
index 51b1b0b6f..699fa1edc 100644
--- a/selfdrive/ui/qt/offroad/developer_panel.h
+++ b/selfdrive/ui/qt/offroad/developer_panel.h
@@ -12,7 +12,7 @@ public:
   explicit DeveloperPanel(SettingsWindow *parent);
   void showEvent(QShowEvent *event) override;
 
-private:
+protected:
   Params params;
   ParamControl* adbToggle;
   ParamControl* joystickToggle;
diff --git a/selfdrive/ui/sunnypilot/qt/offroad/settings/developer_panel.cc b/selfdrive/ui/sunnypilot/qt/offroad/settings/developer_panel.cc
index 021f5b377..9eb8da71e 100644
--- a/selfdrive/ui/sunnypilot/qt/offroad/settings/developer_panel.cc
+++ b/selfdrive/ui/sunnypilot/qt/offroad/settings/developer_panel.cc
@@ -60,7 +60,7 @@ DeveloperPanelSP::DeveloperPanelSP(SettingsWindow *parent) : DeveloperPanel(pare
 
 void DeveloperPanelSP::updateToggles(bool offroad) {
   bool disable_updates = params.getBool("DisableUpdates");
-  bool is_release = params.getBool("IsReleaseBranch");
+  bool is_release = params.getBool("IsReleaseBranch") || params.getBool("IsReleaseSpBranch");
   bool is_tested = params.getBool("IsTestedBranch");
   bool is_development = params.getBool("IsDevelopmentBranch");
 
@@ -79,6 +79,9 @@ void DeveloperPanelSP::updateToggles(bool offroad) {
   enableGithubRunner->setVisible(!is_release);
   errorLogBtn->setVisible(!is_release);
   showAdvancedControls->setEnabled(true);
+
+  joystickToggle->setVisible(!is_release);
+  longManeuverToggle->setVisible(!is_release);
 }
 
 void DeveloperPanelSP::showEvent(QShowEvent *event) {
diff --git a/system/manager/manager.py b/system/manager/manager.py
index 1186c2511..23e8ff725 100755
--- a/system/manager/manager.py
+++ b/system/manager/manager.py
@@ -67,6 +67,7 @@ def manager_init() -> None:
   params.put_bool("IsDevelopmentBranch", build_metadata.development_channel)
   params.put_bool("IsTestedBranch", build_metadata.tested_channel)
   params.put_bool("IsReleaseBranch", build_metadata.release_channel)
+  params.put_bool("IsReleaseSpBranch", build_metadata.release_sp_channel)
   params.put("HardwareSerial", serial)
 
   # set dongle id
diff --git a/system/version.py b/system/version.py
index 9719311b7..6ff290e03 100755
--- a/system/version.py
+++ b/system/version.py
@@ -13,8 +13,8 @@ from openpilot.common.git import get_commit, get_origin, get_branch, get_short_b
 RELEASE_SP_BRANCHES = ['release-c3', 'release']
 TESTED_SP_BRANCHES = ['staging-c3', 'staging-c3-new', 'staging']
 MASTER_SP_BRANCHES = ['master']
-RELEASE_BRANCHES = ['release3-staging', 'release3', 'release-tici', 'nightly'] + RELEASE_SP_BRANCHES
-TESTED_BRANCHES = RELEASE_BRANCHES + ['devel', 'devel-staging', 'nightly-dev'] + TESTED_SP_BRANCHES
+RELEASE_BRANCHES = ['release3-staging', 'release3', 'release-tici', 'nightly']
+TESTED_BRANCHES = RELEASE_BRANCHES + ['devel', 'devel-staging', 'nightly-dev'] + RELEASE_SP_BRANCHES + TESTED_SP_BRANCHES
 
 SP_BRANCH_MIGRATIONS = {
   ("tici", "staging-c3-new"): "staging-tici",
@@ -96,7 +96,9 @@ class OpenpilotMetadata:
   @property
   def sunnypilot_remote(self) -> bool:
     return self.git_normalized_origin in ("github.com/sunnypilot/sunnypilot",
-                                          "github.com/sunnypilot/openpilot")
+                                          "github.com/sunnypilot/openpilot",
+                                          "github.com/sunnyhaibin/sunnypilot",
+                                          "github.com/sunnyhaibin/openpilot")
 
   @property
   def git_normalized_origin(self) -> str:
@@ -120,6 +122,10 @@ class BuildMetadata:
   def release_channel(self) -> bool:
     return self.channel in RELEASE_BRANCHES
 
+  @property
+  def release_sp_channel(self) -> bool:
+    return self.channel in RELEASE_SP_BRANCHES
+
   @property
   def canonical(self) -> str:
     return f"{self.openpilot.version}-{self.openpilot.git_commit}-{self.openpilot.build_style}"
@@ -146,7 +152,7 @@ class BuildMetadata:
       return "staging"
     elif self.master_channel:
       return "master"
-    elif self.release_channel:
+    elif self.release_channel or self.release_sp_channel:
       return "release"
     else:
       return "feature"