diff --git a/.github/workflows/terraform-standard-iac-pipeline-aws-account-matrix.yaml b/.github/workflows/terraform-standard-iac-pipeline-aws-account-matrix.yaml
index abc459f4..7668fc57 100644
--- a/.github/workflows/terraform-standard-iac-pipeline-aws-account-matrix.yaml
+++ b/.github/workflows/terraform-standard-iac-pipeline-aws-account-matrix.yaml
@@ -3,8 +3,8 @@ name: IAC Pipeline AWS Cloud (Account/VPC Matrix)
 on:
   push:
     paths:
-      - 'iac-template/terraform-hcl-standard/aws-cloud/envs/dev-vpc/**'
-      - 'iac-template/terraform-hcl-standard/aws-cloud/envs/dev-role/**'
+      - 'iac-template/terraform-hcl-standard/aws-cloud/instance/vpc/**'
+      - 'iac-template/terraform-hcl-standard/aws-cloud/instance/role/**'
       - '.github/workflows/terraform-standard-iac-pipeline-account-matrix.yaml'
   workflow_dispatch:
     inputs:
@@ -14,8 +14,8 @@ on:
         default: 'true'
 
 env:
-  BASE_DIR: iac-template/terraform-hcl-standard/aws-cloud/envs
   AWS_REGION: ap-northeast-1
+  BASE_DIR: iac-template/terraform-hcl-standard/aws-cloud/instance/
   DRY_RUN: ${{ github.event.inputs.dry_run || 'true' }}
 
 jobs:
@@ -26,9 +26,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        env:
-          - dev-vpc
-          - dev-role
+        component:
+          - vpc
+          - role
 
     steps:
       - uses: actions/checkout@v4
@@ -48,15 +48,15 @@ jobs:
           aws-region: ${{ env.AWS_REGION }}
 
       - name: Init
-        working-directory: ${{ env.BASE_DIR }}/${{ matrix.env }}
+        working-directory: ${{ env.BASE_DIR }}/${{ matrix.component }}
         run: make init
 
       - name: Plan
-        working-directory: ${{ env.BASE_DIR }}/${{ matrix.env }}
+        working-directory: ${{ env.BASE_DIR }}/${{ matrix.component }}
         run: make plan
 
       - name: Apply
-        working-directory: ${{ env.BASE_DIR }}/${{ matrix.env }}
+        working-directory: ${{ env.BASE_DIR }}/${{ matrix.component }}
         if: ${{ env.DRY_RUN == 'false' }}
         run: make apply
 
@@ -65,7 +65,6 @@ jobs:
         run: echo "Dry run enabled → skip apply step."
 
       - name: Output
-        working-directory: ${{ env.BASE_DIR }}/${{ matrix.env }}
+        working-directory: ${{ env.BASE_DIR }}/${{ matrix.component }}
         if: ${{ env.DRY_RUN == 'false' }}
         run: terraform output -json
-
diff --git a/iac-template/terraform-hcl-standard/aws-cloud/instance/alb/main.tf b/iac-template/terraform-hcl-standard/aws-cloud/component/alb/main.tf
similarity index 100%
rename from iac-template/terraform-hcl-standard/aws-cloud/instance/alb/main.tf
rename to iac-template/terraform-hcl-standard/aws-cloud/component/alb/main.tf
diff --git a/iac-template/terraform-hcl-standard/aws-cloud/instance/alb/outputs.tf b/iac-template/terraform-hcl-standard/aws-cloud/component/alb/outputs.tf
similarity index 100%
rename from iac-template/terraform-hcl-standard/aws-cloud/instance/alb/outputs.tf
rename to iac-template/terraform-hcl-standard/aws-cloud/component/alb/outputs.tf
diff --git a/iac-template/terraform-hcl-standard/aws-cloud/instance/ec2/.gitignore b/iac-template/terraform-hcl-standard/aws-cloud/component/ec2/.gitignore
similarity index 100%
rename from iac-template/terraform-hcl-standard/aws-cloud/instance/ec2/.gitignore
rename to iac-template/terraform-hcl-standard/aws-cloud/component/ec2/.gitignore
diff --git a/iac-template/terraform-hcl-standard/aws-cloud/instance/ec2/Makefile b/iac-template/terraform-hcl-standard/aws-cloud/component/ec2/Makefile
similarity index 100%
rename from iac-template/terraform-hcl-standard/aws-cloud/instance/ec2/Makefile
rename to iac-template/terraform-hcl-standard/aws-cloud/component/ec2/Makefile
diff --git a/iac-template/terraform-hcl-standard/aws-cloud/instance/ec2/main.tf b/iac-template/terraform-hcl-standard/aws-cloud/component/ec2/main.tf
similarity index 100%
rename from iac-template/terraform-hcl-standard/aws-cloud/instance/ec2/main.tf
rename to iac-template/terraform-hcl-standard/aws-cloud/component/ec2/main.tf
diff --git a/iac-template/terraform-hcl-standard/aws-cloud/instance/ec2/outputs.tf b/iac-template/terraform-hcl-standard/aws-cloud/component/ec2/outputs.tf
similarity index 100%
rename from iac-template/terraform-hcl-standard/aws-cloud/instance/ec2/outputs.tf
rename to iac-template/terraform-hcl-standard/aws-cloud/component/ec2/outputs.tf
diff --git a/iac-template/terraform-hcl-standard/aws-cloud/instance/kafka/.gitignore b/iac-template/terraform-hcl-standard/aws-cloud/component/kafka/.gitignore
similarity index 100%
rename from iac-template/terraform-hcl-standard/aws-cloud/instance/kafka/.gitignore
rename to iac-template/terraform-hcl-standard/aws-cloud/component/kafka/.gitignore
diff --git a/iac-template/terraform-hcl-standard/aws-cloud/instance/kafka/Makefile b/iac-template/terraform-hcl-standard/aws-cloud/component/kafka/Makefile
similarity index 100%
rename from iac-template/terraform-hcl-standard/aws-cloud/instance/kafka/Makefile
rename to iac-template/terraform-hcl-standard/aws-cloud/component/kafka/Makefile
diff --git a/iac-template/terraform-hcl-standard/aws-cloud/instance/kafka/main.tf b/iac-template/terraform-hcl-standard/aws-cloud/component/kafka/main.tf
similarity index 100%
rename from iac-template/terraform-hcl-standard/aws-cloud/instance/kafka/main.tf
rename to iac-template/terraform-hcl-standard/aws-cloud/component/kafka/main.tf
diff --git a/iac-template/terraform-hcl-standard/aws-cloud/instance/kafka/outputs.tf b/iac-template/terraform-hcl-standard/aws-cloud/component/kafka/outputs.tf
similarity index 100%
rename from iac-template/terraform-hcl-standard/aws-cloud/instance/kafka/outputs.tf
rename to iac-template/terraform-hcl-standard/aws-cloud/component/kafka/outputs.tf
diff --git a/iac-template/terraform-hcl-standard/aws-cloud/instance/landingzone/.gitignore b/iac-template/terraform-hcl-standard/aws-cloud/component/landingzone/.gitignore
similarity index 100%
rename from iac-template/terraform-hcl-standard/aws-cloud/instance/landingzone/.gitignore
rename to iac-template/terraform-hcl-standard/aws-cloud/component/landingzone/.gitignore
diff --git a/iac-template/terraform-hcl-standard/aws-cloud/instance/landingzone/Makefile b/iac-template/terraform-hcl-standard/aws-cloud/component/landingzone/Makefile
similarity index 100%
rename from iac-template/terraform-hcl-standard/aws-cloud/instance/landingzone/Makefile
rename to iac-template/terraform-hcl-standard/aws-cloud/component/landingzone/Makefile
diff --git a/iac-template/terraform-hcl-standard/aws-cloud/instance/landingzone/main.tf b/iac-template/terraform-hcl-standard/aws-cloud/component/landingzone/main.tf
similarity index 100%
rename from iac-template/terraform-hcl-standard/aws-cloud/instance/landingzone/main.tf
rename to iac-template/terraform-hcl-standard/aws-cloud/component/landingzone/main.tf
diff --git a/iac-template/terraform-hcl-standard/aws-cloud/instance/nlb/main.tf b/iac-template/terraform-hcl-standard/aws-cloud/component/nlb/main.tf
similarity index 100%
rename from iac-template/terraform-hcl-standard/aws-cloud/instance/nlb/main.tf
rename to iac-template/terraform-hcl-standard/aws-cloud/component/nlb/main.tf
diff --git a/iac-template/terraform-hcl-standard/aws-cloud/instance/nlb/outputs.tf b/iac-template/terraform-hcl-standard/aws-cloud/component/nlb/outputs.tf
similarity index 100%
rename from iac-template/terraform-hcl-standard/aws-cloud/instance/nlb/outputs.tf
rename to iac-template/terraform-hcl-standard/aws-cloud/component/nlb/outputs.tf
diff --git a/iac-template/terraform-hcl-standard/aws-cloud/instance/rds/.terraform.lock.hcl b/iac-template/terraform-hcl-standard/aws-cloud/component/rds/.terraform.lock.hcl
similarity index 100%
rename from iac-template/terraform-hcl-standard/aws-cloud/instance/rds/.terraform.lock.hcl
rename to iac-template/terraform-hcl-standard/aws-cloud/component/rds/.terraform.lock.hcl
diff --git a/iac-template/terraform-hcl-standard/aws-cloud/instance/rds/Makefile b/iac-template/terraform-hcl-standard/aws-cloud/component/rds/Makefile
similarity index 100%
rename from iac-template/terraform-hcl-standard/aws-cloud/instance/rds/Makefile
rename to iac-template/terraform-hcl-standard/aws-cloud/component/rds/Makefile
diff --git a/iac-template/terraform-hcl-standard/aws-cloud/instance/rds/main.tf b/iac-template/terraform-hcl-standard/aws-cloud/component/rds/main.tf
similarity index 100%
rename from iac-template/terraform-hcl-standard/aws-cloud/instance/rds/main.tf
rename to iac-template/terraform-hcl-standard/aws-cloud/component/rds/main.tf
diff --git a/iac-template/terraform-hcl-standard/aws-cloud/instance/rds/outputs.tf b/iac-template/terraform-hcl-standard/aws-cloud/component/rds/outputs.tf
similarity index 100%
rename from iac-template/terraform-hcl-standard/aws-cloud/instance/rds/outputs.tf
rename to iac-template/terraform-hcl-standard/aws-cloud/component/rds/outputs.tf
diff --git a/iac-template/terraform-hcl-standard/aws-cloud/instance/redis/main.tf b/iac-template/terraform-hcl-standard/aws-cloud/component/redis/main.tf
similarity index 100%
rename from iac-template/terraform-hcl-standard/aws-cloud/instance/redis/main.tf
rename to iac-template/terraform-hcl-standard/aws-cloud/component/redis/main.tf
diff --git a/iac-template/terraform-hcl-standard/aws-cloud/instance/redis/outputs.tf b/iac-template/terraform-hcl-standard/aws-cloud/component/redis/outputs.tf
similarity index 100%
rename from iac-template/terraform-hcl-standard/aws-cloud/instance/redis/outputs.tf
rename to iac-template/terraform-hcl-standard/aws-cloud/component/redis/outputs.tf
diff --git a/iac-template/terraform-hcl-standard/aws-cloud/instance/role/.gitignore b/iac-template/terraform-hcl-standard/aws-cloud/component/role/.gitignore
similarity index 100%
rename from iac-template/terraform-hcl-standard/aws-cloud/instance/role/.gitignore
rename to iac-template/terraform-hcl-standard/aws-cloud/component/role/.gitignore
diff --git a/iac-template/terraform-hcl-standard/aws-cloud/instance/role/Makefile b/iac-template/terraform-hcl-standard/aws-cloud/component/role/Makefile
similarity index 100%
rename from iac-template/terraform-hcl-standard/aws-cloud/instance/role/Makefile
rename to iac-template/terraform-hcl-standard/aws-cloud/component/role/Makefile
diff --git a/iac-template/terraform-hcl-standard/aws-cloud/instance/role/main.tf b/iac-template/terraform-hcl-standard/aws-cloud/component/role/main.tf
similarity index 100%
rename from iac-template/terraform-hcl-standard/aws-cloud/instance/role/main.tf
rename to iac-template/terraform-hcl-standard/aws-cloud/component/role/main.tf
diff --git a/iac-template/terraform-hcl-standard/aws-cloud/instance/role/outputs.tf b/iac-template/terraform-hcl-standard/aws-cloud/component/role/outputs.tf
similarity index 100%
rename from iac-template/terraform-hcl-standard/aws-cloud/instance/role/outputs.tf
rename to iac-template/terraform-hcl-standard/aws-cloud/component/role/outputs.tf
diff --git a/iac-template/terraform-hcl-standard/aws-cloud/instance/s3/.gitignore b/iac-template/terraform-hcl-standard/aws-cloud/component/s3/.gitignore
similarity index 100%
rename from iac-template/terraform-hcl-standard/aws-cloud/instance/s3/.gitignore
rename to iac-template/terraform-hcl-standard/aws-cloud/component/s3/.gitignore
diff --git a/iac-template/terraform-hcl-standard/aws-cloud/instance/s3/Makefile b/iac-template/terraform-hcl-standard/aws-cloud/component/s3/Makefile
similarity index 100%
rename from iac-template/terraform-hcl-standard/aws-cloud/instance/s3/Makefile
rename to iac-template/terraform-hcl-standard/aws-cloud/component/s3/Makefile
diff --git a/iac-template/terraform-hcl-standard/aws-cloud/instance/s3/main.tf b/iac-template/terraform-hcl-standard/aws-cloud/component/s3/main.tf
similarity index 100%
rename from iac-template/terraform-hcl-standard/aws-cloud/instance/s3/main.tf
rename to iac-template/terraform-hcl-standard/aws-cloud/component/s3/main.tf
diff --git a/iac-template/terraform-hcl-standard/aws-cloud/instance/s3/outputs.tf b/iac-template/terraform-hcl-standard/aws-cloud/component/s3/outputs.tf
similarity index 100%
rename from iac-template/terraform-hcl-standard/aws-cloud/instance/s3/outputs.tf
rename to iac-template/terraform-hcl-standard/aws-cloud/component/s3/outputs.tf
diff --git a/iac-template/terraform-hcl-standard/aws-cloud/instance/vpc/.terraform.lock.hcl b/iac-template/terraform-hcl-standard/aws-cloud/component/vpc/.terraform.lock.hcl
similarity index 100%
rename from iac-template/terraform-hcl-standard/aws-cloud/instance/vpc/.terraform.lock.hcl
rename to iac-template/terraform-hcl-standard/aws-cloud/component/vpc/.terraform.lock.hcl
diff --git a/iac-template/terraform-hcl-standard/aws-cloud/instance/vpc/Makefile b/iac-template/terraform-hcl-standard/aws-cloud/component/vpc/Makefile
similarity index 100%
rename from iac-template/terraform-hcl-standard/aws-cloud/instance/vpc/Makefile
rename to iac-template/terraform-hcl-standard/aws-cloud/component/vpc/Makefile
diff --git a/iac-template/terraform-hcl-standard/aws-cloud/instance/vpc/README.md b/iac-template/terraform-hcl-standard/aws-cloud/component/vpc/README.md
similarity index 100%
rename from iac-template/terraform-hcl-standard/aws-cloud/instance/vpc/README.md
rename to iac-template/terraform-hcl-standard/aws-cloud/component/vpc/README.md
diff --git a/iac-template/terraform-hcl-standard/aws-cloud/instance/vpc/main.tf b/iac-template/terraform-hcl-standard/aws-cloud/component/vpc/main.tf
similarity index 100%
rename from iac-template/terraform-hcl-standard/aws-cloud/instance/vpc/main.tf
rename to iac-template/terraform-hcl-standard/aws-cloud/component/vpc/main.tf
diff --git a/iac-template/terraform-hcl-standard/aws-cloud/instance/vpc/outputs.tf b/iac-template/terraform-hcl-standard/aws-cloud/component/vpc/outputs.tf
similarity index 100%
rename from iac-template/terraform-hcl-standard/aws-cloud/instance/vpc/outputs.tf
rename to iac-template/terraform-hcl-standard/aws-cloud/component/vpc/outputs.tf