diff --git a/Access_Controls-Policies-Rule_Groups.tf b/Access_Controls-Policies-Rule_Groups.tf
index 04dd73b..90a38c4 100644
--- a/Access_Controls-Policies-Rule_Groups.tf
+++ b/Access_Controls-Policies-Rule_Groups.tf
@@ -205,7 +205,8 @@ resource "cloudflare_zero_trust_access_group" "saml_groups" {
 # Composite Rule Groups
 #===================================================
 resource "cloudflare_zero_trust_access_group" "employees_rule_group" {
-  account_id = var.cloudflare_account_id
+  account_id = local.cloudflare_account_id
+
   name       = "Employees"
 
   include = [
@@ -218,9 +219,9 @@ resource "cloudflare_zero_trust_access_group" "employees_rule_group" {
 }
 
 resource "cloudflare_zero_trust_access_group" "sales_team_rule_group" {
-  account_id = var.cloudflare_account_id
-  name       = "Sales Team"
+  account_id = local.cloudflare_account_id
 
+  name       = "Sales Team"
   include = [
     for group_key in ["sales", "sales_engineering"] : {
       group = {
@@ -231,9 +232,9 @@ resource "cloudflare_zero_trust_access_group" "sales_team_rule_group" {
 }
 
 resource "cloudflare_zero_trust_access_group" "admins_rule_group" {
-  account_id = var.cloudflare_account_id
-  name       = "Administrators"
+  account_id = local.cloudflare_account_id
 
+  name       = "Administrators"
   include = [
     for group_key in ["it_admin", "infrastructure_admin"] : {
       group = {
@@ -244,9 +245,9 @@ resource "cloudflare_zero_trust_access_group" "admins_rule_group" {
 }
 
 resource "cloudflare_zero_trust_access_group" "contractors_rule_group" {
-  account_id = var.cloudflare_account_id
-  name       = "Contractors Extended"
+  account_id = local.cloudflare_account_id
 
+  name       = "Contractors Extended"
   include = [
     {
       group = {
@@ -264,8 +265,8 @@ resource "cloudflare_zero_trust_access_group" "contractors_rule_group" {
 # Geographic Rule Groups
 resource "cloudflare_zero_trust_access_group" "country_requirements_rule_group" {
   account_id = local.cloudflare_account_id
-  name       = "GRP_Localisation_Country Requirements"
 
+  name       = "GRP_Localisation_Country Requirements"
   include = [
     for country in local.allowed_countries : {
       geo = {