diff --git a/.github/workflows/time-tracker-ui-cd-prod.yml b/.github/workflows/time-tracker-ui-cd-prod.yml
index cf531e0a3..f2ae46744 100644
--- a/.github/workflows/time-tracker-ui-cd-prod.yml
+++ b/.github/workflows/time-tracker-ui-cd-prod.yml
@@ -15,7 +15,9 @@ jobs:
         ARM_CLIENT_SECRET: ${{secrets.TF_ARM_CLIENT_SECRET}}
         ARM_SUBSCRIPTION_ID: ${{secrets.TF_ARM_SUBSCRIPTION_ID}}
         ARM_TENANT_ID: ${{secrets.TF_ARM_TENANT_ID}}
-        
+        AWS_ACCESS_KEY_ID: ${{secrets.AWS_ACCESS_KEY_ID}}
+        AWS_SECRET_ACCESS_KEY: ${{secrets.AWS_SECRET_ACCESS_KEY}}
+
     steps:
     - name: Checkout
       uses: actions/checkout@v3
diff --git a/.github/workflows/time-tracker-ui-cd-stage.yml b/.github/workflows/time-tracker-ui-cd-stage.yml
index 276907f37..d71f65925 100644
--- a/.github/workflows/time-tracker-ui-cd-stage.yml
+++ b/.github/workflows/time-tracker-ui-cd-stage.yml
@@ -15,6 +15,8 @@ jobs:
         ARM_CLIENT_SECRET: ${{secrets.TF_ARM_CLIENT_SECRET}}
         ARM_SUBSCRIPTION_ID: ${{secrets.TF_ARM_SUBSCRIPTION_ID}}
         ARM_TENANT_ID: ${{secrets.TF_ARM_TENANT_ID}}
+        AWS_ACCESS_KEY_ID: ${{secrets.AWS_ACCESS_KEY_ID}}
+        AWS_SECRET_ACCESS_KEY: ${{secrets.AWS_SECRET_ACCESS_KEY}}
         
     steps:
     - name: Checkout
diff --git a/.github/workflows/time-tracker-ui-ci.yml b/.github/workflows/time-tracker-ui-ci.yml
index 74d867c4c..b5cb7cd64 100644
--- a/.github/workflows/time-tracker-ui-ci.yml
+++ b/.github/workflows/time-tracker-ui-ci.yml
@@ -18,6 +18,9 @@ jobs:
         ARM_CLIENT_SECRET: ${{secrets.TF_ARM_CLIENT_SECRET}}
         ARM_SUBSCRIPTION_ID: ${{secrets.TF_ARM_SUBSCRIPTION_ID}}
         ARM_TENANT_ID: ${{secrets.TF_ARM_TENANT_ID}}
+        AWS_ACCESS_KEY_ID: ${{secrets.AWS_ACCESS_KEY_ID}}
+        AWS_SECRET_ACCESS_KEY: ${{secrets.AWS_SECRET_ACCESS_KEY}}
+
     strategy:
       max-parallel: 5
     steps:
diff --git a/infrastructure/main.tf b/infrastructure/main.tf
index 4907d9b7f..caa878ec7 100644
--- a/infrastructure/main.tf
+++ b/infrastructure/main.tf
@@ -5,15 +5,22 @@ terraform {
       source  = "hashicorp/azurerm"
       version = "~> 2.90"
     }
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> 4.9.0"
+    }
   }
 
-  backend "azurerm" {
-    resource_group_name  = "ioet-infra-tf-state"
-    storage_account_name = "timetrackertfstate"
-    container_name       = "time-tracker-tf-state"
-    key                  = "time-tracker-ui.tfstate"
+  backend "s3" {
+    bucket  = "time-tracker-service"
+    key     = "ioet-time-tracker-ui/terraform.tfstate"
+    region  = "us-east-1"
+    encrypt = true
   }
+}
 
+provider "aws" {
+  region = "us-east-1"
 }
 
 provider "azurerm" {
@@ -22,13 +29,11 @@ provider "azurerm" {
 }
 
 data "terraform_remote_state" "service" {
-  backend   = "azurerm"
-  workspace = terraform.workspace
+  backend = "s3"
   config = {
-    resource_group_name  = "ioet-infra-tf-state"
-    storage_account_name = "timetrackertfstate"
-    container_name       = "time-tracker-tf-state"
-    key                  = "this.tfstate"
+    bucket = "time-tracker-service"
+    key    = "env://${local.environment}/time-tracker-service/terraform.tfstate"
+    region = "us-east-1"
   }
 }