diff --git a/Dockerfile b/Dockerfile
index 36ca785c84..a4d5ea0137 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -55,6 +55,7 @@ RUN apk add --no-cache --upgrade libc6-compat bash jq
 # pass build args to env variables
 ARG GIT_COMMIT_SHA
 ENV NEXT_PUBLIC_GIT_COMMIT_SHA=$GIT_COMMIT_SHA
+ENV NEXT_BUILD_ID=$GIT_COMMIT_SHA
 ARG GIT_TAG
 ENV NEXT_PUBLIC_GIT_TAG=$GIT_TAG
 ARG NEXT_OPEN_TELEMETRY_ENABLED
diff --git a/next.config.js b/next.config.js
index 1ac9991d07..b82708b25f 100644
--- a/next.config.js
+++ b/next.config.js
@@ -45,6 +45,9 @@ const moduleExports = {
       'static': 180,
     },
   },
+  generateBuildId: async () => {
+    return process.env.NEXT_BUILD_ID || Date.now().toString(36) + Math.random().toString(36).substring(2);
+  },
 };
 
 module.exports = withBundleAnalyzer(withRoutes(moduleExports));