diff --git a/.github/actions/set-cluster-name/action.yml b/.github/actions/set-cluster-name/action.yml
new file mode 100644
index 000000000..19339fd68
--- /dev/null
+++ b/.github/actions/set-cluster-name/action.yml
@@ -0,0 +1,50 @@
+name: 'Set EKS Test Cluster Name'
+description: 'Generate a shortened, standardized EKS test cluster name'
+inputs:
+  test-type:
+    description: 'Type of test (e.g., smoke, integration)'
+    required: true
+  platform:
+    description: 'Platform variant (e.g., distroless, arm-ubuntu, arm-rhel, arm-al2023, helm, namespace, nightly, manual, or empty for standard)'
+    required: false
+    default: ''
+  test-name:
+    description: 'Test name from matrix (e.g., basic, managerappframeworkc3)'
+    required: true
+  run-id:
+    description: 'GitHub run ID for uniqueness'
+    required: true
+outputs:
+  cluster-name:
+    description: 'The generated cluster name'
+    value: ${{ steps.generate-name.outputs.cluster_name }}
+runs:
+  using: "composite"
+  steps:
+    - name: Generate cluster name
+      id: generate-name
+      shell: bash
+      run: |
+        TEST_NAME="${{ inputs.test-name }}"
+        
+        # Shorten long test names
+        case "$TEST_NAME" in
+          managerappframeworkc3) TEST_NAME="mgr-appfw-c3" ;;
+          managerappframeworkm4) TEST_NAME="mgr-appfw-m4" ;;
+          appframeworksS1) TEST_NAME="appfw-s1" ;;
+          managersecret) TEST_NAME="mgr-secret" ;;
+          managermc) TEST_NAME="mgr-mc" ;;
+        esac
+        
+        # Build cluster name based on platform
+        if [ -z "${{ inputs.platform }}" ]; then
+          # Standard platform (no platform suffix)
+          CLUSTER_NAME="eks-test-${{ inputs.test-type }}-${TEST_NAME}-${{ inputs.run-id }}"
+        else
+          # Platform-specific
+          CLUSTER_NAME="eks-test-${{ inputs.test-type }}-${{ inputs.platform }}-${TEST_NAME}-${{ inputs.run-id }}"
+        fi
+        
+        echo "cluster_name=${CLUSTER_NAME}" >> $GITHUB_OUTPUT
+        echo "Generated cluster name: ${CLUSTER_NAME}"
+
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 9ac21142d..a826ab910 100644
--- a/.github/workflows/arm-AL2023-build-test-push-workflow-AL2023.yml
+++ b/.github/workflows/arm-AL2023-build-test-push-workflow-AL2023.yml
@@ -146,11 +146,19 @@ jobs:
       ARM64: "true"
       GRAVITON_TESTING: "true"
     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: Set Test Cluster Name
+        id: set-cluster-name
+        uses: ./.github/actions/set-cluster-name
+        with:
+          test-type: smoke
+          platform: arm-al2023
+          test-name: ${{ matrix.test }}
+          run-id: ${{ github.run_id }}
+      - name: Export cluster name to environment
+        run: |
+          echo "TEST_CLUSTER_NAME=${{ steps.set-cluster-name.outputs.cluster-name }}" >> $GITHUB_ENV
       - name: Dotenv Action
         id: dotenv
         uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359
diff --git a/.github/workflows/arm-AL2023-int-test-workflow.yml b/.github/workflows/arm-AL2023-int-test-workflow.yml
index 8a228fb8c..c762222e6 100644
--- a/.github/workflows/arm-AL2023-int-test-workflow.yml
+++ b/.github/workflows/arm-AL2023-int-test-workflow.yml
@@ -94,9 +94,6 @@ jobs:
       ARM64: "true"
       GRAVITON_TESTING: "true"
     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
@@ -105,6 +102,17 @@ jobs:
           fi
       - name: Checkcout code
         uses: actions/checkout@v2
+      - name: Set Test Cluster Name
+        id: set-cluster-name
+        uses: ./.github/actions/set-cluster-name
+        with:
+          test-type: integration
+          platform: arm-al2023
+          test-name: ${{ matrix.test }}
+          run-id: ${{ github.run_id }}
+      - name: Export cluster name to environment
+        run: |
+          echo "TEST_CLUSTER_NAME=${{ steps.set-cluster-name.outputs.cluster-name }}" >> $GITHUB_ENV
       - name: Dotenv Action
         id: dotenv
         uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359
diff --git a/.github/workflows/arm-RHEL-build-test-push-workflow.yml b/.github/workflows/arm-RHEL-build-test-push-workflow.yml
index dcc08f5ae..182f94229 100644
--- a/.github/workflows/arm-RHEL-build-test-push-workflow.yml
+++ b/.github/workflows/arm-RHEL-build-test-push-workflow.yml
@@ -1,4 +1,4 @@
-name: ARM RHEL Integration Test WorkFlow
+name: ARM RHEL Smoke Test WorkFlow
 permissions:
   contents: read
   packages: write
@@ -54,7 +54,7 @@ jobs:
         export BASE_IMAGE_VERSION=9.5
         export IMG=${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA
         make docker-buildx PLATFORMS=$PLATFORMS BASE_IMAGE=$BASE_IMAGE BASE_IMAGE_VERSION=$BASE_IMAGE_VERSION IMG=$IMG
-  int-tests-arm-rhel:
+  smoke-tests-arm-rhel:
     strategy:
       fail-fast: false
       matrix:
@@ -79,8 +79,8 @@ jobs:
       SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator
       SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator
       TEST_FOCUS: "${{ matrix.test }}"
-      # This regex matches any string not containing integration keyword
-      TEST_TO_SKIP: "^(?:[^i]+|i(?:$|[^n]|n(?:$|[^t]|t(?:$|[^e]|e(?:$|[^g]|g(?:$|[^r]|r(?:$|[^a]|a(?:$|[^t]|t(?:$|[^i]|i(?:$|[^o]|o(?:$|[^n])))))))))))*$"
+      # This regex matches any string not containing smoke keyword
+      TEST_TO_SKIP: "^(?:[^s]+|s(?:$|[^m]|m(?:$|[^o]|o(?:$|[^k]|k(?:$|[^e])))))*$"
       TEST_CLUSTER_PLATFORM: eks
       EKS_VPC_PRIVATE_SUBNET_STRING: ${{ secrets.EKS_VPC_PRIVATE_SUBNET_STRING }}
       EKS_VPC_PUBLIC_SUBNET_STRING: ${{ secrets.EKS_VPC_PUBLIC_SUBNET_STRING }}
@@ -94,9 +94,6 @@ jobs:
       ARM64: "true"
       GRAVITON_TESTING: "true"
     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
@@ -105,6 +102,17 @@ jobs:
           fi
       - name: Checkcout code
         uses: actions/checkout@v2
+      - name: Set Test Cluster Name
+        id: set-cluster-name
+        uses: ./.github/actions/set-cluster-name
+        with:
+          test-type: smoke
+          platform: arm-rhel
+          test-name: ${{ matrix.test }}
+          run-id: ${{ github.run_id }}
+      - name: Export cluster name to environment
+        run: |
+          echo "TEST_CLUSTER_NAME=${{ steps.set-cluster-name.outputs.cluster-name }}" >> $GITHUB_ENV
       - name: Dotenv Action
         id: dotenv
         uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359
@@ -180,7 +188,7 @@ jobs:
           sudo snap install kustomize
           mkdir -p ./bin
           cp /snap/bin/kustomize ./bin/kustomize
-      - name: Run Integration test
+      - name: Run smoke test
         run: |
           make int-test
       - name: Collect Test Logs
diff --git a/.github/workflows/arm-RHEL-int-test-workflow.yml b/.github/workflows/arm-RHEL-int-test-workflow.yml
index dcc08f5ae..88d02978f 100644
--- a/.github/workflows/arm-RHEL-int-test-workflow.yml
+++ b/.github/workflows/arm-RHEL-int-test-workflow.yml
@@ -94,9 +94,6 @@ jobs:
       ARM64: "true"
       GRAVITON_TESTING: "true"
     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
@@ -105,6 +102,17 @@ jobs:
           fi
       - name: Checkcout code
         uses: actions/checkout@v2
+      - name: Set Test Cluster Name
+        id: set-cluster-name
+        uses: ./.github/actions/set-cluster-name
+        with:
+          test-type: integration
+          platform: arm-rhel
+          test-name: ${{ matrix.test }}
+          run-id: ${{ github.run_id }}
+      - name: Export cluster name to environment
+        run: |
+          echo "TEST_CLUSTER_NAME=${{ steps.set-cluster-name.outputs.cluster-name }}" >> $GITHUB_ENV
       - name: Dotenv Action
         id: dotenv
         uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359
diff --git a/.github/workflows/arm-Ubuntu-build-test-push-workflow.yml b/.github/workflows/arm-Ubuntu-build-test-push-workflow.yml
index a16f17354..0319eea5b 100644
--- a/.github/workflows/arm-Ubuntu-build-test-push-workflow.yml
+++ b/.github/workflows/arm-Ubuntu-build-test-push-workflow.yml
@@ -146,11 +146,19 @@ jobs:
       ARM64: "true"
       GRAVITON_TESTING: "true"
     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: Set Test Cluster Name
+        id: set-cluster-name
+        uses: ./.github/actions/set-cluster-name
+        with:
+          test-type: smoke
+          platform: arm-ubuntu
+          test-name: ${{ matrix.test }}
+          run-id: ${{ github.run_id }}
+      - name: Export cluster name to environment
+        run: |
+          echo "TEST_CLUSTER_NAME=${{ steps.set-cluster-name.outputs.cluster-name }}" >> $GITHUB_ENV
       - name: Dotenv Action
         id: dotenv
         uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359
diff --git a/.github/workflows/arm-Ubuntu-int-test-workflow.yml b/.github/workflows/arm-Ubuntu-int-test-workflow.yml
index 1815f177f..954655422 100644
--- a/.github/workflows/arm-Ubuntu-int-test-workflow.yml
+++ b/.github/workflows/arm-Ubuntu-int-test-workflow.yml
@@ -94,9 +94,6 @@ jobs:
       ARM64: "true"
       GRAVITON_TESTING: "true"
     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
@@ -105,6 +102,17 @@ jobs:
           fi
       - name: Checkcout code
         uses: actions/checkout@v2
+      - name: Set Test Cluster Name
+        id: set-cluster-name
+        uses: ./.github/actions/set-cluster-name
+        with:
+          test-type: integration
+          platform: arm-ubuntu
+          test-name: ${{ matrix.test }}
+          run-id: ${{ github.run_id }}
+      - name: Export cluster name to environment
+        run: |
+          echo "TEST_CLUSTER_NAME=${{ steps.set-cluster-name.outputs.cluster-name }}" >> $GITHUB_ENV
       - name: Dotenv Action
         id: dotenv
         uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359
diff --git a/.github/workflows/build-test-push-workflow.yml b/.github/workflows/build-test-push-workflow.yml
index 5776eb081..bc876543f 100644
--- a/.github/workflows/build-test-push-workflow.yml
+++ b/.github/workflows/build-test-push-workflow.yml
@@ -190,11 +190,18 @@ jobs:
       CLUSTER_WIDE: "true"
       DEPLOYMENT_TYPE: ""
     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: Set Test Cluster Name
+        id: set-cluster-name
+        uses: ./.github/actions/set-cluster-name
+        with:
+          test-type: smoke
+          test-name: ${{ matrix.test }}
+          run-id: ${{ github.run_id }}
+      - name: Export cluster name to environment
+        run: |
+          echo "TEST_CLUSTER_NAME=${{ steps.set-cluster-name.outputs.cluster-name }}" >> $GITHUB_ENV
       - name: Dotenv Action
         id: dotenv
         uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359
diff --git a/.github/workflows/distroless-build-test-push-workflow.yml b/.github/workflows/distroless-build-test-push-workflow.yml
index 789196b02..870ace4c6 100644
--- a/.github/workflows/distroless-build-test-push-workflow.yml
+++ b/.github/workflows/distroless-build-test-push-workflow.yml
@@ -191,11 +191,19 @@ jobs:
       CLUSTER_WIDE: "true"
       DEPLOYMENT_TYPE: ""
     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: Set Test Cluster Name
+        id: set-cluster-name
+        uses: ./.github/actions/set-cluster-name
+        with:
+          test-type: smoke
+          platform: distroless
+          test-name: ${{ matrix.test }}
+          run-id: ${{ github.run_id }}
+      - name: Export cluster name to environment
+        run: |
+          echo "TEST_CLUSTER_NAME=${{ steps.set-cluster-name.outputs.cluster-name }}" >> $GITHUB_ENV
       - name: Dotenv Action
         id: dotenv
         uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359
diff --git a/.github/workflows/distroless-int-test-workflow.yml b/.github/workflows/distroless-int-test-workflow.yml
index e234eb3d7..fb6c9f805 100644
--- a/.github/workflows/distroless-int-test-workflow.yml
+++ b/.github/workflows/distroless-int-test-workflow.yml
@@ -88,9 +88,6 @@ jobs:
       CLUSTER_WIDE: "true"
       DEPLOYMENT_TYPE: ""
     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
@@ -99,6 +96,17 @@ jobs:
           fi
       - name: Checkcout code
         uses: actions/checkout@v2
+      - name: Set Test Cluster Name
+        id: set-cluster-name
+        uses: ./.github/actions/set-cluster-name
+        with:
+          test-type: integration
+          platform: distroless
+          test-name: ${{ matrix.test }}
+          run-id: ${{ github.run_id }}
+      - name: Export cluster name to environment
+        run: |
+          echo "TEST_CLUSTER_NAME=${{ steps.set-cluster-name.outputs.cluster-name }}" >> $GITHUB_ENV
       - name: Dotenv Action
         id: dotenv
         uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359
diff --git a/.github/workflows/helm-test-workflow.yml b/.github/workflows/helm-test-workflow.yml
index 16fa24988..b26969a11 100644
--- a/.github/workflows/helm-test-workflow.yml
+++ b/.github/workflows/helm-test-workflow.yml
@@ -46,8 +46,6 @@ jobs:
       run: |
         make docker-buildx IMG=${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA
   int-tests:
-    strategy:
-      fail-fast: false
     runs-on: ubuntu-latest
     needs: build-operator-image
     env:
@@ -72,9 +70,6 @@ jobs:
       - 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
@@ -83,6 +78,17 @@ jobs:
           fi
       - name: Chekcout code
         uses: actions/checkout@v2
+      - name: Set Test Cluster Name
+        id: set-cluster-name
+        uses: ./.github/actions/set-cluster-name
+        with:
+          test-type: integration
+          platform: helm
+          test-name: ${{ matrix.test }}
+          run-id: ${{ github.run_id }}
+      - name: Export cluster name to environment
+        run: |
+          echo "TEST_CLUSTER_NAME=${{ steps.set-cluster-name.outputs.cluster-name }}" >> $GITHUB_ENV
       - name: Dotenv Action
         id: dotenv
         uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359
diff --git a/.github/workflows/int-test-azure-workflow.yml b/.github/workflows/int-test-azure-workflow.yml
index c8fccb5e2..da27d8599 100644
--- a/.github/workflows/int-test-azure-workflow.yml
+++ b/.github/workflows/int-test-azure-workflow.yml
@@ -100,8 +100,6 @@ jobs:
         inlineScript: |
           az aks update -n ${{ env.TEST_CLUSTER_NAME }} -g ${{ secrets.AZURE_RESOURCE_GROUP_NAME }} --attach-acr ${{ secrets.AZURE_CONTAINER_REGISTRY }}
   int-tests-appframeworkazure:
-    strategy:
-      fail-fast: false
     runs-on: ubuntu-latest
     needs: setup-aks-cluster
     env:
diff --git a/.github/workflows/int-test-gcp-workflow.yml b/.github/workflows/int-test-gcp-workflow.yml
index 7b7d6afef..b6b4687af 100644
--- a/.github/workflows/int-test-gcp-workflow.yml
+++ b/.github/workflows/int-test-gcp-workflow.yml
@@ -87,7 +87,8 @@ jobs:
       SPLUNK_ENTERPRISE_RELEASE_IMAGE: ${{ secrets.SPLUNK_ENTERPRISE_RELEASE_IMAGE }}
       SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator
       SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator
-      TEST_TO_SKIP:  "^(?:[^s]+|s(?:$|[^m]|m(?:$|[^o]|o(?:$|[^k]|k(?:$|[^e])))))*$"
+      # This regex matches any string not containing integration keyword
+      TEST_TO_SKIP: "^(?:[^i]+|i(?:$|[^n]|n(?:$|[^t]|t(?:$|[^e]|e(?:$|[^g]|g(?:$|[^r]|r(?:$|[^a]|a(?:$|[^t]|t(?:$|[^i]|i(?:$|[^o]|o(?:$|[^n])))))))))))*$"
       TEST_BUCKET: ${{ secrets.TEST_BUCKET }}
       TEST_S3_BUCKET: ${{ secrets.TEST_BUCKET }}
       TEST_INDEXES_S3_BUCKET: ${{ secrets.TEST_INDEXES_S3_BUCKET }}
diff --git a/.github/workflows/int-test-workflow.yml b/.github/workflows/int-test-workflow.yml
index 6d2b9f6cc..52960e7f8 100644
--- a/.github/workflows/int-test-workflow.yml
+++ b/.github/workflows/int-test-workflow.yml
@@ -84,9 +84,6 @@ jobs:
       CLUSTER_WIDE: "true"
       DEPLOYMENT_TYPE: ""
     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
@@ -95,6 +92,16 @@ jobs:
           fi
       - name: Checkcout code
         uses: actions/checkout@v2
+      - name: Set Test Cluster Name
+        id: set-cluster-name
+        uses: ./.github/actions/set-cluster-name
+        with:
+          test-type: integration
+          test-name: ${{ matrix.test }}
+          run-id: ${{ github.run_id }}
+      - name: Export cluster name to environment
+        run: |
+          echo "TEST_CLUSTER_NAME=${{ steps.set-cluster-name.outputs.cluster-name }}" >> $GITHUB_ENV
       - name: Dotenv Action
         id: dotenv
         uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359
diff --git a/.github/workflows/manual-int-test-workflow.yml b/.github/workflows/manual-int-test-workflow.yml
index 91e818d80..fd66257ac 100644
--- a/.github/workflows/manual-int-test-workflow.yml
+++ b/.github/workflows/manual-int-test-workflow.yml
@@ -45,9 +45,6 @@ jobs:
       S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
       CLUSTER_WIDE: ${{ github.event.inputs.CLUSTER_WIDE }}
     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
@@ -56,6 +53,17 @@ jobs:
           fi
       - name: Checkout code
         uses: actions/checkout@v2
+      - name: Set Test Cluster Name
+        id: set-cluster-name
+        uses: ./.github/actions/set-cluster-name
+        with:
+          test-type: integration
+          platform: manual
+          test-name: ${{ matrix.test }}
+          run-id: ${{ github.run_id }}
+      - name: Export cluster name to environment
+        run: |
+          echo "TEST_CLUSTER_NAME=${{ steps.set-cluster-name.outputs.cluster-name }}" >> $GITHUB_ENV
       - name: Dotenv Action
         id: dotenv
         uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359
diff --git a/.github/workflows/namespace-scope-int-workflow.yml b/.github/workflows/namespace-scope-int-workflow.yml
index 646c662c6..5a8185277 100644
--- a/.github/workflows/namespace-scope-int-workflow.yml
+++ b/.github/workflows/namespace-scope-int-workflow.yml
@@ -40,9 +40,6 @@ jobs:
       S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
       CLUSTER_WIDE: "false"
     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
@@ -53,6 +50,17 @@ jobs:
         uses: actions/checkout@v2
         with:
           ref: develop
+      - name: Set Test Cluster Name
+        id: set-cluster-name
+        uses: ./.github/actions/set-cluster-name
+        with:
+          test-type: integration
+          platform: namespace
+          test-name: ${{ matrix.test }}
+          run-id: ${{ github.run_id }}
+      - name: Export cluster name to environment
+        run: |
+          echo "TEST_CLUSTER_NAME=${{ steps.set-cluster-name.outputs.cluster-name }}" >> $GITHUB_ENV
       - name: Dotenv Action
         id: dotenv
         uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359
diff --git a/.github/workflows/nightly-int-test-workflow.yml b/.github/workflows/nightly-int-test-workflow.yml
index 811e75904..4b67bd375 100644
--- a/.github/workflows/nightly-int-test-workflow.yml
+++ b/.github/workflows/nightly-int-test-workflow.yml
@@ -81,9 +81,6 @@ jobs:
       S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
       CLUSTER_WIDE: "true"
     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
@@ -93,6 +90,17 @@ jobs:
       - uses: actions/checkout@v2
         with:
           ref: develop
+      - name: Set Test Cluster Name
+        id: set-cluster-name
+        uses: ./.github/actions/set-cluster-name
+        with:
+          test-type: integration
+          platform: nightly
+          test-name: ${{ matrix.test }}
+          run-id: ${{ github.run_id }}
+      - name: Export cluster name to environment
+        run: |
+          echo "TEST_CLUSTER_NAME=${{ steps.set-cluster-name.outputs.cluster-name }}" >> $GITHUB_ENV
       - name: Dotenv Action
         id: dotenv
         uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359
diff --git a/Makefile b/Makefile
index 15cbc192c..dbe4226d4 100644
--- a/Makefile
+++ b/Makefile
@@ -143,7 +143,7 @@ test: manifests generate fmt vet envtest ## Run tests.
 
 docs-preview: ## Preview documentation locally with Jekyll (requires Ruby and bundler)
 	@echo "Installing dependencies locally..."
-	@cd docs && bundle config set --local path 'vendor/bundle' && bundle config set --local deployment 'false' && bundle install
+	@cd docs && bundle install --path vendor/bundle
 	@echo "Starting Jekyll server for documentation preview..."
 	@cd docs && bundle exec jekyll serve --livereload
 	@echo "Documentation available at http://localhost:4000/splunk-operator"
diff --git a/test/trigger-tests.sh b/test/trigger-tests.sh
index d778db88b..dc967546d 100644
--- a/test/trigger-tests.sh
+++ b/test/trigger-tests.sh
@@ -146,5 +146,5 @@ fi
 echo "Skipping following test :: ${TEST_TO_SKIP}"
 
 # Running only smoke test cases by default or value passed through TEST_FOCUS env variable. To run different test packages add/remove path from focus argument or TEST_FOCUS variable
-echo "ginkgo --junit-report=inttest.xml -vv --keep-going --trace -r --timeout=7h  -nodes=${CLUSTER_NODES} --focus="${TEST_TO_RUN}" --skip="${TEST_TO_SKIP}" --output-interceptor-mode=none --cover ${topdir}/test/ -- -commit-hash=${COMMIT_HASH} -operator-image=${PRIVATE_SPLUNK_OPERATOR_IMAGE}  -splunk-image=${PRIVATE_SPLUNK_ENTERPRISE_IMAGE} -cluster-wide=${CLUSTER_WIDE}"
-ginkgo --junit-report=inttest-junit.xml --output-dir=`pwd` -vv --keep-going --trace -r --timeout=7h  -nodes=${CLUSTER_NODES} --focus="${TEST_TO_RUN}" --skip="${TEST_TO_SKIP}" --output-interceptor-mode=none --cover ${topdir}/test/ -- -commit-hash=${COMMIT_HASH} -operator-image=${PRIVATE_SPLUNK_OPERATOR_IMAGE}  -splunk-image=${PRIVATE_SPLUNK_ENTERPRISE_IMAGE} -cluster-wide=${CLUSTER_WIDE}
\ No newline at end of file
+echo "ginkgo --junit-report=inttest.xml -v --keep-going --trace -r --timeout=7h  -nodes=${CLUSTER_NODES} --focus="${TEST_TO_RUN}" --skip="${TEST_TO_SKIP}" --output-interceptor-mode=none --cover ${topdir}/test/ -- -commit-hash=${COMMIT_HASH} -operator-image=${PRIVATE_SPLUNK_OPERATOR_IMAGE}  -splunk-image=${PRIVATE_SPLUNK_ENTERPRISE_IMAGE} -cluster-wide=${CLUSTER_WIDE}"
+ginkgo --junit-report=inttest-junit.xml --output-dir=`pwd` -v --keep-going --trace -r --timeout=7h  -nodes=${CLUSTER_NODES} --focus="${TEST_TO_RUN}" --skip="${TEST_TO_SKIP}" --output-interceptor-mode=none --cover ${topdir}/test/ -- -commit-hash=${COMMIT_HASH} -operator-image=${PRIVATE_SPLUNK_OPERATOR_IMAGE}  -splunk-image=${PRIVATE_SPLUNK_ENTERPRISE_IMAGE} -cluster-wide=${CLUSTER_WIDE}
\ No newline at end of file