From d5eb812b72158989d4b69d84ef807a26fb0281ad Mon Sep 17 00:00:00 2001
From: Meier Lukas <meierschlumpf@gmail.com>
Date: Fri, 5 Sep 2025 22:55:05 +0200
Subject: [PATCH 1/2] chore: update bug report template

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 08a60721d..c347726ed 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -33,6 +33,7 @@ body:
       options:
         # The below comment is used to insert a new version with on-release.yml
         #NEXT_VERSION#
+        - 1.36.0
         - 1.35.1
         - 1.35.0
         - 1.34.0

From 10668ee359940c1e24b543a7a20fe400474e12bf Mon Sep 17 00:00:00 2001
From: Meier Lukas <meierschlumpf@gmail.com>
Date: Fri, 5 Sep 2025 23:05:30 +0200
Subject: [PATCH 2/2] fix(dns): disable caching by default (#4007)

---
 packages/common/env.ts     | 2 ++
 packages/common/src/dns.ts | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/common/env.ts b/packages/common/env.ts
index cbccc8b70..c52abbd25 100644
--- a/packages/common/env.ts
+++ b/packages/common/env.ts
@@ -24,10 +24,12 @@ export const env = createEnv({
         message: `SECRET_ENCRYPTION_KEY must only contain hex characters${errorSuffix}`,
       }),
     NO_EXTERNAL_CONNECTION: createBooleanSchema(false),
+    ENABLE_DNS_CACHING: createBooleanSchema(false),
   },
   runtimeEnv: {
     SECRET_ENCRYPTION_KEY: process.env.SECRET_ENCRYPTION_KEY,
     NODE_ENV: process.env.NODE_ENV,
     NO_EXTERNAL_CONNECTION: process.env.NO_EXTERNAL_CONNECTION,
+    ENABLE_DNS_CACHING: process.env.ENABLE_DNS_CACHING,
   },
 });
diff --git a/packages/common/src/dns.ts b/packages/common/src/dns.ts
index 6e1e65c7c..7a8578b2b 100644
--- a/packages/common/src/dns.ts
+++ b/packages/common/src/dns.ts
@@ -2,6 +2,8 @@ import { DnsCacheManager } from "dns-caching";
 
 import { logger } from "@homarr/log";
 
+import { env } from "../env";
+
 // Add global type augmentation for homarr
 declare global {
   var homarr: {
@@ -19,4 +21,6 @@ global.homarr.dnsCacheManager ??= new DnsCacheManager({
   logger,
 });
 
-global.homarr.dnsCacheManager.initialize();
+if (env.ENABLE_DNS_CACHING) {
+  global.homarr.dnsCacheManager.initialize();
+}