diff --git a/.github/workflows/quali.yml b/.github/workflows/quali.yml
index 5f27a78af..a881adb2e 100644
--- a/.github/workflows/quali.yml
+++ b/.github/workflows/quali.yml
@@ -22,7 +22,7 @@ on:
         description: "revision of the Open Wifi Helm chart"
       ap_models:
         required: true
-        default: "edgecore_eap102_1,hfcl_ion4xe,edgecore_eap101,tp-link_ec420-g1,edgecore_ecw5211,cig_wf188n,edgecore_eap102_2,cig_wf194c,hfcl_ion4,indio_um-305ac,hfcl_ion4xi,udaya_a5-id2"
+        default: "hfcl_ion4xe,edgecore_eap101,tp-link_ec420-g1,edgecore_ecw5211,cig_wf188n,edgecore_eap102,cig_wf194c,hfcl_ion4,indio_um-305ac,hfcl_ion4xi,udaya_a5-id2"
         description: "the AP models to test"
       ap_version:
         required: true
@@ -59,7 +59,7 @@ jobs:
           echo ::set-output name=marker_expression::$(echo "${{ github.event.inputs.marker_expression || 'uc_sanity' }}")
           echo ::set-output name=existing_controller::$(echo "${{ github.event.inputs.existing_controller || 'qa01' }}")
 
-          AP_MODELS="${{ github.event.inputs.ap_models || 'edgecore_eap102_1,hfcl_ion4xe,edgecore_eap101,tp-link_ec420-g1,edgecore_ecw5211,cig_wf188n,edgecore_eap102_2,cig_wf194c,hfcl_ion4,indio_um-305ac,hfcl_ion4xi,udaya_a5-id2' }}"
+          AP_MODELS="${{ github.event.inputs.ap_models || 'hfcl_ion4xe,edgecore_eap101,tp-link_ec420-g1,edgecore_ecw5211,cig_wf188n,edgecore_eap102,cig_wf194c,hfcl_ion4,indio_um-305ac,hfcl_ion4xi,udaya_a5-id2' }}"
           AP_MODELS=$(echo $AP_MODELS | sed "s/,/\",\"/g" | sed 's/^/[\"/g' | sed 's/$/\"]/g')
           echo "::set-output name=ap_models::${AP_MODELS}"
 
@@ -76,129 +76,8 @@ jobs:
           registry_password: ${{ secrets.DOCKER_USER_PASSWORD }}
 
   # Run tests on APs
-  test-edgecore-eap102-1:
-    needs: [ "vars", "build" ]
-    runs-on: ubuntu-latest
-    if: "!cancelled() && contains(fromJSON(needs.vars.outputs.ap_models), 'edgecore_eap102_1')"
-    env:
-      CLOUDSHELL_URL: quali-cloudshell.lab.wlan.tip.build
-      CLOUDSHELL_USER: ${{ secrets.CLOUDSHELL_USER }}
-      CLOUDSHELL_PASSWORD: ${{ secrets.CLOUDSHELL_PASSWORD }}
-      AP_MODEL: edgecore_eap102_1
-    steps:
-      - name: Set AP model output
-        id: ap_model
-        run: |
-          echo "::set-output name=model::${AP_MODEL}"
-
-      - uses: actions/checkout@v2
-      - name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: "3.8"
-
-      - name: install dependencies
-        run: pip install -r .quali/requirements.txt
-
-      - name: start reservation
-        run: |
-          if [ ${{ needs.vars.outputs.existing_controller }} != '' ]
-          then
-            python .quali/start_reservation.py --global-inputs '{"Chart Version":"${{ needs.vars.outputs.openwifi_revision }}","AP Model":"${{ steps.ap_model.outputs.model }}","Optional Existing SDK Namespace":"${{ needs.vars.outputs.existing_controller }}"}' "Basic Lab"
-          else
-            python .quali/start_reservation.py --global-inputs '{"Chart Version":"${{ needs.vars.outputs.openwifi_revision }}","AP Model":"${{ steps.ap_model.outputs.model }}"}' "Basic Lab"
-          fi
-
-      - name: set reservation outputs
-        if: always()
-        id: reservation
-        run: |
-          echo ::set-output name=identifier::"$(cat ./reservation_id.txt)"
-          if [ ${{ needs.vars.outputs.existing_controller }} != '' ]
-          then
-            echo ::set-output name=namespace::"${{ needs.vars.outputs.existing_controller }}"
-          else
-            echo ::set-output name=namespace::"$(cat ./reservation_id.txt | cut -d "-" -f 1)"
-          fi
-
-      # TODO WIFI-7839 delete when issue is resolved on AWS CLI side
-      - name: install kubectl
-        run: |
-          curl -LO "https://dl.k8s.io/release/v1.23.6/bin/linux/amd64/kubectl"
-          sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
-
-      - name: get EKS access credentials
-        run: aws eks update-kubeconfig --name ${{ env.AWS_EKS_NAME }}
-
-      - name: prepare namespace name
-        id: namespace
-        run: |
-          NAMESPACE="testing-${{ github.run_id }}-$(echo ${{ steps.ap_model.outputs.model }} | tr '[:upper:]' '[:lower:]' | tr '_' '-')"
-          echo "::set-output name=name::${NAMESPACE}"
-
-      - name: prepare configuration
-        run: |
-          cat << EOF > lab_info.json
-          ${{ secrets.LAB_CONFIGURATION_JSON }}
-          EOF
-          
-          DYN_CONFIG="$(python .quali/get_configuration.py --json ${{ steps.reservation.outputs.identifier }})"
-          jq ".CONFIGURATION.basic=$DYN_CONFIG" lab_info.json > lab_info.json.tmp && mv lab_info.json.tmp lab_info.json
-          
-          # overwrite configuration value from Quali
-          if [ ${{ needs.vars.outputs.existing_controller }} != '' ]
-          then
-            jq '.CONFIGURATION.basic.controller.url="https://sec-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build:16001"' lab_info.json > lab_info.json.tmp && mv lab_info.json.tmp lab_info.json
-          fi
-
-      - name: run tests
-        uses: ./.github/actions/run-tests
-        with:
-          namespace: ${{ steps.namespace.outputs.name }}
-          testbed: basic
-          marker_expression: "${{ needs.vars.outputs.marker_expression }}"
-          configuration_file: "./lab_info.json"
-          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
-          additional_args: '-o firmware="${{ needs.vars.outputs.ap_version }}"'
-          allure_results_artifact_name: "allure-results-${{ steps.ap_model.outputs.model }}"
-          dns_records_to_resolve: "sec-${{ steps.reservation.outputs.namespace }}.cicd.lab.wlan.tip.build gw-${{ steps.reservation.outputs.namespace }}.cicd.lab.wlan.tip.build fms-${{ steps.reservation.outputs.namespace }}.cicd.lab.wlan.tip.build"
-
-        # necessary because if conditionals in composite actions are currently not respected
-      - name: delete namespace
-        if: always()
-        continue-on-error: true
-        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}
-
-      - name: show gw logs
-        if: failure()
-        run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owgw
-
-      - name: show fms logs
-        if: failure()
-        run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owfms
-
-      - name: show prov logs
-        if: failure()
-        run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owprov
-
-      - name: show analytics logs
-        if: failure()
-        run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owanalytics
-
-      - name: show subscription (userportal) logs
-        if: failure()
-        run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owsub
-
-      - name: show sec logs
-        if: failure()
-        run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owsec
-
-      - name: stop reservation
-        if: always()
-        run: python .quali/stop_reservation.py ${{ steps.reservation.outputs.identifier }}
-
   test-hfcl-ion4xe:
-    needs: ["vars", "build", "test-edgecore-eap102-2"]
+    needs: ["vars", "build", "test-edgecore-eap102"]
     runs-on: ubuntu-latest
     if: "!cancelled() && contains(fromJSON(needs.vars.outputs.ap_models), 'hfcl_ion4xe')"
     env:
@@ -802,15 +681,15 @@ jobs:
         if: always()
         run: python .quali/stop_reservation.py ${{ steps.reservation.outputs.identifier }}
 
-  test-edgecore-eap102-2:
+  test-edgecore-eap102:
     needs: ["vars", "build"]
     runs-on: ubuntu-latest
-    if: "!cancelled() && contains(fromJSON(needs.vars.outputs.ap_models), 'edgecore_eap102_2')"
+    if: "!cancelled() && contains(fromJSON(needs.vars.outputs.ap_models), 'edgecore_eap102')"
     env:
       CLOUDSHELL_URL: quali-cloudshell.lab.wlan.tip.build
       CLOUDSHELL_USER: ${{ secrets.CLOUDSHELL_USER }}
       CLOUDSHELL_PASSWORD: ${{ secrets.CLOUDSHELL_PASSWORD }}
-      AP_MODEL: edgecore_eap102_2
+      AP_MODEL: edgecore_eap102
     steps:
       - name: Set AP model output
         id: ap_model
@@ -1534,7 +1413,7 @@ jobs:
   report:
     if: "!cancelled()"
     runs-on: ubuntu-latest
-    needs: [vars, test-edgecore-eap102-1, test-hfcl-ion4xe, test-edgecore-eap101, test-tp-link-ec420-g1, test-edgecore-ecw5211, test-cig-wf188n, test-edgecore-eap102-2, test-cig-wf194c, test-hfcl-ion4, test-indio-um-305ac, test-hfcl-ion4xi, test-udaya-a5-id2]
+    needs: [vars, test-hfcl-ion4xe, test-edgecore-eap101, test-tp-link-ec420-g1, test-edgecore-ecw5211, test-cig-wf188n, test-edgecore-eap102, test-cig-wf194c, test-hfcl-ion4, test-indio-um-305ac, test-hfcl-ion4xi, test-udaya-a5-id2]
     strategy:
       fail-fast: false
       matrix:
@@ -1585,7 +1464,7 @@ jobs:
 
   # Cleanup
   cleanup:
-    needs: [test-edgecore-eap102-1, test-hfcl-ion4xe, test-edgecore-eap101, test-tp-link-ec420-g1, test-edgecore-ecw5211, test-cig-wf188n, test-edgecore-eap102-2, test-cig-wf194c, test-hfcl-ion4, test-indio-um-305ac, test-hfcl-ion4xi, test-udaya-a5-id2]
+    needs: [test-hfcl-ion4xe, test-edgecore-eap101, test-tp-link-ec420-g1, test-edgecore-ecw5211, test-cig-wf188n, test-edgecore-eap102, test-cig-wf194c, test-hfcl-ion4, test-indio-um-305ac, test-hfcl-ion4xi, test-udaya-a5-id2]
     runs-on: ubuntu-latest
     if: always()
     steps: