diff --git a/Dockerfile b/Dockerfile
index e4294c7..a87dc56 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,18 @@
-FROM node:18.19.0-alpine3.19
+FROM node:18.20.4-alpine3.20
 
-WORKDIR /app/client
+WORKDIR /app
 
+RUN npm install -g pnpm
 COPY package*.json .
-RUN npm i
+COPY pnpm-lock.yaml .
+RUN pnpm install --prefer-offline=true --frozen-lockfile=true
+RUN npm i -g serve
 
 COPY . .
 ENV NODE_ENV=production
-ENV VITE_LOGIN_KEY=7fo24CMyIc
 
-EXPOSE 5000
+RUN pnpm build
 
-CMD ["npm", "run", "dev"]
+EXPOSE 3000
+
+CMD [ "serve", "-s", "dist" ]
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..911e82b
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,14 @@
+services:
+  fuware:
+    container_name: fuware-fe
+    image: fuware-fe:dev
+    build:
+      context: ../
+      target: production
+      dockerfile: ./Dockerfile
+    restart: always
+    ports:
+      - 3000:3000
+    environment:
+      NODE_ENV: 'production'
+      VITE_LOGIN_KEY: '7fo24CMyIc'
diff --git a/src/pages/Home.jsx b/src/pages/Home.jsx
index 854d5a1..31b4eb3 100644
--- a/src/pages/Home.jsx
+++ b/src/pages/Home.jsx
@@ -24,7 +24,7 @@ export default function Home() {
       const first = getFirstItem(NAV_ITEM(t, auth?.userInfo?.isAdmin))
       navigate(first ? first.pathName : PathConstants.PROFILE)
     }
-  }, [auth.userInfo.isAdmin])
+  }, [auth.userInfo?.isAdmin])
 
   return <></>
 }