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
     # -----------------------------------------------------------------------