diff --git a/access_rule_groups.tf b/access_rule_groups.tf
index 3de99c6..16c41fc 100644
--- a/access_rule_groups.tf
+++ b/access_rule_groups.tf
@@ -19,7 +19,7 @@ locals {
 #===================================================
 resource "cloudflare_zero_trust_access_group" "saml_groups" {
   for_each   = local.saml_groups
-  account_id = var.cloudflare_account_id
+  account_id = local.cloudflare_account_id
   name       = each.value
 
   include = [{
@@ -35,7 +35,7 @@ resource "cloudflare_zero_trust_access_group" "saml_groups" {
 # Geographic Rule Groups
 #===================================================
 resource "cloudflare_zero_trust_access_group" "country_requirements_rule_group" {
-  account_id = var.cloudflare_account_id
+  account_id = local.cloudflare_account_id
   name       = "Country Requirements"
 
   include = [
@@ -58,7 +58,7 @@ resource "cloudflare_zero_trust_access_group" "country_requirements_rule_group"
 # Device Posture Rule Groups
 #===================================================
 resource "cloudflare_zero_trust_access_group" "latest_os_version_requirements_rule_group" {
-  account_id = var.cloudflare_account_id
+  account_id = local.cloudflare_account_id
   name       = "Latest OS Version Requirements"
 
   include = [
@@ -74,7 +74,7 @@ resource "cloudflare_zero_trust_access_group" "latest_os_version_requirements_ru
 # 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 = [
@@ -87,7 +87,7 @@ 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
+  account_id = local.cloudflare_account_id
   name       = "Sales Team"
 
   include = [
@@ -100,7 +100,7 @@ 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
+  account_id = local.cloudflare_account_id
   name       = "Administrators"
 
   include = [
@@ -113,7 +113,7 @@ resource "cloudflare_zero_trust_access_group" "admins_rule_group" {
 }
 
 resource "cloudflare_zero_trust_access_group" "contractors_rule_group" {
-  account_id = var.cloudflare_account_id
+  account_id = local.cloudflare_account_id
   name       = "Contractors Extended"
 
   include = [
@@ -135,7 +135,7 @@ resource "cloudflare_zero_trust_access_group" "contractors_rule_group" {
 #===================================================
 resource "cloudflare_zero_trust_access_group" "azure_groups" {
   for_each   = local.azure_groups
-  account_id = var.cloudflare_account_id
+  account_id = local.cloudflare_account_id
   name       = replace(title(replace(each.key, "_", " ")), "Azure", "Azure")
 
   include = [{