diff --git a/packages/hoppscotch-agent/package.json b/packages/hoppscotch-agent/package.json
index 4333ff26a47..aa32efe2529 100644
--- a/packages/hoppscotch-agent/package.json
+++ b/packages/hoppscotch-agent/package.json
@@ -1,7 +1,7 @@
 {
   "name": "hoppscotch-agent",
   "private": true,
-  "version": "0.1.11",
+  "version": "0.1.12",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/packages/hoppscotch-agent/src-tauri/Cargo.lock b/packages/hoppscotch-agent/src-tauri/Cargo.lock
index 1e2d129e517..15422841267 100644
--- a/packages/hoppscotch-agent/src-tauri/Cargo.lock
+++ b/packages/hoppscotch-agent/src-tauri/Cargo.lock
@@ -2076,7 +2076,7 @@ dependencies = [
 
 [[package]]
 name = "hoppscotch-agent"
-version = "0.1.11"
+version = "0.1.12"
 dependencies = [
  "aes-gcm",
  "axum",
@@ -4110,7 +4110,7 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 [[package]]
 name = "relay"
 version = "0.1.1"
-source = "git+https://github.com/CuriousCorrelation/relay.git#dfa662f2e8a2731cd21c59b2a10bfc6e2ef70ca3"
+source = "git+https://github.com/CuriousCorrelation/relay.git#10aca0e5d74515a6fed231ee9d7220a014f8b184"
 dependencies = [
  "bytes",
  "curl",
diff --git a/packages/hoppscotch-agent/src-tauri/Cargo.toml b/packages/hoppscotch-agent/src-tauri/Cargo.toml
index a5e6aa0fa42..fdb292701db 100644
--- a/packages/hoppscotch-agent/src-tauri/Cargo.toml
+++ b/packages/hoppscotch-agent/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hoppscotch-agent"
-version = "0.1.11"
+version = "0.1.12"
 description = "A cross-platform HTTP request agent for Hoppscotch for advanced request handling including custom headers, certificates, proxies, and local system integration."
 authors = ["AndrewBastin", "CuriousCorrelation"]
 edition = "2021"
diff --git a/packages/hoppscotch-agent/src-tauri/tauri.conf.json b/packages/hoppscotch-agent/src-tauri/tauri.conf.json
index 16ffaa629cc..69c0cde011e 100644
--- a/packages/hoppscotch-agent/src-tauri/tauri.conf.json
+++ b/packages/hoppscotch-agent/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2.0.0-rc",
   "productName": "Hoppscotch Agent",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "identifier": "io.hoppscotch.agent",
   "build": {
     "beforeDevCommand": "pnpm dev",
diff --git a/packages/hoppscotch-agent/src-tauri/tauri.portable.conf.json b/packages/hoppscotch-agent/src-tauri/tauri.portable.conf.json
index 6529002a150..bc95662a9e9 100644
--- a/packages/hoppscotch-agent/src-tauri/tauri.portable.conf.json
+++ b/packages/hoppscotch-agent/src-tauri/tauri.portable.conf.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2.0.0-rc",
   "productName": "Hoppscotch Agent Portable",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "identifier": "io.hoppscotch.agent",
   "build": {
     "beforeDevCommand": "pnpm dev",
diff --git a/packages/hoppscotch-backend/package.json b/packages/hoppscotch-backend/package.json
index 81fb9d2f52f..0eaf2e375c2 100644
--- a/packages/hoppscotch-backend/package.json
+++ b/packages/hoppscotch-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hoppscotch-backend",
-  "version": "2025.7.0",
+  "version": "2025.7.1",
   "description": "",
   "author": "",
   "private": true,
diff --git a/packages/hoppscotch-common/locales/es.json b/packages/hoppscotch-common/locales/es.json
index 9e7db3c6935..be9f6541c25 100644
--- a/packages/hoppscotch-common/locales/es.json
+++ b/packages/hoppscotch-common/locales/es.json
@@ -993,7 +993,7 @@
     "invited_to_team": "{owner} te ha invitado al espacio de trabajo {team}",
     "join": "Invitación aceptada",
     "join_team": "Entrar al espacio de trabajo {team}",
-    "joined_team": "Haz entrado al espacio de trabajo {team}",
+    "joined_team": "Has entrado al espacio de trabajo {team}",
     "joined_team_description": "Ahora eres miembro de este espacio de trabajo",
     "left": "Saliste del espacio de trabajo",
     "login_to_continue": "Iniciar sesión para continuar",
diff --git a/packages/hoppscotch-common/locales/tw.json b/packages/hoppscotch-common/locales/tw.json
index e7415b3d94c..12bc4ae149f 100644
--- a/packages/hoppscotch-common/locales/tw.json
+++ b/packages/hoppscotch-common/locales/tw.json
@@ -1,51 +1,63 @@
 {
   "action": {
-    "add": "Add",
+    "add": "新增",
     "autoscroll": "自動捲動",
     "cancel": "取消",
     "choose_file": "選擇一個檔案",
+    "choose_workspace": "選擇工作區",
+    "choose_collection": "選擇集合",
+    "select_workspace": "選擇工作區",
     "clear": "清除",
     "clear_all": "全部清除",
+    "clear_cache": "清除快取",
     "clear_history": "清除所有歷史記錄",
+    "clear_unpinned": "清除未釘選",
     "close": "關閉",
+    "confirm": "確認",
     "connect": "連線",
-    "connecting": "正在連接",
+    "connecting": "連線中",
     "copy": "複製",
     "create": "建立",
     "delete": "刪除",
-    "disconnect": "斷開連線",
+    "disconnect": "中斷連線",
     "dismiss": "忽略",
+    "done": "完成",
     "dont_save": "不要儲存",
     "download_file": "下載檔案",
+    "download_test_report": "下載測試報告",
     "drag_to_reorder": "拖曳以重新排序",
     "duplicate": "複製",
     "edit": "編輯",
-    "filter": "篩選回應",
+    "filter": "篩選",
     "go_back": "返回",
-    "go_forward": "向前",
-    "group_by": "分組方式",
+    "go_forward": "前進",
+    "group_by": "分組",
     "hide_secret": "Hide secret",
     "label": "標籤",
     "learn_more": "瞭解更多",
-    "download_here": "Download here",
+    "download_here": "下載到這裡",
     "less": "更少",
     "more": "更多",
     "new": "新增",
     "no": "否",
     "open_workspace": "開啟工作區",
     "paste": "貼上",
-    "prettify": "美化",
-    "properties": "Properties",
+    "prettify": "格式化",
+    "properties": "屬性",
+    "register": "註冊",
     "remove": "移除",
-    "rename": "Rename",
+    "remove_instance": "移除實例",
+    "rename": "重新命名",
     "restore": "還原",
+    "retry": "重試",
     "save": "儲存",
+    "save_as_example": "儲存為範本",
     "scroll_to_bottom": "捲動至底部",
     "scroll_to_top": "捲動至頂部",
     "search": "搜尋",
-    "send": "傳送",
-    "share": "Share",
-    "show_secret": "Show secret",
+    "send": "送出",
+    "share": "分享",
+    "show_secret": "顯示祕密",
     "start": "開始",
     "starting": "正在開始",
     "stop": "停止",
@@ -55,7 +67,11 @@
     "turn_off": "關閉",
     "turn_on": "開啟",
     "undo": "復原",
-    "yes": "是"
+    "yes": "是",
+    "verify": "驗證",
+    "enable": "啟用",
+    "disable": "停用",
+    "assign": "指派"
   },
   "add": {
     "new": "新增",
diff --git a/packages/hoppscotch-common/package.json b/packages/hoppscotch-common/package.json
index 907359f2b54..4fcde06fc02 100644
--- a/packages/hoppscotch-common/package.json
+++ b/packages/hoppscotch-common/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@hoppscotch/common",
   "private": true,
-  "version": "2025.7.0",
+  "version": "2025.7.1",
   "scripts": {
     "dev": "pnpm exec npm-run-all -p -l dev:*",
     "test": "vitest --run",
diff --git a/packages/hoppscotch-common/src/components.d.ts b/packages/hoppscotch-common/src/components.d.ts
index 3392c2b4d3c..a34181a00e4 100644
--- a/packages/hoppscotch-common/src/components.d.ts
+++ b/packages/hoppscotch-common/src/components.d.ts
@@ -211,9 +211,7 @@ declare module 'vue' {
     IconLucideArrowUpRight: typeof import('~icons/lucide/arrow-up-right')['default']
     IconLucideBrush: typeof import('~icons/lucide/brush')['default']
     IconLucideCheckCircle: typeof import('~icons/lucide/check-circle')['default']
-    IconLucideChevronDown: typeof import('~icons/lucide/chevron-down')['default']
     IconLucideChevronRight: typeof import('~icons/lucide/chevron-right')['default']
-    IconLucideChevronUp: typeof import('~icons/lucide/chevron-up')['default']
     IconLucideCircleCheck: typeof import('~icons/lucide/circle-check')['default']
     IconLucideGlobe: typeof import('~icons/lucide/globe')['default']
     IconLucideHelpCircle: typeof import('~icons/lucide/help-circle')['default']
@@ -223,6 +221,7 @@ declare module 'vue' {
     IconLucideListEnd: typeof import('~icons/lucide/list-end')['default']
     IconLucideMinus: typeof import('~icons/lucide/minus')['default']
     IconLucidePlusCircle: typeof import('~icons/lucide/plus-circle')['default']
+    IconLucideRss: typeof import('~icons/lucide/rss')['default']
     IconLucideSearch: typeof import('~icons/lucide/search')['default']
     IconLucideTriangleAlert: typeof import('~icons/lucide/triangle-alert')['default']
     IconLucideUsers: typeof import('~icons/lucide/users')['default']
diff --git a/packages/hoppscotch-common/src/components/http/RequestTab.vue b/packages/hoppscotch-common/src/components/http/RequestTab.vue
index 6e9a65a061e..66352e572b6 100644
--- a/packages/hoppscotch-common/src/components/http/RequestTab.vue
+++ b/packages/hoppscotch-common/src/components/http/RequestTab.vue
@@ -4,7 +4,7 @@
       <HttpRequest v-model="tab" />
       <HttpRequestOptions
         v-model="tab.document.request"
-        v-model:option-tab="tab.document.optionTabPreference"
+        v-model:option-tab="tab.document.optionTabPreference!"
         v-model:inherited-properties="tab.document.inheritedProperties"
       />
     </template>
diff --git a/packages/hoppscotch-common/src/components/importExport/ImportExportList.vue b/packages/hoppscotch-common/src/components/importExport/ImportExportList.vue
index ed8fe23d4f5..e357f15003e 100644
--- a/packages/hoppscotch-common/src/components/importExport/ImportExportList.vue
+++ b/packages/hoppscotch-common/src/components/importExport/ImportExportList.vue
@@ -1,5 +1,10 @@
 <template>
-  <div class="flex flex-col">
+  <div
+    class="flex flex-col"
+    :class="{
+      'space-y-2': !hasTeamWriteAccess,
+    }"
+  >
     <div class="flex flex-col space-y-2">
       <HoppSmartItem
         v-for="importer in importers"
diff --git a/packages/hoppscotch-common/src/components/smart/EnvInput.vue b/packages/hoppscotch-common/src/components/smart/EnvInput.vue
index 2073c8b8db5..748baae8aee 100644
--- a/packages/hoppscotch-common/src/components/smart/EnvInput.vue
+++ b/packages/hoppscotch-common/src/components/smart/EnvInput.vue
@@ -376,7 +376,7 @@ const aggregateEnvs = useReadonlyStream(
 const tabs = useService(RESTTabService)
 
 const envVars = computed(() => {
-  if (props.envs) {
+  if (props.envs?.length) {
     return props.envs.map((x) => {
       const { key, secret } = x
       const currentValue = secret ? "********" : x.currentValue
diff --git a/packages/hoppscotch-common/src/helpers/RequestRunner.ts b/packages/hoppscotch-common/src/helpers/RequestRunner.ts
index a9a45fb3daf..634ef11a0cb 100644
--- a/packages/hoppscotch-common/src/helpers/RequestRunner.ts
+++ b/packages/hoppscotch-common/src/helpers/RequestRunner.ts
@@ -587,6 +587,17 @@ export function runTestRunnerRequest(
       return E.left("script_fail" as const)
     }
 
+    const finalRequestVariables = pipe(
+      request.requestVariables,
+      A.filter(({ active }) => active),
+      A.map(({ key, value }) => ({
+        key,
+        initialValue: value,
+        currentValue: value,
+        secret: false,
+      }))
+    )
+
     const effectiveRequest = await getEffectiveRESTRequest(request, {
       id: "env-id",
       v: 2,
@@ -597,7 +608,7 @@ export function runTestRunnerRequest(
             ...preRequestScriptResult.right.envs,
             temp: !persistEnv ? getTemporaryVariables() : [],
           },
-          requestVariables: [],
+          requestVariables: finalRequestVariables,
         })
       ),
     })
diff --git a/packages/hoppscotch-desktop/package.json b/packages/hoppscotch-desktop/package.json
index 7c3f28950c1..447c2558ed5 100644
--- a/packages/hoppscotch-desktop/package.json
+++ b/packages/hoppscotch-desktop/package.json
@@ -1,7 +1,7 @@
 {
   "name": "hoppscotch-desktop",
   "private": true,
-  "version": "25.7.0",
+  "version": "25.7.1",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/packages/hoppscotch-desktop/plugin-workspace/relay/src/interop.rs b/packages/hoppscotch-desktop/plugin-workspace/relay/src/interop.rs
index df415212a85..73604247a73 100644
--- a/packages/hoppscotch-desktop/plugin-workspace/relay/src/interop.rs
+++ b/packages/hoppscotch-desktop/plugin-workspace/relay/src/interop.rs
@@ -8,6 +8,7 @@ use time::OffsetDateTime;
 
 #[derive(Debug, Serialize, Deserialize, Clone, Copy, PartialEq, Display, EnumString)]
 pub enum MediaType {
+    // Text
     #[serde(rename = "text/plain")]
     #[strum(to_string = "text/plain")]
     TextPlain,
@@ -20,6 +21,11 @@ pub enum MediaType {
     #[serde(rename = "text/csv")]
     #[strum(to_string = "text/csv")]
     TextCsv,
+    #[serde(rename = "text/xml")]
+    #[strum(to_string = "text/xml")]
+    TextXml,
+
+    // Application
     #[serde(rename = "application/json")]
     #[strum(to_string = "application/json")]
     Json,
@@ -29,9 +35,6 @@ pub enum MediaType {
     #[serde(rename = "application/xml")]
     #[strum(to_string = "application/xml")]
     Xml,
-    #[serde(rename = "text/xml")]
-    #[strum(to_string = "text/xml")]
-    TextXml,
     #[serde(rename = "application/x-www-form-urlencoded")]
     #[strum(to_string = "application/x-www-form-urlencoded")]
     FormUrlEncoded,
@@ -41,6 +44,83 @@ pub enum MediaType {
     #[serde(rename = "application/octet-stream")]
     #[strum(to_string = "application/octet-stream")]
     OctetStream,
+    #[serde(rename = "application/pdf")]
+    #[strum(to_string = "application/pdf")]
+    ApplicationPdf,
+    #[serde(rename = "application/zip")]
+    #[strum(to_string = "application/zip")]
+    ApplicationZip,
+    #[serde(rename = "application/javascript")]
+    #[strum(to_string = "application/javascript")]
+    ApplicationJavascript,
+
+    // Audio
+    #[serde(rename = "audio/mpeg")]
+    #[strum(to_string = "audio/mpeg")]
+    AudioMpeg,
+    #[serde(rename = "audio/mp4")]
+    #[strum(to_string = "audio/mp4")]
+    AudioMp4,
+    #[serde(rename = "audio/x-m4a")]
+    #[strum(to_string = "audio/x-m4a")]
+    AudioXM4a,
+    #[serde(rename = "audio/wav")]
+    #[strum(to_string = "audio/wav")]
+    AudioWav,
+    #[serde(rename = "audio/ogg")]
+    #[strum(to_string = "audio/ogg")]
+    AudioOgg,
+    #[serde(rename = "audio/aac")]
+    #[strum(to_string = "audio/aac")]
+    AudioAac,
+    #[serde(rename = "audio/flac")]
+    #[strum(to_string = "audio/flac")]
+    AudioFlac,
+
+    // Video
+    #[serde(rename = "video/mp4")]
+    #[strum(to_string = "video/mp4")]
+    VideoMp4,
+    #[serde(rename = "video/avi")]
+    #[strum(to_string = "video/avi")]
+    VideoAvi,
+    #[serde(rename = "video/quicktime")]
+    #[strum(to_string = "video/quicktime")]
+    VideoQuicktime,
+    #[serde(rename = "video/x-msvideo")]
+    #[strum(to_string = "video/x-msvideo")]
+    VideoXMsvideo,
+    #[serde(rename = "video/webm")]
+    #[strum(to_string = "video/webm")]
+    VideoWebm,
+    #[serde(rename = "video/x-flv")]
+    #[strum(to_string = "video/x-flv")]
+    VideoXFlv,
+
+    // Image
+    #[serde(rename = "image/png")]
+    #[strum(to_string = "image/png")]
+    ImagePng,
+    #[serde(rename = "image/jpeg")]
+    #[strum(to_string = "image/jpeg")]
+    ImageJpeg,
+    #[serde(rename = "image/gif")]
+    #[strum(to_string = "image/gif")]
+    ImageGif,
+    #[serde(rename = "image/svg+xml")]
+    #[strum(to_string = "image/svg+xml")]
+    ImageSvgXml,
+    #[serde(rename = "image/webp")]
+    #[strum(to_string = "image/webp")]
+    ImageWebp,
+    #[serde(rename = "image/bmp")]
+    #[strum(to_string = "image/bmp")]
+    ImageBmp,
+    #[serde(rename = "image/x-icon")]
+    #[strum(to_string = "image/x-icon")]
+    ImageXIcon,
+
+    // Fallback for unknown
     #[serde(other)]
     Other,
 }
diff --git a/packages/hoppscotch-desktop/plugin-workspace/tauri-plugin-relay/Cargo.lock b/packages/hoppscotch-desktop/plugin-workspace/tauri-plugin-relay/Cargo.lock
index 3c53f963e90..139218b32cd 100644
--- a/packages/hoppscotch-desktop/plugin-workspace/tauri-plugin-relay/Cargo.lock
+++ b/packages/hoppscotch-desktop/plugin-workspace/tauri-plugin-relay/Cargo.lock
@@ -2888,7 +2888,7 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 [[package]]
 name = "relay"
 version = "0.1.1"
-source = "git+https://github.com/CuriousCorrelation/relay.git#dfa662f2e8a2731cd21c59b2a10bfc6e2ef70ca3"
+source = "git+https://github.com/CuriousCorrelation/relay.git#10aca0e5d74515a6fed231ee9d7220a014f8b184"
 dependencies = [
  "bytes",
  "curl",
diff --git a/packages/hoppscotch-desktop/src-tauri/Cargo.lock b/packages/hoppscotch-desktop/src-tauri/Cargo.lock
index 3289e06bf93..832b8983f80 100644
--- a/packages/hoppscotch-desktop/src-tauri/Cargo.lock
+++ b/packages/hoppscotch-desktop/src-tauri/Cargo.lock
@@ -2216,13 +2216,13 @@ dependencies = [
 
 [[package]]
 name = "hoppscotch-desktop"
-version = "25.7.0"
+version = "25.7.1"
 dependencies = [
  "axum",
  "dirs 6.0.0",
  "file-rotate",
  "native-dialog",
- "portpicker",
+ "random-port",
  "semver",
  "serde",
  "serde_json",
@@ -3151,6 +3151,18 @@ dependencies = [
  "jni-sys",
 ]
 
+[[package]]
+name = "network-interface"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4a43439bf756eed340bdf8feba761e2d50c7d47175d87545cd5cbe4a137c4d1"
+dependencies = [
+ "cc",
+ "libc",
+ "thiserror 1.0.69",
+ "winapi",
+]
+
 [[package]]
 name = "new_debug_unreachable"
 version = "1.0.6"
@@ -3247,7 +3259,7 @@ version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
 dependencies = [
- "proc-macro-crate 1.3.1",
+ "proc-macro-crate 3.3.0",
  "proc-macro2",
  "quote",
  "syn 2.0.90",
@@ -3922,15 +3934,6 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "portpicker"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be97d76faf1bfab666e1375477b23fde79eccf0276e9b63b92a39d676a889ba9"
-dependencies = [
- "rand 0.8.5",
-]
-
 [[package]]
 name = "powerfmt"
 version = "0.2.0"
@@ -4195,6 +4198,17 @@ dependencies = [
  "rand_core 0.5.1",
 ]
 
+[[package]]
+name = "random-port"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d52b7d0e298a1b2f2f46c8d5da944c80ed1e5e6b032521cc44ee2b1dcbe2b94a"
+dependencies = [
+ "network-interface",
+ "rand 0.8.5",
+ "thiserror 1.0.69",
+]
+
 [[package]]
 name = "raw-window-handle"
 version = "0.5.2"
@@ -4305,7 +4319,7 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 [[package]]
 name = "relay"
 version = "0.1.1"
-source = "git+https://github.com/CuriousCorrelation/relay.git#dfa662f2e8a2731cd21c59b2a10bfc6e2ef70ca3"
+source = "git+https://github.com/CuriousCorrelation/relay.git#10aca0e5d74515a6fed231ee9d7220a014f8b184"
 dependencies = [
  "bytes",
  "curl",
@@ -5481,7 +5495,7 @@ dependencies = [
 [[package]]
 name = "tauri-plugin-relay"
 version = "0.1.0"
-source = "git+https://github.com/CuriousCorrelation/tauri-plugin-relay?rev=0147ac1bb29d3b88d6652432a482bd86f0174506#0147ac1bb29d3b88d6652432a482bd86f0174506"
+source = "git+https://github.com/CuriousCorrelation/tauri-plugin-relay?rev=4ed4fcafeb93856591e8a36522f6ec6e340e4dc5#4ed4fcafeb93856591e8a36522f6ec6e340e4dc5"
 dependencies = [
  "relay",
  "serde",
diff --git a/packages/hoppscotch-desktop/src-tauri/Cargo.toml b/packages/hoppscotch-desktop/src-tauri/Cargo.toml
index d3dd515d1d9..c4acceff483 100644
--- a/packages/hoppscotch-desktop/src-tauri/Cargo.toml
+++ b/packages/hoppscotch-desktop/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hoppscotch-desktop"
-version = "25.7.0"
+version = "25.7.1"
 description = "Desktop App for hoppscotch.io"
 authors = ["CuriousCorrelation"]
 edition = "2021"
@@ -30,10 +30,10 @@ tauri-plugin-dialog = "2.2.0"
 tauri-plugin-fs = "2.2.0"
 tauri-plugin-deep-link = "2.2.0"
 tauri-plugin-appload = { git = "https://github.com/CuriousCorrelation/tauri-plugin-appload", rev = "1b52e49d881926135838cf6cfebdc1643a9bec31" }
-tauri-plugin-relay = { git = "https://github.com/CuriousCorrelation/tauri-plugin-relay", rev = "0147ac1bb29d3b88d6652432a482bd86f0174506" }
+tauri-plugin-relay = { git = "https://github.com/CuriousCorrelation/tauri-plugin-relay", rev = "4ed4fcafeb93856591e8a36522f6ec6e340e4dc5" }
 axum = "0.8.1"
 tower-http = { version = "0.6.2", features = ["cors"] }
-portpicker = "0.1.1"
+random-port = "0.1.1"
 tokio = "1.43.0"
 tauri-plugin-process = "2.2.0"
 file-rotate = "0.8.0"
diff --git a/packages/hoppscotch-desktop/src-tauri/src/lib.rs b/packages/hoppscotch-desktop/src-tauri/src/lib.rs
index 00f9f18e998..572da8c2a5e 100644
--- a/packages/hoppscotch-desktop/src-tauri/src/lib.rs
+++ b/packages/hoppscotch-desktop/src-tauri/src/lib.rs
@@ -9,6 +9,8 @@ use tauri_plugin_appload::VendorConfigBuilder;
 use tauri_plugin_deep_link::DeepLinkExt;
 use tauri_plugin_window_state::StateFlags;
 
+use random_port::{PortPicker, Protocol};
+
 pub const HOPPSCOTCH_DESKTOP_IDENTIFIER: &'static str = "io.hoppscotch.desktop";
 static SERVER_PORT: OnceLock<u16> = OnceLock::new();
 
@@ -40,7 +42,11 @@ fn quit_app(app: tauri::AppHandle) -> Result<(), String> {
 pub fn run() {
     tauri::Builder::default()
         .setup(|app| {
-            let server_port = portpicker::pick_unused_port().expect("Cannot find unused port");
+            let server_port: u16 = PortPicker::new()
+                .protocol(Protocol::Tcp)
+                .port_range(15000..=25000)
+                .pick()
+                .expect("Cannot find unused port");
             tracing::info!("Selected server port: {}", server_port);
             SERVER_PORT
                 .set(server_port)
diff --git a/packages/hoppscotch-desktop/src-tauri/tauri.conf.json b/packages/hoppscotch-desktop/src-tauri/tauri.conf.json
index f21ce23d857..ba339c13204 100644
--- a/packages/hoppscotch-desktop/src-tauri/tauri.conf.json
+++ b/packages/hoppscotch-desktop/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "Hoppscotch",
-  "version": "25.7.0",
+  "version": "25.7.1",
   "identifier": "io.hoppscotch.desktop",
   "build": {
     "beforeDevCommand": "pnpm dev",
diff --git a/packages/hoppscotch-desktop/src-tauri/tauri.portable.macos.conf.json b/packages/hoppscotch-desktop/src-tauri/tauri.portable.macos.conf.json
index 805dfe18d9c..fb289d007c1 100644
--- a/packages/hoppscotch-desktop/src-tauri/tauri.portable.macos.conf.json
+++ b/packages/hoppscotch-desktop/src-tauri/tauri.portable.macos.conf.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "Hoppscotch",
-  "version": "25.7.0",
+  "version": "25.7.1",
   "identifier": "io.hoppscotch.desktop",
   "build": {
     "beforeDevCommand": "pnpm dev",
diff --git a/packages/hoppscotch-desktop/src-tauri/tauri.portable.windows.conf.json b/packages/hoppscotch-desktop/src-tauri/tauri.portable.windows.conf.json
index c2e18c1bca0..20cc7c94f6b 100644
--- a/packages/hoppscotch-desktop/src-tauri/tauri.portable.windows.conf.json
+++ b/packages/hoppscotch-desktop/src-tauri/tauri.portable.windows.conf.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "Hoppscotch",
-  "version": "25.7.0",
+  "version": "25.7.1",
   "identifier": "io.hoppscotch.desktop",
   "build": {
     "beforeDevCommand": "pnpm dev",
diff --git a/packages/hoppscotch-desktop/src/views/Home.vue b/packages/hoppscotch-desktop/src/views/Home.vue
index 6eaed8dd0c3..de80b4d9994 100644
--- a/packages/hoppscotch-desktop/src/views/Home.vue
+++ b/packages/hoppscotch-desktop/src/views/Home.vue
@@ -299,7 +299,7 @@ const loadVendored = async () => {
     const vendoredInstance: VendoredInstance = {
       type: "vendored",
       displayName: "Hoppscotch",
-      version: "25.7.0",
+      version: "25.7.1",
     }
 
     const connectionState: ConnectionState = {
diff --git a/packages/hoppscotch-kernel/package.json b/packages/hoppscotch-kernel/package.json
index 0b439ee1d77..11b091340bc 100644
--- a/packages/hoppscotch-kernel/package.json
+++ b/packages/hoppscotch-kernel/package.json
@@ -57,6 +57,6 @@
     "@tauri-apps/plugin-dialog": "2.0.1",
     "@tauri-apps/plugin-fs": "2.0.2",
     "@tauri-apps/plugin-store": "2.2.0",
-    "@hoppscotch/plugin-relay": "github:CuriousCorrelation/tauri-plugin-relay#0147ac1bb29d3b88d6652432a482bd86f0174506"
+    "@hoppscotch/plugin-relay": "github:CuriousCorrelation/tauri-plugin-relay#4ed4fcafeb93856591e8a36522f6ec6e340e4dc5"
   }
 }
diff --git a/packages/hoppscotch-selfhost-web/package.json b/packages/hoppscotch-selfhost-web/package.json
index 9176a0db15f..db971648d50 100644
--- a/packages/hoppscotch-selfhost-web/package.json
+++ b/packages/hoppscotch-selfhost-web/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@hoppscotch/selfhost-web",
   "private": true,
-  "version": "2025.7.0",
+  "version": "2025.7.1",
   "type": "module",
   "scripts": {
     "dev:vite": "vite",
diff --git a/packages/hoppscotch-selfhost-web/src/main.ts b/packages/hoppscotch-selfhost-web/src/main.ts
index 6bc576f609a..080ba719054 100644
--- a/packages/hoppscotch-selfhost-web/src/main.ts
+++ b/packages/hoppscotch-selfhost-web/src/main.ts
@@ -84,7 +84,7 @@ async function initApp() {
       displayConfig: {
         displayName: "Hoppscotch",
         description: "On-Prem",
-        version: "25.7.0",
+        version: "25.7.1",
         connectingMessage: "Connecting to On-prem",
         connectedMessage: "Connected to On-prem",
       },
diff --git a/packages/hoppscotch-selfhost-web/webapp-server/src/bundle/model.rs b/packages/hoppscotch-selfhost-web/webapp-server/src/bundle/model.rs
index 94b3b33ec29..f6f85204ea5 100644
--- a/packages/hoppscotch-selfhost-web/webapp-server/src/bundle/model.rs
+++ b/packages/hoppscotch-selfhost-web/webapp-server/src/bundle/model.rs
@@ -47,7 +47,7 @@ pub struct Bundle {
 impl Bundle {
     pub fn new(bundle_version: Option<String>, content: Vec<u8>, signature: Signature, files: Vec<FileEntry>) -> Self {
         let metadata = BundleMetadata {
-            version: "2025.7.0".to_string(),
+            version: "2025.7.1".to_string(),
             created_at: Utc::now(),
             signature,
             manifest: Manifest { files },
diff --git a/packages/hoppscotch-selfhost-web/webapp-server/src/config.rs b/packages/hoppscotch-selfhost-web/webapp-server/src/config.rs
index 8bf85f3c094..f430260dfda 100644
--- a/packages/hoppscotch-selfhost-web/webapp-server/src/config.rs
+++ b/packages/hoppscotch-selfhost-web/webapp-server/src/config.rs
@@ -54,7 +54,7 @@ impl Default for ServerConfig {
         Self {
             port: default_port(),
             max_bundle_size: default_max_bundle_size(),
-            bundle_version: Some("2025.7.0".to_string()),
+            bundle_version: Some("2025.7.1".to_string()),
             csp_directives: None,
             signing_key: None,
             verifying_key: None,
@@ -75,7 +75,7 @@ impl ServerConfig {
         Self {
             signing_key: Some(key_pair.signing_key),
             verifying_key: Some(key_pair.verifying_key),
-            bundle_version: Some("2025.7.0".to_string()),
+            bundle_version: Some("2025.7.1".to_string()),
             frontend_path,
             is_dev: cfg!(debug_assertions),
             ..Default::default()
diff --git a/packages/hoppscotch-sh-admin/package.json b/packages/hoppscotch-sh-admin/package.json
index d656e07d06d..6baf2bb6de8 100644
--- a/packages/hoppscotch-sh-admin/package.json
+++ b/packages/hoppscotch-sh-admin/package.json
@@ -1,7 +1,7 @@
 {
   "name": "hoppscotch-sh-admin",
   "private": true,
-  "version": "2025.7.0",
+  "version": "2025.7.1",
   "type": "module",
   "scripts": {
     "dev": "pnpm exec npm-run-all -p -l dev:*",
diff --git a/packages/hoppscotch-sh-admin/src/composables/useOnboardingConfigHandler.ts b/packages/hoppscotch-sh-admin/src/composables/useOnboardingConfigHandler.ts
index a41502521b2..300c7a66808 100644
--- a/packages/hoppscotch-sh-admin/src/composables/useOnboardingConfigHandler.ts
+++ b/packages/hoppscotch-sh-admin/src/composables/useOnboardingConfigHandler.ts
@@ -214,7 +214,11 @@ export function useOnboardingConfigHandler() {
       if (!enabledConfigs.value.includes('MAILER')) return false;
 
       if (!usingCustom) {
-        return ['MAILER_SMTP_URL', 'MAILER_ADDRESS_FROM'].includes(key);
+        return [
+          'MAILER_SMTP_ENABLE',
+          'MAILER_SMTP_URL',
+          'MAILER_ADDRESS_FROM',
+        ].includes(key);
       }
 
       return [
@@ -222,6 +226,11 @@ export function useOnboardingConfigHandler() {
         'MAILER_SMTP_PORT',
         'MAILER_SMTP_USER',
         'MAILER_SMTP_PASSWORD',
+        'MAILER_ADDRESS_FROM',
+        'MAILER_USE_CUSTOM_CONFIGS',
+        'MAILER_SMTP_SECURE',
+        'MAILER_TLS_REJECT_UNAUTHORIZED',
+        'MAILER_SMTP_ENABLE',
       ].includes(key);
     });
   };
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 04ed9f051b4..6e0ec68b609 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1236,8 +1236,8 @@ importers:
   packages/hoppscotch-kernel:
     dependencies:
       '@hoppscotch/plugin-relay':
-        specifier: github:CuriousCorrelation/tauri-plugin-relay#0147ac1bb29d3b88d6652432a482bd86f0174506
-        version: '@CuriousCorrelation/plugin-relay@https://codeload.github.com/CuriousCorrelation/tauri-plugin-relay/tar.gz/0147ac1bb29d3b88d6652432a482bd86f0174506'
+        specifier: github:CuriousCorrelation/tauri-plugin-relay#4ed4fcafeb93856591e8a36522f6ec6e340e4dc5
+        version: '@CuriousCorrelation/plugin-relay@https://codeload.github.com/CuriousCorrelation/tauri-plugin-relay/tar.gz/4ed4fcafeb93856591e8a36522f6ec6e340e4dc5'
       '@tauri-apps/api':
         specifier: 2.1.1
         version: 2.1.1
@@ -1883,8 +1883,8 @@ packages:
     resolution: {tarball: https://codeload.github.com/CuriousCorrelation/tauri-plugin-appload/tar.gz/1b52e49d881926135838cf6cfebdc1643a9bec31}
     version: 0.1.0
 
-  '@CuriousCorrelation/plugin-relay@https://codeload.github.com/CuriousCorrelation/tauri-plugin-relay/tar.gz/0147ac1bb29d3b88d6652432a482bd86f0174506':
-    resolution: {tarball: https://codeload.github.com/CuriousCorrelation/tauri-plugin-relay/tar.gz/0147ac1bb29d3b88d6652432a482bd86f0174506}
+  '@CuriousCorrelation/plugin-relay@https://codeload.github.com/CuriousCorrelation/tauri-plugin-relay/tar.gz/4ed4fcafeb93856591e8a36522f6ec6e340e4dc5':
+    resolution: {tarball: https://codeload.github.com/CuriousCorrelation/tauri-plugin-relay/tar.gz/4ed4fcafeb93856591e8a36522f6ec6e340e4dc5}
     version: 0.1.0
 
   '@alloc/quick-lru@5.2.0':
@@ -14878,7 +14878,7 @@ snapshots:
     dependencies:
       '@tauri-apps/api': 2.1.1
 
-  '@CuriousCorrelation/plugin-relay@https://codeload.github.com/CuriousCorrelation/tauri-plugin-relay/tar.gz/0147ac1bb29d3b88d6652432a482bd86f0174506':
+  '@CuriousCorrelation/plugin-relay@https://codeload.github.com/CuriousCorrelation/tauri-plugin-relay/tar.gz/4ed4fcafeb93856591e8a36522f6ec6e340e4dc5':
     dependencies:
       '@tauri-apps/api': 2.1.1