diff --git a/submodules/dynamic_values/main.tf b/submodules/dynamic_values/main.tf
index 8acf947..615b4e4 100644
--- a/submodules/dynamic_values/main.tf
+++ b/submodules/dynamic_values/main.tf
@@ -33,13 +33,13 @@ locals {
   depth_1_accounts = {
     for value in local.nested_accounts :
     value.key_name => value
-    if contains(keys(local.depth_1_account_groups), value.parent_key_name)
+    if contains(keys(local.depth_0_account_groups), value.parent_key_name)
   }
 
   depth_2_accounts = {
     for value in local.nested_accounts :
     value.key_name => value
-    if contains(keys(local.depth_2_account_groups), value.parent_key_name)
+    if contains(keys(local.depth_1_account_groups), value.parent_key_name)
   }
 
   enterprise_hierarchy_depth_0 = {
diff --git a/submodules/enterprise_hierarchy/main.tf b/submodules/enterprise_hierarchy/main.tf
index ef95cd6..8058803 100644
--- a/submodules/enterprise_hierarchy/main.tf
+++ b/submodules/enterprise_hierarchy/main.tf
@@ -8,7 +8,7 @@ resource "ibm_enterprise_account_group" "enterprise_account_group" {
 
 resource "ibm_enterprise_account" "enterprise_account" {
   for_each     = var.enterprise_hierarchy.accounts
-  parent       = each.value.parent_key_name != null ? resource.ibm_enterprise_account_group.enterprise_account_group[each.value.parent_key_name].crn : var.enterprise_crn
+  parent       = each.value.parent_key_name != null ? var.parent_account_groups[each.value.parent_key_name].crn : var.enterprise_crn
   name         = each.value.name
   owner_iam_id = each.value.owner_iam_id == null ? var.enterprise_primary_contact_iam_id : each.value.owner_iam_id
 }