diff --git a/.github/workflows/cloud-controller-build.yaml b/.github/workflows/cloud-controller-build.yaml
index bc300a61e..e8dc2c2b1 100644
--- a/.github/workflows/cloud-controller-build.yaml
+++ b/.github/workflows/cloud-controller-build.yaml
@@ -17,17 +17,13 @@ env:
 
   # https://stackoverflow.com/questions/59977364/github-actions-how-use-strategy-matrix-with-script
   testbeds: '[
-    {
-      "number": "ext-03",
-      "version": "1.1.0"
-    },
     {
       "number": "01",
-      "version": "1.1.0"
+      "version": "1.2.0-RC1"
     },
     {
       "number": "02",
-      "version": "1.1.0"
+      "version": "1.2.0-RC1"
     }
   ]'
 
diff --git a/.github/workflows/ucentralgw-deployment.yaml b/.github/workflows/ucentralgw-deployment.yaml
index 4f8a8ef4d..63f1b20fd 100644
--- a/.github/workflows/ucentralgw-deployment.yaml
+++ b/.github/workflows/ucentralgw-deployment.yaml
@@ -17,9 +17,19 @@ env:
   DIGICERT_KEY: ${{ secrets.DIGICERT_KEY }}
 
   # https://stackoverflow.com/questions/59977364/github-actions-how-use-strategy-matrix-with-script
+  # Required object fiels per environment:
+  # - namespace - namespace suffix that will used added for the Kubernetes environment (i.e. if you pass 'test', kubernetes namespace will be named 'ucentral-test')
+  # - deploy_method - deployment method for the chart deployment (supported methods - 'git' (will use helm-git from assembly chart) and 'bundle' (will use chart stored in the Artifactory0
+  # - chart_version - version of chart to be deployed from assembly chart (for 'git' method git ref may be passed, for 'bundle' method version of chart may be passed)
+  # - ucentralgw_version - uCentralGW version to deploy (will be used for Docker image tag and git branch for Helm chart if git deployment is required)
+  # - ucentralsec_version - uCentralSec version to deploy (will be used for Docker image tag and git branch for Helm chart if git deployment is required)
+  # - ucentralfms_version - uCentralFMS version to deploy (will be used for Docker image tag and git branch for Helm chart if git deployment is required)
+  # - ucentralgwui_version - uCentralGW UI version to deploy (will be used for Docker image tag and git branch for Helm chart if git deployment is required)
   testbeds: '[
     {
       "namespace": "qa01",
+      "deploy_method": "git",
+      "chart_version": "main",
       "ucentralgw_version": "master",
       "ucentralsec_version": "main",
       "ucentralfms_version": "main",
@@ -27,6 +37,8 @@ env:
     },
     {
       "namespace": "dev01",
+      "deploy_method": "git",
+      "chart_version": "main",
       "ucentralgw_version": "master",
       "ucentralsec_version": "main",
       "ucentralfms_version": "main",
@@ -58,17 +70,13 @@ jobs:
       fail-fast: false
     steps:
 
-    - name: Checkout uCentral assembly chart repo
-      uses: actions/checkout@v2
-      with:
-        path: wlan-cloud-ucentral-deploy
-        repository: Telecominfraproject/wlan-cloud-ucentral-deploy
     - name: Checkout repo with Helm values
       uses: actions/checkout@v2
       with:
         path: wlan-testing
 
     - name: Prepare certificates from secrets
+      working-directory: wlan-testing/helm/ucentral
       run: |
         echo "${{ env.DIGICERT_CERT }}" | base64 -d > cert.pem
         echo "${{ env.DIGICERT_KEY }}" | base64 -d > key.pem
@@ -78,62 +86,22 @@ jobs:
         aws eks update-kubeconfig --name ${{ env.AWS_EKS_NAME }}
 
     - name: Deploy uCentralGW
-      working-directory: wlan-cloud-ucentral-deploy/chart
+      working-directory: wlan-testing/helm/ucentral
       run: |
-        helm plugin install https://github.com/aslafy-z/helm-git --version 0.10.0
-        sed -i '/wlan-cloud-ucentralgw@/s/ref=.*/ref='${{ matrix.ucentralgw_version }}'\"/g' Chart.yaml
-        sed -i '/wlan-cloud-ucentralgw-ui@/s/ref=.*/ref='${{ matrix.ucentralgwui_version }}'\"/g' Chart.yaml
-        sed -i '/wlan-cloud-ucentralsec@/s/ref=.*/ref='${{ matrix.ucentralsec_version }}'\"/g' Chart.yaml
-        sed -i '/wlan-cloud-ucentralfms@/s/ref=.*/ref='${{ matrix.ucentralfms_version }}'\"/g' Chart.yaml
-        export UCENTRALGW_VERSION_TAG=$(echo ${{ matrix.ucentralgw_version }} | tr '/' '-')
-        export UCENTRALGWUI_VERSION_TAG=$(echo ${{ matrix.ucentralgwui_version }} | tr '/' '-')
-        export UCENTRALSEC_VERSION_TAG=$(echo ${{ matrix.ucentralsec_version }} | tr '/' '-')
-        export UCENTRALFMS_VERSION_TAG=$(echo ${{ matrix.ucentralfms_version }} | tr '/' '-')
-        helm repo add bitnami https://charts.bitnami.com/bitnami
-        helm repo update
-        helm dependency update
-        helm upgrade --install --create-namespace \
-          --namespace ucentral-${{ matrix.namespace }} --wait --timeout 20m \
-          -f ../../wlan-testing/helm/ucentral/values.ucentral-qa.yaml \
-          --set ucentralgw.configProperties."rtty\.token"=${{ secrets.RTTY_TOKEN }} \
-          --set ucentralsec.configProperties."authentication\.default\.username"=${{ secrets.UCENTRALGW_AUTH_USERNAME }} \
-          --set ucentralsec.configProperties."authentication\.default\.password"=${{ secrets.UCENTRALGW_AUTH_PASSWORD }} \
-          --set rttys.config.token=${{ secrets.RTTY_TOKEN }} \
-          --set ucentralfms.configProperties."s3\.secret"=${{ secrets.UCENTRALFMS_S3_SECRET }} \
-          --set ucentralfms.configProperties."s3\.key"=${{ secrets.UCENTRALFMS_S3_KEY }} \
-          --set ucentralgw.services.ucentralgw.annotations."external-dns\.alpha\.kubernetes\.io/hostname"=gw-ucentral-${{ matrix.namespace }}.cicd.lab.wlan.tip.build \
-          --set ucentralgw.configProperties."ucentral\.fileuploader\.host\.0\.name"=gw-ucentral-${{ matrix.namespace }}.cicd.lab.wlan.tip.build \
-          --set ucentralgw.configProperties."rtty\.server"=rtty-ucentral-${{ matrix.namespace }}.cicd.lab.wlan.tip.build \
-          --set ucentralgw.configProperties."ucentral\.system\.uri\.public"=https://gw-ucentral-${{ matrix.namespace }}.cicd.lab.wlan.tip.build:16002 \
-          --set ucentralgw.configProperties."ucentral\.system\.uri\.private"=https://gw-ucentral-${{ matrix.namespace }}.cicd.lab.wlan.tip.build:17002 \
-          --set ucentralgw.configProperties."ucentral\.system\.uri\.ui"=https://webui-ucentral-${{ matrix.namespace }}.cicd.lab.wlan.tip.build \
-          --set ucentralsec.services.ucentralsec.annotations."external-dns\.alpha\.kubernetes\.io/hostname"=sec-ucentral-${{ matrix.namespace }}.cicd.lab.wlan.tip.build \
-          --set ucentralsec.configProperties."ucentral\.system\.uri\.public"=https://sec-ucentral-${{ matrix.namespace }}.cicd.lab.wlan.tip.build:16001 \
-          --set ucentralsec.configProperties."ucentral\.system\.uri\.private"=https://sec-ucentral-${{ matrix.namespace }}.cicd.lab.wlan.tip.build:17001 \
-          --set ucentralsec.configProperties."ucentral\.system\.uri\.ui"=https://webui-ucentral-${{ matrix.namespace }}.cicd.lab.wlan.tip.build \
-          --set rttys.services.rttys.annotations."external-dns\.alpha\.kubernetes\.io/hostname"=rtty-ucentral-${{ matrix.namespace }}.cicd.lab.wlan.tip.build \
-          --set ucentralgwui.ingresses.default.annotations."external-dns\.alpha\.kubernetes\.io/hostname"=webui-ucentral-${{ matrix.namespace }}.cicd.lab.wlan.tip.build \
-          --set ucentralgwui.ingresses.default.hosts={webui-ucentral-${{ matrix.namespace }}.cicd.lab.wlan.tip.build} \
-          --set ucentralgwui.public_env_variables.DEFAULT_UCENTRALSEC_URL=https://sec-ucentral-${{ matrix.namespace }}.cicd.lab.wlan.tip.build:16001 \
-          --set ucentralfms.services.ucentralfms.annotations."external-dns\.alpha\.kubernetes\.io/hostname"=fms-ucentral-${{ matrix.namespace }}.cicd.lab.wlan.tip.build \
-          --set ucentralfms.configProperties."ucentral\.system\.uri\.public"=https://fms-ucentral-${{ matrix.namespace }}.cicd.lab.wlan.tip.build:16004 \
-          --set ucentralfms.configProperties."ucentral\.system\.uri\.private"=https://fms-ucentral-${{ matrix.namespace }}.cicd.lab.wlan.tip.build:17004 \
-          --set ucentralfms.configProperties."ucentral\.system\.uri\.ui"=https://webui-ucentral-${{ matrix.namespace }}.cicd.lab.wlan.tip.build \
-          --set-file ucentralgw.certs."restapi-cert\.pem"=../../cert.pem \
-          --set-file ucentralgw.certs."restapi-key\.pem"=../../key.pem \
-          --set-file ucentralgw.certs."websocket-cert\.pem"=../../cert.pem \
-          --set-file ucentralgw.certs."websocket-key\.pem"=../../key.pem \
-          --set-file rttys.certs."restapi-cert\.pem"=../../cert.pem \
-          --set-file rttys.certs."restapi-key\.pem"=../../key.pem \
-          --set-file ucentralsec.certs."restapi-cert\.pem"=../../cert.pem \
-          --set-file ucentralsec.certs."restapi-key\.pem"=../../key.pem \
-          --set-file ucentralfms.certs."restapi-cert\.pem"=../../cert.pem \
-          --set-file ucentralfms.certs."restapi-key\.pem"=../../key.pem \
-          --set ucentralgw.images.ucentralgw.tag=$UCENTRALGW_VERSION_TAG \
-          --set ucentralgwui.images.ucentralgwui.tag=$UCENTRALGWUI_VERSION_TAG \
-          --set ucentralsec.images.ucentralsec.tag=$UCENTRALSEC_VERSION_TAG \
-          --set ucentralfms.images.ucentralfms.tag=$UCENTRALFMS_VERSION_TAG \
-          tip-ucentral .
+        export NAMESPACE="${{ matrix.namespace }}"
+        export DEPLOY_METHOD="${{ matrix.deploy_method }}"
+        export CHART_VERSION="${{ matrix.chart_version }}"
+        export UCENTRALGW_VERSION="${{ matrix.ucentralgw_version }}"
+        export UCENTRALGWUI_VERSION="${{ matrix.ucentralgwui_version }}"
+        export UCENTRALSEC_VERSION="{{ matrix.ucentralsec_version }}"
+        export UCENTRALFMS_VERSION="${{ matrix.ucentralfms_version }}"
+        export VALUES_FILE_LOCATION=values.ucentral-qa.yaml
+        export RTTY_TOKEN="${{ secrets.RTTY_TOKEN }}"
+        export UCENTRALGW_AUTH_USERNAME="${{ secrets.UCENTRALGW_AUTH_USERNAME }}"
+        export UCENTRALGW_AUTH_PASSWORD="${{ secrets.UCENTRALGW_AUTH_PASSWORD }}"
+        export UCENTRALFMS_S3_SECRET="${{ secrets.UCENTRALFMS_S3_SECRET }}"
+        export UCENTRALFMS_S3_KEY="${{ secrets.UCENTRALFMS_S3_KEY }}"
+        ./deploy.sh
 
     - name: Show resource state on deployment failure
       if: failure()
diff --git a/helm/ucentral/deploy.sh b/helm/ucentral/deploy.sh
new file mode 100755
index 000000000..b8730f941
--- /dev/null
+++ b/helm/ucentral/deploy.sh
@@ -0,0 +1,126 @@
+#!/bin/bash
+set -e
+
+# Usage function
+usage () {
+  echo;
+  echo "This script is indended for uCentral Cloud SDK deployment to TIP QA/Dev environments using assembly Helm chart (https://github.com/Telecominfraproject/wlan-cloud-ucentral-deploy/tree/main/chart) with configuration through environment variables";
+  echo;
+  echo "Required environment variables:"
+  echo;
+  echo "- NAMESPACE - namespace suffix that will used added for the Kubernetes environment (i.e. if you pass 'test', kubernetes namespace will be named 'ucentral-test')";
+  echo "- UCENTRALGW_VERSION - uCentralGW version to deploy (will be used for Docker image tag and git branch for Helm chart if git deployment is required)";
+  echo "- UCENTRALGWUI_VERSION - uCentralGW UI version to deploy (will be used for Docker image tag and git branch for Helm chart if git deployment is required)";
+  echo "- UCENTRALSEC_VERSION - uCentralSec version to deploy (will be used for Docker image tag and git branch for Helm chart if git deployment is required)";
+  echo "- UCENTRALFMS_VERSION - uCentralFMS version to deploy (will be used for Docker image tag and git branch for Helm chart if git deployment is required)";
+  echo;
+  echo "- DEPLOY_METHOD - deployment method for the chart deployment (supported methods - 'git' (will use helm-git from assembly chart) and 'bundle' (will use chart stored in the Artifactory0";
+  echo "- CHART_VERSION - version of chart to be deployed from assembly chart (for 'git' method git ref may be passed, for 'bundle' method version of chart may be passed)";
+  echo;
+  echo "- VALUES_FILE_LOCATION - path to file with override values that may be used for deployment";
+  echo "- RTTY_TOKEN - token to be used for rttys and uCentralGW for remote tty sessions";
+  echo "- UCENTRALGW_AUTH_USERNAME - username to be used for requests to uCentralSec";
+  echo "- UCENTRALGW_AUTH_PASSWORD - hashed password for uCentralSec (details on this may be found in https://github.com/Telecominfraproject/wlan-cloud-ucentralsec/#authenticationdefaultpassword)";
+  echo "- UCENTRALFMS_S3_SECRET - secret key that is used for uCentralFMS access to firmwares S3 bucket";
+  echo "- UCENTRALFMS_S3_KEY - access key that is used for uCentralFMS access to firmwares S3 bucket";
+  echo "- CERT_LOCATION - path to certificate in PEM format that will be used for securing all endpoint in all services";
+  echo "- KEY_LOCATION - path to private key in PEM format that will be used for securing all endpoint in all services";
+}
+
+# Check if required environment variables were passed
+## Environment specifics
+[ -z ${NAMESPACE+x} ] && echo "NAMESPACE is unset" && usage && exit 1
+[ -z ${UCENTRALGW_VERSION+x} ] && echo "UCENTRALGW_VERSION is unset" && usage && exit 1
+[ -z ${UCENTRALGWUI_VERSION+x} ] && echo "UCENTRALGWUI_VERSION is unset" && usage && exit 1
+[ -z ${UCENTRALSEC_VERSION+x} ] && echo "UCENTRALSEC_VERSION is unset" && usage && exit 1
+[ -z ${UCENTRALFMS_VERSION+x} ] && echo "UCENTRALFMS_VERSION is unset" && usage && exit 1
+## Deployment specifics
+[ -z ${DEPLOY_METHOD+x} ] && echo "DEPLOY_METHOD is unset" && usage && exit 1
+[ -z ${CHART_VERSION+x} ] && echo "CHART_VERSION is unset" && usage && exit 1
+## Variables specifics
+[ -z ${VALUES_FILE_LOCATION+x} ] && echo "VALUES_FILE_LOCATION is unset" && usage && exit 1
+[ -z ${RTTY_TOKEN+x} ] && echo "RTTY_TOKEN is unset" && usage && exit 1
+[ -z ${UCENTRALGW_AUTH_USERNAME+x} ] && echo "UCENTRALGW_AUTH_USERNAME is unset" && usage && exit 1
+[ -z ${UCENTRALGW_AUTH_PASSWORD+x} ] && echo "UCENTRALGW_AUTH_PASSWORD is unset" && usage && exit 1
+[ -z ${UCENTRALFMS_S3_SECRET+x} ] && echo "UCENTRALFMS_S3_SECRET is unset" && usage && exit 1
+[ -z ${UCENTRALFMS_S3_KEY+x} ] && echo "UCENTRALFMS_S3_KEY is unset" && usage && exit 1
+[ -z ${CERT_LOCATION+x} ] && echo "CERT_LOCATION is unset" && usage && exit 1
+[ -z ${KEY_LOCATION+x} ] && echo "KEY_LOCATION is unset" && usage && exit 1
+
+# Transform some environment variables
+export UCENTRALGW_VERSION_TAG=$(echo ${UCENTRALGW_VERSION} | tr '/' '-')
+export UCENTRALGWUI_VERSION_TAG=$(echo ${UCENTRALGWUI_VERSION} | tr '/' '-')
+export UCENTRALSEC_VERSION_TAG=$(echo ${UCENTRALSEC_VERSION} | tr '/' '-')
+export UCENTRALFMS_VERSION_TAG=$(echo ${UCENTRALFMS_VERSION} | tr '/' '-')
+
+# Check deployment method that's required for this environment
+helm plugin install https://github.com/databus23/helm-diff || true
+if [[ "$DEPLOY_METHOD" == "git" ]]; then
+  helm plugin install https://github.com/aslafy-z/helm-git --version 0.10.0 || true
+  rm -rf wlan-cloud-ucentral-deploy || true
+  git clone https://github.com/Telecominfraproject/wlan-cloud-ucentral-deploy.git
+  cd wlan-cloud-ucentral-deploy
+  git checkout $CHART_VERSION
+  cd chart
+  sed -i '/wlan-cloud-ucentralgw@/s/ref=.*/ref='${UCENTRALGW_VERSION}'\"/g' Chart.yaml
+  sed -i '/wlan-cloud-ucentralgw-ui@/s/ref=.*/ref='${UCENTRALGWUI_VERSION}'\"/g' Chart.yaml
+  sed -i '/wlan-cloud-ucentralsec@/s/ref=.*/ref='${UCENTRALSEC_VERSION}'\"/g' Chart.yaml
+  sed -i '/wlan-cloud-ucentralfms@/s/ref=.*/ref='${UCENTRALFMS_VERSION}'\"/g' Chart.yaml
+  helm repo add bitnami https://charts.bitnami.com/bitnami
+  helm repo update
+  helm dependency update
+  cd ../..
+  export DEPLOY_SOURCE="wlan-cloud-ucentral-deploy/chart"
+else
+  if [[ "$DEPLOY_METHOD" == "bundle" ]]; then
+    helm repo add tip-wlan-cloud-ucentral-helm https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral-helm/ || true
+    export DEPLOY_SOURCE="tip-wlan-cloud-ucentral-helm/wlan-cloud-ucentral --version $CHART_VERSION"
+  else
+    echo "Deploy method is not correct: $DEPLOY_METHOD. Valid value - git or bundle"
+    exit 1
+  fi
+fi
+
+# Run the deployment
+helm upgrade --install --create-namespace --wait --timeout 20m \
+  --namespace ucentral-${NAMESPACE} \
+  -f $VALUES_FILE_LOCATION \
+  --set ucentralgw.configProperties."rtty\.token"=${RTTY_TOKEN} \
+  --set ucentralsec.configProperties."authentication\.default\.username"=${UCENTRALGW_AUTH_USERNAME} \
+  --set ucentralsec.configProperties."authentication\.default\.password"=${UCENTRALGW_AUTH_PASSWORD} \
+  --set rttys.config.token=${RTTY_TOKEN} \
+  --set ucentralfms.configProperties."s3\.secret"=${UCENTRALFMS_S3_SECRET} \
+  --set ucentralfms.configProperties."s3\.key"=${UCENTRALFMS_S3_KEY} \
+  --set ucentralgw.services.ucentralgw.annotations."external-dns\.alpha\.kubernetes\.io/hostname"=gw-ucentral-${NAMESPACE}.cicd.lab.wlan.tip.build \
+  --set ucentralgw.configProperties."ucentral\.fileuploader\.host\.0\.name"=gw-ucentral-${NAMESPACE}.cicd.lab.wlan.tip.build \
+  --set ucentralgw.configProperties."rtty\.server"=rtty-ucentral-${NAMESPACE}.cicd.lab.wlan.tip.build \
+  --set ucentralgw.configProperties."ucentral\.system\.uri\.public"=https://gw-ucentral-${NAMESPACE}.cicd.lab.wlan.tip.build:16002 \
+  --set ucentralgw.configProperties."ucentral\.system\.uri\.private"=https://gw-ucentral-${NAMESPACE}.cicd.lab.wlan.tip.build:17002 \
+  --set ucentralgw.configProperties."ucentral\.system\.uri\.ui"=https://webui-ucentral-${NAMESPACE}.cicd.lab.wlan.tip.build \
+  --set ucentralsec.services.ucentralsec.annotations."external-dns\.alpha\.kubernetes\.io/hostname"=sec-ucentral-${NAMESPACE}.cicd.lab.wlan.tip.build \
+  --set ucentralsec.configProperties."ucentral\.system\.uri\.public"=https://sec-ucentral-${NAMESPACE}.cicd.lab.wlan.tip.build:16001 \
+  --set ucentralsec.configProperties."ucentral\.system\.uri\.private"=https://sec-ucentral-${NAMESPACE}.cicd.lab.wlan.tip.build:17001 \
+  --set ucentralsec.configProperties."ucentral\.system\.uri\.ui"=https://webui-ucentral-${NAMESPACE}.cicd.lab.wlan.tip.build \
+  --set rttys.services.rttys.annotations."external-dns\.alpha\.kubernetes\.io/hostname"=rtty-ucentral-${NAMESPACE}.cicd.lab.wlan.tip.build \
+  --set ucentralgwui.ingresses.default.annotations."external-dns\.alpha\.kubernetes\.io/hostname"=webui-ucentral-${NAMESPACE}.cicd.lab.wlan.tip.build \
+  --set ucentralgwui.ingresses.default.hosts={webui-ucentral-${NAMESPACE}.cicd.lab.wlan.tip.build} \
+  --set ucentralgwui.public_env_variables.DEFAULT_UCENTRALSEC_URL=https://sec-ucentral-${NAMESPACE}.cicd.lab.wlan.tip.build:16001 \
+  --set ucentralfms.services.ucentralfms.annotations."external-dns\.alpha\.kubernetes\.io/hostname"=fms-ucentral-${NAMESPACE}.cicd.lab.wlan.tip.build \
+  --set ucentralfms.configProperties."ucentral\.system\.uri\.public"=https://fms-ucentral-${NAMESPACE}.cicd.lab.wlan.tip.build:16004 \
+  --set ucentralfms.configProperties."ucentral\.system\.uri\.private"=https://fms-ucentral-${NAMESPACE}.cicd.lab.wlan.tip.build:17004 \
+  --set ucentralfms.configProperties."ucentral\.system\.uri\.ui"=https://webui-ucentral-${NAMESPACE}.cicd.lab.wlan.tip.build \
+  --set-file ucentralgw.certs."restapi-cert\.pem"=$CERT_LOCATION \
+  --set-file ucentralgw.certs."restapi-key\.pem"=$KEY_LOCATION \
+  --set-file ucentralgw.certs."websocket-cert\.pem"=$CERT_LOCATION \
+  --set-file ucentralgw.certs."websocket-key\.pem"=$KEY_LOCATION \
+  --set-file rttys.certs."restapi-cert\.pem"=$CERT_LOCATION \
+  --set-file rttys.certs."restapi-key\.pem"=$KEY_LOCATION \
+  --set-file ucentralsec.certs."restapi-cert\.pem"=$CERT_LOCATION \
+  --set-file ucentralsec.certs."restapi-key\.pem"=$KEY_LOCATION \
+  --set-file ucentralfms.certs."restapi-cert\.pem"=$CERT_LOCATION \
+  --set-file ucentralfms.certs."restapi-key\.pem"=$KEY_LOCATION \
+  --set ucentralgw.images.ucentralgw.tag=$UCENTRALGW_VERSION_TAG \
+  --set ucentralgwui.images.ucentralgwui.tag=$UCENTRALGWUI_VERSION_TAG \
+  --set ucentralsec.images.ucentralsec.tag=$UCENTRALSEC_VERSION_TAG \
+  --set ucentralfms.images.ucentralfms.tag=$UCENTRALFMS_VERSION_TAG \
+  tip-ucentral $DEPLOY_SOURCE
diff --git a/tests/conftest.py b/tests/conftest.py
index 17336c8e3..dcfc0b974 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -249,12 +249,15 @@ def get_equipment_id(request, setup_controller, testbed, get_configuration):
 @pytest.fixture(scope="session")
 def instantiate_access_point(testbed, get_apnos, get_configuration):
     """setup the access point connectivity"""
-    for access_point_info in get_configuration['access_point']:
-        if access_point_info["jumphost"]:
-            get_apnos(access_point_info, pwd="../libs/apnos/")
-        else:
-            pass
-        # Write a code to verify Access Point Connectivity
+    if request.config.getoption("1.x"):
+        for access_point_info in get_configuration['access_point']:
+            if access_point_info["jumphost"]:
+                get_apnos(access_point_info, pwd="../libs/apnos/", sdk="1.x")
+            else:
+                pass
+    else:
+        get_apnos(access_point_info, pwd="../libs/apnos/")
+            # Write a code to verify Access Point Connectivity
     yield True
 
 
@@ -338,7 +341,7 @@ def upgrade_firmware(request, instantiate_firmware, get_equipment_id, check_ap_f
         active_fw_list = []
         try:
             for access_point in get_configuration['access_point']:
-                ap_ssh = get_apnos(access_point)
+                ap_ssh = get_apnos(access_point, sdk="1.x")
                 active_fw = ap_ssh.get_active_firmware()
                 active_fw_list.append(active_fw)
         except Exception as e:
@@ -412,7 +415,7 @@ def setup_test_run(setup_controller, request, upgrade_firmware, get_configuratio
         active_fw_list = []
         try:
             for access_point in get_configuration['access_point']:
-                ap_ssh = get_apnos(access_point)
+                ap_ssh = get_apnos(access_point, sdk="1.x")
                 active_fw = ap_ssh.get_active_firmware()
                 active_fw_list.append(active_fw)
         except Exception as e:
@@ -497,7 +500,7 @@ def test_access_point(request, testbed, get_apnos, get_configuration):
     mgr_status = []
     if request.config.getoption("1.x"):
         for access_point_info in get_configuration['access_point']:
-            ap_ssh = get_apnos(access_point_info)
+            ap_ssh = get_apnos(access_point_info, sdk="1.x")
             status = ap_ssh.get_manager_state()
             if "ACTIVE" not in status:
                 time.sleep(30)
diff --git a/tests/e2e/basic/conftest.py b/tests/e2e/basic/conftest.py
index b1348c876..790c2ef15 100644
--- a/tests/e2e/basic/conftest.py
+++ b/tests/e2e/basic/conftest.py
@@ -116,7 +116,7 @@ def num_stations(request):
 @pytest.fixture(scope="class")
 def get_vif_state(get_apnos, get_configuration, request, lf_tools):
     if request.config.getoption("1.x"):
-        ap_ssh = get_apnos(get_configuration['access_point'][0], pwd="../libs/apnos/")
+        ap_ssh = get_apnos(get_configuration['access_point'][0], pwd="../libs/apnos/", sdk="1.x")
         vif_state = list(ap_ssh.get_vif_state_ssids())
         vif_state.sort()
         yield vif_state