diff --git a/.gitignore b/.gitignore
index 35ddcfd52f..989455297b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,8 @@ frontend/npm-debug.log*
 frontend/yarn-debug.log*
 frontend/yarn-error.log*
 
+.idea
+
 **/.vscode
 *.tgz
 **/build
\ No newline at end of file
diff --git a/frontend/src/api/graphQuery.js b/frontend/src/api/graphQuery.js
index c0fa16e917..3b47d63f92 100644
--- a/frontend/src/api/graphQuery.js
+++ b/frontend/src/api/graphQuery.js
@@ -1,6 +1,7 @@
 import axios from "axios";
+import { ENVIRONMENT } from "../constants/env";
 
 // No auth for the API
 export default axios.create({
-	baseURL: "https://api.signoz.io/api/prom/api/v1",
+	baseURL: `${ENVIRONMENT.baseURL}/api/prom/api/v1`,
 });
diff --git a/frontend/src/api/metricsAPI.js b/frontend/src/api/metricsAPI.js
index bf2e3db4f1..ca1366b7e3 100644
--- a/frontend/src/api/metricsAPI.js
+++ b/frontend/src/api/metricsAPI.js
@@ -1,8 +1,6 @@
 import axios from "axios";
+import { ENVIRONMENT } from "../constants/env";
 
 export default axios.create({
-	// baseURL: 'http://104.211.113.204:8080/api/v1/',
-	// baseURL: process.env.REACT_APP_QUERY_SERVICE_URL,
-	// console.log('in metrics API', process.env.QUERY_SERVICE_URL)
-	baseURL: "/api/v1/",
+	baseURL: `${ENVIRONMENT.baseURL}/api/v1/`,
 });
diff --git a/frontend/src/api/submitForm.js b/frontend/src/api/submitForm.js
index 3468a2f31a..78b5852e02 100644
--- a/frontend/src/api/submitForm.js
+++ b/frontend/src/api/submitForm.js
@@ -1,9 +1,11 @@
 import axios from "axios";
+import { ENVIRONMENT } from "../constants/env";
 
 export default axios.create({
 	// baseURL: 'https://api.telegram.org/bot1518273960:AAHcgVvym9a0Qkl-PKiCI84X1VZaVbkTud0/',
 	// baseURL: 'http://104.211.113.204:8080/api/v1/',
-	baseURL: "/api/v1/",
+	// baseURL: "/api/v1/",
+	baseURL: `${ENVIRONMENT.baseURL}/api/v1/`,
 });
 
 //https://api.telegram.org/bot1518273960:AAHcgVvym9a0Qkl-PKiCI84X1VZaVbkTud0/sendMessage?chat_id=351813222&text=Hello%20there
diff --git a/frontend/src/api/tracesAPI.js b/frontend/src/api/tracesAPI.js
index 74b0f4703e..189f37d20b 100644
--- a/frontend/src/api/tracesAPI.js
+++ b/frontend/src/api/tracesAPI.js
@@ -1,9 +1,11 @@
 import axios from "axios";
+import { ENVIRONMENT } from "../constants/env";
 //import { format } from 'path';
 
 export default axios.create({
 	// baseURL: 'http://104.211.113.204:8080/api/v1/' //comment this line and remove  this comment before pushing
 	// baseURL: process.env.QUERY_SERVICE_URL,
 	// console.log('in traces API', process.env.QUERY_SERVICE_URL)
-	baseURL: "/api/v1/",
+	// baseURL: "/api/v1/",
+	baseURL: `${ENVIRONMENT.baseURL}/api/v1/`,
 });
diff --git a/frontend/src/components/constants/query.ts b/frontend/src/components/constants/query.ts
deleted file mode 100644
index 561b5467f0..0000000000
--- a/frontend/src/components/constants/query.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export enum MetricQueryParama {
-	time = "time",
-}
diff --git a/frontend/src/components/constants/localStorage.ts b/frontend/src/constants/LOCAL_STORAGE.ts
similarity index 63%
rename from frontend/src/components/constants/localStorage.ts
rename to frontend/src/constants/LOCAL_STORAGE.ts
index 18dfba9697..ccd305d284 100644
--- a/frontend/src/components/constants/localStorage.ts
+++ b/frontend/src/constants/LOCAL_STORAGE.ts
@@ -1,3 +1,3 @@
-export enum LocalStorage {
+export enum LOCAL_STORAGE {
 	metricsTimeDuration = "metricsTimeDuration",
 }
diff --git a/frontend/src/constants/env.ts b/frontend/src/constants/env.ts
new file mode 100644
index 0000000000..63cca65667
--- /dev/null
+++ b/frontend/src/constants/env.ts
@@ -0,0 +1,3 @@
+export const ENVIRONMENT = {
+	baseURL: "http://104.211.113.204:8080"
+}
\ No newline at end of file
diff --git a/frontend/src/constants/query.ts b/frontend/src/constants/query.ts
new file mode 100644
index 0000000000..540aca58d2
--- /dev/null
+++ b/frontend/src/constants/query.ts
@@ -0,0 +1,3 @@
+export enum METRICS_PAGE_QUERY_PARAM {
+	time = "time",
+}