diff --git a/.github/workflows/cloud-run-test.yml b/.github/workflows/cloud-run-test.yml
index 99d17a1..82b861c 100644
--- a/.github/workflows/cloud-run-test.yml
+++ b/.github/workflows/cloud-run-test.yml
@@ -9,7 +9,14 @@ env:
   PROJECT_ID: ${{ secrets.CLOUD_RUN_PROJECT_NAME}}
   REGION: asia-south1
   REPO_NAME: activity-dekho-staging
-
+<<<<<<< HEAD
+  FIREBASE_API_KEY: ${{ secrets.FIREBASE_API_KEY}}
+  FIREBASE_MESSAGING_SENDER_ID: ${{ secrets.FIREBASE_MESSAGING_SENDER_ID}}
+  FIREBASE_APP_ID: ${{ secrets.FIREBASE_APP_ID}}
+  
+=======
+
+>>>>>>> ede71521b8c65e6233e2d5d795c0c5e693b641ba
 jobs:
   build-and-deploy:
     name: Setup, Build, and Deploy
@@ -35,7 +42,7 @@ jobs:
       # build docker image
       - name: Build and tag the docker image
         run: |-
-          docker build . --tag gcr.io/$PROJECT_ID/$REPO_NAME:$GITHUB_SHA          
+          docker build . --tag gcr.io/$PROJECT_ID/$REPO_NAME:$GITHUB_SHA 
 
       # pushing image to google container registry
       - name: Push the image to the Google Container Registry (GCR)
@@ -48,4 +55,9 @@ jobs:
           --region $REGION \
           --image gcr.io/$PROJECT_ID/$REPO_NAME:$GITHUB_SHA \
           --platform "managed" \
-          --quiet
\ No newline at end of file
+<<<<<<< HEAD
+          --quiet \
+          
+=======
+          --quiet
+>>>>>>> ede71521b8c65e6233e2d5d795c0c5e693b641ba
diff --git a/Dockerfile b/Dockerfile
index e221d11..2efe0ea 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,19 @@ WORKDIR /usr/app
 
 COPY . .
 
+ARG FIREBASE_API_KEY
+ARG FIREBASE_MESSAGING_SENDER_ID
+ARG FIREBASE_APP_ID
+
+ENV FIREBASE_API_KEY=${FIREBASE_API_KEY}
+ENV FIREBASE_MESSAGING_SENDER_ID=${FIREBASE_API_KEY}
+ENV FIREBASE_APP_ID=${FIREBASE_API_KEY}
+ENV FIREBASE_AUTH_DOMAIN=aicte-diary.firebaseapp.com
+ENV FIREBASE_PROJECT_ID=aicte-diary
+ENV FIREBASE_STORAGE_BUCKET=aicte-diary.appspot.com
+
+
+
 RUN yarn install --frozen-lockfile
 
 RUN yarn build 
diff --git a/src/firebase/config.ts b/src/firebase/config.ts
index ba23ee9..623231d 100644
--- a/src/firebase/config.ts
+++ b/src/firebase/config.ts
@@ -1,21 +1,48 @@
 // Import the functions you need from the SDKs you need
 import { initializeApp } from "firebase/app";
-import {getFirestore} from "firebase/firestore"
-import {getAuth} from "firebase/auth"
+import { getFirestore } from "firebase/firestore";
+import { getAuth } from "firebase/auth";
 // TODO: Add SDKs for Firebase products that you want to use
 // https://firebase.google.com/docs/web/setup#available-libraries
 
 // Your web app's Firebase configuration
-const firebaseConfig = {
-  apiKey: "AIzaSyDvyg0ymLOqs181XfDZ2VxvuAEqDcvZrOI",
-  authDomain: "aicte-diary.firebaseapp.com",
-  projectId: "aicte-diary",
-  storageBucket: "aicte-diary.appspot.com",
-  messagingSenderId: "944319415450",
-  appId: "1:944319415450:web:3e453ecb0786bde4f68b23"
-};
+
+console.log("prod env ", process.env.NODE_ENV);
+let firebaseConfig = {};
+// if (process.env.NODE_ENV === "production") {
+//   console.log("here is the node env")
+//   firebaseConfig = {
+//     apiKey: process.env.FIREBASE_API_KEY,
+//     authDomain: "aicte-diary.firebaseapp.com",
+//     projectId: "aicte-diary",
+//     storageBucket: "aicte-diary.appspot.com",
+//     messagingSenderId: process.env.FIREBASE_MESSAGING_SENDER_ID,
+//     appId: process.env.FIREBASE_APP_ID,
+//   };
+// } 
+if (process.env.NODE_ENV === "production") {
+  console.log("here is the node env")
+  firebaseConfig = {
+    apiKey: "AIzaSyDvyg0ymLOqs181XfDZ2VxvuAEqDcvZrOI",
+    authDomain: "aicte-diary.firebaseapp.com",
+    projectId: "aicte-diary",
+    storageBucket: "aicte-diary.appspot.com",
+    messagingSenderId: "944319415450",
+    appId: "1:944319415450:web:7598324a715c03c1f68b23",
+  };
+} 
+else {
+  firebaseConfig = {
+    apiKey: "process.env.NEXT_PUBLIC_FIREBASE_API_KEY",
+    authDomain: "aicte-diary.firebaseapp.com",
+    projectId: "aicte-diary",
+    storageBucket: "aicte-diary.appspot.com",
+    messagingSenderId: process.env.NEXT_PUBLIC_FIREBASE_MESSAGING_SENDER_ID,
+    appId: process.env.NEXT_PUBLIC_FIREBASE_APP_ID,
+  };
+}
 
 // Initialize Firebase
 const app = initializeApp(firebaseConfig);
-export const firedb = getFirestore(app)
-export const auth = getAuth(app)
\ No newline at end of file
+export const firedb = getFirestore(app);
+export const auth = getAuth(app);