diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
new file mode 100644
index 00000000..87748c33
--- /dev/null
+++ b/.github/workflows/ci-cd.yml
@@ -0,0 +1,57 @@
+name: CI/CD Pipeline
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Login to ACR
+        uses: azure/docker-login@v1
+        with:
+          login-server: ${{ secrets.ACR_LOGIN_SERVER }}
+          username: ${{ secrets.ACR_USERNAME }}
+          password: ${{ secrets.ACR_PASSWORD }}
+
+      - name: Build and push course-service
+        run: |
+          docker build -t ${{ secrets.ACR_LOGIN_SERVER }}/course-service:${{ github.sha }} -t ${{ secrets.ACR_LOGIN_SERVER }}/course-service:latest ./course-service
+          docker push ${{ secrets.ACR_LOGIN_SERVER }}/course-service:${{ github.sha }}
+          docker push ${{ secrets.ACR_LOGIN_SERVER }}/course-service:latest
+
+      - name: Build and push frontend
+        run: |
+          docker build -t ${{ secrets.ACR_LOGIN_SERVER }}/frontend:${{ github.sha }} -t ${{ secrets.ACR_LOGIN_SERVER }}/frontend:latest ./frontend
+          docker push ${{ secrets.ACR_LOGIN_SERVER }}/frontend:${{ github.sha }}
+          docker push ${{ secrets.ACR_LOGIN_SERVER }}/frontend:latest
+
+  deploy:
+    needs: build
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/main'
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up kubectl
+        uses: azure/setup-kubectl@v3
+
+      - name: Deploy to AKS
+        run: |
+          mkdir -p $HOME/.kube
+          echo "${{ secrets.KUBE_CONFIG }}" | base64 -d > $HOME/.kube/config
+          kubectl apply -f kubernetes/
+          kubectl rollout restart deployment/course-service
+          kubectl rollout restart deployment/frontend
+
+      - name: Verify deployment
+        run: |
+          kubectl rollout status deployment/course-service --timeout=120s
+          kubectl rollout status deployment/frontend --timeout=120s
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 4299cd1a..4551d169 100644
--- a/.gitignore
+++ b/.gitignore
@@ -196,4 +196,5 @@ cython_debug/
 .cursorignore
 .cursorindexingignore
 
-node_modules/
\ No newline at end of file
+node_modules/
+terraform/
\ No newline at end of file
diff --git a/course-service/app/main.py b/course-service/app/main.py
index 7c8cbfb2..31e388a2 100644
--- a/course-service/app/main.py
+++ b/course-service/app/main.py
@@ -1,3 +1,4 @@
+# CI trigger test - Rithwik 225379656
 import logging
 import time
 from contextlib import asynccontextmanager
diff --git a/docker-compose.yml b/docker-compose.yml
index e1d3379c..a1580042 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -232,6 +232,38 @@ services:
     networks:
       - koalatech-network
 
+  prometheus:
+    image: prom/prometheus:latest
+    container_name: prometheus
+    ports:
+      - "9090:9090"
+    volumes:
+      - ./prometheus.yml:/etc/prometheus/prometheus.yml
+    networks:
+      - koalatech-network
+
+  grafana:
+    image: grafana/grafana:latest
+    container_name: grafana
+    ports:
+      - "3001:3000"
+    depends_on:
+      - prometheus
+    networks:
+      - koalatech-network
+
+  cadvisor:
+    image: gcr.io/cadvisor/cadvisor:latest
+    container_name: cadvisor
+    ports:
+      - "8080:8080"
+    volumes:
+      - //var/run:/var/run:ro
+      - //sys:/sys:ro
+      - //var/lib/docker/:/var/lib/docker:ro
+    networks:
+      - koalatech-network
+
 networks:
   koalatech-network:
     driver: bridge
@@ -241,4 +273,4 @@ volumes:
   student-db-data:
   lecturer-db-data:
   course-db-data:
-  enrollment-db-data:
\ No newline at end of file
+  enrollment-db-data:
diff --git a/frontend/src/pages/Login.jsx b/frontend/src/pages/Login.jsx
index 1132741c..3bdd68cf 100644
--- a/frontend/src/pages/Login.jsx
+++ b/frontend/src/pages/Login.jsx
@@ -93,7 +93,7 @@ const Login = () => {
             variant="h4"
             gutterBottom
           >
-            KoalaTech University
+                        KoalaTech University - V2 Deployed
           </Typography>
 
           <Typography
diff --git a/kubernetes/configmap.yml b/kubernetes/configmap.yml
new file mode 100644
index 00000000..e099cabe
--- /dev/null
+++ b/kubernetes/configmap.yml
@@ -0,0 +1,21 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: frontend-nginx-config
+data:
+  default.conf: |
+    server {
+        listen 3000;
+        root /usr/share/nginx/html;
+        index index.html;
+
+        location / {
+            try_files $uri $uri/ /index.html;
+        }
+
+        location /api/courses {
+            proxy_pass http://course-service:3000;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+        }
+    }
\ No newline at end of file
diff --git a/kubernetes/deployment.yml b/kubernetes/deployment.yml
new file mode 100644
index 00000000..b7b4366d
--- /dev/null
+++ b/kubernetes/deployment.yml
@@ -0,0 +1,91 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: course-service
+  labels:
+    app: course-service
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: course-service
+  template:
+    metadata:
+      labels:
+        app: course-service
+    spec:
+      containers:
+        - name: course-service
+          image: sit722acrrithwik5566.azurecr.io/course-service:latest
+          ports:
+            - containerPort: 3000
+          env:
+            - name: POSTGRES_HOST
+              value: course-db
+            - name: POSTGRES_USER
+              value: postgres
+            - name: POSTGRES_PASSWORD
+              value: postgres
+            - name: POSTGRES_DB
+              value: course_db
+            - name: JWT_SECRET
+              value: mysecretkey
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: course-db
+  labels:
+    app: course-db
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: course-db
+  template:
+    metadata:
+      labels:
+        app: course-db
+    spec:
+      containers:
+        - name: course-db
+          image: postgres:15
+          ports:
+            - containerPort: 5432
+          env:
+            - name: POSTGRES_USER
+              value: postgres
+            - name: POSTGRES_PASSWORD
+              value: postgres
+            - name: POSTGRES_DB
+              value: course_db
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: frontend
+  labels:
+    app: frontend
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: frontend
+  template:
+    metadata:
+      labels:
+        app: frontend
+    spec:
+      containers:
+        - name: frontend
+          image: sit722acrrithwik5566.azurecr.io/frontend:latest
+          ports:
+            - containerPort: 3000
+          volumeMounts:
+            - name: nginx-config
+              mountPath: /etc/nginx/conf.d/default.conf
+              subPath: default.conf
+      volumes:
+        - name: nginx-config
+          configMap:
+            name: frontend-nginx-config
\ No newline at end of file
diff --git a/kubernetes/service.yml b/kubernetes/service.yml
new file mode 100644
index 00000000..76a52cf5
--- /dev/null
+++ b/kubernetes/service.yml
@@ -0,0 +1,35 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: course-service
+spec:
+  selector:
+    app: course-service
+  ports:
+    - port: 3000
+      targetPort: 3000
+  type: ClusterIP
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: course-db
+spec:
+  selector:
+    app: course-db
+  ports:
+    - port: 5432
+      targetPort: 5432
+  type: ClusterIP
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: frontend
+spec:
+  selector:
+    app: frontend
+  ports:
+    - port: 80
+      targetPort: 3000
+  type: LoadBalancer
\ No newline at end of file
diff --git a/prometheus.yml b/prometheus.yml
new file mode 100644
index 00000000..03152387
--- /dev/null
+++ b/prometheus.yml
@@ -0,0 +1,11 @@
+global:
+  scrape_interval: 15s
+
+scrape_configs:
+  - job_name: 'prometheus'
+    static_configs:
+      - targets: ['prometheus:9090']
+
+  - job_name: 'cadvisor'
+    static_configs:
+      - targets: ['cadvisor:8080']
\ No newline at end of file