diff --git a/config/xzerolab/sit/aws-cloud/accounts/dev.yaml b/config/xzerolab/sit/aws-cloud/account/accounts.yaml
similarity index 100%
rename from config/xzerolab/sit/aws-cloud/accounts/dev.yaml
rename to config/xzerolab/sit/aws-cloud/account/accounts.yaml
diff --git a/config/xzerolab/sit/aws-cloud/accounts/bootstrap.yaml b/config/xzerolab/sit/aws-cloud/account/bootstrap.yaml
similarity index 100%
rename from config/xzerolab/sit/aws-cloud/accounts/bootstrap.yaml
rename to config/xzerolab/sit/aws-cloud/account/bootstrap.yaml
diff --git a/config/xzerolab/sit/aws-cloud/accounts/dev-landingzone.yaml b/config/xzerolab/sit/aws-cloud/account/landingzone.yaml
similarity index 100%
rename from config/xzerolab/sit/aws-cloud/accounts/dev-landingzone.yaml
rename to config/xzerolab/sit/aws-cloud/account/landingzone.yaml
diff --git a/config/xzerolab/sit/aws-cloud/provider_backend.yaml b/config/xzerolab/sit/aws-cloud/provider_backend.yaml
deleted file mode 100644
index 92feab6e..00000000
--- a/config/xzerolab/sit/aws-cloud/provider_backend.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-defaults:
-  terraform_required_version: ">= 1.2"
-  aws_provider_version: "~> 5.92.0"
-  session_name: "TerraformDevSession"
-
-modules:
-  dev:
-    account: dev
-    backend:
-      key: "account/dev/core/terraform.tfstate"
-
-  dev-alb:
-    account: dev
-    backend:
-      key: "account/dev/alb/terraform.tfstate"
-
-  dev-ec2:
-    account: dev
-    backend:
-      key: "account/dev/ec2/terraform.tfstate"
-
-  dev-kafka:
-    account: dev
-    backend:
-      key: "account/dev/kafka/terraform.tfstate"
-
-  dev-landingzone:
-    account: dev
-    backend:
-      key: "bootstrap/dev-landingzone/terraform.tfstate"
-
-  dev-nlb:
-    account: dev
-    backend:
-      key: "account/dev/nlb/terraform.tfstate"
-
-  dev-object:
-    account: dev
-    component_dir: s3
-    backend:
-      key: "account/dev/s3/terraform.tfstate"
-
-  dev-rds:
-    account: dev
-    backend:
-      key: "account/dev/rds/terraform.tfstate"
-
-  dev-redis:
-    account: dev
-    backend:
-      key: "account/dev/redis/terraform.tfstate"
-
-  dev-role:
-    account: dev
-    backend:
-      key: "account/dev/iam/terraform.tfstate"
-
-  dev-vpc:
-    account: dev
-    backend:
-      key: "account/dev/vpc/terraform.tfstate"
diff --git a/config/xzerolab/sit/aws-cloud/resources/dev-alb/alb.yaml b/config/xzerolab/sit/aws-cloud/resources/alb.yaml
similarity index 94%
rename from config/xzerolab/sit/aws-cloud/resources/dev-alb/alb.yaml
rename to config/xzerolab/sit/aws-cloud/resources/alb.yaml
index 074e9b19..bcc35f42 100644
--- a/config/xzerolab/sit/aws-cloud/resources/dev-alb/alb.yaml
+++ b/config/xzerolab/sit/aws-cloud/resources/alb.yaml
@@ -1,4 +1,4 @@
-name_prefix: "dev-alb"
+name_prefix: "alb"
 
 vpc_id: "vpc-0d0d8d822fa215104"
 
diff --git a/config/xzerolab/sit/aws-cloud/resources/ec2/dev.yaml b/config/xzerolab/sit/aws-cloud/resources/ec2.yaml
similarity index 100%
rename from config/xzerolab/sit/aws-cloud/resources/ec2/dev.yaml
rename to config/xzerolab/sit/aws-cloud/resources/ec2.yaml
diff --git a/config/xzerolab/sit/aws-cloud/resources/dev-kafka/msk.yaml b/config/xzerolab/sit/aws-cloud/resources/msk.yaml
similarity index 100%
rename from config/xzerolab/sit/aws-cloud/resources/dev-kafka/msk.yaml
rename to config/xzerolab/sit/aws-cloud/resources/msk.yaml
diff --git a/config/xzerolab/sit/aws-cloud/resources/dev-nlb/nlb.yaml b/config/xzerolab/sit/aws-cloud/resources/nlb.yaml
similarity index 100%
rename from config/xzerolab/sit/aws-cloud/resources/dev-nlb/nlb.yaml
rename to config/xzerolab/sit/aws-cloud/resources/nlb.yaml
diff --git a/config/xzerolab/sit/aws-cloud/resources/dev-rds/rds.yaml b/config/xzerolab/sit/aws-cloud/resources/rds.yaml
similarity index 100%
rename from config/xzerolab/sit/aws-cloud/resources/dev-rds/rds.yaml
rename to config/xzerolab/sit/aws-cloud/resources/rds.yaml
diff --git a/config/xzerolab/sit/aws-cloud/resources/dev-redis/redis.yaml b/config/xzerolab/sit/aws-cloud/resources/redis.yaml
similarity index 100%
rename from config/xzerolab/sit/aws-cloud/resources/dev-redis/redis.yaml
rename to config/xzerolab/sit/aws-cloud/resources/redis.yaml
diff --git a/config/xzerolab/sit/aws-cloud/resources/dev-object/bucket.yaml b/config/xzerolab/sit/aws-cloud/resources/s3.yaml
similarity index 100%
rename from config/xzerolab/sit/aws-cloud/resources/dev-object/bucket.yaml
rename to config/xzerolab/sit/aws-cloud/resources/s3.yaml
diff --git a/config/xzerolab/sit/aws-cloud/resources/vpc/dev.yaml b/config/xzerolab/sit/aws-cloud/resources/vpc.yaml
similarity index 100%
rename from config/xzerolab/sit/aws-cloud/resources/vpc/dev.yaml
rename to config/xzerolab/sit/aws-cloud/resources/vpc.yaml