diff --git a/daily-thought-frontend/Dockerfile b/daily-thought-frontend/Dockerfile
index 4eda2af323a55c926f186b7e8362695356afd581..95443bb192a2fef04dc4f52454a594cf30a5aa66 100644
--- a/daily-thought-frontend/Dockerfile
+++ b/daily-thought-frontend/Dockerfile
@@ -1,14 +1,14 @@
-FROM node:latest as base
+# base image
+FROM node:alpine
 
-# Create app directory
+# create & set working directory
+RUN mkdir -p /frontend-service/app
 WORKDIR /frontend-service/app
 
-COPY package*.json ./
-RUN  npm install
-
-# Bundle app source
-COPY . .
+# copy source files
+COPY . /frontend-service/app
 
+# start app
+RUN npm run build
 EXPOSE 9000
-
-CMD [ "npm", "run", "dev" ]
\ No newline at end of file
+CMD npm run dev
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 09e453e82282967764a2f37f6b02114bda532ad9..af8976486bfe70938bfa901752da353a1a46631b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -34,13 +34,17 @@ services:
       - MONGO_PORT=27017
       - MONGO_DBNAME=friends
 
-  # frontend-service:
-  #   build:
-  #     context: './daily-thought-frontend'
-  #     dockerfile: Dockerfile
-  #   restart: unless-stopped
-  #   ports:
-  #   - "8000:9000"
+  frontend-service:
+    build:
+      context: "./daily-thought-frontend"
+      dockerfile: Dockerfile
+    restart: unless-stopped
+    ports:
+      - "8000:9000"
+    volumes:
+      - ./daily-thought-frontend:/frontend-service/app
+      - /frontend-service/app/node_modules
+      - /frontend-service/app/.next
 
   feed-mongo:
     image: mongo