diff --git a/molecule/ps-innodb-cluster/Jenkinsfile b/molecule/ps-innodb-cluster/Jenkinsfile
index a8be0eab7..ef9559816 100644
--- a/molecule/ps-innodb-cluster/Jenkinsfile
+++ b/molecule/ps-innodb-cluster/Jenkinsfile
@@ -33,7 +33,7 @@ pipeline {
             fi
             pip3 install ansible python-vagrant testinfra pytest
             rm -rf package-testing
-            git clone https://github.com/Percona-QA/package-testing.git --branch master --depth 1
+            git clone https://github.com/kaushikpuneet07/package-testing.git --branch ps84-inno --depth 1
           '''
       } //end steps
     } //end Prepare stage
diff --git a/molecule/ps-innodb-cluster/playbooks/prepare.yml b/molecule/ps-innodb-cluster/playbooks/prepare.yml
index cd379bb0e..494bb6e77 100644
--- a/molecule/ps-innodb-cluster/playbooks/prepare.yml
+++ b/molecule/ps-innodb-cluster/playbooks/prepare.yml
@@ -75,21 +75,21 @@
         update_cache: yes
         state: present
       when: 
-        - ansible_facts['distribution'] in ["RedHat", "CentOS", "OracleLinux", "Amazon"]
+        - ansible_facts['distribution'] in ["RedHat", "CentOS", "OracleLinux"]
         - ansible_facts['distribution_major_version'] | int <= 7
 
-    - name: setup epel release centos dnf
+    - name: setup epel release dnf
       dnf:
         name: epel-release
         update_cache: yes
         state: present
       when: 
-        - ansible_facts['distribution'] in ["RedHat", "CentOS", "OracleLinux", "Amazon"]
+        - ansible_facts['distribution'] in ["RedHat", "CentOS", "OracleLinux"]
         - ansible_facts['distribution_major_version'] | int >= 8
 
     - name: buster workaround
       shell: |
-        apt -y update --allow-releaseinfo-change || true 
+        apt -y update --allow-releaseinfo-change || true
       when: ansible_os_family == "Debian" and ansible_distribution_release == "buster"
 
     - name: install needed packages for running tests with apt
diff --git a/molecule/ps-innodb-cluster/router/molecule/al-2023-arm/molecule.yml b/molecule/ps-innodb-cluster/router/molecule/al-2023-arm/molecule.yml
new file mode 100644
index 000000000..87586c485
--- /dev/null
+++ b/molecule/ps-innodb-cluster/router/molecule/al-2023-arm/molecule.yml
@@ -0,0 +1,35 @@
+---
+scenario:
+  name: al-2023-arm
+dependency:
+  name: galaxy
+driver:
+  name: ec2
+platforms:
+  - name: mysql-router-al-2023-arm
+    region: us-west-2
+    image: ami-0c7104b910fd5acb5
+    vpc_subnet_id: subnet-03136d8c244f56036
+    instance_type: c6g.large
+    ssh_user: ec2-user
+    root_device_name: /dev/sda1
+    instance_tags:
+      iit-billing-tag: jenkins-ps80-worker
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    create: ../../../playbooks/create.yml
+    destroy: ../../../playbooks/destroy.yml
+    prepare: ../../../playbooks/prepare.yml
+    converge: ../../playbooks/playbook.yml
+verifier:
+  name: testinfra
+  directory: ../../tests/
+  options:
+    verbose: true
+    s: true
+    junitxml: report.xml
+  lint:
+    name: flake8
diff --git a/molecule/ps-innodb-cluster/router/molecule/al-2023/molecule.yml b/molecule/ps-innodb-cluster/router/molecule/al-2023/molecule.yml
new file mode 100644
index 000000000..361d72fa1
--- /dev/null
+++ b/molecule/ps-innodb-cluster/router/molecule/al-2023/molecule.yml
@@ -0,0 +1,35 @@
+---
+scenario:
+  name: al-2023
+dependency:
+  name: galaxy
+driver:
+  name: ec2
+platforms:
+  - name: mysql-router-al-2023
+    region: us-west-2
+    image: ami-0005ee01bca55ab66
+    vpc_subnet_id: subnet-03136d8c244f56036
+    instance_type: t2.small
+    ssh_user: ec2-user
+    root_device_name: /dev/sda1
+    instance_tags:
+      iit-billing-tag: jenkins-ps-worker
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    create: ../../../playbooks/create.yml
+    destroy: ../../../playbooks/destroy.yml
+    prepare: ../../../playbooks/prepare.yml
+    converge: ../../playbooks/playbook.yml
+verifier:
+  name: testinfra
+  directory: ../../tests/
+  options:
+    verbose: true
+    s: true
+    junitxml: report.xml
+  lint:
+    name: flake8
diff --git a/molecule/ps-innodb-cluster/router/molecule/debian-13-arm/molecule.yml b/molecule/ps-innodb-cluster/router/molecule/debian-13-arm/molecule.yml
new file mode 100644
index 000000000..fd74be0d8
--- /dev/null
+++ b/molecule/ps-innodb-cluster/router/molecule/debian-13-arm/molecule.yml
@@ -0,0 +1,35 @@
+---
+scenario:
+  name: debian-13-arm
+dependency:
+  name: galaxy
+driver:
+  name: ec2
+platforms:
+  - name: mysql-router-debian-13-arm
+    region: us-west-2
+    image: ami-00f9bd78b9eb2c2d0
+    vpc_subnet_id: subnet-0430e63d7cdbcd237
+    instance_type: c6g.large
+    ssh_user: admin
+    root_device_name: /dev/xvda
+    instance_tags:
+      iit-billing-tag: jenkins-ps-worker
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    create: ../../../playbooks/create.yml
+    destroy: ../../../playbooks/destroy.yml
+    prepare: ../../../playbooks/prepare.yml
+    converge: ../../playbooks/playbook.yml
+verifier:
+  name: testinfra
+  directory: ../../tests/
+  options:
+    verbose: true
+    s: true
+    junitxml: report.xml
+  lint:
+    name: flake8
diff --git a/molecule/ps-innodb-cluster/router/molecule/debian-13/molecule.yml b/molecule/ps-innodb-cluster/router/molecule/debian-13/molecule.yml
new file mode 100644
index 000000000..4bf342e0e
--- /dev/null
+++ b/molecule/ps-innodb-cluster/router/molecule/debian-13/molecule.yml
@@ -0,0 +1,35 @@
+---
+scenario:
+  name: debian-13
+dependency:
+  name: galaxy
+driver:
+  name: ec2
+platforms:
+  - name: mysql-router-debian-13
+    region: us-west-2
+    image: ami-081ac37fe26dacc98
+    vpc_subnet_id: subnet-0430e63d7cdbcd237
+    instance_type: t2.micro
+    ssh_user: admin
+    root_device_name: /dev/xvda
+    instance_tags:
+      iit-billing-tag: jenkins-ps-worker
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    create: ../../../playbooks/create.yml
+#    destroy: ../../../playbooks/destroy.yml
+    prepare: ../../../playbooks/prepare.yml
+    converge: ../../playbooks/playbook.yml
+verifier:
+  name: testinfra
+  directory: ../../tests/
+  options:
+    verbose: true
+    s: true
+    junitxml: report.xml
+  lint:
+    name: flake8
diff --git a/molecule/ps-innodb-cluster/router/tasks/main.yml b/molecule/ps-innodb-cluster/router/tasks/main.yml
index 29b5d6c33..330341f92 100644
--- a/molecule/ps-innodb-cluster/router/tasks/main.yml
+++ b/molecule/ps-innodb-cluster/router/tasks/main.yml
@@ -94,10 +94,10 @@
       - ansible_facts['distribution'] in ["RedHat", "CentOS", "OracleLinux", "Amazon"]
       - ansible_facts['distribution_major_version'] | int >= 8
 
-  - name: remove conflicting bundled libssh
-    file:
-      path: /usr/lib/mysqlsh/libssh.so.4
-      state: absent
+#  - name: remove conflicting bundled libssh
+#    file:
+#      path: /usr/lib/mysqlsh/libssh.so.4
+#      state: absent
 
 
   - name: create cluster
diff --git a/molecule/ps-innodb-cluster/server/molecule/al-2023-arm/molecule.yml b/molecule/ps-innodb-cluster/server/molecule/al-2023-arm/molecule.yml
new file mode 100644
index 000000000..fd9901aed
--- /dev/null
+++ b/molecule/ps-innodb-cluster/server/molecule/al-2023-arm/molecule.yml
@@ -0,0 +1,59 @@
+---
+scenario:
+  name: al-2023-arm
+dependency:
+  name: galaxy
+driver:
+  name: ec2
+platforms:
+  - name: ps-node1-al-2023-arm
+    region: us-west-2
+    image: ami-0c7104b910fd5acb5
+    vpc_subnet_id: subnet-03136d8c244f56036
+    instance_type: c6g.large
+    ssh_user: ec2-user
+    root_device_name: /dev/sda1
+    instance_tags:
+      iit-billing-tag: jenkins-ps80-worker
+      job-name: ${JOB_NAME}
+      build-number: ${BUILD_NUMBER}
+  - name: ps-node2-al-2023-arm
+    region: us-west-2
+    image: ami-0c7104b910fd5acb5
+    vpc_subnet_id: subnet-03136d8c244f56036
+    instance_type: c6g.large
+    ssh_user: ec2-user
+    root_device_name: /dev/sda1
+    instance_tags:
+      iit-billing-tag: jenkins-ps80-worker
+      job-name: ${JOB_NAME}
+      build-number: ${BUILD_NUMBER}
+  - name: ps-node3-al-2023-arm
+    region: us-west-2
+    image: ami-0c7104b910fd5acb5
+    vpc_subnet_id: subnet-03136d8c244f56036
+    instance_type: c6g.large
+    ssh_user: ec2-user
+    root_device_name: /dev/sda1
+    instance_tags:
+      iit-billing-tag: jenkins-ps80-worker
+      job-name: ${JOB_NAME}
+      build-number: ${BUILD_NUMBER}
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    create: ../../../playbooks/create.yml
+    destroy: ../../../playbooks/destroy.yml
+    prepare: ../../../playbooks/prepare.yml
+    converge: ../../playbooks/playbook.yml
+verifier:
+  name: testinfra
+  directory: ../../tests/
+  options:
+    verbose: true
+    s: true
+    junitxml: report.xml
+  lint:
+    name: flake8
diff --git a/molecule/ps-innodb-cluster/server/molecule/al-2023/molecule.yml b/molecule/ps-innodb-cluster/server/molecule/al-2023/molecule.yml
new file mode 100644
index 000000000..e5e9d5cc6
--- /dev/null
+++ b/molecule/ps-innodb-cluster/server/molecule/al-2023/molecule.yml
@@ -0,0 +1,59 @@
+---
+scenario:
+  name: al-2023
+dependency:
+  name: galaxy
+driver:
+  name: ec2
+platforms:
+  - name: ps-node1-al-2023
+    region: us-west-2
+    image: ami-0005ee01bca55ab66
+    vpc_subnet_id: subnet-03136d8c244f56036
+    instance_type: t2.small
+    ssh_user: ec2-user
+    root_device_name: /dev/sda1
+    instance_tags:
+      iit-billing-tag: jenkins-ps80-worker
+      job-name: ${JOB_NAME}
+      build-number: ${BUILD_NUMBER}
+  - name: ps-node2-al-2023
+    region: us-west-2
+    image: ami-0005ee01bca55ab66
+    vpc_subnet_id: subnet-03136d8c244f56036
+    instance_type: t2.small
+    ssh_user: ec2-user
+    root_device_name: /dev/sda1
+    instance_tags:
+      iit-billing-tag: jenkins-ps80-worker
+      job-name: ${JOB_NAME}
+      build-number: ${BUILD_NUMBER}
+  - name: ps-node3-al-2023
+    region: us-west-2
+    image: ami-0005ee01bca55ab66
+    vpc_subnet_id: subnet-03136d8c244f56036
+    instance_type: t2.small
+    ssh_user: ec2-user
+    root_device_name: /dev/sda1
+    instance_tags:
+      iit-billing-tag: jenkins-ps80-worker
+      job-name: ${JOB_NAME}
+      build-number: ${BUILD_NUMBER}
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    create: ../../../playbooks/create.yml
+    destroy: ../../../playbooks/destroy.yml
+    prepare: ../../../playbooks/prepare.yml
+    converge: ../../playbooks/playbook.yml
+verifier:
+  name: testinfra
+  directory: ../../tests/
+  options:
+    verbose: true
+    s: true
+    junitxml: report.xml
+  lint:
+    name: flake8
diff --git a/molecule/ps-innodb-cluster/server/molecule/debian-13-arm/molecule.yml b/molecule/ps-innodb-cluster/server/molecule/debian-13-arm/molecule.yml
new file mode 100644
index 000000000..8dbadde1b
--- /dev/null
+++ b/molecule/ps-innodb-cluster/server/molecule/debian-13-arm/molecule.yml
@@ -0,0 +1,59 @@
+---
+scenario:
+  name: debian-13-arm
+dependency:
+  name: galaxy
+driver:
+  name: ec2
+platforms:
+  - name: ps-node1-debian-13-arm
+    region: us-west-2
+    image: ami-00f9bd78b9eb2c2d0
+    vpc_subnet_id: subnet-03136d8c244f56036
+    instance_type: c6g.large
+    ssh_user: admin
+    root_device_name: /dev/xvda
+    instance_tags:
+      iit-billing-tag: jenkins-ps-worker
+      job-name: ${JOB_NAME}
+      build-number: ${BUILD_NUMBER}
+  - name: ps-node2-debian-12-arm
+    region: us-west-2
+    image: ami-00f9bd78b9eb2c2d0
+    vpc_subnet_id: subnet-03136d8c244f56036
+    instance_type: c6g.large
+    ssh_user: admin
+    root_device_name: /dev/xvda
+    instance_tags:
+      iit-billing-tag: jenkins-ps-worker
+      job-name: ${JOB_NAME}
+      build-number: ${BUILD_NUMBER}
+  - name: ps-node3-debian-12-arm
+    region: us-west-2
+    image: ami-00f9bd78b9eb2c2d0
+    vpc_subnet_id: subnet-03136d8c244f56036
+    instance_type: c6g.large
+    ssh_user: admin
+    root_device_name: /dev/xvda
+    instance_tags:
+      iit-billing-tag: jenkins-ps-worker
+      job-name: ${JOB_NAME}
+      build-number: ${BUILD_NUMBER}
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    create: ../../../playbooks/create.yml
+    destroy: ../../../playbooks/destroy.yml
+    prepare: ../../../playbooks/prepare.yml
+    converge: ../../playbooks/playbook.yml
+verifier:
+  name: testinfra
+  directory: ../../tests/
+  options:
+    verbose: true
+    s: true
+    junitxml: report.xml
+  lint:
+    name: flake8
diff --git a/molecule/ps-innodb-cluster/server/molecule/debian-13/molecule.yml b/molecule/ps-innodb-cluster/server/molecule/debian-13/molecule.yml
new file mode 100644
index 000000000..ae255d344
--- /dev/null
+++ b/molecule/ps-innodb-cluster/server/molecule/debian-13/molecule.yml
@@ -0,0 +1,59 @@
+---
+scenario:
+  name: debian-13
+dependency:
+  name: galaxy
+driver:
+  name: ec2
+platforms:
+  - name: ps-node1-debian-13
+    region: us-west-2
+    image: ami-081ac37fe26dacc98
+    vpc_subnet_id: subnet-03136d8c244f56036
+    instance_type: t2.micro
+    ssh_user: admin
+    root_device_name: /dev/xvda
+    instance_tags:
+      iit-billing-tag: jenkins-ps-worker
+      job-name: ${JOB_NAME}
+      build-number: ${BUILD_NUMBER}
+  - name: ps-node2-debian-13
+    region: us-west-2
+    image: ami-081ac37fe26dacc98
+    vpc_subnet_id: subnet-03136d8c244f56036
+    instance_type: t2.micro
+    ssh_user: admin
+    root_device_name: /dev/xvda
+    instance_tags:
+      iit-billing-tag: jenkins-ps-worker
+      job-name: ${JOB_NAME}
+      build-number: ${BUILD_NUMBER}
+  - name: ps-node3-debian-13
+    region: us-west-2
+    image: ami-081ac37fe26dacc98
+    vpc_subnet_id: subnet-03136d8c244f56036
+    instance_type: t2.micro
+    ssh_user: admin
+    root_device_name: /dev/xvda
+    instance_tags:
+      iit-billing-tag: jenkins-ps-worker
+      job-name: ${JOB_NAME}
+      build-number: ${BUILD_NUMBER}
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    create: ../../../playbooks/create.yml
+#    destroy: ../../../playbooks/destroy.yml
+    prepare: ../../../playbooks/prepare.yml
+    converge: ../../playbooks/playbook.yml
+verifier:
+  name: testinfra
+  directory: ../../tests/
+  options:
+    verbose: true
+    s: true
+    junitxml: report.xml
+  lint:
+    name: flake8
diff --git a/tasks/test_prep.yml b/tasks/test_prep.yml
index 51c27b69f..625aba31d 100644
--- a/tasks/test_prep.yml
+++ b/tasks/test_prep.yml
@@ -243,10 +243,10 @@
     with_items:
     - rm -rf /package-testing
     - rm -f master.zip
-    - wget --no-check-certificate -O master.zip "https://github.com/{{ git_account }}/package-testing/archive/{{ branch }}.zip"
+    - wget --no-check-certificate -O master.zip "https://github.com/kaushikpuneet07/package-testing/archive/ps84-inno.zip"
     - unzip master.zip
     - rm -f master.zip
-    - mv "package-testing-{{ branch }}" /package-testing
+    - mv "package-testing-ps84-inno" /package-testing
     vars:
       branch: "{{ lookup('env', 'TESTING_BRANCH') | default('master', true) }}"
       git_account: "{{ lookup('env', 'TESTING_GIT_ACCOUNT') | default('Percona-QA', true) }}"