diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 6ce781f2..155879d3 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,9 +1,9 @@
+
 name: Deploy Frontend
 
 on:
   push:
     branches:
-      - main
       - supuni-dev
 
 jobs:
@@ -14,19 +14,30 @@ jobs:
     - name: Checkout code
       uses: actions/checkout@v3
 
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
+    - name: Install Node.js
+      uses: actions/setup-node@v3
+      with:
+        node-version: '18'
+
+    - name: Install dependencies
+      run: npm install
 
-    - name: Build Docker image
-      run: docker build -t frontend-app .
+    - name: Build frontend
+      run: npm run build
 
-    - name: Copy files to EC2
+    - name: Check build folder exists
+      run: |
+        if [ ! -d "build" ]; then
+          echo "❌ build folder not found. Check if 'npm run build' works."
+          exit 1
+        fi
+    - name: Copy build folder to EC2
       uses: appleboy/scp-action@master
       with:
         host: ${{ secrets.FRONTEND_EC2_IP }}
         username: ubuntu
         key: ${{ secrets.FRONTEND_EC2_SSH_KEY }}
-        source: "./"
+        source: "build"       # ✅ Changed from dist to build
         target: "/home/ubuntu/frontend"
 
     - name: Deploy on EC2 via SSH
@@ -35,9 +46,12 @@ jobs:
         host: ${{ secrets.FRONTEND_EC2_IP }}
         username: ubuntu
         key: ${{ secrets.FRONTEND_EC2_SSH_KEY }}
+        timeout: 600s
+        command_timeout: 600s 
         script: |
-          cd frontend
-          docker build -t frontend-app .
-          docker stop frontend-app || true
-          docker rm frontend-app || true
-          docker run -d -p 80:80 --name frontend-app frontend-app
+          sudo apt-get update
+          sudo apt-get install -y nginx
+          sudo rm -rf /var/www/html/*
+          sudo cp -r /home/ubuntu/frontend/build/* /var/www/html/  # ✅ Changed dist → build
+          sudo systemctl restart nginx
+          echo "✅ Frontend deployed successfully!"
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 91e00bdd..5cf178e2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,25 @@
-FROM node:18-alpine AS build
+FROM node:20-alpine AS build
+
+# Set working directory
 WORKDIR /app
+
+# Copy all files
 COPY . .
+
+# Install dependencies
 RUN npm install
-RUN npm run build
 
+# Increase memory limit and build the app
+RUN NODE_OPTIONS="--max-old-space-size=4096" npm run build
+
+# Use Nginx to serve the built app
 FROM nginx:alpine
+
+# Copy the build output to Nginx public directory
 COPY --from=build /app/build /usr/share/nginx/html
+
+# Expose port 80
 EXPOSE 80
+
+# Start Nginx
 CMD ["nginx", "-g", "daemon off;"]
diff --git a/src/Pages/Menu.jsx b/src/Pages/Menu.jsx
index c6fc942b..53da728a 100644
--- a/src/Pages/Menu.jsx
+++ b/src/Pages/Menu.jsx
@@ -52,8 +52,8 @@ export default function MenuPage() {
     let list =
       category && category !== "All"
         ? items.filter(
-            (it) => it.category?.toLowerCase() === category.toLowerCase()
-          )
+          (it) => it.category?.toLowerCase() === category.toLowerCase()
+        )
         : [...items];
 
     if (search.trim()) {
@@ -136,11 +136,10 @@ export default function MenuPage() {
                   <button
                     key={c}
                     onClick={() => setCategory(c)}
-                    className={`rounded-xl px-4 py-2 text-sm font-medium transition-all border ${
-                      c === category
+                    className={`rounded-xl px-4 py-2 text-sm font-medium transition-all border ${c === category
                         ? "bg-emerald-600 text-white border-emerald-600 shadow"
                         : "bg-white text-gray-700 border-gray-300 hover:bg-gray-50"
-                    }`}
+                      }`}
                   >
                     {c}
                   </button>
@@ -246,9 +245,8 @@ export default function MenuPage() {
 
         {/* Toast */}
         <div
-          className={`pointer-events-none fixed inset-x-0 bottom-6 flex justify-center transition-all duration-300 ${
-            toast ? "opacity-100 translate-y-0" : "opacity-0 translate-y-3"
-          }`}
+          className={`pointer-events-none fixed inset-x-0 bottom-6 flex justify-center transition-all duration-300 ${toast ? "opacity-100 translate-y-0" : "opacity-0 translate-y-3"
+            }`}
           aria-live="polite"
         >
           <div className="pointer-events-auto rounded-xl bg-gray-900 text-white px-4 py-2 text-sm shadow-lg">
diff --git a/src/Pages/forgot-pw.jsx b/src/Pages/forgot-pw.jsx
index ee1447c3..1a39e29f 100644
--- a/src/Pages/forgot-pw.jsx
+++ b/src/Pages/forgot-pw.jsx
@@ -16,7 +16,7 @@ const ForgotPW = () => {
   const navigate = useNavigate();
   const { openNotification } = useNotification();
 
-const handleSubmit = async (values) => {
+  const handleSubmit = async (values) => {
     setIsLoading(true);
     try {
       const response = await axios.post(
@@ -56,7 +56,7 @@ const handleSubmit = async (values) => {
 
   useEffect(() => {
     handleFormChange();
-  }, []);
+  });
 
   return (
     <div
@@ -79,7 +79,7 @@ const handleSubmit = async (values) => {
 
           {/* Form */}
           <div className="flex flex-col items-center w-full">
-             <Form
+            <Form
               form={form}
               layout="vertical"
               className="w-[380px] sm:w-[400px]"
diff --git a/src/Pages/reset-pw.jsx b/src/Pages/reset-pw.jsx
index a2f13d27..72bcc28c 100644
--- a/src/Pages/reset-pw.jsx
+++ b/src/Pages/reset-pw.jsx
@@ -1,6 +1,6 @@
-import React, { useState, useEffect } from "react";
+import { useState, useEffect } from "react";
 import { useSearchParams } from "react-router-dom";
-import { Form, Input, Button, Typography, message } from "antd";
+import { Form, Input, Button, Typography } from "antd";
 import { LockOutlined } from "@ant-design/icons";
 import bg from "../assets/fpw.png";
 import { passwordFieldValidation } from "../helpers/PasswordValidation";
diff --git a/terraform/.terraform.lock.hcl b/terraform/.terraform.lock.hcl
index 3a7e66e5..aa47e49a 100644
--- a/terraform/.terraform.lock.hcl
+++ b/terraform/.terraform.lock.hcl
@@ -2,23 +2,23 @@
 # Manual edits may be lost in future updates.
 
 provider "registry.terraform.io/hashicorp/aws" {
-  version = "6.8.0"
+  version = "6.10.0"
   hashes = [
-    "h1:BfoqVUq+X9n0jRpsZazxIjcKKuvjsn90FuNfQ2pCy5o=",
-    "zh:04781915164a85316d2f659383bb4a2c26ce258efdd63b10ebf5dc741b13d3a4",
-    "zh:050eba0f1d40b6a2542206742fbf8697b139e045120e50b59fa090eb1babb46d",
-    "zh:0590b7ba32f211142fc1acc1350560ce47faa287aeec697b577c9fe10e0efcab",
-    "zh:279943444a858c38976b30248bdcf968ff4b536b9cd8054e7475b8e493c67a16",
-    "zh:46c556c8753d31fdb98123ba3437e6eded07d7671c2cbfc127b2c315f82c0899",
-    "zh:5f6943dfd9e44458b6b915a64f5e103b0e7cff98bf804bb95b8eedaa9c6cc786",
-    "zh:6456d583155ce05028517425a5b5057a05978a89f90df29f37c5c2295e37f605",
-    "zh:83fc4712f0a972b13be71e4323982f55687fb431e1657c91854d3ec8ff846dfb",
-    "zh:921d2761e8474eb12cde03e57dba127021edff8423183241528514351519f721",
+    "h1:ToB7wJhFPmcX1/0vbx5NgZAnP+cJ7Rti5NpNPyEJpxI=",
+    "zh:3c92efebaf635372bf7283e04fc667d59b0ff3cf1aacd011fc484a11f70954d9",
+    "zh:404b2a1d360851e63f25945406f2d0c2cb9c20b361552ce01bf7fe3df516a5bf",
+    "zh:523b1640e2b9e2b548876a1dccc627c290f342255d727568fe4becfd9a8f5689",
+    "zh:697adf10c76384195303650555229129d64135f5be3abf95da0bf4b6de742054",
+    "zh:69d6177e3e106518844373871d4e6377003336761aab884da32f66b034229b5c",
+    "zh:6a41899ce8ab9cdd6f706160fd350951e5f3fc1432a37e638d3576a780c686fd",
+    "zh:6e8fd28299d6bf0ab6922cf987757e578f357a45ac45abc312688580dbde3bee",
+    "zh:7ca4bfb5a8f89586dd0c8dd9c1e638a03bc7c6f456bcc29be57cfb7bdc90fc30",
+    "zh:8fe1f6e0a2718318bae3f53a4fb77bc9eaef0fc4131145996f48482b135830c6",
     "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425",
-    "zh:9f7e13279fcb9ca3e775cbda837735d6868c2fc966e7c23aa27607838ce06c11",
-    "zh:a21075ba6cf6345ed2b28c64bd52af3871d3957f8ca13dbce488975c8b496cbc",
-    "zh:c2e05b36d5d1eb106eb1e763fca9b9ea9e0e5f9900c773b5a80678b66229cfc1",
-    "zh:f340a9a4b67d3f63f36e68ba73145900b7c5cb774d7716aef0600e853fad910e",
-    "zh:f5ce5af7e58f7b3a06b902efb953b64895e5c70c203fc9cdeeb75db240abba31",
+    "zh:b221cfbc9f19ad30719b773f05f45571e88b124c15c35ac230021df1bb1110f5",
+    "zh:b458c357b5f38092e374957e51827d9113447696deccf0cb01f5684d976e7725",
+    "zh:b7fbb1b05972d73d72af58a2179ac124c6d69a4f0392aa2ce4dc855e78f52268",
+    "zh:d95da0dc45df0f30005e17c5206addbd62b0471c265d9855fe8039bf6f2adef7",
+    "zh:db5dd4120c6ab6ae13df67353a9bc902ac34d01c1d297812d628ebf61dc6f681",
   ]
 }
diff --git a/terraform/blendrush_f_key b/terraform/blendrush_f_key
new file mode 100644
index 00000000..b6b9a183
--- /dev/null
+++ b/terraform/blendrush_f_key
@@ -0,0 +1,49 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+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
+-----END OPENSSH PRIVATE KEY-----
diff --git a/terraform/blendrush_f_key.pub b/terraform/blendrush_f_key.pub
new file mode 100644
index 00000000..86a0578a
--- /dev/null
+++ b/terraform/blendrush_f_key.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCt8kfpI3iKDLL1s2TE218krlMdzjBGLyrKjCvtxHs4nneaOcJ5j9zopsn3cjQwnlfkSmFVZZR1+vBVzIhgrnCF/y/dsR/dOJKWyHfantE+f/U/cDPWxPqlyuw2HnHge00TVhlP9KlrCUFa+Kid6gceOpHJYkEkjbHCN9H3EFw/FliCMfKUa0cHY3pyX/ofZTh+RnOsAkJkgPp7Xb/LvbnjSycs8hefkXOsvqnZZ4q9l7DPbaT/s/zhJTNmbRKkGyWOMvoJZ/8tCYvXD0vZ/qhbZRx3ROPkYxnpgFhGlbnQSs3+fXna+wz15QRUIdlP6wZ4eDF5CF8Bk8qgE2vMBDA8Mgdmlt9ca7yaTwN2SePxk9z17YDFQ1CpHHlfP7CMQBWRU4eicSoOnPVUZQlGzWqbrPLDCCMbNVdFrp1AuqvJDHNVE2RJ3E/TIsHOPJuZTbSm8+sHLJeXalNoB3anPG1aWCA/xQvdO/EvdyScedzSuU9obQmI1e1j57VCEzyTitA7cP4ZG5Ya5wvxAQal4A0GXCodYCwVhRIhOrylkbJFri8sO84FIRc4ycEiyUbxlzYC/a/shogEhq7tFi+7rT1uwfT9FDVix6ALYTAz1MSEcAN7QjKXtvIGiyaGUAtjXlCp9PhLzN9Orx7fOgWB0C6/5/GfkPYiwRpG/44jSJzQfw== supuni@DESKTOP-KMFPTKS
diff --git a/terraform/frontend_key.pub b/terraform/frontend_key.pub
deleted file mode 100644
index 580d66eb..00000000
--- a/terraform/frontend_key.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCaWz0pUfZYEwuaeLwoYJuonc54/ec86xZ1gCHfHA7BRpyuUXBZsh6Qn2XMWUjYSgl9DxqzCG8mWocrEXjUJoV4qX28cFi7tvBy7lsiPU8m31HrP9xdaq6aBI5kvfKkkcRvJrtCZdqCzrBgUasM7uGd2KbLOfwxepjIL0GFnlCtJZVjO+csext57hw1StkJeQVsx01Z06LpLfETAJ190K7DzsV5McJAjFBaYn7Gau4Z+seQiv4JPL8GoinoKmJTS2svJy8RMmTU8MUY2hfl6KbvzyTi1YlGgzqAdDlWl0bO2PQQ512cZ2pbsgfB96ND/3pgBppDvbYm6yY18a3uNjWjdEJi+HlU2KWWYmWYJGF2kHHV8x3D5BUNtH7IAUQwwvIQlYS6ciKMAqOf6FIrNaW2Ge/5lB3akbFnPd4pnO0MURyUsr98JhPzPm0Cy+7NQ19rHYMREeHuSB5HNJcD7ktYGLe5rykJSpVRS7jHnLccR5DfLP30XNdQCRD97XjVGlp2j64tmh5gc8TlxqgDN6ef755dPSjGePsUkTdte15nTZRqm2lhug/1NJ68ETiUahh7O+K74NM0Hso9VN0OmKNEWo3HTAPHJ2U1PP8/ueHZg4OhzFsZRCeyPiqYGJQib6X8NsjlABZjYxakfaFbGu+oHaqCw08oytHQhQrR9zpYlw== supuni@DESKTOP-KMFPTKS
diff --git a/terraform/main.tf b/terraform/main.tf
index 6e21f44a..0ab500e3 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -1,24 +1,74 @@
 provider "aws" {
-  region = var.region
+  region = "us-east-1"
 }
 
-resource "aws_key_pair" "frontend_key" {
-  key_name   = "frontend_key"
-  public_key = file("${path.module}/frontend_key.pub")
+variable "region" {
+  default = "us-east-1"
 }
 
+variable "ami" {
+  default = "ami-053b0d53c279acc90" # Ubuntu 22.04 LTS
+}
+
+variable "instance_type" {
+  default = "t2.micro"
+}
+
+# 🔐 SSH Key Pair
+resource "aws_key_pair" "blendrush_f_key" {
+  key_name   = "blendrush_f_key"
+  public_key = file("${path.module}/blendrush_f_key.pub")
+}
+
+# 🌐 VPC
+resource "aws_vpc" "main_vpc" {
+  cidr_block = "10.0.0.0/16"
+}
+
+# 📡 Internet Gateway
+resource "aws_internet_gateway" "igw" {
+  vpc_id = aws_vpc.main_vpc.id
+}
+
+# 🛣 Route Table
+resource "aws_route_table" "public_rt" {
+  vpc_id = aws_vpc.main_vpc.id
+
+  route {
+    cidr_block = "0.0.0.0/0"
+    gateway_id = aws_internet_gateway.igw.id
+  }
+}
+
+# 🌐 Public Subnet
+resource "aws_subnet" "public_subnet" {
+  vpc_id                  = aws_vpc.main_vpc.id
+  cidr_block              = "10.0.1.0/24"
+  map_public_ip_on_launch = true
+}
+
+# 🔗 Associate Subnet to Route Table
+resource "aws_route_table_association" "public_assoc" {
+  subnet_id      = aws_subnet.public_subnet.id
+  route_table_id = aws_route_table.public_rt.id
+}
+
+# 🔒 Security Group
 resource "aws_security_group" "frontend_sg" {
-  name        = "frontend-sg"
-  description = "Allow HTTP and SSH"
-  
+  name        = "frontend_sg"
+  description = "Allow SSH and HTTP"
+  vpc_id      = aws_vpc.main_vpc.id
+
   ingress {
+    description = "SSH"
     from_port   = 22
     to_port     = 22
     protocol    = "tcp"
     cidr_blocks = ["0.0.0.0/0"]
   }
-  
+
   ingress {
+    description = "HTTP"
     from_port   = 80
     to_port     = 80
     protocol    = "tcp"
@@ -33,29 +83,37 @@ resource "aws_security_group" "frontend_sg" {
   }
 }
 
-resource "aws_instance" "frontend_ec2" {
-  ami                    = var.ami
-  instance_type          = var.instance_type
-  key_name               = aws_key_pair.frontend_key.key_name
-  vpc_security_group_ids = [aws_security_group.frontend_sg.id]
+# 💻 EC2 Instance
+resource "aws_instance" "frontend_instance" {
+  ami                         = var.ami
+  instance_type               = var.instance_type
+  key_name                    = aws_key_pair.blendrush_f_key.key_name
+  subnet_id                   = aws_subnet.public_subnet.id
+  associate_public_ip_address = true
+  vpc_security_group_ids      = [aws_security_group.frontend_sg.id]
+
+  tags = {
+    Name = "FrontendAppInstance"
+  }
 
   provisioner "remote-exec" {
     inline = [
       "sudo apt update -y",
       "sudo apt install docker.io -y",
       "sudo systemctl start docker",
-      "sudo usermod -aG docker ubuntu"
+      "sudo systemctl enable docker"
     ]
 
     connection {
       type        = "ssh"
       user        = "ubuntu"
-      private_key = file("${path.module}/frontend_key")
+      private_key = file("${path.module}/blendrush_f_key")
       host        = self.public_ip
     }
   }
+}
 
-  tags = {
-    Name = "Frontend-EC2"
-  }
+# 🔎 Output the public IP
+output "frontend_public_ip" {
+  value = aws_instance.frontend_instance.public_ip
 }
diff --git a/terraform/outputs.tf b/terraform/outputs.tf
index de4098b4..1b24e616 100644
--- a/terraform/outputs.tf
+++ b/terraform/outputs.tf
@@ -1,3 +1,3 @@
-output "frontend_public_ip" {
-  value = aws_instance.frontend_ec2.public_ip
+output "blendrush_fd_public_ip" {
+  value = aws_instance.frontend_instance.public_ip
 }
diff --git a/terraform/terraform.tfstate b/terraform/terraform.tfstate
index 6100ed7f..751a6275 100644
--- a/terraform/terraform.tfstate
+++ b/terraform/terraform.tfstate
@@ -1,11 +1,15 @@
 {
   "version": 4,
   "terraform_version": "1.12.2",
-  "serial": 4,
-  "lineage": "00002fe4-8c37-da47-3c7f-86b0c4210b7a",
+  "serial": 11,
+  "lineage": "17044509-bb1a-415c-3b54-f1707970e5d6",
   "outputs": {
+    "blendrush_fd_public_ip": {
+      "value": "54.235.60.229",
+      "type": "string"
+    },
     "frontend_public_ip": {
-      "value": "52.207.224.204",
+      "value": "54.235.60.229",
       "type": "string"
     }
   },
@@ -13,16 +17,16 @@
     {
       "mode": "managed",
       "type": "aws_instance",
-      "name": "frontend_ec2",
+      "name": "frontend_instance",
       "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]",
       "instances": [
         {
           "schema_version": 2,
           "attributes": {
-            "ami": "ami-0c7217cdde317cfec",
-            "arn": "arn:aws:ec2:us-east-1:830437195502:instance/i-0d6faa00ef62902d9",
+            "ami": "ami-053b0d53c279acc90",
+            "arn": "arn:aws:ec2:us-east-1:830437195502:instance/i-0387d090610cde019",
             "associate_public_ip_address": true,
-            "availability_zone": "us-east-1b",
+            "availability_zone": "us-east-1c",
             "capacity_reservation_specification": [
               {
                 "capacity_reservation_preference": "open",
@@ -58,7 +62,7 @@
             "host_id": "",
             "host_resource_group_arn": null,
             "iam_instance_profile": "",
-            "id": "i-0d6faa00ef62902d9",
+            "id": "i-0387d090610cde019",
             "instance_initiated_shutdown_behavior": "stop",
             "instance_lifecycle": "",
             "instance_market_options": [],
@@ -66,7 +70,7 @@
             "instance_type": "t2.micro",
             "ipv6_address_count": 0,
             "ipv6_addresses": [],
-            "key_name": "frontend_key",
+            "key_name": "blendrush_f_key",
             "launch_template": [],
             "maintenance_options": [
               {
@@ -88,8 +92,14 @@
             "password_data": "",
             "placement_group": "",
             "placement_partition_number": 0,
-            "primary_network_interface_id": "eni-008f15032e565e9df",
-            "private_dns": "ip-172-31-25-33.ec2.internal",
+            "primary_network_interface": [
+              {
+                "delete_on_termination": true,
+                "network_interface_id": "eni-007d87fbb322cf078"
+              }
+            ],
+            "primary_network_interface_id": "eni-007d87fbb322cf078",
+            "private_dns": "ip-10-0-1-49.ec2.internal",
             "private_dns_name_options": [
               {
                 "enable_resource_name_dns_a_record": false,
@@ -97,9 +107,9 @@
                 "hostname_type": "ip-name"
               }
             ],
-            "private_ip": "172.31.25.33",
-            "public_dns": "ec2-52-207-224-204.compute-1.amazonaws.com",
-            "public_ip": "52.207.224.204",
+            "private_ip": "10.0.1.49",
+            "public_dns": "",
+            "public_ip": "54.235.60.229",
             "region": "us-east-1",
             "root_block_device": [
               {
@@ -111,23 +121,21 @@
                 "tags": {},
                 "tags_all": {},
                 "throughput": 0,
-                "volume_id": "vol-02f6c466c51ebecf8",
+                "volume_id": "vol-08bed4189e85571bb",
                 "volume_size": 8,
                 "volume_type": "gp2"
               }
             ],
             "secondary_private_ips": [],
-            "security_groups": [
-              "frontend-sg"
-            ],
+            "security_groups": [],
             "source_dest_check": true,
             "spot_instance_request_id": "",
-            "subnet_id": "subnet-02979142b6aa590ef",
+            "subnet_id": "subnet-06c356ad52941ca6d",
             "tags": {
-              "Name": "Frontend-EC2"
+              "Name": "FrontendAppInstance"
             },
             "tags_all": {
-              "Name": "Frontend-EC2"
+              "Name": "FrontendAppInstance"
             },
             "tenancy": "default",
             "timeouts": null,
@@ -136,15 +144,44 @@
             "user_data_replace_on_change": false,
             "volume_tags": null,
             "vpc_security_group_ids": [
-              "sg-03a0602a4d5b23740"
+              "sg-0a3c5a0c06dfe1a4f"
             ]
           },
           "sensitive_attributes": [],
           "identity_schema_version": 0,
           "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6MTIwMDAwMDAwMDAwMCwicmVhZCI6OTAwMDAwMDAwMDAwLCJ1cGRhdGUiOjYwMDAwMDAwMDAwMH0sInNjaGVtYV92ZXJzaW9uIjoiMiJ9",
           "dependencies": [
-            "aws_key_pair.frontend_key",
-            "aws_security_group.frontend_sg"
+            "aws_key_pair.blendrush_f_key",
+            "aws_security_group.frontend_sg",
+            "aws_subnet.public_subnet",
+            "aws_vpc.main_vpc"
+          ]
+        }
+      ]
+    },
+    {
+      "mode": "managed",
+      "type": "aws_internet_gateway",
+      "name": "igw",
+      "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]",
+      "instances": [
+        {
+          "schema_version": 0,
+          "attributes": {
+            "arn": "arn:aws:ec2:us-east-1:830437195502:internet-gateway/igw-0f18c76ceab3d051e",
+            "id": "igw-0f18c76ceab3d051e",
+            "owner_id": "830437195502",
+            "region": "us-east-1",
+            "tags": {},
+            "tags_all": {},
+            "timeouts": null,
+            "vpc_id": "vpc-087dc5937b62c8b3a"
+          },
+          "sensitive_attributes": [],
+          "identity_schema_version": 0,
+          "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxMjAwMDAwMDAwMDAwLCJkZWxldGUiOjEyMDAwMDAwMDAwMDAsInVwZGF0ZSI6MTIwMDAwMDAwMDAwMH19",
+          "dependencies": [
+            "aws_vpc.main_vpc"
           ]
         }
       ]
@@ -152,20 +189,20 @@
     {
       "mode": "managed",
       "type": "aws_key_pair",
-      "name": "frontend_key",
+      "name": "blendrush_f_key",
       "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]",
       "instances": [
         {
           "schema_version": 1,
           "attributes": {
-            "arn": "arn:aws:ec2:us-east-1:830437195502:key-pair/frontend_key",
-            "fingerprint": "bb:3c:d0:15:b0:93:32:9d:3f:25:25:82:fd:dc:5b:e7",
-            "id": "frontend_key",
-            "key_name": "frontend_key",
+            "arn": "arn:aws:ec2:us-east-1:830437195502:key-pair/blendrush_f_key",
+            "fingerprint": "eb:f5:20:38:c6:f6:dc:73:e1:86:8b:b4:9f:7a:6f:7e",
+            "id": "blendrush_f_key",
+            "key_name": "blendrush_f_key",
             "key_name_prefix": "",
-            "key_pair_id": "key-0e2a4c8892a59a419",
+            "key_pair_id": "key-08a4d028bf4de217d",
             "key_type": "rsa",
-            "public_key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCaWz0pUfZYEwuaeLwoYJuonc54/ec86xZ1gCHfHA7BRpyuUXBZsh6Qn2XMWUjYSgl9DxqzCG8mWocrEXjUJoV4qX28cFi7tvBy7lsiPU8m31HrP9xdaq6aBI5kvfKkkcRvJrtCZdqCzrBgUasM7uGd2KbLOfwxepjIL0GFnlCtJZVjO+csext57hw1StkJeQVsx01Z06LpLfETAJ190K7DzsV5McJAjFBaYn7Gau4Z+seQiv4JPL8GoinoKmJTS2svJy8RMmTU8MUY2hfl6KbvzyTi1YlGgzqAdDlWl0bO2PQQ512cZ2pbsgfB96ND/3pgBppDvbYm6yY18a3uNjWjdEJi+HlU2KWWYmWYJGF2kHHV8x3D5BUNtH7IAUQwwvIQlYS6ciKMAqOf6FIrNaW2Ge/5lB3akbFnPd4pnO0MURyUsr98JhPzPm0Cy+7NQ19rHYMREeHuSB5HNJcD7ktYGLe5rykJSpVRS7jHnLccR5DfLP30XNdQCRD97XjVGlp2j64tmh5gc8TlxqgDN6ef755dPSjGePsUkTdte15nTZRqm2lhug/1NJ68ETiUahh7O+K74NM0Hso9VN0OmKNEWo3HTAPHJ2U1PP8/ueHZg4OhzFsZRCeyPiqYGJQib6X8NsjlABZjYxakfaFbGu+oHaqCw08oytHQhQrR9zpYlw== supuni@DESKTOP-KMFPTKS",
+            "public_key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCt8kfpI3iKDLL1s2TE218krlMdzjBGLyrKjCvtxHs4nneaOcJ5j9zopsn3cjQwnlfkSmFVZZR1+vBVzIhgrnCF/y/dsR/dOJKWyHfantE+f/U/cDPWxPqlyuw2HnHge00TVhlP9KlrCUFa+Kid6gceOpHJYkEkjbHCN9H3EFw/FliCMfKUa0cHY3pyX/ofZTh+RnOsAkJkgPp7Xb/LvbnjSycs8hefkXOsvqnZZ4q9l7DPbaT/s/zhJTNmbRKkGyWOMvoJZ/8tCYvXD0vZ/qhbZRx3ROPkYxnpgFhGlbnQSs3+fXna+wz15QRUIdlP6wZ4eDF5CF8Bk8qgE2vMBDA8Mgdmlt9ca7yaTwN2SePxk9z17YDFQ1CpHHlfP7CMQBWRU4eicSoOnPVUZQlGzWqbrPLDCCMbNVdFrp1AuqvJDHNVE2RJ3E/TIsHOPJuZTbSm8+sHLJeXalNoB3anPG1aWCA/xQvdO/EvdyScedzSuU9obQmI1e1j57VCEzyTitA7cP4ZG5Ya5wvxAQal4A0GXCodYCwVhRIhOrylkbJFri8sO84FIRc4ycEiyUbxlzYC/a/shogEhq7tFi+7rT1uwfT9FDVix6ALYTAz1MSEcAN7QjKXtvIGiyaGUAtjXlCp9PhLzN9Orx7fOgWB0C6/5/GfkPYiwRpG/44jSJzQfw== supuni@DESKTOP-KMFPTKS",
             "region": "us-east-1",
             "tags": null,
             "tags_all": {}
@@ -176,6 +213,80 @@
         }
       ]
     },
+    {
+      "mode": "managed",
+      "type": "aws_route_table",
+      "name": "public_rt",
+      "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]",
+      "instances": [
+        {
+          "schema_version": 0,
+          "attributes": {
+            "arn": "arn:aws:ec2:us-east-1:830437195502:route-table/rtb-03bf040028db4aeaf",
+            "id": "rtb-03bf040028db4aeaf",
+            "owner_id": "830437195502",
+            "propagating_vgws": [],
+            "region": "us-east-1",
+            "route": [
+              {
+                "carrier_gateway_id": "",
+                "cidr_block": "0.0.0.0/0",
+                "core_network_arn": "",
+                "destination_prefix_list_id": "",
+                "egress_only_gateway_id": "",
+                "gateway_id": "igw-0f18c76ceab3d051e",
+                "ipv6_cidr_block": "",
+                "local_gateway_id": "",
+                "nat_gateway_id": "",
+                "network_interface_id": "",
+                "transit_gateway_id": "",
+                "vpc_endpoint_id": "",
+                "vpc_peering_connection_id": ""
+              }
+            ],
+            "tags": {},
+            "tags_all": {},
+            "timeouts": null,
+            "vpc_id": "vpc-087dc5937b62c8b3a"
+          },
+          "sensitive_attributes": [],
+          "identity_schema_version": 0,
+          "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjozMDAwMDAwMDAwMDAsImRlbGV0ZSI6MzAwMDAwMDAwMDAwLCJ1cGRhdGUiOjEyMDAwMDAwMDAwMH19",
+          "dependencies": [
+            "aws_internet_gateway.igw",
+            "aws_vpc.main_vpc"
+          ]
+        }
+      ]
+    },
+    {
+      "mode": "managed",
+      "type": "aws_route_table_association",
+      "name": "public_assoc",
+      "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]",
+      "instances": [
+        {
+          "schema_version": 0,
+          "attributes": {
+            "gateway_id": "",
+            "id": "rtbassoc-007a151a721e671eb",
+            "region": "us-east-1",
+            "route_table_id": "rtb-03bf040028db4aeaf",
+            "subnet_id": "subnet-06c356ad52941ca6d",
+            "timeouts": null
+          },
+          "sensitive_attributes": [],
+          "identity_schema_version": 0,
+          "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjozMDAwMDAwMDAwMDAsImRlbGV0ZSI6MzAwMDAwMDAwMDAwLCJ1cGRhdGUiOjEyMDAwMDAwMDAwMH19",
+          "dependencies": [
+            "aws_internet_gateway.igw",
+            "aws_route_table.public_rt",
+            "aws_subnet.public_subnet",
+            "aws_vpc.main_vpc"
+          ]
+        }
+      ]
+    },
     {
       "mode": "managed",
       "type": "aws_security_group",
@@ -185,8 +296,8 @@
         {
           "schema_version": 1,
           "attributes": {
-            "arn": "arn:aws:ec2:us-east-1:830437195502:security-group/sg-03a0602a4d5b23740",
-            "description": "Allow HTTP and SSH",
+            "arn": "arn:aws:ec2:us-east-1:830437195502:security-group/sg-0a3c5a0c06dfe1a4f",
+            "description": "Allow SSH and HTTP",
             "egress": [
               {
                 "cidr_blocks": [
@@ -202,53 +313,144 @@
                 "to_port": 0
               }
             ],
-            "id": "sg-03a0602a4d5b23740",
+            "id": "sg-0a3c5a0c06dfe1a4f",
             "ingress": [
               {
                 "cidr_blocks": [
                   "0.0.0.0/0"
                 ],
-                "description": "",
-                "from_port": 22,
+                "description": "HTTP",
+                "from_port": 80,
                 "ipv6_cidr_blocks": [],
                 "prefix_list_ids": [],
                 "protocol": "tcp",
                 "security_groups": [],
                 "self": false,
-                "to_port": 22
+                "to_port": 80
               },
               {
                 "cidr_blocks": [
                   "0.0.0.0/0"
                 ],
-                "description": "",
-                "from_port": 80,
+                "description": "SSH",
+                "from_port": 22,
                 "ipv6_cidr_blocks": [],
                 "prefix_list_ids": [],
                 "protocol": "tcp",
                 "security_groups": [],
                 "self": false,
-                "to_port": 80
+                "to_port": 22
               }
             ],
-            "name": "frontend-sg",
+            "name": "frontend_sg",
             "name_prefix": "",
             "owner_id": "830437195502",
             "region": "us-east-1",
             "revoke_rules_on_delete": false,
-            "tags": null,
+            "tags": {},
             "tags_all": {},
             "timeouts": null,
-            "vpc_id": "vpc-0236220b592d22e09"
+            "vpc_id": "vpc-087dc5937b62c8b3a"
           },
           "sensitive_attributes": [],
           "identity_schema_version": 0,
           "identity": {
             "account_id": "830437195502",
-            "id": "sg-03a0602a4d5b23740",
+            "id": "sg-0a3c5a0c06dfe1a4f",
             "region": "us-east-1"
           },
-          "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6OTAwMDAwMDAwMDAwfSwic2NoZW1hX3ZlcnNpb24iOiIxIn0="
+          "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6OTAwMDAwMDAwMDAwfSwic2NoZW1hX3ZlcnNpb24iOiIxIn0=",
+          "dependencies": [
+            "aws_vpc.main_vpc"
+          ]
+        }
+      ]
+    },
+    {
+      "mode": "managed",
+      "type": "aws_subnet",
+      "name": "public_subnet",
+      "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]",
+      "instances": [
+        {
+          "schema_version": 1,
+          "attributes": {
+            "arn": "arn:aws:ec2:us-east-1:830437195502:subnet/subnet-06c356ad52941ca6d",
+            "assign_ipv6_address_on_creation": false,
+            "availability_zone": "us-east-1c",
+            "availability_zone_id": "use1-az6",
+            "cidr_block": "10.0.1.0/24",
+            "customer_owned_ipv4_pool": "",
+            "enable_dns64": false,
+            "enable_lni_at_device_index": 0,
+            "enable_resource_name_dns_a_record_on_launch": false,
+            "enable_resource_name_dns_aaaa_record_on_launch": false,
+            "id": "subnet-06c356ad52941ca6d",
+            "ipv6_cidr_block": "",
+            "ipv6_cidr_block_association_id": "",
+            "ipv6_native": false,
+            "map_customer_owned_ip_on_launch": false,
+            "map_public_ip_on_launch": true,
+            "outpost_arn": "",
+            "owner_id": "830437195502",
+            "private_dns_hostname_type_on_launch": "ip-name",
+            "region": "us-east-1",
+            "tags": {},
+            "tags_all": {},
+            "timeouts": null,
+            "vpc_id": "vpc-087dc5937b62c8b3a"
+          },
+          "sensitive_attributes": [],
+          "identity_schema_version": 0,
+          "identity": {
+            "account_id": "830437195502",
+            "id": "subnet-06c356ad52941ca6d",
+            "region": "us-east-1"
+          },
+          "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6MTIwMDAwMDAwMDAwMH0sInNjaGVtYV92ZXJzaW9uIjoiMSJ9",
+          "dependencies": [
+            "aws_vpc.main_vpc"
+          ]
+        }
+      ]
+    },
+    {
+      "mode": "managed",
+      "type": "aws_vpc",
+      "name": "main_vpc",
+      "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]",
+      "instances": [
+        {
+          "schema_version": 1,
+          "attributes": {
+            "arn": "arn:aws:ec2:us-east-1:830437195502:vpc/vpc-087dc5937b62c8b3a",
+            "assign_generated_ipv6_cidr_block": false,
+            "cidr_block": "10.0.0.0/16",
+            "default_network_acl_id": "acl-092e214f844bfc5b3",
+            "default_route_table_id": "rtb-066f870e9292afb65",
+            "default_security_group_id": "sg-073385a9bb4f33d60",
+            "dhcp_options_id": "dopt-01847d218e50082ba",
+            "enable_dns_hostnames": false,
+            "enable_dns_support": true,
+            "enable_network_address_usage_metrics": false,
+            "id": "vpc-087dc5937b62c8b3a",
+            "instance_tenancy": "default",
+            "ipv4_ipam_pool_id": null,
+            "ipv4_netmask_length": null,
+            "ipv6_association_id": "",
+            "ipv6_cidr_block": "",
+            "ipv6_cidr_block_network_border_group": "",
+            "ipv6_ipam_pool_id": "",
+            "ipv6_netmask_length": 0,
+            "main_route_table_id": "rtb-066f870e9292afb65",
+            "owner_id": "830437195502",
+            "region": "us-east-1",
+            "tags": {},
+            "tags_all": {}
+          },
+          "sensitive_attributes": [],
+          "identity_schema_version": 0,
+          "private": "eyJzY2hlbWFfdmVyc2lvbiI6IjEifQ=="
         }
       ]
     }
diff --git a/terraform/variables.tf b/terraform/variables.tf
index e84d61e2..e69de29b 100644
--- a/terraform/variables.tf
+++ b/terraform/variables.tf
@@ -1,9 +0,0 @@
-variable "region" {
-  default = "us-east-1"
-}
-variable "ami" {
-  default = "ami-0c7217cdde317cfec" # Ubuntu 20.04 LTS in us-east-1
-}
-variable "instance_type" {
-  default = "t2.micro"
-}