diff --git a/environments/dev/backend.tf b/environments/dev/backend.tf
index 33a807a336..cfb97c3f7f 100644
--- a/environments/dev/backend.tf
+++ b/environments/dev/backend.tf
@@ -15,7 +15,8 @@
 
 terraform {
   backend "gcs" {
-    bucket = "PROJECT_ID-tfstate"
+    bucket = "tf-cloudbuild-gitops-tfstate"
     prefix = "env/dev"
+    location = "EU"
   }
 }
diff --git a/environments/dev/terraform.tfvars b/environments/dev/terraform.tfvars
index cb8a5a1bbc..10c5a9b1d9 100644
--- a/environments/dev/terraform.tfvars
+++ b/environments/dev/terraform.tfvars
@@ -1 +1 @@
-project="PROJECT_ID"
\ No newline at end of file
+project="tf-cloudbuild-gitops"
\ No newline at end of file
diff --git a/environments/prod/backend.tf b/environments/prod/backend.tf
index 7ed343b1a2..f2d487da0a 100644
--- a/environments/prod/backend.tf
+++ b/environments/prod/backend.tf
@@ -15,7 +15,8 @@
 
 terraform {
   backend "gcs" {
-    bucket = "PROJECT_ID-tfstate"
+    bucket = "tf-cloudbuild-gitops-tfstate"
     prefix = "env/prod"
+    location = "EU"
   }
 }
diff --git a/environments/prod/terraform.tfvars b/environments/prod/terraform.tfvars
index cb8a5a1bbc..10c5a9b1d9 100644
--- a/environments/prod/terraform.tfvars
+++ b/environments/prod/terraform.tfvars
@@ -1 +1 @@
-project="PROJECT_ID"
\ No newline at end of file
+project="tf-cloudbuild-gitops"
\ No newline at end of file
diff --git a/modules/firewall/main.tf b/modules/firewall/main.tf
index 5e40f7089f..1d2e549134 100644
--- a/modules/firewall/main.tf
+++ b/modules/firewall/main.tf
@@ -27,6 +27,6 @@ resource "google_compute_firewall" "allow-http" {
     ports    = ["80"]
   }
 
-  target_tags   = ["http-server2"]
+  target_tags   = ["http-server"]
   source_ranges = ["0.0.0.0/0"]
 }