diff --git a/backend/collab-backend/Dockerfile.prod b/backend/collab-backend/Dockerfile.prod
index 89291a0d..8df8ed4f 100644
--- a/backend/collab-backend/Dockerfile.prod
+++ b/backend/collab-backend/Dockerfile.prod
@@ -3,6 +3,6 @@ WORKDIR /usr/src/app
 COPY package*.json ./
 RUN npm install
 COPY . .
-# ENV FRONTEND_HOST=https://peerprep.jonoans.com
+ENV FRONTEND_HOST=https://peerprep.jonoans.com
 EXPOSE 9000
 CMD [ "node", "index.js" ]
\ No newline at end of file
diff --git a/backend/communication-backend/Dockerfile b/backend/communication-backend/Dockerfile
index 3049349b..929c388c 100644
--- a/backend/communication-backend/Dockerfile
+++ b/backend/communication-backend/Dockerfile
@@ -3,6 +3,6 @@ WORKDIR /usr/src/app
 COPY package*.json ./
 RUN npm install
 COPY . .
-# ENV FRONTEND_HOST=https://peerprep.jonoans.com
+
 EXPOSE 9001
 CMD [ "node", "index.js" ]
\ No newline at end of file
diff --git a/backend/question-backend/Dockerfile.prod b/backend/question-backend/Dockerfile.prod
index 863827c0..4918e1d6 100644
--- a/backend/question-backend/Dockerfile.prod
+++ b/backend/question-backend/Dockerfile.prod
@@ -3,6 +3,6 @@ WORKDIR /src/app
 COPY package*.json ./
 RUN npm install
 COPY . .
-# ENV USER_HOST=http://peerprep-g53-fe-2022344057.ap-southeast-1.elb.amazonaws.com/api/users
+ENV USER_HOST=http://peerprep-g53-fe-2022344057.ap-southeast-1.elb.amazonaws.com/api/users
 EXPOSE 8000
 CMD ["node", "index.js"]
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 28f341aa..e65d2332 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -4,13 +4,6 @@ COPY package*.json ./
 RUN npm install
 COPY . .
 
-# ENV REACT_APP_USER_HOST=https://peerprep.jonoans.com/api/users
-# ENV REACT_APP_QUESTION_HOST=https://peerprep.jonoans.com/api/questions
-# ENV REACT_APP_MATCHING_HOST=https://peerprep.jonoans.com:8443
-# ENV REACT_APP_COLLAB_HOST=https://peerprep.jonoans.com
-# ENV REACT_APP_COMMUNICATION_HOST=https://peerprep.jonoans.com:2096
-# ENV REACT_APP_CATEGORIES_HOST=https://peerprep.jonoans.com/api/categories
-
 RUN npm run build
 RUN npm i -g serve
 EXPOSE 3000