diff --git a/terraform/deployments/cluster-infrastructure/main.tf b/terraform/deployments/cluster-infrastructure/main.tf
index f912ba2fb..f0b74e2ea 100644
--- a/terraform/deployments/cluster-infrastructure/main.tf
+++ b/terraform/deployments/cluster-infrastructure/main.tf
@@ -7,8 +7,13 @@
 # See https://github.com/alphagov/govuk-infrastructure/blob/main/docs/architecture/decisions/0003-split-terraform-state-into-separate-aws-cluster-and-kubernetes-resource-phases.md
 
 terraform {
-  backend "s3" {}
-
+  # backend "s3" {}
+  cloud {
+    organization = "govuk"
+    workspaces {
+      tags = ["cluster-infrastructure", "eks", "aws"]
+    }
+  }
   required_version = "~> 1.5"
   required_providers {
     aws = {