diff --git a/Dockerfile b/Dockerfile
index c4c69ff..fa43432 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,24 @@
+# Step 1 - Building the app
+FROM node:22 AS build
+WORKDIR /app
+COPY package*.json ./
+# Install dependencies
+RUN npm install -g @quasar/cli
+COPY . .
+RUN npm ci
+RUN npm run build
+
+# Step 2 - Move Applicatin to Nginx
 FROM nginx:alpine
+COPY --from=build /app/dist/spa /usr/share/nginx/html
 RUN mkdir /usr/share/nginx/html/src
-COPY dist /usr/share/nginx/html
-COPY source /usr/share/nginx/html/src
-RUN ls -la /usr/share/nginx/html/src
+COPY --from=build /app/src /usr/share/nginx/html/src
+
+COPY env.sh /docker-entrypoint.d/env.sh
+RUN dos2unix /docker-entrypoint.d/env.sh
+RUN chmod +x /docker-entrypoint.d/env.sh
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
+
 EXPOSE 80
 CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file