diff --git a/.github/workflows/arm-AL2023-build-test-push-workflow-AL2023.yml b/.github/workflows/arm-AL2023-build-test-push-workflow-AL2023.yml
index 1d1f561d6..7031d0d7d 100644
--- a/.github/workflows/arm-AL2023-build-test-push-workflow-AL2023.yml
+++ b/.github/workflows/arm-AL2023-build-test-push-workflow-AL2023.yml
@@ -117,7 +117,7 @@ jobs:
       matrix:
         test: [
                 basic,
-                appframeworksS1,
+                appframeworks1,
                 managersecret,
                 managermc,
                ]
@@ -146,10 +146,9 @@ jobs:
       DEPLOYMENT_TYPE: ""
       ARM64: "true"
       GRAVITON_TESTING: "true"
+      TEST_CLUSTER_NAME: cspl-3760-vcluster-karpenter-test
+      TEST_VCLUSTER_NAME: al-smk-${{ matrix.test }}-${{ github.run_id }}
     steps:
-      - name: Set Test Cluster Name
-        run: |
-          echo "TEST_CLUSTER_NAME=eks-integration-test-cluster-${{ matrix.test }}-$GITHUB_RUN_ID" >> $GITHUB_ENV
       - name: Chekcout code
         uses: actions/checkout@v2
       - name: Dotenv Action
@@ -183,7 +182,7 @@ jobs:
           curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
           chmod 700 get_helm.sh
           ./get_helm.sh
-          DESIRED_VERSION=v3.8.2 bash get_helm.sh
+          DESIRED_VERSION=v3.18.3 bash get_helm.sh
       - name: Install EKS CTL
         run: |
           curl --silent --insecure --location "https://github.com/weaveworks/eksctl/releases/download/${{ steps.dotenv.outputs.EKSCTL_VERSION }}/eksctl_$(uname -s)_amd64.tar.gz" | tar xz -C /tmp
@@ -214,11 +213,14 @@ jobs:
         uses: aws-actions/amazon-ecr-login@v1
       - name: Pull Splunk Enterprise Image
         run: docker pull ${{ env.SPLUNK_ENTERPRISE_IMAGE }}
-      - name: Create EKS cluster
+      - name: Login to test cluster
         run: |
-           export EKS_CLUSTER_K8_VERSION=${{ steps.dotenv.outputs.EKS_CLUSTER_K8_VERSION }}
-           export EKS_INSTANCE_TYPE=${{ steps.dotenv.outputs.EKS_INSTANCE_TYPE_ARM64 }}
-           make cluster-up
+          echo "Retrieving kubeconfig for ${TEST_CLUSTER_NAME}"
+          eksctl utils write-kubeconfig --cluster=${TEST_CLUSTER_NAME}
+      - name: Install vCluster CLI
+        uses: loft-sh/setup-vcluster@main
+      - name: Create Virtual Cluster
+        run: vcluster create ${TEST_VCLUSTER_NAME}
       - name: install metric server
         run: |
           kubectl apply -f https://github.com/kubernetes-sigs/metrics-server/releases/latest/download/components.yaml
@@ -250,7 +252,6 @@ jobs:
         run: |
           make cleanup
           make clean
-      - name: Cleanup up EKS cluster
+      - name: Delete Virtual Cluster
         if: ${{ always() }}
-        run: |
-          make cluster-down
\ No newline at end of file
+        run: vcluster delete ${TEST_VCLUSTER_NAME}
\ No newline at end of file
diff --git a/.github/workflows/arm-AL2023-int-test-workflow.yml b/.github/workflows/arm-AL2023-int-test-workflow.yml
index e055a0ac8..a49c687a2 100644
--- a/.github/workflows/arm-AL2023-int-test-workflow.yml
+++ b/.github/workflows/arm-AL2023-int-test-workflow.yml
@@ -60,7 +60,7 @@ jobs:
       matrix:
         test:
           [
-            appframeworksS1,
+            appframeworks1,
             managersecret,
             managersmartstore,
             managermc1,
@@ -94,10 +94,9 @@ jobs:
       DEPLOYMENT_TYPE: ""
       ARM64: "true"
       GRAVITON_TESTING: "true"
+      TEST_CLUSTER_NAME: cspl-3760-vcluster-karpenter-test
+      TEST_VCLUSTER_NAME: al-int-${{ matrix.test }}-${{ github.run_id }}
     steps:
-      - name: Set Test Cluster Name
-        run: |
-          echo "TEST_CLUSTER_NAME=eks-integration-test-cluster-${{ matrix.test }}-$GITHUB_RUN_ID" >> $GITHUB_ENV
       - name: Set Test Cluster Nodes and Parallel Runs
         run: >-
           if grep -q "appframework" <<< "${{ matrix.test }}"; then
@@ -137,7 +136,7 @@ jobs:
           curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
           chmod 700 get_helm.sh
           ./get_helm.sh
-          DESIRED_VERSION=v3.8.2 bash get_helm.sh
+          DESIRED_VERSION=v3.18.3 bash get_helm.sh
       - name: Install EKS CTL
         run: |
           curl --silent --insecure --location "https://github.com/weaveworks/eksctl/releases/download/${{ steps.dotenv.outputs.EKSCTL_VERSION }}/eksctl_$(uname -s)_amd64.tar.gz" | tar xz -C /tmp
@@ -164,11 +163,14 @@ jobs:
         uses: aws-actions/amazon-ecr-login@v1
       - name: Pull Splunk Enterprise Image
         run: docker pull ${{ env.SPLUNK_ENTERPRISE_IMAGE }}
-      - name: Create EKS cluster
+      - name: Login to test cluster
         run: |
-          export EKS_CLUSTER_K8_VERSION=${{ steps.dotenv.outputs.EKS_CLUSTER_K8_VERSION }}
-          export EKS_INSTANCE_TYPE=${{ steps.dotenv.outputs.EKS_INSTANCE_TYPE_ARM64 }}
-          make cluster-up
+          echo "Retrieving kubeconfig for ${TEST_CLUSTER_NAME}"
+          eksctl utils write-kubeconfig --cluster=${TEST_CLUSTER_NAME}
+      - name: Install vCluster CLI
+        uses: loft-sh/setup-vcluster@main
+      - name: Create Virtual Cluster
+        run: vcluster create ${TEST_VCLUSTER_NAME}
       - name: install metric server
         run: |
           kubectl apply -f https://github.com/kubernetes-sigs/metrics-server/releases/latest/download/components.yaml
@@ -199,7 +201,6 @@ jobs:
         run: |
           make cleanup
           make clean
-      - name: Cleanup up EKS cluster
+      - name: Delete Virtual Cluster
         if: ${{ always() }}
-        run: |
-          make cluster-down
\ No newline at end of file
+        run: vcluster delete ${TEST_VCLUSTER_NAME}
\ No newline at end of file
diff --git a/.github/workflows/arm-RHEL-build-test-push-workflow.yml b/.github/workflows/arm-RHEL-build-test-push-workflow.yml
index ebc018e78..77719f6b7 100644
--- a/.github/workflows/arm-RHEL-build-test-push-workflow.yml
+++ b/.github/workflows/arm-RHEL-build-test-push-workflow.yml
@@ -60,7 +60,7 @@ jobs:
       matrix:
         test:
           [
-            appframeworksS1,
+            appframeworks1,
             managersecret,
             managersmartstore,
             managermc1,
@@ -94,10 +94,9 @@ jobs:
       DEPLOYMENT_TYPE: ""
       ARM64: "true"
       GRAVITON_TESTING: "true"
+      TEST_CLUSTER_NAME: cspl-3760-vcluster-karpenter-test
+      TEST_VCLUSTER_NAME: rh-smk-${{ matrix.test }}-${{ github.run_id }}
     steps:
-      - name: Set Test Cluster Name
-        run: |
-          echo "TEST_CLUSTER_NAME=eks-integration-test-cluster-${{ matrix.test }}-$GITHUB_RUN_ID" >> $GITHUB_ENV
       - name: Set Test Cluster Nodes and Parallel Runs
         run: >-
           if grep -q "appframework" <<< "${{ matrix.test }}"; then
@@ -137,7 +136,7 @@ jobs:
           curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
           chmod 700 get_helm.sh
           ./get_helm.sh
-          DESIRED_VERSION=v3.8.2 bash get_helm.sh
+          DESIRED_VERSION=v3.18.3 bash get_helm.sh
       - name: Install EKS CTL
         run: |
           curl --silent --insecure --location "https://github.com/weaveworks/eksctl/releases/download/${{ steps.dotenv.outputs.EKSCTL_VERSION }}/eksctl_$(uname -s)_amd64.tar.gz" | tar xz -C /tmp
@@ -164,11 +163,14 @@ jobs:
         uses: aws-actions/amazon-ecr-login@v1
       - name: Pull Splunk Enterprise Image
         run: docker pull ${{ env.SPLUNK_ENTERPRISE_IMAGE }}
-      - name: Create EKS cluster
+      - name: Login to test cluster
         run: |
-          export EKS_CLUSTER_K8_VERSION=${{ steps.dotenv.outputs.EKS_CLUSTER_K8_VERSION }}
-          export EKS_INSTANCE_TYPE=${{ steps.dotenv.outputs.EKS_INSTANCE_TYPE_ARM64 }}
-          make cluster-up
+          echo "Retrieving kubeconfig for ${TEST_CLUSTER_NAME}"
+          eksctl utils write-kubeconfig --cluster=${TEST_CLUSTER_NAME}
+      - name: Install vCluster CLI
+        uses: loft-sh/setup-vcluster@main
+      - name: Create Virtual Cluster
+        run: vcluster create ${TEST_VCLUSTER_NAME}
       - name: install metric server
         run: |
           kubectl apply -f https://github.com/kubernetes-sigs/metrics-server/releases/latest/download/components.yaml
@@ -199,7 +201,6 @@ jobs:
         run: |
           make cleanup
           make clean
-      - name: Cleanup up EKS cluster
+      - name: Delete Virtual Cluster
         if: ${{ always() }}
-        run: |
-          make cluster-down
\ No newline at end of file
+        run: vcluster delete ${TEST_VCLUSTER_NAME}
\ No newline at end of file
diff --git a/.github/workflows/arm-RHEL-int-test-workflow.yml b/.github/workflows/arm-RHEL-int-test-workflow.yml
index ebc018e78..85b1e89ef 100644
--- a/.github/workflows/arm-RHEL-int-test-workflow.yml
+++ b/.github/workflows/arm-RHEL-int-test-workflow.yml
@@ -60,7 +60,7 @@ jobs:
       matrix:
         test:
           [
-            appframeworksS1,
+            appframeworks1,
             managersecret,
             managersmartstore,
             managermc1,
@@ -94,10 +94,9 @@ jobs:
       DEPLOYMENT_TYPE: ""
       ARM64: "true"
       GRAVITON_TESTING: "true"
+      TEST_CLUSTER_NAME: cspl-3760-vcluster-karpenter-test
+      TEST_VCLUSTER_NAME: rh-int-${{ matrix.test }}-${{ github.run_id }}
     steps:
-      - name: Set Test Cluster Name
-        run: |
-          echo "TEST_CLUSTER_NAME=eks-integration-test-cluster-${{ matrix.test }}-$GITHUB_RUN_ID" >> $GITHUB_ENV
       - name: Set Test Cluster Nodes and Parallel Runs
         run: >-
           if grep -q "appframework" <<< "${{ matrix.test }}"; then
@@ -137,7 +136,7 @@ jobs:
           curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
           chmod 700 get_helm.sh
           ./get_helm.sh
-          DESIRED_VERSION=v3.8.2 bash get_helm.sh
+          DESIRED_VERSION=v3.18.3 bash get_helm.sh
       - name: Install EKS CTL
         run: |
           curl --silent --insecure --location "https://github.com/weaveworks/eksctl/releases/download/${{ steps.dotenv.outputs.EKSCTL_VERSION }}/eksctl_$(uname -s)_amd64.tar.gz" | tar xz -C /tmp
@@ -164,11 +163,14 @@ jobs:
         uses: aws-actions/amazon-ecr-login@v1
       - name: Pull Splunk Enterprise Image
         run: docker pull ${{ env.SPLUNK_ENTERPRISE_IMAGE }}
-      - name: Create EKS cluster
+      - name: Login to test cluster
         run: |
-          export EKS_CLUSTER_K8_VERSION=${{ steps.dotenv.outputs.EKS_CLUSTER_K8_VERSION }}
-          export EKS_INSTANCE_TYPE=${{ steps.dotenv.outputs.EKS_INSTANCE_TYPE_ARM64 }}
-          make cluster-up
+          echo "Retrieving kubeconfig for ${TEST_CLUSTER_NAME}"
+          eksctl utils write-kubeconfig --cluster=${TEST_CLUSTER_NAME}
+      - name: Install vCluster CLI
+        uses: loft-sh/setup-vcluster@main
+      - name: Create Virtual Cluster
+        run: vcluster create ${TEST_VCLUSTER_NAME}
       - name: install metric server
         run: |
           kubectl apply -f https://github.com/kubernetes-sigs/metrics-server/releases/latest/download/components.yaml
@@ -199,7 +201,6 @@ jobs:
         run: |
           make cleanup
           make clean
-      - name: Cleanup up EKS cluster
+      - name: Delete Virtual Cluster
         if: ${{ always() }}
-        run: |
-          make cluster-down
\ No newline at end of file
+        run: vcluster delete ${TEST_VCLUSTER_NAME}
\ No newline at end of file
diff --git a/.github/workflows/arm-Ubuntu-build-test-push-workflow.yml b/.github/workflows/arm-Ubuntu-build-test-push-workflow.yml
index 913956199..d824234f3 100644
--- a/.github/workflows/arm-Ubuntu-build-test-push-workflow.yml
+++ b/.github/workflows/arm-Ubuntu-build-test-push-workflow.yml
@@ -117,7 +117,7 @@ jobs:
       matrix:
         test: [
                 basic,
-                appframeworksS1,
+                appframeworks1,
                 managersecret,
                 managermc,
               ]
@@ -146,10 +146,9 @@ jobs:
       DEPLOYMENT_TYPE: ""
       ARM64: "true"
       GRAVITON_TESTING: "true"
+      TEST_CLUSTER_NAME: cspl-3760-vcluster-karpenter-test
+      TEST_VCLUSTER_NAME: ubnt-smk-${{ matrix.test }}-${{ github.run_id }}
     steps:
-      - name: Set Test Cluster Name
-        run: |
-          echo "TEST_CLUSTER_NAME=eks-integration-test-cluster-${{ matrix.test }}-$GITHUB_RUN_ID" >> $GITHUB_ENV
       - name: Chekcout code
         uses: actions/checkout@v2
       - name: Dotenv Action
@@ -183,7 +182,7 @@ jobs:
           curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
           chmod 700 get_helm.sh
           ./get_helm.sh
-          DESIRED_VERSION=v3.8.2 bash get_helm.sh
+          DESIRED_VERSION=v3.18.3 bash get_helm.sh
       - name: Install EKS CTL
         run: |
           curl --silent --insecure --location "https://github.com/weaveworks/eksctl/releases/download/${{ steps.dotenv.outputs.EKSCTL_VERSION }}/eksctl_$(uname -s)_amd64.tar.gz" | tar xz -C /tmp
@@ -214,11 +213,14 @@ jobs:
         uses: aws-actions/amazon-ecr-login@v1
       - name: Pull Splunk Enterprise Image
         run: docker pull ${{ env.SPLUNK_ENTERPRISE_IMAGE }}
-      - name: Create EKS cluster
+      - name: Login to test cluster
         run: |
-           export EKS_CLUSTER_K8_VERSION=${{ steps.dotenv.outputs.EKS_CLUSTER_K8_VERSION }}
-           export EKS_INSTANCE_TYPE=${{ steps.dotenv.outputs.EKS_INSTANCE_TYPE_ARM64 }}
-           make cluster-up
+          echo "Retrieving kubeconfig for ${TEST_CLUSTER_NAME}"
+          eksctl utils write-kubeconfig --cluster=${TEST_CLUSTER_NAME}
+      - name: Install vCluster CLI
+        uses: loft-sh/setup-vcluster@main
+      - name: Create Virtual Cluster
+        run: vcluster create ${TEST_VCLUSTER_NAME}
       - name: install metric server
         run: |
           kubectl apply -f https://github.com/kubernetes-sigs/metrics-server/releases/latest/download/components.yaml
@@ -250,7 +252,6 @@ jobs:
         run: |
           make cleanup
           make clean
-      - name: Cleanup up EKS cluster
+      - name: Delete Virtual Cluster
         if: ${{ always() }}
-        run: |
-          make cluster-down
\ No newline at end of file
+        run: vcluster delete ${TEST_VCLUSTER_NAME}
\ No newline at end of file
diff --git a/.github/workflows/arm-Ubuntu-int-test-workflow.yml b/.github/workflows/arm-Ubuntu-int-test-workflow.yml
index 0f06370c2..5f49b552c 100644
--- a/.github/workflows/arm-Ubuntu-int-test-workflow.yml
+++ b/.github/workflows/arm-Ubuntu-int-test-workflow.yml
@@ -60,7 +60,7 @@ jobs:
       matrix:
         test:
           [
-            appframeworksS1,
+            appframeworks1,
             managersecret,
             managersmartstore,
             managermc1,
@@ -94,10 +94,9 @@ jobs:
       DEPLOYMENT_TYPE: ""
       ARM64: "true"
       GRAVITON_TESTING: "true"
+      TEST_CLUSTER_NAME: cspl-3760-vcluster-karpenter-test
+      TEST_VCLUSTER_NAME: ubnt-int-${{ matrix.test }}-${{ github.run_id }}
     steps:
-      - name: Set Test Cluster Name
-        run: |
-          echo "TEST_CLUSTER_NAME=eks-integration-test-cluster-${{ matrix.test }}-$GITHUB_RUN_ID" >> $GITHUB_ENV
       - name: Set Test Cluster Nodes and Parallel Runs
         run: >-
           if grep -q "appframework" <<< "${{ matrix.test }}"; then
@@ -137,7 +136,7 @@ jobs:
           curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
           chmod 700 get_helm.sh
           ./get_helm.sh
-          DESIRED_VERSION=v3.8.2 bash get_helm.sh
+          DESIRED_VERSION=v3.18.3 bash get_helm.sh
       - name: Install EKS CTL
         run: |
           curl --silent --insecure --location "https://github.com/weaveworks/eksctl/releases/download/${{ steps.dotenv.outputs.EKSCTL_VERSION }}/eksctl_$(uname -s)_amd64.tar.gz" | tar xz -C /tmp
@@ -164,11 +163,14 @@ jobs:
         uses: aws-actions/amazon-ecr-login@v1
       - name: Pull Splunk Enterprise Image
         run: docker pull ${{ env.SPLUNK_ENTERPRISE_IMAGE }}
-      - name: Create EKS cluster
+      - name: Login to test cluster
         run: |
-          export EKS_CLUSTER_K8_VERSION=${{ steps.dotenv.outputs.EKS_CLUSTER_K8_VERSION }}
-          export EKS_INSTANCE_TYPE=${{ steps.dotenv.outputs.EKS_INSTANCE_TYPE_ARM64 }}
-          make cluster-up
+          echo "Retrieving kubeconfig for ${TEST_CLUSTER_NAME}"
+          eksctl utils write-kubeconfig --cluster=${TEST_CLUSTER_NAME}
+      - name: Install vCluster CLI
+        uses: loft-sh/setup-vcluster@main
+      - name: Create Virtual Cluster
+        run: vcluster create ${TEST_VCLUSTER_NAME}
       - name: install metric server
         run: |
           kubectl apply -f https://github.com/kubernetes-sigs/metrics-server/releases/latest/download/components.yaml
@@ -199,10 +201,9 @@ jobs:
         run: |
           make cleanup
           make clean
-      - name: Cleanup up EKS cluster
+      - name: Delete Virtual Cluster
         if: ${{ always() }}
-        run: |
-          make cluster-down
+        run: vcluster delete ${TEST_VCLUSTER_NAME}
       #- name: Test Report
       #  uses: dorny/test-reporter@v1
       #  if: success() || failure()    # run this step even if previous step failed
diff --git a/.github/workflows/build-test-push-workflow.yml b/.github/workflows/build-test-push-workflow.yml
index 9f4a2397b..b3fc30d76 100644
--- a/.github/workflows/build-test-push-workflow.yml
+++ b/.github/workflows/build-test-push-workflow.yml
@@ -161,11 +161,11 @@ jobs:
       matrix:
         test: [
                 basic,
-                appframeworksS1,
-                managerappframeworkc3,
-                managerappframeworkm4,
-                managersecret,
-                managermc,
+                # appframeworks1,
+                # managerappframeworkc3,
+                # managerappframeworkm4,
+                # managersecret,
+                # managermc,
                ]
     runs-on: ubuntu-latest
     env:
@@ -190,10 +190,9 @@ jobs:
       EKS_SSH_PUBLIC_KEY: ${{ secrets.EKS_SSH_PUBLIC_KEY }}
       CLUSTER_WIDE: "true"
       DEPLOYMENT_TYPE: ""
+      TEST_CLUSTER_NAME: cspl-3760-vcluster-karpenter-test
+      TEST_VCLUSTER_NAME: eks-smk-${{ matrix.test }}-${{ github.run_id }}
     steps:
-      - name: Set Test Cluster Name
-        run: |
-          echo "TEST_CLUSTER_NAME=eks-integration-test-cluster-${{ matrix.test }}-$GITHUB_RUN_ID" >> $GITHUB_ENV
       - name: Chekcout code
         uses: actions/checkout@v2
       - name: Dotenv Action
@@ -227,7 +226,7 @@ jobs:
           curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
           chmod 700 get_helm.sh
           ./get_helm.sh
-          DESIRED_VERSION=v3.8.2 bash get_helm.sh
+          DESIRED_VERSION=v3.18.3 bash get_helm.sh
       - name: Install EKS CTL
         run: |
           curl --silent --insecure --location "https://github.com/weaveworks/eksctl/releases/download/${{ steps.dotenv.outputs.EKSCTL_VERSION }}/eksctl_$(uname -s)_amd64.tar.gz" | tar xz -C /tmp
@@ -262,13 +261,17 @@ jobs:
         run: |
           docker tag ${{ env.SPLUNK_ENTERPRISE_IMAGE }} ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }}
           docker push ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }}
-      - name: Create EKS cluster
-        run: |
-           export EKS_CLUSTER_K8_VERSION=${{ steps.dotenv.outputs.EKS_CLUSTER_K8_VERSION }}
-           make cluster-up
-      - name: install metric server
+      - name: Login to test cluster
         run: |
-          kubectl apply -f https://github.com/kubernetes-sigs/metrics-server/releases/latest/download/components.yaml
+          echo "Retrieving kubeconfig for ${TEST_CLUSTER_NAME}"
+          eksctl utils write-kubeconfig --cluster=${TEST_CLUSTER_NAME}
+      - name: Install vCluster CLI
+        uses: loft-sh/setup-vcluster@main
+      - name: Create Virtual Cluster
+        run: vcluster create ${TEST_VCLUSTER_NAME}
+      # - name: install metric server
+      #   run: |
+      #     kubectl apply -f https://github.com/kubernetes-sigs/metrics-server/releases/latest/download/components.yaml
       - name: install k8s dashboard
         run: |
           kubectl apply -f https://raw.githubusercontent.com/kubernetes/dashboard/v2.0.5/aio/deploy/recommended.yaml
@@ -297,10 +300,9 @@ jobs:
         run: |
           make cleanup
           make clean
-      - name: Cleanup up EKS cluster
+      - name: Delete Virtual Cluster
         if: ${{ always() }}
-        run: |
-          make cluster-down
+        run: vcluster delete ${TEST_VCLUSTER_NAME}
       #- name: Test Report
       #  uses: dorny/test-reporter@v1
       #  if: success() || failure()    # run this step even if previous step failed
diff --git a/.github/workflows/distroless-build-test-push-workflow.yml b/.github/workflows/distroless-build-test-push-workflow.yml
index f21e0550e..3fa465cf5 100644
--- a/.github/workflows/distroless-build-test-push-workflow.yml
+++ b/.github/workflows/distroless-build-test-push-workflow.yml
@@ -160,7 +160,7 @@ jobs:
       matrix:
         test: [
           basic,
-          appframeworksS1,
+          appframeworks1,
           managerappframeworkc3,
           managerappframeworkm4,
           managersecret,
@@ -189,10 +189,10 @@ jobs:
       EKS_SSH_PUBLIC_KEY: ${{ secrets.EKS_SSH_PUBLIC_KEY }}
       CLUSTER_WIDE: "true"
       DEPLOYMENT_TYPE: ""
+      TEST_CLUSTER_NAME: cspl-3760-vcluster-karpenter-test
+      TEST_VCLUSTER_NAME: dl-smk-${{ matrix.test }}-${{ github.run_id }}
     steps:
       - name: Set Test Cluster Name
-        run: |
-          echo "TEST_CLUSTER_NAME=eks-integration-test-cluster-${{ matrix.test }}-$GITHUB_RUN_ID" >> $GITHUB_ENV
       - name: Chekcout code
         uses: actions/checkout@v2
       - name: Dotenv Action
@@ -226,7 +226,7 @@ jobs:
           curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
           chmod 700 get_helm.sh
           ./get_helm.sh
-          DESIRED_VERSION=v3.8.2 bash get_helm.sh
+          DESIRED_VERSION=v3.18.3 bash get_helm.sh
       - name: Install EKS CTL
         run: |
           curl --silent --insecure --location "https://github.com/weaveworks/eksctl/releases/download/${{ steps.dotenv.outputs.EKSCTL_VERSION }}/eksctl_$(uname -s)_amd64.tar.gz" | tar xz -C /tmp
@@ -261,10 +261,14 @@ jobs:
         run: |
           docker tag ${{ env.SPLUNK_ENTERPRISE_IMAGE }} ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }}
           docker push ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }}
-      - name: Create EKS cluster
+      - name: Login to test cluster
         run: |
-          export EKS_CLUSTER_K8_VERSION=${{ steps.dotenv.outputs.EKS_CLUSTER_K8_VERSION }}
-          make cluster-up
+          echo "Retrieving kubeconfig for ${TEST_CLUSTER_NAME}"
+          eksctl utils write-kubeconfig --cluster=${TEST_CLUSTER_NAME}
+      - name: Install vCluster CLI
+        uses: loft-sh/setup-vcluster@main
+      - name: Create Virtual Cluster
+        run: vcluster create ${TEST_VCLUSTER_NAME}
       - name: install metric server
         run: |
           kubectl apply -f https://github.com/kubernetes-sigs/metrics-server/releases/latest/download/components.yaml
@@ -296,10 +300,9 @@ jobs:
         run: |
           make cleanup
           make clean
-      - name: Cleanup up EKS cluster
+      - name: Delete Virtual Cluster
         if: ${{ always() }}
-        run: |
-          make cluster-down
+        run: vcluster delete ${TEST_VCLUSTER_NAME}
       #- name: Test Report
       #  uses: dorny/test-reporter@v1
       #  if: success() || failure()    # run this step even if previous step failed
diff --git a/.github/workflows/distroless-int-test-workflow.yml b/.github/workflows/distroless-int-test-workflow.yml
index e6031491e..fed70ce60 100644
--- a/.github/workflows/distroless-int-test-workflow.yml
+++ b/.github/workflows/distroless-int-test-workflow.yml
@@ -54,7 +54,7 @@ jobs:
       matrix:
         test:
           [
-            appframeworksS1,
+            appframeworks1,
             managerappframeworkc3,
             managerappframeworkm4,
             managersecret,
@@ -88,10 +88,9 @@ jobs:
       ENTERPRISE_LICENSE_LOCATION: ${{ secrets.ENTERPRISE_LICENSE_LOCATION }}
       CLUSTER_WIDE: "true"
       DEPLOYMENT_TYPE: ""
+      TEST_CLUSTER_NAME: cspl-3760-vcluster-karpenter-test
+      TEST_VCLUSTER_NAME: dl-int-${{ matrix.test }}-${{ github.run_id }}
     steps:
-      - name: Set Test Cluster Name
-        run: |
-          echo "TEST_CLUSTER_NAME=eks-integration-test-cluster-${{ matrix.test }}-$GITHUB_RUN_ID" >> $GITHUB_ENV
       - name: Set Test Cluster Nodes and Parallel Runs
         run: >-
           if grep -q "appframework" <<< "${{ matrix.test }}"; then
@@ -131,7 +130,7 @@ jobs:
           curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
           chmod 700 get_helm.sh
           ./get_helm.sh
-          DESIRED_VERSION=v3.8.2 bash get_helm.sh
+          DESIRED_VERSION=v3.18.3 bash get_helm.sh
       - name: Install EKS CTL
         run: |
           curl --silent --insecure --location "https://github.com/weaveworks/eksctl/releases/download/${{ steps.dotenv.outputs.EKSCTL_VERSION }}/eksctl_$(uname -s)_amd64.tar.gz" | tar xz -C /tmp
@@ -158,10 +157,14 @@ jobs:
         uses: aws-actions/amazon-ecr-login@v1
       - name: Pull Splunk Enterprise Image
         run: docker pull ${{ env.SPLUNK_ENTERPRISE_IMAGE }}
-      - name: Create EKS cluster
-        run: |
-          export EKS_CLUSTER_K8_VERSION=${{ steps.dotenv.outputs.EKS_CLUSTER_K8_VERSION }}
-          make cluster-up
+      - name: Login to test cluster
+        run: |
+          echo "Retrieving kubeconfig for ${TEST_CLUSTER_NAME}"
+          eksctl utils write-kubeconfig --cluster=${TEST_CLUSTER_NAME}
+      - name: Install vCluster CLI
+        uses: loft-sh/setup-vcluster@main
+      - name: Create Virtual Cluster
+        run: vcluster create ${TEST_VCLUSTER_NAME}
       - name: install metric server
         run: |
           kubectl apply -f https://github.com/kubernetes-sigs/metrics-server/releases/latest/download/components.yaml
@@ -192,10 +195,9 @@ jobs:
         run: |
           make cleanup
           make clean
-      - name: Cleanup up EKS cluster
+      - name: Delete Virtual Cluster
         if: ${{ always() }}
-        run: |
-          make cluster-down
+        run: vcluster delete ${TEST_VCLUSTER_NAME}
       #- name: Test Report
       #  uses: dorny/test-reporter@v1
       #  if: success() || failure()    # run this step even if previous step failed
diff --git a/.github/workflows/helm-test-workflow.yml b/.github/workflows/helm-test-workflow.yml
index e49a9865f..88a125518 100644
--- a/.github/workflows/helm-test-workflow.yml
+++ b/.github/workflows/helm-test-workflow.yml
@@ -67,14 +67,13 @@ jobs:
       HELM_REPO_PATH: "../../../../helm-chart"
       INSTALL_OPERATOR: "true"
       TEST_VPC_ENDPOINT_URL: ${{ secrets.TEST_VPC_ENDPOINT_URL }}
+      TEST_CLUSTER_NAME: cspl-3760-vcluster-karpenter-test
+      TEST_VCLUSTER_NAME: helm-int-${{ matrix.test }}-${{ github.run_id }}
     steps:
       - uses: chrisdickinson/setup-yq@3d931309f27270ebbafd53f2daee773a82ea1822
       - name: Checking YQ installation
         run: |
            yq --help
-      - name: Set Test Cluster Name
-        run: |
-          echo "TEST_CLUSTER_NAME=eks-integration-test-cluster-${{ matrix.test }}-$GITHUB_RUN_ID" >> $GITHUB_ENV
       - name: Set Test Cluster Nodes and Parallel Runs
         run: >-
           if grep -q "appframework" <<< "${{ matrix.test }}"; then
@@ -121,7 +120,7 @@ jobs:
           curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
           chmod 700 get_helm.sh
           ./get_helm.sh
-          DESIRED_VERSION=v3.8.2 bash get_helm.sh
+          DESIRED_VERSION=v3.18.3 bash get_helm.sh
       - name: Install EKS CTL
         run: |
           curl --silent --insecure --location "https://github.com/weaveworks/eksctl/releases/download/${{ steps.dotenv.outputs.EKSCTL_VERSION }}/eksctl_$(uname -s)_amd64.tar.gz" | tar xz -C /tmp
@@ -159,10 +158,14 @@ jobs:
       - name: Change Operator Image Tag to latest
         run: |
           docker tag ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA ${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:latest
-      - name: Create EKS cluster
-        run: |
-          export EKS_CLUSTER_K8_VERSION=${{ steps.dotenv.outputs.EKS_CLUSTER_K8_VERSION }}
-          make cluster-up
+      - name: Login to test cluster
+        run: |
+          echo "Retrieving kubeconfig for ${TEST_CLUSTER_NAME}"
+          eksctl utils write-kubeconfig --cluster=${TEST_CLUSTER_NAME}
+      - name: Install vCluster CLI
+        uses: loft-sh/setup-vcluster@main
+      - name: Create Virtual Cluster
+        run: vcluster create ${TEST_VCLUSTER_NAME}
       - name: install metric server
         run: |
           kubectl apply -f https://github.com/kubernetes-sigs/metrics-server/releases/latest/download/components.yaml
@@ -195,7 +198,6 @@ jobs:
         run: |
           make cleanup
           make clean
-      - name: Cleanup up EKS cluster
+      - name: Delete Virtual Cluster
         if: ${{ always() }}
-        run: |
-          make cluster-down
+        run: vcluster delete ${TEST_VCLUSTER_NAME}
diff --git a/.github/workflows/int-test-workflow.yml b/.github/workflows/int-test-workflow.yml
index e1079b464..c7dad84bd 100644
--- a/.github/workflows/int-test-workflow.yml
+++ b/.github/workflows/int-test-workflow.yml
@@ -5,6 +5,7 @@ on:
       - develop
       - main
       - feature**
+      - CSPL-3776-vcluster-enablement
 jobs:
   build-operator-image:
     runs-on: ubuntu-latest
@@ -51,15 +52,15 @@ jobs:
       matrix:
         test:
           [
-            appframeworksS1,
-            managerappframeworkc3,
-            managerappframeworkm4,
-            managersecret,
-            managersmartstore,
-            managermc1,
-            managermc2,
-            managercrcrud,
-            licensemanager,
+            # appframeworks1,
+            # managerappframeworkc3,
+            # managerappframeworkm4,
+            # managersecret,
+            # managersmartstore,
+            # managermc1,
+            # managermc2,
+            # managercrcrud,
+            # licensemanager,
             managerdeletecr,
           ]
     runs-on: ubuntu-latest
@@ -84,16 +85,15 @@ jobs:
       ENTERPRISE_LICENSE_LOCATION: ${{ secrets.ENTERPRISE_LICENSE_LOCATION }}
       CLUSTER_WIDE: "true"
       DEPLOYMENT_TYPE: ""
+      TEST_CLUSTER_NAME: cspl-3760-vcluster-karpenter-test
+      TEST_VCLUSTER_NAME: eks-int-${{ matrix.test }}-${{ github.run_id }}
     steps:
-      - name: Set Test Cluster Name
-        run: |
-          echo "TEST_CLUSTER_NAME=eks-integration-test-cluster-${{ matrix.test }}-$GITHUB_RUN_ID" >> $GITHUB_ENV
       - name: Set Test Cluster Nodes and Parallel Runs
         run: >-
-          if grep -q "appframework" <<< "${{ matrix.test }}"; then
-            echo "CLUSTER_WORKERS=5" >> $GITHUB_ENV
-            echo "CLUSTER_NODES=2" >> $GITHUB_ENV
-          fi
+            if grep -q "appframework" <<< "${{ matrix.test }}"; then
+              echo "CLUSTER_WORKERS=5" >> $GITHUB_ENV
+              echo "CLUSTER_NODES=2" >> $GITHUB_ENV
+            fi
       - name: Checkcout code
         uses: actions/checkout@v2
       - name: Dotenv Action
@@ -127,7 +127,7 @@ jobs:
           curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
           chmod 700 get_helm.sh
           ./get_helm.sh
-          DESIRED_VERSION=v3.8.2 bash get_helm.sh
+          DESIRED_VERSION=v3.18.3 bash get_helm.sh
       - name: Install EKS CTL
         run: |
           curl --silent --insecure --location "https://github.com/weaveworks/eksctl/releases/download/${{ steps.dotenv.outputs.EKSCTL_VERSION }}/eksctl_$(uname -s)_amd64.tar.gz" | tar xz -C /tmp
@@ -158,13 +158,17 @@ jobs:
         run: |
           docker tag ${{ env.SPLUNK_ENTERPRISE_IMAGE }} ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }}
           docker push ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }}
-      - name: Create EKS cluster
-        run: |
-          export EKS_CLUSTER_K8_VERSION=${{ steps.dotenv.outputs.EKS_CLUSTER_K8_VERSION }}
-          make cluster-up
-      - name: install metric server
-        run: |
-          kubectl apply -f https://github.com/kubernetes-sigs/metrics-server/releases/latest/download/components.yaml
+      - name: Login to test cluster
+        run: |
+          echo "Retrieving kubeconfig for ${TEST_CLUSTER_NAME}"
+          eksctl utils write-kubeconfig --cluster=${TEST_CLUSTER_NAME}
+      - name: Install vCluster CLI
+        uses: loft-sh/setup-vcluster@main
+      - name: Create Virtual Cluster
+        run: vcluster create ${TEST_VCLUSTER_NAME}
+      # - name: install metric server
+      #   run: |
+      #     kubectl apply -f https://github.com/kubernetes-sigs/metrics-server/releases/latest/download/components.yaml
       - name: install k8s dashboard
         run: |
           kubectl apply -f https://raw.githubusercontent.com/kubernetes/dashboard/v2.0.5/aio/deploy/recommended.yaml
@@ -192,10 +196,8 @@ jobs:
         run: |
           make cleanup
           make clean
-      - name: Cleanup up EKS cluster
-        if: ${{ always() }}
-        run: |
-          make cluster-down
+      - name: Delete Virtual Cluster
+        run: vcluster delete ${TEST_VCLUSTER_NAME}
       #- name: Test Report
       #  uses: dorny/test-reporter@v1
       #  if: success() || failure()    # run this step even if previous step failed
diff --git a/.github/workflows/manual-int-test-workflow.yml b/.github/workflows/manual-int-test-workflow.yml
index a4dceab35..2bee7e802 100644
--- a/.github/workflows/manual-int-test-workflow.yml
+++ b/.github/workflows/manual-int-test-workflow.yml
@@ -13,7 +13,7 @@ jobs:
       matrix:
         test:
           [
-            appframeworksS1,
+            appframeworks1,
             managerappframeworkc3,
             managerappframeworkm4,
             managersecret,
@@ -45,10 +45,9 @@ jobs:
       S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
       ENTERPRISE_LICENSE_LOCATION: ${{ secrets.ENTERPRISE_LICENSE_LOCATION }}
       CLUSTER_WIDE: ${{ github.event.inputs.CLUSTER_WIDE }}
+      TEST_CLUSTER_NAME: cspl-3760-vcluster-karpenter-test
+      TEST_VCLUSTER_NAME: mnl-int-${{ matrix.test }}-${{ github.run_id }}
     steps:
-      - name: Set Test Cluster Name
-        run: |
-          echo "TEST_CLUSTER_NAME=eks-integration-test-cluster-${{ matrix.test }}-$GITHUB_RUN_ID" >> $GITHUB_ENV
       - name: Set Test Cluster Nodes and Parallel Runs
         run: >-
           if grep -q "appframework" <<< "${{ matrix.test }}"; then
@@ -114,10 +113,14 @@ jobs:
         run: |
           docker tag ${{ env.SPLUNK_ENTERPRISE_IMAGE }} ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }}
           docker push ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }}
-      - name: Create EKS cluster
+      - name: Login to test cluster
         run: |
-          export EKS_CLUSTER_K8_VERSION=${{ steps.dotenv.outputs.EKS_CLUSTER_K8_VERSION }}
-          make cluster-up
+          echo "Retrieving kubeconfig for ${TEST_CLUSTER_NAME}"
+          eksctl utils write-kubeconfig --cluster=${TEST_CLUSTER_NAME}
+      - name: Install vCluster CLI
+        uses: loft-sh/setup-vcluster@main
+      - name: Create Virtual Cluster
+        run: vcluster create ${TEST_VCLUSTER_NAME}
       - name: install metric server
         run: |
           kubectl apply -f https://github.com/kubernetes-sigs/metrics-server/releases/latest/download/components.yaml
@@ -149,10 +152,9 @@ jobs:
         run: |
           make cleanup
           make clean
-      - name: Cleanup up EKS cluster
+      - name: Delete Virtual Cluster
         if: ${{ always() }}
-        run: |
-          make cluster-down
+        run: vcluster delete ${TEST_VCLUSTER_NAME}
   publish_operator_image:
     runs-on: ubuntu-latest
     needs: int-tests
diff --git a/.github/workflows/namespace-scope-int-workflow.yml b/.github/workflows/namespace-scope-int-workflow.yml
index 476a5ad83..54acabb3d 100644
--- a/.github/workflows/namespace-scope-int-workflow.yml
+++ b/.github/workflows/namespace-scope-int-workflow.yml
@@ -9,7 +9,7 @@ jobs:
       matrix:
         test:
           [
-            appframeworksS1,
+            appframeworks1,
             managerappframeworkc3,
             managerappframeworkm4,
             managersecret,
@@ -40,10 +40,9 @@ jobs:
       S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
       ENTERPRISE_LICENSE_LOCATION: ${{ secrets.ENTERPRISE_LICENSE_LOCATION }}
       CLUSTER_WIDE: "false"
+      TEST_CLUSTER_NAME: cspl-3760-vcluster-karpenter-test
+      TEST_VCLUSTER_NAME: ns-int-${{ matrix.test }}-${{ github.run_id }}
     steps:
-      - name: Set Test Cluster Name
-        run: |
-          echo "TEST_CLUSTER_NAME=eks-integration-test-cluster-${{ matrix.test }}-$GITHUB_RUN_ID" >> $GITHUB_ENV
       - name: Set Test Cluster Nodes and Parallel Runs
         run: >-
           if grep -q "appframework" <<< "${{ matrix.test }}"; then
@@ -111,10 +110,14 @@ jobs:
         run: |
           docker tag ${{ env.SPLUNK_ENTERPRISE_IMAGE }} ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }}
           docker push ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }}
-      - name: Create EKS cluster
+      - name: Login to test cluster
         run: |
-          export EKS_CLUSTER_K8_VERSION=${{ steps.dotenv.outputs.EKS_CLUSTER_K8_VERSION }}
-          make cluster-up
+          echo "Retrieving kubeconfig for ${TEST_CLUSTER_NAME}"
+          eksctl utils write-kubeconfig --cluster=${TEST_CLUSTER_NAME}
+      - name: Install vCluster CLI
+        uses: loft-sh/setup-vcluster@main
+      - name: Create Virtual Cluster
+        run: vcluster create ${TEST_VCLUSTER_NAME}
       - name: install metric server
         run: |
           kubectl apply -f https://github.com/kubernetes-sigs/metrics-server/releases/latest/download/components.yaml
@@ -141,7 +144,6 @@ jobs:
         with:
           name: "splunk-pods-logs--artifacts-${{ matrix.test }}"
           path: "/tmp/pod_logs/**"
-      - name: Cleanup up EKS cluster
+      - name: Delete Virtual Cluster
         if: ${{ always() }}
-        run: |
-          make cluster-down
+        run: vcluster delete ${TEST_VCLUSTER_NAME}
diff --git a/.github/workflows/nightly-int-test-workflow.yml b/.github/workflows/nightly-int-test-workflow.yml
index da3554a51..9e279fdeb 100644
--- a/.github/workflows/nightly-int-test-workflow.yml
+++ b/.github/workflows/nightly-int-test-workflow.yml
@@ -49,7 +49,7 @@ jobs:
       matrix:
         test:
           [
-            appframeworksS1,
+            appframeworks1,
             managerappframeworkc3,
             managerappframeworkm4,
             managersecret,
@@ -81,10 +81,9 @@ jobs:
       S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
       ENTERPRISE_LICENSE_LOCATION: ${{ secrets.ENTERPRISE_LICENSE_LOCATION }}
       CLUSTER_WIDE: "true"
+      TEST_CLUSTER_NAME: cspl-3760-vcluster-karpenter-test
+      TEST_VCLUSTER_NAME: night-int-${{ matrix.test }}-${{ github.run_id }}
     steps:
-      - name: Set Test Cluster Name
-        run: |
-          echo "TEST_CLUSTER_NAME=eks-integration-test-cluster-${{ matrix.test }}-$GITHUB_RUN_ID" >> $GITHUB_ENV
       - name: Set Test Cluster Nodes and Parallel Runs
         run: >-
           if grep -q "appframework" <<< "${{ matrix.test }}"; then
@@ -150,10 +149,14 @@ jobs:
       - name: Change Operator Image Tag to latest
         run: |
           docker tag ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA ${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:latest
-      - name: Create EKS cluster
+      - name: Login to test cluster
         run: |
-          export EKS_CLUSTER_K8_VERSION=${{ steps.dotenv.outputs.EKS_CLUSTER_K8_VERSION }}
-          make cluster-up
+          echo "Retrieving kubeconfig for ${TEST_CLUSTER_NAME}"
+          eksctl utils write-kubeconfig --cluster=${TEST_CLUSTER_NAME}
+      - name: Install vCluster CLI
+        uses: loft-sh/setup-vcluster@main
+      - name: Create Virtual Cluster
+        run: vcluster create ${TEST_VCLUSTER_NAME}
       - name: install metric server
         run: |
           kubectl apply -f https://github.com/kubernetes-sigs/metrics-server/releases/latest/download/components.yaml
@@ -185,10 +188,9 @@ jobs:
         run: |
           make cleanup
           make clean
-      - name: Cleanup up EKS cluster
+      - name: Delete Virtual Cluster
         if: ${{ always() }}
-        run: |
-          make cluster-down
+        run: vcluster delete ${TEST_VCLUSTER_NAME}
   publish_operator_image:
     runs-on: ubuntu-latest
     needs: int-tests
diff --git a/test/appframework_aws/s1/appframework_aws_test.go b/test/appframework_aws/s1/appframework_aws_test.go
index c42746b91..07583bbad 100644
--- a/test/appframework_aws/s1/appframework_aws_test.go
+++ b/test/appframework_aws/s1/appframework_aws_test.go
@@ -80,7 +80,7 @@ var _ = Describe("s1appfw test", func() {
 	})
 
 	Context("Standalone deployment (S1) with App Framework", func() {
-		It("smoke, s1, appframeworksS1, appframework: can deploy a Standalone instance with App Framework enabled, install apps then upgrade them", func() {
+		It("smoke, s1, appframeworks1, appframework: can deploy a Standalone instance with App Framework enabled, install apps then upgrade them", func() {
 
 			/* Test Steps
 			   ################## SETUP ####################
@@ -253,7 +253,7 @@ var _ = Describe("s1appfw test", func() {
 	})
 
 	Context("Standalone deployment (S1) with App Framework", func() {
-		It("smoke, s1, appframeworksS1, appframework: can deploy a Standalone instance with App Framework enabled, install apps then downgrade them", func() {
+		It("smoke, s1, appframeworks1, appframework: can deploy a Standalone instance with App Framework enabled, install apps then downgrade them", func() {
 
 			/* Test Steps
 			   ################## SETUP ####################
@@ -418,7 +418,7 @@ var _ = Describe("s1appfw test", func() {
 	})
 
 	Context("Standalone deployment (S1) with App Framework", func() {
-		It("s1, smoke, appframeworksS1, appframework: can deploy a Standalone instance with App Framework enabled, install apps, scale up, install apps on new pod, scale down", func() {
+		It("s1, smoke, appframeworks1, appframework: can deploy a Standalone instance with App Framework enabled, install apps, scale up, install apps on new pod, scale down", func() {
 
 			/* Test Steps
 			   ################## SETUP ####################
@@ -615,7 +615,7 @@ var _ = Describe("s1appfw test", func() {
 	})
 
 	Context("Standalone deployment (S1) with App Framework", func() {
-		It("s1, integration, appframeworksS1, appframework: can deploy a Standalone instance with App Framework enabled, install apps, scale up, upgrade apps", func() {
+		It("s1, integration, appframeworks1, appframework: can deploy a Standalone instance with App Framework enabled, install apps, scale up, upgrade apps", func() {
 
 			/* Test Steps
 			   ################## SETUP ####################
@@ -750,7 +750,7 @@ var _ = Describe("s1appfw test", func() {
 
 	// ES App Installation not supported at the time. Will be added back at a later time.
 	Context("Standalone deployment (S1) with App Framework", func() {
-		It("s1, integration, appframeworksS1, appframework: can deploy a Standalone and have ES app installed", func() {
+		It("s1, integration, appframeworks1, appframework: can deploy a Standalone and have ES app installed", func() {
 
 			/* Test Steps
 			   ################## SETUP ####################
@@ -852,7 +852,7 @@ var _ = Describe("s1appfw test", func() {
 	})
 
 	Context("Standalone deployment (S1) with App Framework", func() {
-		It("integration, s1, appframeworksS1, appframework: can deploy a Standalone instance with App Framework enabled and install around 350MB of apps at once", func() {
+		It("integration, s1, appframeworks1, appframework: can deploy a Standalone instance with App Framework enabled and install around 350MB of apps at once", func() {
 
 			/* Test Steps
 			   ################## SETUP ####################
@@ -922,7 +922,7 @@ var _ = Describe("s1appfw test", func() {
 	})
 
 	Context("Standalone deployment (S1) with App Framework", func() {
-		It("s1, smoke, appframeworksS1, appframework: can deploy a standalone instance with App Framework enabled for manual poll", func() {
+		It("s1, smoke, appframeworks1, appframework: can deploy a standalone instance with App Framework enabled for manual poll", func() {
 
 			/* Test Steps
 			   ################## SETUP ####################
@@ -1113,7 +1113,7 @@ var _ = Describe("s1appfw test", func() {
 	})
 
 	Context("Standalone deployment (S1) with App Framework", func() {
-		It("integration, s1, appframeworksS1, appframework: can deploy Several standalone CRs in the same namespace with App Framework enabled", func() {
+		It("integration, s1, appframeworks1, appframework: can deploy Several standalone CRs in the same namespace with App Framework enabled", func() {
 
 			/* Test Steps
 			   ################## SETUP ####################
@@ -1216,7 +1216,7 @@ var _ = Describe("s1appfw test", func() {
 	})
 
 	Context("Standalone deployment (S1) with App Framework", func() {
-		It("integration, s1, appframeworksS1, appframework: can add new apps to app source while install is in progress and have all apps installed", func() {
+		It("integration, s1, appframeworks1, appframework: can add new apps to app source while install is in progress and have all apps installed", func() {
 
 			/* Test Steps
 				################## SETUP ####################
@@ -1330,7 +1330,7 @@ var _ = Describe("s1appfw test", func() {
 	})
 
 	Context("Standalone deployment (S1) with App Framework", func() {
-		It("integration, s1, appframeworksS1, appframework: Deploy a Standalone instance with App Framework enabled and reset operator pod while app install is in progress", func() {
+		It("integration, s1, appframeworks1, appframework: Deploy a Standalone instance with App Framework enabled and reset operator pod while app install is in progress", func() {
 
 			/* Test Steps
 				################## SETUP ####################
@@ -1427,7 +1427,7 @@ var _ = Describe("s1appfw test", func() {
 	})
 
 	Context("Standalone deployment (S1) with App Framework", func() {
-		It("integration, s1, appframeworksS1, appframework: Deploy a Standalone instance with App Framework enabled and reset operator pod while app download is in progress", func() {
+		It("integration, s1, appframeworks1, appframework: Deploy a Standalone instance with App Framework enabled and reset operator pod while app download is in progress", func() {
 
 			/* Test Steps
 				################## SETUP ####################
@@ -1496,7 +1496,7 @@ var _ = Describe("s1appfw test", func() {
 	})
 
 	Context("Standalone deployment (S1) with App Framework", func() {
-		It("integration, s1, appframeworksS1, appframework: can deploy a Standalone instance with App Framework enabled, install an app then disable it and remove it from app source", func() {
+		It("integration, s1, appframeworks1, appframework: can deploy a Standalone instance with App Framework enabled, install an app then disable it and remove it from app source", func() {
 
 			/* Test Steps
 			   ################## SETUP ####################
@@ -1591,7 +1591,7 @@ var _ = Describe("s1appfw test", func() {
 	})
 
 	Context("Standalone deployment (S1) with App Framework", func() {
-		It("integration, s1, appframeworksS1, appframework: can deploy a Standalone instance with App Framework enabled, attempt to update using incorrect S3 credentials", func() {
+		It("integration, s1, appframeworks1, appframework: can deploy a Standalone instance with App Framework enabled, attempt to update using incorrect S3 credentials", func() {
 
 			/* Test Steps
 			   ################## SETUP ####################
@@ -1729,7 +1729,7 @@ var _ = Describe("s1appfw test", func() {
 	})
 
 	Context("Standalone deployment (S1) with App Framework", func() {
-		It("integration, s1, appframeworksS1, appframework: Deploy a Standalone instance with App Framework enabled and update apps after app download is completed", func() {
+		It("integration, s1, appframeworks1, appframework: Deploy a Standalone instance with App Framework enabled and update apps after app download is completed", func() {
 
 			/* Test Steps
 			################## SETUP ####################
@@ -1814,7 +1814,7 @@ var _ = Describe("s1appfw test", func() {
 	})
 
 	Context("Standalone deployment (S1) with App Framework", func() {
-		It("integration, s1, appframeworksS1, appframework: can deploy a Standalone instance and install a bigger volume of apps than the operator PV disk space", func() {
+		It("integration, s1, appframeworks1, appframework: can deploy a Standalone instance and install a bigger volume of apps than the operator PV disk space", func() {
 
 			/* Test Steps
 			   ################## SETUP ####################
@@ -1890,7 +1890,7 @@ var _ = Describe("s1appfw test", func() {
 	})
 
 	Context("Standalone deployment (S1) with App Framework", func() {
-		It("integration, s1, appframeworksS1, appframework: Deploy a Standalone instance with App Framework enabled and delete apps from app directory when app download is complete", func() {
+		It("integration, s1, appframeworks1, appframework: Deploy a Standalone instance with App Framework enabled and delete apps from app directory when app download is complete", func() {
 
 			/* Test Steps
 				################## SETUP ####################
@@ -1962,7 +1962,7 @@ var _ = Describe("s1appfw test", func() {
 	})
 
 	Context("Standalone deployment (S1) with App Framework", func() {
-		It("smoke, s1, appframeworksS1, appframework: can deploy a Standalone instance with App Framework enabled, install apps and check isDeploymentInProgress is set for Standaloen and MC CR's", func() {
+		It("smoke, s1, appframeworks1, appframework: can deploy a Standalone instance with App Framework enabled, install apps and check isDeploymentInProgress is set for Standaloen and MC CR's", func() {
 
 			/* Test Steps
 			   ################## SETUP ####################
diff --git a/test/delete_cr/deletecr_suite_test.go b/test/delete_cr/deletecr_suite_test.go
index 49b34af39..b0df20af8 100644
--- a/test/delete_cr/deletecr_suite_test.go
+++ b/test/delete_cr/deletecr_suite_test.go
@@ -55,6 +55,6 @@ var _ = BeforeSuite(func() {
 
 var _ = AfterSuite(func() {
 	if testenvInstance != nil {
-		Expect(testenvInstance.Teardown()).ToNot(HaveOccurred())
+		testenvInstance.Teardown()
 	}
 })
diff --git a/test/delete_cr/deletecr_test.go b/test/delete_cr/deletecr_test.go
index e93269d10..3f7e4cb00 100644
--- a/test/delete_cr/deletecr_test.go
+++ b/test/delete_cr/deletecr_test.go
@@ -52,7 +52,7 @@ var _ = Describe("DeleteCR test", func() {
 			deployment.Teardown()
 		}
 		if testcaseEnvInst != nil {
-			Expect(testcaseEnvInst.Teardown()).ToNot(HaveOccurred())
+			testcaseEnvInst.Teardown()
 		}
 	})
 
diff --git a/test/deploy-eks-cluster.sh b/test/deploy-eks-cluster.sh
index 4acfdff60..c578e730e 100755
--- a/test/deploy-eks-cluster.sh
+++ b/test/deploy-eks-cluster.sh
@@ -123,7 +123,7 @@ function createCluster() {
     aws iam create-role --role-name ${rolename} --assume-role-policy-document file://aws-ebs-csi-driver-trust-policy.json --description "irsa role for ${TEST_CLUSTER_NAME}"
     aws iam attach-role-policy  --policy-arn arn:aws:iam::aws:policy/service-role/AmazonEBSCSIDriverPolicy  --role-name ${rolename}
     kubectl annotate serviceaccount -n $namespace $service_account eks.amazonaws.com/role-arn=arn:aws:iam::$account_id:role/${rolename}
-    eksctl create addon --name aws-ebs-csi-driver --cluster ${TEST_CLUSTER_NAME} --service-account-role-arn arn:aws:iam::$account_id:role/${rolename} --force
+    eksctl create addon --name aws-ebs-csi-driver --cluster ${TEST_CLUSTER_NAME} --service-account-role-arn arn:aws:iam::${account_id}:role/${rolename} --force
     eksctl utils update-cluster-logging --cluster ${TEST_CLUSTER_NAME}
     # CSPL-2887 - Patch the default storage class to gp2
     kubectl patch storageclass gp2 -p '{"metadata": {"annotations":{"storageclass.kubernetes.io/is-default-class":"true"}}}'
diff --git a/test/smoke/smoke_suite_test.go b/test/smoke/smoke_suite_test.go
index b47f8a984..424c954c8 100644
--- a/test/smoke/smoke_suite_test.go
+++ b/test/smoke/smoke_suite_test.go
@@ -53,6 +53,6 @@ var _ = BeforeSuite(func() {
 
 var _ = AfterSuite(func() {
 	if testenvInstance != nil {
-		Expect(testenvInstance.Teardown()).ToNot(HaveOccurred())
+		testenvInstance.Teardown()
 	}
 })
diff --git a/test/smoke/smoke_test.go b/test/smoke/smoke_test.go
index 9c0a609e6..df5161205 100644
--- a/test/smoke/smoke_test.go
+++ b/test/smoke/smoke_test.go
@@ -51,7 +51,7 @@ var _ = Describe("Smoke test", func() {
 			deployment.Teardown()
 		}
 		if testcaseEnvInst != nil {
-			Expect(testcaseEnvInst.Teardown()).ToNot(HaveOccurred())
+			testcaseEnvInst.Teardown()
 		}
 	})
 
diff --git a/test/testenv/testenv.go b/test/testenv/testenv.go
index 7e4579ee2..2d14d61f5 100644
--- a/test/testenv/testenv.go
+++ b/test/testenv/testenv.go
@@ -20,9 +20,10 @@ import (
 	"fmt"
 	"net"
 	"os"
-	"sigs.k8s.io/controller-runtime/pkg/metrics/server"
 	"time"
 
+	"sigs.k8s.io/controller-runtime/pkg/metrics/server"
+
 	enterpriseApiV3 "github.com/splunk/splunk-operator/api/v3"
 	enterpriseApi "github.com/splunk/splunk-operator/api/v4"