diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index d8b1b49e9..b39d1b006 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -139,6 +139,10 @@ jobs:
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: ${{ env.AWS_REGION }}
 
+      - name: Create AWS State Bucket
+        run: |
+          aws s3api create-bucket --bucket devops-assignment-tf-state-aws --region us-east-2 --create-bucket-configuration LocationConstraint=us-east-2 2>/dev/null || echo "Bucket already exists"
+
       - name: Terraform Init AWS
         run: |
           cd terraform/aws
diff --git a/terraform/aws/main.tf b/terraform/aws/main.tf
index 469f80377..0d3077a83 100644
--- a/terraform/aws/main.tf
+++ b/terraform/aws/main.tf
@@ -5,8 +5,10 @@ terraform {
       version = "~> 5.0"
     }
   }
-  backend "local" {
-     path = "terraform.tfstate"
+  backend "s3" {
+    bucket = "devops-assignment-tf-state-aws"
+    key    = "terraform/state/aws.tfstate"
+    region = "us-east-2"
   }
 }