diff --git a/.github/workflows/e2e-parallel-destroy.yml b/.github/workflows/e2e-parallel-destroy.yml
index 3ba004f4ad..e00efac3cc 100644
--- a/.github/workflows/e2e-parallel-destroy.yml
+++ b/.github/workflows/e2e-parallel-destroy.yml
@@ -74,17 +74,17 @@ jobs:
       - name: Pre Setup
         id: pre-setup
         run: |
-          mkdir -p deploy/e2e/gh-e2e-test
+          mkdir -p deploy/e2e-test
           if [[ ${{ matrix.example_path }} == deploy/* ]]
           then
             echo "Skipping pre-setup for ${{ matrix.example_path }}"
-            cp -R ${{ matrix.example_path }}/* deploy/e2e/gh-e2e-test/
+            cp -R ${{ matrix.example_path }}/* deploy/e2e-test/
           else
             echo "Running pre-setup for ${{ matrix.example_path }}"
-            cp -R deploy/e2e/gh-e2e-template/* deploy/e2e/gh-e2e-test/
-            sed -i "s!REPLACE_ME!${{ matrix.tenant_name }}!g" deploy/e2e/gh-e2e-test/base.tfvars
-            sed -i "s!TF_STATE_PATH!${{ matrix.example_path }}!g" deploy/e2e/gh-e2e-test/backend.conf
-            sed -i "s!EXAMPLE_PATH!${{ matrix.example_path }}!g" deploy/e2e/gh-e2e-test/main.tf
+            cp -R deploy/e2e-template/* deploy/e2e-test/
+            sed -i "s!REPLACE_ME!${{ matrix.tenant_name }}!g" deploy/e2e-test/base.tfvars
+            sed -i "s!TF_STATE_PATH!${{ matrix.example_path }}!g" deploy/e2e-test/backend.conf
+            sed -i "s!EXAMPLE_PATH!${{ matrix.example_path }}!g" deploy/e2e-test/main.tf
           fi
         continue-on-error: false
 
@@ -123,24 +123,24 @@ jobs:
       - name: Terraform Init
         id: init
         run: terraform init  -backend-config backend.conf -reconfigure
-        working-directory: deploy/e2e/gh-e2e-test
+        working-directory: deploy/e2e-test
         continue-on-error: false
 
       - name: Terraform Validate
         id: validate
-        working-directory: deploy/e2e/gh-e2e-test
+        working-directory: deploy/e2e-test
         run: terraform validate -no-color
         continue-on-error: false
 
       - name: Terraform Plan Destroy
         id: plan-destroy
-        working-directory: deploy/e2e/gh-e2e-test
+        working-directory: deploy/e2e-test
         run: terraform plan -destroy -var-file base.tfvars -no-color
         continue-on-error: false
 
       - name: Terraform Destroy
         id: destroy
-        working-directory: deploy/e2e/gh-e2e-test
+        working-directory: deploy/e2e-test
         run: |
           reverse_array=$(echo ${{ env.DEPLOYMENT_ORDER }}  | awk -F, '{for (i=NF; i>0; --i) printf "%s%s", (i<NF ? "," : ""), $i; printf "\n"}')
           IFS=',' read -r -a array <<< "$reverse_array"
diff --git a/.github/workflows/e2e-parallel-full.yml b/.github/workflows/e2e-parallel-full.yml
index 3cd7130340..4aa14d0478 100644
--- a/.github/workflows/e2e-parallel-full.yml
+++ b/.github/workflows/e2e-parallel-full.yml
@@ -27,9 +27,6 @@ jobs:
             tenant_name: "emr-eks"
           - example_path: examples/analytics/spark-k8s-operator
             tenant_name: "spark"
-          # This is example that we can use test from deploy folder, see logic in the pre setup step
-          # - example_path: deploy/e2e/vpc
-          #   tenant_name: "vpc"
           - example_path: examples/multi-tenancy-with-teams
             tenant_name: "teams"
           - example_path: examples/gitops/argocd
@@ -76,17 +73,17 @@ jobs:
       - name: Pre Setup
         id: pre-setup
         run: |
-          mkdir -p deploy/e2e/gh-e2e-test
+          mkdir -p deploy/e2e-test
           if [[ ${{ matrix.example_path }} == deploy/* ]]
           then
             echo "Skipping pre-setup for ${{ matrix.example_path }}"
-            cp -R ${{ matrix.example_path }}/* deploy/e2e/gh-e2e-test/
+            cp -R ${{ matrix.example_path }}/* deploy/e2e-test/
           else
             echo "Running pre-setup for ${{ matrix.example_path }}"
-            cp -R deploy/e2e/gh-e2e-template/* deploy/e2e/gh-e2e-test/
-            sed -i "s!REPLACE_ME!${{ matrix.tenant_name }}!g" deploy/e2e/gh-e2e-test/base.tfvars
-            sed -i "s!TF_STATE_PATH!${{ matrix.example_path }}!g" deploy/e2e/gh-e2e-test/backend.conf
-            sed -i "s!EXAMPLE_PATH!${{ matrix.example_path }}!g" deploy/e2e/gh-e2e-test/main.tf
+            cp -R deploy/e2e-template/* deploy/e2e-test/
+            sed -i "s!REPLACE_ME!${{ matrix.tenant_name }}!g" deploy/e2e-test/base.tfvars
+            sed -i "s!TF_STATE_PATH!${{ matrix.example_path }}!g" deploy/e2e-test/backend.conf
+            sed -i "s!EXAMPLE_PATH!${{ matrix.example_path }}!g" deploy/e2e-test/main.tf
           fi
         continue-on-error: false
 
@@ -125,24 +122,24 @@ jobs:
       - name: Terraform Init
         id: init
         run: terraform init  -backend-config backend.conf -reconfigure
-        working-directory: deploy/e2e/gh-e2e-test
+        working-directory: deploy/e2e-test
         continue-on-error: false
 
       - name: Terraform Validate
         id: validate
-        working-directory: deploy/e2e/gh-e2e-test
+        working-directory: deploy/e2e-test
         run: terraform validate -no-color
         continue-on-error: false
 
       - name: Terraform Plan
         id: plan
-        working-directory: deploy/e2e/gh-e2e-test
+        working-directory: deploy/e2e-test
         run: terraform plan -var-file base.tfvars -no-color
         continue-on-error: false
 
       - name: Terraform Apply
         id: apply
-        working-directory: deploy/e2e/gh-e2e-test
+        working-directory: deploy/e2e-test
         run: |
           IFS=',' read -r -a array <<< "${{ env.DEPLOYMENT_ORDER }}"
           for element in "${array[@]}"
@@ -155,7 +152,7 @@ jobs:
       - name: Terraform Destroy
         if: github.event.inputs.TFDestroy == 'true' && (steps.apply.outcome == 'success' || steps.apply.outcome == 'failure')
         id: destroy
-        working-directory: deploy/e2e/gh-e2e-test
+        working-directory: deploy/e2e-test
         run: |
           reverse_array=$(echo ${{ env.DEPLOYMENT_ORDER }}  | awk -F, '{for (i=NF; i>0; --i) printf "%s%s", (i<NF ? "," : ""), $i; printf "\n"}')
           IFS=',' read -r -a array <<< "$reverse_array"
diff --git a/.github/workflows/e2e-test-cleanup.yml b/.github/workflows/e2e-test-cleanup.yml
deleted file mode 100644
index 157f129807..0000000000
--- a/.github/workflows/e2e-test-cleanup.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-name: e2e-test-cleanup
-
-on:
-  workflow_dispatch:
-
-jobs:
-    deploy:
-      name: Run e2e test cleanup
-      runs-on: ubuntu-latest
-
-      # These permissions are needed to interact with GitHub's OIDC Token endpoint.
-      permissions:
-        id-token: write
-        contents: read
-
-      steps:
-        - name: Checkout
-          uses: actions/checkout@v2
-
-        - name: Configure AWS credentials from Test account
-          uses: aws-actions/configure-aws-credentials@v1
-          with:
-            role-to-assume: ${{ secrets.ROLE_TO_ASSUME }}
-            aws-region: us-west-2
-            role-duration-seconds: 3600
-            role-session-name: GithubActions-Session
-
-        - name: Terraform Job
-          uses: hashicorp/setup-terraform@v1
-          with:
-            terraform_version: 1.0.11
-
-        - name: Terraform Init
-          id: init
-          run: terraform init -backend-config backend.conf -reconfigure
-          working-directory: deploy/e2e/eks
-          continue-on-error: false
-
-        - name: Terraform Plan Destroy
-          id: plan-destroy
-          working-directory: deploy/e2e/eks
-          run: terraform plan -destroy -var-file base.tfvars -no-color
-          continue-on-error: false
-
-        - name: Terraform Destroy
-          id: destroy
-          working-directory: deploy/e2e/eks
-          run: terraform destroy -var-file base.tfvars -no-color -auto-approve
-          continue-on-error: false
diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
deleted file mode 100644
index 9d6ab3e011..0000000000
--- a/.github/workflows/e2e-test.yml
+++ /dev/null
@@ -1,75 +0,0 @@
-name: e2e-test
-
-on:
-  workflow_dispatch:
-    inputs:
-      TFDestroy:
-        description: 'Destroy TF Automatically (false/true) - Default: true'
-        required: true
-        default: 'true'
-
-jobs:
-    deploy:
-      name: Run e2e test
-      runs-on: ubuntu-latest
-
-      # These permissions are needed to interact with GitHub's OIDC Token endpoint.
-      permissions:
-        id-token: write
-        contents: read
-
-      steps:
-        - name: Checkout
-          uses: actions/checkout@v2
-
-        - name: Configure AWS credentials from Test account
-          uses: aws-actions/configure-aws-credentials@v1
-          with:
-            role-to-assume: ${{ secrets.ROLE_TO_ASSUME }}
-            aws-region: us-west-2
-            role-duration-seconds: 3600
-            role-session-name: GithubActions-Session
-
-        - name: Terraform Job
-          uses: hashicorp/setup-terraform@v1
-          with:
-            terraform_version: 1.0.11
-
-        - name: Terraform Fmt
-          id: fmt
-          run: terraform fmt -check -recursive -list -no-color
-          continue-on-error: false
-
-        - name: Terraform Init
-          id: init
-          run: terraform init -backend-config backend.conf -reconfigure
-          working-directory: deploy/e2e/eks
-          continue-on-error: false
-
-        - name: Terraform Validate
-          id: validate
-          working-directory: deploy/e2e/eks
-          run: terraform validate -no-color
-          continue-on-error: false
-
-        - name: Terraform Apply
-          id: apply
-          working-directory: deploy/e2e/eks
-          run: terraform apply -var-file base.tfvars -no-color -input=false -auto-approve
-          continue-on-error: false
-
-        - name: Terraform Destroy
-          if: github.event.inputs.TFDestroy == 'true' && (steps.apply.outcome == 'success' || steps.apply.outcome == 'failure')
-          id: destroy
-          working-directory: deploy/e2e/eks
-          run: terraform destroy -var-file base.tfvars -no-color -auto-approve
-          continue-on-error: false
-
-        - name: Fail if TF apply failed
-          if: steps.apply.outcome == 'failure'
-          id: fail-if-tf-apply-failed
-          run: |
-            echo "Terraform Apply step failed...Please check the logs of the Terraform Apply step."
-            echo "Failing the job to avoid false positives."
-            exit 1
-          continue-on-error: false
diff --git a/.github/workflows/vpc-test-cleanup.yml b/.github/workflows/vpc-test-cleanup.yml
deleted file mode 100644
index e89bcdb4a0..0000000000
--- a/.github/workflows/vpc-test-cleanup.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-name: vpc-cleanup
-
-on:
-  workflow_dispatch:
-
-jobs:
-  deploy:
-    name: Destroy VPC
-    runs-on: ubuntu-latest
-
-    # These permissions are needed to interact with GitHub's OIDC Token endpoint.
-    permissions:
-      id-token: write
-      contents: read
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Configure AWS credentials from Test account
-        uses: aws-actions/configure-aws-credentials@v1
-        with:
-          role-to-assume: ${{ secrets.ROLE_TO_ASSUME }}
-          aws-region: us-west-2
-          role-duration-seconds: 1800
-          role-session-name: GithubActions-Session
-
-      - name: Terraform Job
-        uses: hashicorp/setup-terraform@v1
-        with:
-          terraform_version: 1.0.11
-
-      - name: Terraform Init
-        id: init
-        run: terraform init
-        working-directory: deploy/e2e/vpc
-        continue-on-error: false
-
-      - name: Terraform Plan Destroy
-        id: plan-destroy
-        working-directory: deploy/e2e/vpc
-        run: terraform plan -no-color -destroy
-        continue-on-error: false
-
-      - name: Terraform Destroy
-        id: destroy
-        working-directory: deploy/e2e/vpc
-        run: terraform destroy -no-color -auto-approve
-        continue-on-error: false
diff --git a/.github/workflows/vpc-test.yml b/.github/workflows/vpc-test.yml
deleted file mode 100644
index 48a0b3fe16..0000000000
--- a/.github/workflows/vpc-test.yml
+++ /dev/null
@@ -1,60 +0,0 @@
-name: vpc-test
-
-on:
-  workflow_dispatch:
-
-jobs:
-  deploy:
-    name: Create VPC
-    runs-on: ubuntu-latest
-
-    # These permissions are needed to interact with GitHub's OIDC Token endpoint.
-    permissions:
-      id-token: write
-      contents: read
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Configure AWS credentials from Test account
-        uses: aws-actions/configure-aws-credentials@v1
-        with:
-          role-to-assume: ${{ secrets.ROLE_TO_ASSUME }}
-          aws-region: us-west-2
-          role-duration-seconds: 1800
-          role-session-name: GithubActions-Session
-
-      - name: Terraform Job
-        uses: hashicorp/setup-terraform@v1
-        with:
-          terraform_version: 1.0.11
-
-      - name: Terraform Fmt
-        id: fmt
-        run: terraform fmt -check -recursive -list -no-color
-        continue-on-error: false
-
-      - name: Terraform Init
-        id: init
-        run: terraform init -backend-config backend.conf -reconfigure
-        working-directory: deploy/e2e/vpc
-        continue-on-error: false
-
-      - name: Terraform Validate
-        id: validate
-        working-directory: deploy/e2e/vpc
-        run: terraform validate -no-color
-        continue-on-error: false
-
-      - name: Terraform Plan
-        id: plan
-        working-directory: deploy/e2e/vpc
-        run: terraform plan -var-file base.tfvars -no-color
-        continue-on-error: false
-
-      - name: Terraform Apply
-        id: apply
-        working-directory: deploy/e2e/vpc
-        run: terraform apply -var-file base.tfvars -no-color -auto-approve
-        continue-on-error: false
diff --git a/deploy/e2e/gh-e2e-template/README.md b/deploy/e2e-template/README.md
similarity index 100%
rename from deploy/e2e/gh-e2e-template/README.md
rename to deploy/e2e-template/README.md
diff --git a/deploy/e2e/gh-e2e-template/backend.conf b/deploy/e2e-template/backend.conf
similarity index 100%
rename from deploy/e2e/gh-e2e-template/backend.conf
rename to deploy/e2e-template/backend.conf
diff --git a/deploy/e2e/gh-e2e-template/base.tfvars b/deploy/e2e-template/base.tfvars
similarity index 100%
rename from deploy/e2e/gh-e2e-template/base.tfvars
rename to deploy/e2e-template/base.tfvars
diff --git a/deploy/e2e/gh-e2e-template/main.tf b/deploy/e2e-template/main.tf
similarity index 100%
rename from deploy/e2e/gh-e2e-template/main.tf
rename to deploy/e2e-template/main.tf
diff --git a/deploy/e2e/eks/outputs.tf b/deploy/e2e-template/outputs.tf
similarity index 100%
rename from deploy/e2e/eks/outputs.tf
rename to deploy/e2e-template/outputs.tf
diff --git a/deploy/e2e/gh-e2e-template/variables.tf b/deploy/e2e-template/variables.tf
similarity index 100%
rename from deploy/e2e/gh-e2e-template/variables.tf
rename to deploy/e2e-template/variables.tf
diff --git a/deploy/e2e/eks/versions.tf b/deploy/e2e-template/versions.tf
similarity index 100%
rename from deploy/e2e/eks/versions.tf
rename to deploy/e2e-template/versions.tf
diff --git a/deploy/e2e/eks/README.md b/deploy/e2e/eks/README.md
deleted file mode 100644
index c8a934b86a..0000000000
--- a/deploy/e2e/eks/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-## How to deploy the example
-
-    git clone https://github.com/aws-ia/terraform-aws-eks-blueprints.git
-
-    cd ~/eks-blueprints/deploy/e2e/eks
-
-    terraform init -backend-config backend.conf -reconfigure
-
-    terraform plan -var-file base.tfvars
-
-    terraform apply -var-file base.tfvars -auto-approve
-
-## How to Destroy the cluster
-
-    terraform destroy -var-file base.tfvars -auto-approve
diff --git a/deploy/e2e/eks/backend.conf b/deploy/e2e/eks/backend.conf
deleted file mode 100644
index 31d3af3749..0000000000
--- a/deploy/e2e/eks/backend.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-bucket = "terraform-ssp-github-actions-state"
-region = "us-west-2"
-key    = "e2e/eks/terraform-main.tfstate"
diff --git a/deploy/e2e/eks/base.tfvars b/deploy/e2e/eks/base.tfvars
deleted file mode 100644
index 399e2b91af..0000000000
--- a/deploy/e2e/eks/base.tfvars
+++ /dev/null
@@ -1,6 +0,0 @@
-tenant      = "aws001"
-environment = "preprod"
-zone        = "test"
-
-tf_state_vpc_s3_bucket = "terraform-ssp-github-actions-state"
-tf_state_vpc_s3_key    = "e2e/vpc/terraform-main.tfstate"
diff --git a/deploy/e2e/eks/main.tf b/deploy/e2e/eks/main.tf
deleted file mode 100644
index ad98a71d40..0000000000
--- a/deploy/e2e/eks/main.tf
+++ /dev/null
@@ -1,15 +0,0 @@
-provider "aws" {
-  region = "us-west-2"
-}
-
-module "eks_cluster_with_import_vpc" {
-  source = "../../../examples/eks-cluster-with-import-vpc/eks"
-
-  tenant      = var.tenant
-  environment = var.environment
-  zone        = var.zone
-
-  # VPC S3 TF State
-  tf_state_vpc_s3_bucket = var.tf_state_vpc_s3_bucket
-  tf_state_vpc_s3_key    = var.tf_state_vpc_s3_key
-}
diff --git a/deploy/e2e/eks/variables.tf b/deploy/e2e/eks/variables.tf
deleted file mode 100644
index 77b4551b62..0000000000
--- a/deploy/e2e/eks/variables.tf
+++ /dev/null
@@ -1,24 +0,0 @@
-variable "tf_state_vpc_s3_bucket" {
-  type        = string
-  description = "Terraform state S3 Bucket Name"
-}
-
-variable "tf_state_vpc_s3_key" {
-  type        = string
-  description = "Terraform state S3 Key path"
-}
-
-variable "tenant" {
-  type        = string
-  description = "Account Name or unique account unique id e.g., apps or management or aws007"
-}
-
-variable "environment" {
-  type        = string
-  description = "Environment area, e.g. prod or preprod "
-}
-
-variable "zone" {
-  type        = string
-  description = "zone, e.g. dev or qa or load or ops etc..."
-}
diff --git a/deploy/e2e/gh-e2e-template/outputs.tf b/deploy/e2e/gh-e2e-template/outputs.tf
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/deploy/e2e/gh-e2e-template/versions.tf b/deploy/e2e/gh-e2e-template/versions.tf
deleted file mode 100644
index e10a6b663e..0000000000
--- a/deploy/e2e/gh-e2e-template/versions.tf
+++ /dev/null
@@ -1,12 +0,0 @@
-terraform {
-  required_version = ">= 1.0.0"
-
-  required_providers {
-    aws = {
-      source  = "hashicorp/aws"
-      version = ">= 3.72"
-    }
-  }
-
-  backend "s3" {}
-}
diff --git a/deploy/e2e/vpc/README.md b/deploy/e2e/vpc/README.md
deleted file mode 100644
index 89d76c662c..0000000000
--- a/deploy/e2e/vpc/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-## How to deploy the example
-
-    git clone https://github.com/aws-ia/terraform-aws-eks-blueprints.git
-
-    cd ~/terraform-aws-eks-blueprints/deploy/e2e/vpc
-
-    terraform init -backend-config backend.conf -reconfigure
-
-    terraform plan -var-file base.tfvars
-
-    terraform apply -var-file base.tfvars -auto-approve
-
-## How to Destroy the cluster
-
-    terraform destroy -var-file base.tfvars -auto-approve
diff --git a/deploy/e2e/vpc/backend.conf b/deploy/e2e/vpc/backend.conf
deleted file mode 100644
index 7c701df9b2..0000000000
--- a/deploy/e2e/vpc/backend.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-bucket = "terraform-ssp-github-actions-state"
-region = "us-west-2"
-key    = "e2e/vpc/terraform-main.tfstate"
diff --git a/deploy/e2e/vpc/base.tfvars b/deploy/e2e/vpc/base.tfvars
deleted file mode 100644
index 2c871e089f..0000000000
--- a/deploy/e2e/vpc/base.tfvars
+++ /dev/null
@@ -1,3 +0,0 @@
-tenant      = "aws001"
-environment = "preprod"
-zone        = "test"
diff --git a/deploy/e2e/vpc/main.tf b/deploy/e2e/vpc/main.tf
deleted file mode 100644
index bb4a90c42f..0000000000
--- a/deploy/e2e/vpc/main.tf
+++ /dev/null
@@ -1,11 +0,0 @@
-provider "aws" {
-  region = "us-west-2"
-}
-
-module "eks_cluster_with_import_vpc" {
-  source = "../../../examples/eks-cluster-with-import-vpc/vpc"
-
-  tenant      = var.tenant
-  environment = var.environment
-  zone        = var.zone
-}
diff --git a/deploy/e2e/vpc/outputs.tf b/deploy/e2e/vpc/outputs.tf
deleted file mode 100644
index d88136a291..0000000000
--- a/deploy/e2e/vpc/outputs.tf
+++ /dev/null
@@ -1,14 +0,0 @@
-output "vpc_id" {
-  description = "The ID of the VPC"
-  value       = module.eks_cluster_with_import_vpc.vpc_id
-}
-
-output "private_subnets" {
-  description = "List of IDs of private subnets"
-  value       = module.eks_cluster_with_import_vpc.private_subnets
-}
-
-output "public_subnets" {
-  description = "List of IDs of public subnets"
-  value       = module.eks_cluster_with_import_vpc.public_subnets
-}
diff --git a/deploy/e2e/vpc/variables.tf b/deploy/e2e/vpc/variables.tf
deleted file mode 100644
index 0b273ac2f8..0000000000
--- a/deploy/e2e/vpc/variables.tf
+++ /dev/null
@@ -1,14 +0,0 @@
-variable "tenant" {
-  type        = string
-  description = "Account Name or unique account unique id e.g., apps or management or aws007"
-}
-
-variable "environment" {
-  type        = string
-  description = "Environment area, e.g. prod or preprod "
-}
-
-variable "zone" {
-  type        = string
-  description = "zone, e.g. dev or qa or load or ops etc..."
-}
diff --git a/deploy/e2e/vpc/versions.tf b/deploy/e2e/vpc/versions.tf
deleted file mode 100644
index e10a6b663e..0000000000
--- a/deploy/e2e/vpc/versions.tf
+++ /dev/null
@@ -1,12 +0,0 @@
-terraform {
-  required_version = ">= 1.0.0"
-
-  required_providers {
-    aws = {
-      source  = "hashicorp/aws"
-      version = ">= 3.72"
-    }
-  }
-
-  backend "s3" {}
-}