diff --git a/app/client/public/404.html b/app/client/public/404.html
index fde74d5a4007..3d7109f0d3e5 100644
--- a/app/client/public/404.html
+++ b/app/client/public/404.html
@@ -27,8 +27,8 @@
       return result;
     }
 
-    const smartLookId = parseConfig("__APPSMITH_SMART_LOOK_ID__");
-    const sentryDSN = parseConfig("__APPSMITH_SENTRY_DSN__");
+    const smartLookId = parseConfig('{{env "APPSMITH_SMART_LOOK_ID"}}');
+    const sentryDSN = parseConfig('{{env "APPSMITH_SENTRY_DSN"}}');
   </script>
   <script type='text/javascript'>
     if(smartLookId) {
diff --git a/deploy/docker/fs/opt/appsmith/caddy-reconfigure.mjs b/deploy/docker/fs/opt/appsmith/caddy-reconfigure.mjs
index 252a8c6b0d0b..8da1ef22ad2f 100644
--- a/deploy/docker/fs/opt/appsmith/caddy-reconfigure.mjs
+++ b/deploy/docker/fs/opt/appsmith/caddy-reconfigure.mjs
@@ -225,7 +225,7 @@ if (CUSTOM_DOMAIN !== "") {
 }
 
 if (!process.argv.includes("--no-finalize-index-html")) {
-  finalizeIndexHtml()
+  finalizeHtmlFiles()
 }
 
 fs.mkdirSync(dirname(CaddyfilePath), { recursive: true })
@@ -233,7 +233,7 @@ fs.writeFileSync(CaddyfilePath, parts.join("\n"))
 spawnSync(AppsmithCaddy, ["fmt", "--overwrite", CaddyfilePath])
 spawnSync(AppsmithCaddy, ["reload", "--config", CaddyfilePath])
 
-function finalizeIndexHtml() {
+function finalizeHtmlFiles() {
   let info = null;
   try {
     info = JSON.parse(fs.readFileSync("/opt/appsmith/info.json", "utf8"))
@@ -248,12 +248,14 @@ function finalizeIndexHtml() {
     APPSMITH_VERSION_RELEASE_DATE: info?.imageBuiltAt ?? "",
   }
 
-  const content = fs.readFileSync("/opt/appsmith/editor/index.html", "utf8").replaceAll(
-    /\{\{env\s+"(APPSMITH_[A-Z0-9_]+)"}}/g,
-    (_, name) => (process.env[name] || extraEnv[name] || "")
-  )
+  for (const file of ["index.html", "404.html"]) {
+    const content = fs.readFileSync("/opt/appsmith/editor/" + file, "utf8").replaceAll(
+      /\{\{env\s+"(APPSMITH_[A-Z0-9_]+)"}}/g,
+      (_, name) => (process.env[name] || extraEnv[name] || "")
+    )
 
-  fs.writeFileSync(process.env.WWW_PATH + "/index.html", content)
+    fs.writeFileSync(process.env.WWW_PATH + "/" + file, content)
+  }
 }
 
 function isCertExpired(path) {
@@ -261,4 +263,3 @@ function isCertExpired(path) {
   console.log(path, cert)
   return new Date(cert.validTo) < new Date()
 }
-