diff --git a/server/index.ts b/server/index.ts
index 8b4b3728..f80fd16e 100644
--- a/server/index.ts
+++ b/server/index.ts
@@ -20,7 +20,7 @@ import { initTelemetryClient } from "./lib/telemetry.js";
 import { TraefikConfigManager } from "./lib/traefik/TraefikConfigManager.js";
 import { initCleanup } from "#dynamic/cleanup";
 import license from "#dynamic/license/license";
-
+import { fetchServerIp } from "./lib/serverIpService.js";
 async function startServers() {
     await setHostMeta();
 
@@ -31,6 +31,8 @@ async function startServers() {
 
     await runSetupFunctions();
 
+    await fetchServerIp();
+
     initTelemetryClient();
 
     // Start all servers
diff --git a/server/lib/serverIpService.ts b/server/lib/serverIpService.ts
new file mode 100644
index 00000000..fb25c1c2
--- /dev/null
+++ b/server/lib/serverIpService.ts
@@ -0,0 +1,28 @@
+import axios from "axios";
+
+let serverIp: string | null = null;
+
+const services = [
+    "https://ifconfig.io/ip",
+    "https://api.ipify.org",
+    "https://checkip.amazonaws.com"
+];
+
+export async function fetchServerIp() {
+    for (const url of services) {
+        try {
+            const response = await axios.get(url, { timeout: 5000 });
+            serverIp = response.data.trim();
+            console.log("Detected public IP:", serverIp);
+            return; 
+        } catch (err: any) {
+            console.warn(`Failed to fetch server IP from ${url}: ${err.message || err.code}`);
+        }
+    }
+
+    console.error("All attempts to fetch server IP failed.");
+}
+
+export function getServerIp() {
+    return serverIp;
+}
diff --git a/server/routers/domain/getDNSRecords.ts b/server/routers/domain/getDNSRecords.ts
index ee349cdd..c705b4fa 100644
--- a/server/routers/domain/getDNSRecords.ts
+++ b/server/routers/domain/getDNSRecords.ts
@@ -8,6 +8,7 @@ import createHttpError from "http-errors";
 import logger from "@server/logger";
 import { fromError } from "zod-validation-error";
 import { OpenAPITags, registry } from "@server/openApi";
+import { getServerIp } from "@server/lib/serverIpService"; // your in-memory IP module
 
 const getDNSRecordsSchema = z
     .object({
@@ -70,8 +71,18 @@ export async function getDNSRecords(
             );
         }
 
+        const serverIp = getServerIp();
+
+        // Override value for type A or wildcard records
+        const updatedRecords = records.map(record => {
+            if ((record.recordType === "A" || record.baseDomain === "*") && serverIp) {
+                return { ...record, value: serverIp };
+            }
+            return record;
+        });
+
         return response<GetDNSRecordsResponse>(res, {
-            data: records,
+            data: updatedRecords,
             success: true,
             error: false,
             message: "DNS records retrieved successfully",