diff --git a/apps/formbricks-com/app/docs/self-hosting/docker/page.mdx b/apps/formbricks-com/app/docs/self-hosting/docker/page.mdx
index 4aa5716608..7182a7167e 100644
--- a/apps/formbricks-com/app/docs/self-hosting/docker/page.mdx
+++ b/apps/formbricks-com/app/docs/self-hosting/docker/page.mdx
@@ -165,4 +165,12 @@ formbricks-quickstart-formbricks-1  | Listening on port 3000 url: http://<random
 
 You can close the logs again with `CTRL + C`.
 
+<Note>
+## Customizing the Build Time variables
+
+To edit any of the variables that start with `NEXT_PUBLIC_`, you need to rebuild the Formbricks Docker from source! It is just one
+more added step and is not as much of a hassle as you think! Please check the [Building from Source](/docs/self-hosting/from-source) section!
+
+</Note>
+
 Still facing issues? [Join our Discord!](https://formbricks.com/discord) and we'd be glad to assist you!
diff --git a/apps/formbricks-com/app/docs/self-hosting/from-source/page.mdx b/apps/formbricks-com/app/docs/self-hosting/from-source/page.mdx
index 5af29426e2..b606445ceb 100644
--- a/apps/formbricks-com/app/docs/self-hosting/from-source/page.mdx
+++ b/apps/formbricks-com/app/docs/self-hosting/from-source/page.mdx
@@ -32,6 +32,7 @@ Ensure `docker` & `docker compose` are installed on your server/system. Both are
 2.  **Modify the `.env.docker` file as required by your setup.** <br/> This file comes with a basic setup and Formbricks works without making any changes to the file. To enable email sending functionality you need to configure the SMTP settings. If you configured your email credentials, you can also comment the following lines to enable email verification (`# NEXT_PUBLIC_EMAIL_VERIFICATION_DISABLED=1`) and password reset (`# NEXT_PUBLIC_PASSWORD_RESET_DISABLED=1`)
 
         <Note>
+           ## Editing a NEXT_PUBLIC_* variable?
           Note: All environment variables starting with `NEXT_PUBLIC_` are used at build time. When you change
           environment variables later, you need to rebuild the image with `docker compose build` for the changes
           to take effect.
diff --git a/apps/formbricks-com/app/docs/self-hosting/production/page.mdx b/apps/formbricks-com/app/docs/self-hosting/production/page.mdx
index ddab046339..6d8388455c 100644
--- a/apps/formbricks-com/app/docs/self-hosting/production/page.mdx
+++ b/apps/formbricks-com/app/docs/self-hosting/production/page.mdx
@@ -168,6 +168,14 @@ cd formbricks && docker compose logs -f
 
 You can close the logs again with `CTRL + C`.
 
+<Note>
+## Customizing the Build Time variables
+
+To edit any of the variables that start with `NEXT_PUBLIC_`, you need to rebuild the Formbricks Docker from source! It is just one
+more added step and is not as much of a hassle as you think! Please check the [Building from Source](/docs/self-hosting/from-source) section!
+
+</Note>
+
 ## Troubleshooting
 
 If you encounter any issues, consider the following steps:
@@ -180,4 +188,4 @@ If you encounter any issues, consider the following steps:
 
 - **Check Formbricks Logs**: Run `cd formbricks && docker compose logs` to check the logs of the Formbricks stack.
 
-- **Still can’t figure it out?**: [Join our Discord!](https://formbricks.com/discord)
+**Still can’t figure it out?**: [Join our Discord!](https://formbricks.com/discord)