diff --git a/k8s/specs/tofu/data.tf b/k8s/requirements/aws/data.tf
similarity index 100%
rename from k8s/specs/tofu/data.tf
rename to k8s/requirements/aws/data.tf
diff --git a/k8s/specs/tofu/locals.tf b/k8s/requirements/aws/locals.tf
similarity index 91%
rename from k8s/specs/tofu/locals.tf
rename to k8s/requirements/aws/locals.tf
index 42a8cf3d..b47445c9 100644
--- a/k8s/specs/tofu/locals.tf
+++ b/k8s/requirements/aws/locals.tf
@@ -6,7 +6,7 @@ locals {
   iam_create = var.iam_create_role
 
   # Derived names (overridable via variables)
-  permissions_role_name = var.permissions_role_name != "" ? var.permissions_role_name : "nullplatform-${var.cluster_name}-agent-permissions-role"
+  permissions_role_name = var.permissions_role_name != "" ? var.permissions_role_name : "nullplatform_${var.cluster_name}_k8s_role"
   policies_name_prefix  = var.policies_name_prefix != "" ? var.policies_name_prefix : "nullplatform_${var.cluster_name}"
 
   # Primary agent role trusted by the permissions role. Defaults to the
diff --git a/k8s/specs/tofu/main.tf b/k8s/requirements/aws/main.tf
similarity index 100%
rename from k8s/specs/tofu/main.tf
rename to k8s/requirements/aws/main.tf
diff --git a/k8s/specs/tofu/outputs.tf b/k8s/requirements/aws/outputs.tf
similarity index 100%
rename from k8s/specs/tofu/outputs.tf
rename to k8s/requirements/aws/outputs.tf
diff --git a/k8s/specs/tofu/variables.tf b/k8s/requirements/aws/variables.tf
similarity index 96%
rename from k8s/specs/tofu/variables.tf
rename to k8s/requirements/aws/variables.tf
index 84838ca4..ec1b7df1 100644
--- a/k8s/specs/tofu/variables.tf
+++ b/k8s/requirements/aws/variables.tf
@@ -26,7 +26,7 @@ variable "cluster_name" {
 }
 
 variable "permissions_role_name" {
-  description = "Override for the permissions IAM role name. Defaults to nullplatform-{cluster_name}-agent-permissions-role."
+  description = "Override for the permissions IAM role name. Defaults to nullplatform_{cluster_name}_k8s_role."
   type        = string
   default     = ""
 }
diff --git a/k8s/specs/tofu/versions.tf b/k8s/requirements/aws/versions.tf
similarity index 100%
rename from k8s/specs/tofu/versions.tf
rename to k8s/requirements/aws/versions.tf