diff --git a/.github/workflows/main_dvt-devo-gpt-app.yml b/.github/workflows/main_dvt-devo-gpt-app.yml
index 812a3d6..2212d5b 100644
--- a/.github/workflows/main_dvt-devo-gpt-app.yml
+++ b/.github/workflows/main_dvt-devo-gpt-app.yml
@@ -1,62 +1,32 @@
 # Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
 # More GitHub Actions for Azure: https://github.com/Azure/actions
 
-name: Build and deploy Node.js app to Azure Web App - dvt-devo-gpt-app
-
+name: Build and Push docker image to Azure Container Registry
 on:
   push:
     branches:
-      - main
+      - feat/feedback-endpoint
   workflow_dispatch:
-
 jobs:
-  build:
+  build-and-push:
     runs-on: ubuntu-latest
-
     steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up Node.js version
-        uses: actions/setup-node@v3
+      - name: Checkout
+        uses: actions/checkout@v4
+        # Add support for more platforms with QEMU (optional)
+        # https://github.com/docker/setup-qemu-action
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to Azure Container Registry
+        uses: azure/docker-login@v1
         with:
-          node-version: '18.x'
-
-      - name: npm install, build, and test
-        run: |
-          npm install
-          npm run build --if-present
-#          npm run test --if-present
-
-      - name: Zip artifact for deployment
-        run: zip release.zip ./* -r
-
-      - name: Upload artifact for deployment job
-        uses: actions/upload-artifact@v3
-        with:
-          name: node-app
-          path: release.zip
-
-  deploy:
-    runs-on: ubuntu-latest
-    needs: build
-    environment:
-      name: 'Production'
-      url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
-    
-    steps:
-      - name: Download artifact from build job
-        uses: actions/download-artifact@v3
-        with:
-          name: node-app
-
-      - name: Unzip artifact for deployment
-        run: unzip release.zip
-      
-      - name: 'Deploy to Azure Web App'
-        id: deploy-to-webapp
-        uses: azure/webapps-deploy@v2
+          login-server: ${{ secrets.REGISTRY_NAME }}.azurecr.io
+          username: ${{ secrets.REGISTRY_USERNAME }}
+          password: ${{ secrets.REGISTRY_PASSWORD }}
+      - name: Build and push
+        uses: docker/build-push-action@v2
         with:
-          app-name: 'dvt-devo-gpt-app'
-          slot-name: 'Production'
-          package: .
-          publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_A7A3987A93F24B56B3C85DE00061F365 }}
\ No newline at end of file
+          push: true
+          tags: ${{ secrets.REGISTRY_NAME }}.azurecr.io/infini-connect:latest
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..ddce6f6
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,24 @@
+# Stage 1: Build the application
+FROM node:14 AS builder
+
+WORKDIR /usr/src/app
+
+COPY package*.json ./
+
+RUN npm install
+
+COPY . .
+
+RUN npm run build
+
+
+# Stage 2: Setup production environment
+FROM node:20-alpine
+
+WORKDIR /usr/src/app
+
+COPY --from=builder /usr/src/app/node_modules ./node_modules
+COPY --from=builder /usr/src/app/dist ./dist
+COPY --from=builder /usr/src/app/.env ./.env
+
+CMD ["node", "dist/main"]
diff --git a/src/main.ts b/src/main.ts
index d9c505a..66c1c03 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -19,7 +19,9 @@ async function bootstrap() {
   const document = SwaggerModule.createDocument(app, options);
   SwaggerModule.setup('/docs', app, document);
 
-  await app.listen(8080);
+  // Get Port from env or default to 8080
+  const port = process.env.PORT || 8081;
+  await app.listen(port);
 }
 
 bootstrap().catch((err) => {