diff --git a/.github/actions/bbsim-tests/README.md b/.github/actions/bbsim-tests/README.md
index 4731187..88867a3 100644
--- a/.github/actions/bbsim-tests/README.md
+++ b/.github/actions/bbsim-tests/README.md
@@ -29,8 +29,6 @@
 
 - **`gerrit-project`**: Gerrit project name if building a patch (default: `""`)
 - **`gerrit-refspec`**: Gerrit refspec if building a patch (default: `""`)
-- **`voltha-system-tests-change`**: Gerrit change number for voltha-system-tests (default: `""`)
-- **`voltha-helm-charts-change`**: Gerrit change number for voltha-helm-charts (default: `""`)
 - **`extra-helm-flags`**: Additional Helm flags for deployment (default: `""`)
 - **`log-level`**: Log level for VOLTHA components: DEBUG, INFO, WARN, ERROR (default: `"WARN"`)
 - **`timeout`**: Timeout in minutes for the entire action (default: `"240"`)
@@ -217,34 +215,6 @@
               vgcEnabled: false
 ```
 
-### Testing with voltha-system-tests Changes
-
-```yaml
-name: Test System Tests Changes
-
-on:
-  pull_request:
-    paths:
-      - 'tests/**'
-
-jobs:
-  test-changes:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Run BBSim Tests
-        uses: opencord/shared-workflows/.github/actions/bbsim-tests@master
-        with:
-          branch: master
-          voltha-system-tests-change: "refs/changes/12/34512/1"
-          test-targets: |
-            - target: functional-single-kind-dt
-              workflow: dt
-              flags: ""
-              teardown: true
-              logging: true
-              vgcEnabled: false
-```
-
 ## How It Works
 
 This action is implemented as a **composite action** with all logic embedded directly in the `action.yaml` file. When called from an external repository:
@@ -366,8 +336,6 @@
 | `testTargets` | `test-targets` |
 | `gerritProject` | `gerrit-project` |
 | `gerritRefspec` | `gerrit-refspec` |
-| `volthaSystemTestsChange` | `voltha-system-tests-change` |
-| `volthaHelmChartsChange` | `voltha-helm-charts-change` |
 | `extraHelmFlags` | `extra-helm-flags` |
 | `logLevel` | `log-level` |
 | `timeout` | `timeout` |
diff --git a/.github/actions/bbsim-tests/action.yaml b/.github/actions/bbsim-tests/action.yaml
index 72803ac..cc5e546 100644
--- a/.github/actions/bbsim-tests/action.yaml
+++ b/.github/actions/bbsim-tests/action.yaml
@@ -9,75 +9,52 @@
   branch:
     description: "Branch to test (master, voltha-2.15, etc.)"
     required: true
-    type: string
   test-targets:
     description: "YAML string defining test targets to run"
     required: true
-    type: string
   gerrit-project:
     description: "Gerrit project name if building a patch"
     required: false
-    type: string
     default: ""
   gerrit-refspec:
     description: "Gerrit refspec if building a patch"
     required: false
-    type: string
-    default: ""
-  voltha-system-tests-change:
-    description: "Gerrit change number for voltha-system-tests"
-    required: false
-    type: string
-    default: ""
-  voltha-helm-charts-change:
-    description: "Gerrit change number for voltha-helm-charts"
-    required: false
-    type: string
     default: ""
   extra-helm-flags:
     description: "Additional Helm flags for deployment"
     required: false
-    type: string
     default: ""
   log-level:
     description: "Log level for VOLTHA components (DEBUG, INFO, WARN, ERROR)"
     required: false
-    type: string
     default: "WARN"
   timeout:
     description: "Timeout in minutes for the entire action"
     required: false
-    type: string
     default: "240"
   cluster-name:
     description: "Name of the kind cluster"
     required: false
-    type: string
     default: "kind-ci"
   docker-registry:
     description: "Docker registry to use"
     required: false
-    type: string
     default: "linuxfoundation.jfrog.io/voltha-docker"
   olts:
     description: "Number of OLTs to simulate"
     required: false
-    type: string
     default: "1"
   with-monitoring:
     description: "Enable monitoring with prometheus"
     required: false
-    type: boolean
-    default: false
+    default: "false"
   enable-mac-learning:
     description: "Enable MAC learning in VOLTHA"
     required: false
-    type: boolean
-    default: false
+    default: "false"
   extra-robot-args:
     description: "Additional arguments for Robot Framework"
     required: false
-    type: string
     default: ""
 
 outputs:
@@ -205,16 +182,6 @@
         ref: ${{ inputs.branch }}
         path: voltha-system-tests
 
-    - name: Apply voltha-system-tests patch
-      if: inputs.voltha-system-tests-change != ''
-      shell: bash
-      working-directory: voltha-system-tests
-      run: |
-        echo "Applying voltha-system-tests change ${{ inputs.voltha-system-tests-change }}"
-        git fetch https://gerrit.lfbroadband.org/voltha-system-tests \
-          refs/changes/${{ inputs.voltha-system-tests-change }}
-        git checkout FETCH_HEAD
-
     - name: Checkout voltha-helm-charts
       uses: actions/checkout@v4
       with:
@@ -222,16 +189,6 @@
         ref: ${{ inputs.branch }}
         path: voltha-helm-charts
 
-    - name: Apply voltha-helm-charts patch
-      if: inputs.voltha-helm-charts-change != ''
-      shell: bash
-      working-directory: voltha-helm-charts
-      run: |
-        echo "Applying voltha-helm-charts change ${{ inputs.voltha-helm-charts-change }}"
-        git fetch https://gerrit.lfbroadband.org/voltha-helm-charts \
-          refs/changes/${{ inputs.voltha-helm-charts-change }}
-        git checkout FETCH_HEAD
-
     # -----------------------------------------------------------------------
     # Checkout and build gerrit project if specified
     # -----------------------------------------------------------------------
diff --git a/.github/workflows/sanity-test.yaml b/.github/workflows/sanity-test.yaml
new file mode 100644
index 0000000..3d27981
--- /dev/null
+++ b/.github/workflows/sanity-test.yaml
@@ -0,0 +1,169 @@
+---
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-FileCopyrightText: 2026 The Linux Foundation
+name: Sanity Test
+
+# yamllint disable-line rule:truthy
+on:
+  workflow_call:
+    inputs:
+      GERRIT_BRANCH:
+        description: "Branch that change is against"
+        required: true
+        type: string
+      GERRIT_PROJECT:
+        description: "Project in Gerrit"
+        required: true
+        type: string
+      GERRIT_REFSPEC:
+        description: "Gerrit refspec of change"
+        required: true
+        type: string
+      EC2_INSTANCE_TYPE:
+        description: "EC2 instance type"
+        required: false
+        type: string
+        default: "t2.xlarge"
+      TEST_TARGETS:
+        description: "List of test targets"
+        required: false
+        type: string
+        default: |
+          - target: sanity-kind-att
+            workflow: att
+            flags: ""
+            teardown: true
+            logging: true
+          - target: sanity-kind-dt
+            workflow: dt
+            flags: ""
+            teardown: true
+            logging: true
+          - target: sanity-kind-tt
+            workflow: tt
+            flags: ""
+            teardown: true
+            logging: true
+      EXTRA_HELM_FLAGS:
+        description: "Additional Helm flags for deployment"
+        required: false
+        type: string
+        default: ""
+      LOG_LEVEL:
+        description: "Log level for VOLTHA components (DEBUG, INFO, WARN, ERROR)"
+        required: false
+        type: string
+        default: "INFO"
+      TIMEOUT:
+        description: "Timeout in minutes for the entire action"
+        required: false
+        type: string
+        default: "240"
+      OLTS:
+        description: "Number of OLTs to simulate"
+        required: false
+        type: string
+        default: "1"
+      WITH_MONITORING:
+        description: "Enable monitoring with prometheus"
+        required: false
+        type: string
+        default: "false"
+      ENABLE_MAC_LEARNING:
+        description: "Enable MAC learning in VOLTHA"
+        required: false
+        type: string
+        default: "false"
+      EXTRA_ROBOT_ARGS:
+        description: "Additional arguments for Robot Framework"
+        required: false
+        type: string
+        default: ""
+    secrets:
+      GERRIT_SSH_PRIVKEY:
+        description: "SSH Key for the authorized user account"
+        required: true
+      AWS_ACCESS_KEY_ID:
+        description: "AWS access key ID"
+        required: true
+      AWS_SECRET_ACCESS_KEY:
+        description: "AWS secret access key"
+        required: true
+      EC2_IMAGE_ID:
+        description: "EC2 image ID"
+        required: true
+      EC2_SUBNET_ID:
+        description: "EC2 subnet ID"
+        required: true
+      EC2_SG_ID:
+        description: "EC2 security group ID"
+        required: true
+      GH_TO_AWS_KEY:
+        description: "GitHub to AWS key"
+        required: true
+
+jobs:
+  start-runner:
+    name: Start self-hosted EC2 runner
+    runs-on: ubuntu-latest
+    outputs:
+      label: ${{ steps.start-ec2-runner.outputs.label }}
+      ec2-instance-id: ${{ steps.start-ec2-runner.outputs.ec2-instance-id }}
+    steps:
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ vars.AWS_REGION }}
+      - name: Start EC2 runner
+        id: start-ec2-runner
+        uses: machulav/ec2-github-runner@v2
+        with:
+          mode: start
+          github-token: ${{ secrets.GH_TO_AWS_KEY }}
+          ec2-image-id: ${{ secrets.EC2_IMAGE_ID }}
+          ec2-instance-type: ${{ inputs.EC2_INSTANCE_TYPE }}
+          subnet-id: ${{ secrets.EC2_SUBNET_ID }}
+          security-group-id: ${{ secrets.EC2_SG_ID }}
+
+  sanity-tests:
+    needs: start-runner
+    runs-on: ${{ needs.start-runner.outputs.label }}
+    steps:
+      - name: Run Sanity Tests
+        uses: opencord/shared-workflows/.github/actions/bbsim-tests@main
+        with:
+          branch: ${{ inputs.GERRIT_BRANCH }}
+          test-targets: ${{ inputs.TEST_TARGETS }}
+          gerrit-project: ${{ inputs.GERRIT_PROJECT }}
+          gerrit-refspec: ${{ inputs.GERRIT_REFSPEC }}
+          extra-helm-flags: ${{ inputs.EXTRA_HELM_FLAGS }}
+          log-level: ${{ inputs.LOG_LEVEL }}
+          timeout: ${{ inputs.TIMEOUT }}
+          olts: ${{ inputs.OLTS }}
+          with-monitoring: ${{ inputs.WITH_MONITORING }}
+          enable-mac-learning: ${{ inputs.ENABLE_MAC_LEARNING }}
+          extra-robot-args: ${{ inputs.EXTRA_ROBOT_ARGS }}
+
+  stop-runner:
+    name: Stop self-hosted EC2 runner
+    needs:
+      - start-runner # required to get output from the start-runner job
+      - sanity-tests
+    runs-on: ubuntu-latest
+    if: ${{ always() }} # required to stop the runner even if the error happened in the previous jobs
+    steps:
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ vars.AWS_REGION }}
+      - name: Stop EC2 runner
+        uses: machulav/ec2-github-runner@v2
+        with:
+          mode: stop
+          github-token: ${{ secrets.GH_TO_AWS_KEY }}
+          label: ${{ needs.start-runner.outputs.label }}
+          ec2-instance-id: ${{ needs.start-runner.outputs.ec2-instance-id }}