diff --git a/roles/common/defaults/main.yml b/roles/common/defaults/main.yml
index 81b0a69f..2d5967a5 100644
--- a/roles/common/defaults/main.yml
+++ b/roles/common/defaults/main.yml
@@ -58,6 +58,7 @@ common__unique_storage_name_suffix:       "{{ globals.storage.name | default((co
 
 # Infra
 common__infra_type:                       "{{ globals.infra_type | default('aws') }}"
+common__aws_profile:                      "{{ globals.aws_profile | default('') }}"
 common__public_key_file:                  "{{ globals.ssh.public_key_file | default('') }}"
 common__namespace_cdp:                    "{{ globals.namespace_cdp | default([common__namespace, common__namespace_unique_suffix] | join('-')) }}"
 common__tags:                             "{{ globals.tags | default({}) }}"
@@ -87,11 +88,10 @@ common__data_path:                        "{{ infra.storage.path.data | default(
 common__ranger_audit_path:                "{{ infra.storage.path.ranger_audit | default('ranger/audit') }}"
 
 # AWS Infra
+common__aws_region:                       "{{ infra.aws.region | default('eu-west-1') }}"
 common__aws_vpc_id:                       "{{ infra.aws.vpc.existing.vpc_id | default('') }}"
 common__aws_public_subnet_ids:            "{{ infra.aws.vpc.existing.public_subnet_ids | default([]) }}"
 common__aws_private_subnet_ids:           "{{ infra.aws.vpc.existing.private_subnet_ids | default([]) }}"
-common__aws_region:                       "{{ infra.aws.region | default('eu-west-1') }}"
-common__aws_profile:                      "{{ infra.aws.profile | default('') }}"
 common__aws_role_suffix:                  "{{ infra.aws.role.suffix | default(common__role_suffix) }}"
 common__aws_datalake_admin_role_name:     "{{ env.aws.role.name.datalake_admin | default([common__namespace, common__aws_datalake_admin_suffix, common__aws_role_suffix] | join('-')) }}"
 common__aws_datalake_admin_suffix:        "{{ env.aws.role.label.datalake_admin | default(common__datalake_admin_suffix) }}"