diff --git a/pmm/pmm2-dbaas-upgrade-tests-matrix.groovy b/pmm/pmm2-dbaas-upgrade-tests-matrix.groovy
new file mode 100644
index 0000000000..f5c60ca1dd
--- /dev/null
+++ b/pmm/pmm2-dbaas-upgrade-tests-matrix.groovy
@@ -0,0 +1,98 @@
+library changelog: false, identifier: 'lib@PMM-9610', retriever: modernSCM([
+    $class: 'GitSCMSource',
+    remote: 'https://github.com/Percona-Lab/jenkins-pipelines.git'
+]) _
+void runDbaaSUpgradeTests(String GIT_BRANCH, DOCKER_VERSION, CLIENT_VERSION, PMM_SERVER_LATEST, VERSION_SERVICE_VERSION, PMM_REPOSITORY, PMM_QA_GIT_BRANCH) {
+    upgradeJob = build job: 'pmm2-dbaas-upgrade-tests', parameters: [
+        string(name: 'GIT_BRANCH', value: GIT_BRANCH),
+        string(name: 'DOCKER_VERSION', value: DOCKER_VERSION),
+        string(name: 'CLIENT_VERSION', value: CLIENT_VERSION),
+        string(name: 'PMM_SERVER_LATEST', value: PMM_SERVER_LATEST),
+        string(name: 'VERSION_SERVICE_VERSION', value: VERSION_SERVICE_VERSION),
+        string(name: 'PMM_REPOSITORY', value: PMM_REPOSITORY),
+        string(name: 'PMM_QA_GIT_BRANCH', value: PMM_QA_GIT_BRANCH)
+    ]
+}
+
+def latestVersion = pmmVersion()
+def versionsList = pmmVersion('dbaas')
+
+def parallelStagesMatrix = versionsList.collectEntries {
+    ["${it}" : generateStage(it)]
+}
+
+def generateStage(VERSION) {
+    return {
+        stage("${VERSION}") {
+            runDbaaSUpgradeTests(
+                GIT_BRANCH,
+                VERSION,
+                VERSION,
+                PMM_SERVER_LATEST,
+                VERSION_SERVICE_VERSION,
+                PMM_REPOSITORY,
+                PMM_QA_GIT_BRANCH
+            )
+        }
+    }
+}
+
+pipeline {
+    agent {
+        label 'cli'
+    }
+    parameters {
+        string(
+            defaultValue: 'main',
+            description: 'Tag/Branch for pmm-ui-tests repository',
+            name: 'GIT_BRANCH')
+        string(
+            defaultValue: 'main',
+            description: 'Tag/Branch for pmm-qa repository',
+            name: 'PMM_QA_GIT_BRANCH')
+        string(
+            defaultValue: latestVersion,
+            description: 'dev-latest PMM Server Version',
+            name: 'PMM_SERVER_LATEST')
+        choice(
+            choices: ['dev','prod'],
+            description: 'Prod or Dev version service',
+            name: 'VERSION_SERVICE_VERSION')
+        string(
+            defaultValue: 'main',
+            description: 'Tag/Branch for pmm-qa repository',
+            name: 'PMM_QA_GIT_BRANCH')
+        choice(
+            choices: ['Experimental', 'Testing'],
+            description: "Select Testing (RC Tesing) or Experimental (dev-latest testing) Repository",
+            name: 'PMM_REPOSITORY')
+    }
+    options {
+        skipDefaultCheckout()
+        disableConcurrentBuilds()
+    }
+    triggers {
+        cron('0 1 * * 7')
+    }
+    stages{
+        stage('Upgrade DbaaS E2E Matrix'){
+            steps{
+                script {
+                    parallel parallelStagesMatrix
+                }
+            }
+        }
+    }
+    post {
+        always {
+            script {
+                if (currentBuild.result == null || currentBuild.result == 'SUCCESS') {
+                    slackSend channel: '#pmm-ci', color: '#00FF00', message: "[${JOB_NAME}]: build finished - ${BUILD_URL} "
+                } else {
+                    slackSend channel: '#pmm-ci', color: '#FF0000', message: "[${JOB_NAME}]: build ${currentBuild.result} - ${BUILD_URL}"
+                }
+            }
+            deleteDir()
+        }
+    }
+}
diff --git a/pmm/pmm2-dbaas-upgrade-tests.groovy b/pmm/pmm2-dbaas-upgrade-tests.groovy
new file mode 100644
index 0000000000..15ceb35840
--- /dev/null
+++ b/pmm/pmm2-dbaas-upgrade-tests.groovy
@@ -0,0 +1,251 @@
+library changelog: false, identifier: 'lib@master', retriever: modernSCM([
+    $class: 'GitSCMSource',
+    remote: 'https://github.com/Percona-Lab/jenkins-pipelines.git'
+]) _
+
+void runStagingServer(String DOCKER_VERSION, CLIENT_VERSION, VERSION_SERVICE_VERSION, ADMIN_PASSWORD) {
+    stagingJob = build job: 'aws-staging-start', parameters: [
+        string(name: 'DOCKER_VERSION', value: DOCKER_VERSION),
+        string(name: 'CLIENT_VERSION', value: CLIENT_VERSION),
+        string(name: 'VERSION_SERVICE_VERSION', value: VERSION_SERVICE_VERSION),
+        string(name: 'DOCKER_ENV_VARIABLE', value: ' -e ENABLE_DBAAS=1' ),
+        string(name: 'NOTIFY', value: 'false'),
+        string(name: 'DAYS', value: '1'),
+        string(name: 'ADMIN_PASSWORD', value: ADMIN_PASSWORD)
+    ]
+    env.VM_IP = stagingJob.buildVariables.IP
+    env.VM_NAME = stagingJob.buildVariables.VM_NAME
+    env.PMM_URL = "http://admin:${ADMIN_PASSWORD}@${VM_IP}"
+    env.PMM_UI_URL = "http://${VM_IP}/"
+}
+
+void runClusterStaging(String PMM_QA_GIT_BRANCH) {
+    clusterJob = build job: 'kubernetes-cluster-staging', parameters: [
+        string(name: 'NOTIFY', value: 'false'),
+        string(name: 'PMM_QA_GIT_BRANCH', value: PMM_QA_GIT_BRANCH),
+        string(name: 'DAYS', value: '1')
+    ]
+    env.CLUSTER_IP = clusterJob.buildVariables.IP
+    env.KUBECONFIG = clusterJob.buildVariables.KUBECONFIG
+}
+
+void destroyStaging(IP) {
+    build job: 'aws-staging-stop', parameters: [
+        string(name: 'VM', value: IP),
+    ]
+}
+
+def latestVersion = pmmVersion()
+def versionsList = pmmVersion('list')
+
+pipeline {
+    agent {
+        label 'agent-amd64'
+    }
+    parameters {
+        string(
+            defaultValue: 'main',
+            description: 'Tag/Branch for pmm-ui-tests repository',
+            name: 'GIT_BRANCH')
+        string(
+            defaultValue: '',
+            description: 'Commit hash for the branch',
+            name: 'GIT_COMMIT_HASH')
+        choice(
+            choices: versionsList,
+            description: 'PMM Server Version to test for Upgrade',
+            name: 'DOCKER_VERSION')
+        choice(
+            choices: versionsList,
+            description: 'PMM Client Version to test for Upgrade',
+            name: 'CLIENT_VERSION')
+        string(
+            defaultValue: latestVersion,
+            description: 'latest PMM Server Version',
+            name: 'PMM_SERVER_LATEST')
+        string(
+            defaultValue: 'perconalab/pmm-server:dev-latest',
+            description: 'PMM Server Tag to be Upgraded to via Docker way Upgrade',
+            name: 'PMM_SERVER_TAG')
+        string(
+            defaultValue: 'admin-password',
+            description: 'pmm-server admin user default password',
+            name: 'ADMIN_PASSWORD')
+        choice(
+            choices: ['dev','prod'],
+            description: 'Prod or Dev version service',
+            name: 'VERSION_SERVICE_VERSION')            
+        string(
+            defaultValue: "'@dbaas-upgrade'",
+            description: 'Pass test tags ex. @dbaas-upgrade',
+            name: 'TEST_TAGS')
+        string(
+            defaultValue: 'main',
+            description: 'Tag/Branch for pmm-qa repository',
+            name: 'PMM_QA_GIT_BRANCH')
+        choice(
+            choices: ['Experimental', 'Testing'],
+            description: "Select Testing (RC Tesing) or Experimental (dev-latest testing) Repository",
+            name: 'PMM_REPOSITORY')            
+    }
+    options {
+        skipDefaultCheckout()
+    }
+    stages {
+        stage('Prepare') {
+            steps {
+                // clean up workspace and fetch pmm-ui-tests repository
+                deleteDir()
+                git poll: false, branch: GIT_BRANCH, url: 'https://github.com/percona/pmm-ui-tests.git'
+                sh '''
+                    docker-compose --version
+                    sudo yum -y install mysql
+                    sudo amazon-linux-extras install epel -y
+                    sudo mkdir -p /srv/pmm-qa || :
+                    pushd /srv/pmm-qa
+                        sudo git clone --single-branch --branch \${PMM_QA_GIT_BRANCH} https://github.com/percona/pmm-qa.git .
+                        sudo git checkout \${PMM_QA_GIT_COMMIT_HASH}
+                    popd
+                    sudo ln -s /usr/bin/chromium-browser /usr/bin/chromium
+                '''
+            }
+        }
+        stage('Checkout Commit') {
+            when {
+                expression { env.GIT_COMMIT_HASH.length()>0 }
+            }
+            steps {
+                sh 'git checkout ' + env.GIT_COMMIT_HASH
+            }
+        }
+        stage('Setup PMM Server') {
+            parallel {
+                stage('Start Server') {
+                    steps {
+                        runStagingServer('percona/pmm-server:' + DOCKER_VERSION, CLIENT_VERSION, VERSION_SERVICE_VERSION, ADMIN_PASSWORD)
+                    }
+                }
+                stage('Start PMM Cluster Staging Instance') {
+                    steps {
+                        runClusterStaging('main')
+                    }
+                }
+            }
+        }
+        stage('Setup') {
+            parallel {
+                stage('Sanity check') {
+
+                    steps {
+                        sleep 120
+                        sh 'timeout 100 bash -c \'while [[ "$(curl -s -o /dev/null -w \'\'%{http_code}\'\' \${PMM_URL}/ping)" != "200" ]]; do sleep 5; done\' || false'
+                    }
+                }
+                stage('Setup Node') {
+                    steps {
+                        sh """
+                            envsubst < env.list > env.generated.list
+                            npm ci
+                        """
+                    }
+                }
+            }
+        }
+        stage('Enable Testing Repo') {
+            when {
+                expression { env.PMM_REPOSITORY == "Testing"}
+            }
+            steps{
+                withCredentials([sshUserPrivateKey(credentialsId: 'aws-jenkins', keyFileVariable: 'KEY_PATH', passphraseVariable: '', usernameVariable: 'USER')]) {
+                    sh """
+                        ssh -i "${KEY_PATH}" -o ConnectTimeout=1 -o StrictHostKeyChecking=no ${USER}@${VM_IP} '
+                            docker exec ${VM_NAME}-server sed -i'' -e 's^/release/^/testing/^' /etc/yum.repos.d/pmm2-server.repo
+                            docker exec ${VM_NAME}-server percona-release enable percona testing
+                            docker exec ${VM_NAME}-server yum clean all
+                        '
+                    """
+                }
+            }
+        }
+        stage('Enable Experimental Repo') {
+            when {
+                expression { env.PMM_REPOSITORY == "Experimental"}
+            }
+            steps{
+                withCredentials([sshUserPrivateKey(credentialsId: 'aws-jenkins', keyFileVariable: 'KEY_PATH', passphraseVariable: '', usernameVariable: 'USER')]) {
+                    sh """
+                        ssh -i "${KEY_PATH}" -o ConnectTimeout=1 -o StrictHostKeyChecking=no ${USER}@${VM_IP} '
+                            docker exec ${VM_NAME}-server yum update -y percona-release
+                            docker exec ${VM_NAME}-server sed -i'' -e 's^/release/^/experimental/^' /etc/yum.repos.d/pmm2-server.repo
+                            docker exec ${VM_NAME}-server percona-release enable percona experimental
+                            docker exec ${VM_NAME}-server yum clean all
+                        '
+                    """
+                }
+            }
+        }        
+        stage('Run UI Tests Docker') {
+            options {
+                timeout(time: 150, unit: "MINUTES")
+            }
+            steps {
+                withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: 'PMM_AWS_DEV', secretKeyVariable: 'AWS_SECRET_ACCESS_KEY']]) {
+                    sh """
+                        sed -i 's+http://localhost/+${PMM_UI_URL}/+g' pr.codecept.js
+                        export PWD=\$(pwd);
+                        export CHROMIUM_PATH=/usr/bin/chromium
+                        export kubeconfig_minikube="${KUBECONFIG}"
+                        echo "${KUBECONFIG}" > kubeconfig
+                        export KUBECONFIG=./kubeconfig
+                        kubectl get nodes
+                        ./node_modules/.bin/codeceptjs run-multiple parallel --steps --reporter mocha-multi -c pr.codecept.js --grep ${TEST_TAGS}
+                    """
+                }
+            }
+        }
+    }
+    post {
+        always {
+            // stop staging
+            sh '''
+                curl --insecure ${PMM_URL}/logs.zip --output logs.zip || true
+            '''
+            script {
+                if(env.VM_NAME)
+                {
+                    destroyStaging(VM_IP)
+                }
+                if(env.CLUSTER_IP)
+                {
+                    destroyStaging(CLUSTER_IP)
+                }
+            }
+            script {
+                env.PATH_TO_REPORT_RESULTS = 'tests/output/parallel_chunk*/*.xml'
+                if (currentBuild.result == null || currentBuild.result == 'SUCCESS') {
+                    junit env.PATH_TO_REPORT_RESULTS
+                    slackSend channel: '#pmm-ci', color: '#00FF00', message: "[${JOB_NAME}]: build finished - ${BUILD_URL} "
+                    archiveArtifacts artifacts: 'logs.zip'
+                } else {
+                    junit env.PATH_TO_REPORT_RESULTS
+                    slackSend channel: '#pmm-ci', color: '#FF0000', message: "[${JOB_NAME}]: build ${currentBuild.result} - ${BUILD_URL}"
+                    archiveArtifacts artifacts: 'logs.zip'
+                    archiveArtifacts artifacts: 'tests/output/*.png'
+                    archiveArtifacts artifacts: 'tests/output/parallel_chunk*/*.png'
+                }
+            }
+            allure([
+                includeProperties: false,
+                jdk: '',
+                properties: [],
+                reportBuildPolicy: 'ALWAYS',
+                results: [[path: 'tests/output/allure']]
+            ])
+            sh '''
+                sudo rm -r node_modules/
+                sudo rm -r tests/output
+            '''
+            deleteDir()
+        }
+    }
+}
diff --git a/vars/pmmVersion.groovy b/vars/pmmVersion.groovy
index d584a26257..e8e947d0e6 100644
--- a/vars/pmmVersion.groovy
+++ b/vars/pmmVersion.groovy
@@ -63,5 +63,7 @@ def call(String type='latest') {
       return ovfVersions
     case 'list_with_old':
       return oldVersions + versionsList
+    case 'dbaas':
+      return ['2.23.0', '2.24.0', '2.25.0', '2.26.0', '2.27.0', '2.28.0']
   }
 }