diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 516ddc151..60039f497 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -9,10 +9,10 @@ COPY ./packages/client/ ./
 WORKDIR /app
 RUN yarn install
 
+#ENVS FOR PROD FRONTEND
 ENV APP_ENV "production"
 ENV NODE_ENV "production"
 ENV REACT_APP_FRONTEND_URL "cast.fyi"
-ENV NODE_ENV "production"
 ENV REACT_APP_BACK_END_SERVER_API "https://api.cast.fyi"
 ENV REACT_APP_IPFS_GATEWAY "https://gateway.pinata.cloud/ipfs/"
 ENV REACT_APP_FLOW_ENV "mainnet"
diff --git a/frontend/Dockerfile.stage b/frontend/Dockerfile.stage
index 8f86b5883..fb8c9962f 100644
--- a/frontend/Dockerfile.stage
+++ b/frontend/Dockerfile.stage
@@ -9,13 +9,14 @@ COPY ./packages/client/ ./
 WORKDIR /app
 RUN yarn install
 
-#ENVS FOR DEVELOP FRONTEND
+#ENVS FOR STAGING FRONTEND
+ENV APP_ENV "production"
+ENV NODE_ENV "production"
+ENV REACT_APP_FRONTEND_URL "fe.staging.cast.dapperlabs.com"
 ENV REACT_APP_BACK_END_SERVER_API "https://app.staging.cast.dapperlabs.com"
 ENV REACT_APP_IPFS_GATEWAY "https://gateway.pinata.cloud/ipfs/"
 ENV REACT_APP_FLOW_ENV "testnet"
-ENV NODE_ENV "production"
 ENV REACT_APP_TX_OPTIONS_ADDRS "0xe0de919ed4ebeee4,0x7f81b82fa0e59b17"
-ENV REACT_APP_FRONTEND_URL "fe.staging.cast.dapperlabs.com"
 
 RUN yarn build
 
diff --git a/frontend/packages/client/public/index.html b/frontend/packages/client/public/index.html
index 9bbb8a9b2..f00371386 100644
--- a/frontend/packages/client/public/index.html
+++ b/frontend/packages/client/public/index.html
@@ -20,7 +20,7 @@
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.
       Only files inside the `public` folder can be referenced from the HTML.
-
+  
       Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
@@ -29,8 +29,8 @@
     <script
       defer
       data-api="/api/event"
-      data-domain="fe.staging.cast.dapperlabs.com"
-      src="https://fe.staging.cast.dapperlabs.com/js/script.js"
+      data-domain="%REACT_APP_FRONTEND_URL%"
+      src="/js/script.js"
     ></script>
     <script>
       window.plausible =