diff --git a/e2e-tests/functions b/e2e-tests/functions
index e69256717e..ecdb008d13 100644
--- a/e2e-tests/functions
+++ b/e2e-tests/functions
@@ -1114,7 +1114,11 @@ get_container_image() {
 		operatorVersion=main
 	fi
 
-	echo "${IMAGE_BASE}:${operatorVersion}-ppg${pgVersion}-${component}"
+	if [[ $component == 'pgbouncer' || $component == 'pgbackrest' ]]; then
+		echo "${IMAGE_BASE}:${operatorVersion}-${component}${pgVersion}"
+	else
+		echo "${IMAGE_BASE}:${operatorVersion}-ppg${pgVersion}-${component}"
+	fi
 }
 
 get_postgresql_logs() {
diff --git a/e2e-tests/run-release.csv b/e2e-tests/run-release.csv
index 358ce44987..5a53e2617b 100644
--- a/e2e-tests/run-release.csv
+++ b/e2e-tests/run-release.csv
@@ -6,6 +6,7 @@ database-init-sql
 demand-backup
 finalizers
 init-deploy
+major-upgrade
 monitoring
 monitoring-pmm3
 one-pod
diff --git a/e2e-tests/tests/major-upgrade/01-create-cluster.yaml b/e2e-tests/tests/major-upgrade/01-create-cluster.yaml
index 729fbcc51f..ad23c41e3d 100644
--- a/e2e-tests/tests/major-upgrade/01-create-cluster.yaml
+++ b/e2e-tests/tests/major-upgrade/01-create-cluster.yaml
@@ -10,11 +10,11 @@ commands:
 
       get_cr \
         | yq eval '
-          .spec.postgresVersion = 12 |
-          .spec.image = "perconalab/percona-postgresql-operator:main-ppg12-postgres" |
+          .spec.postgresVersion = 13 |
+          .spec.image = "perconalab/percona-postgresql-operator:main-ppg13-postgres" |
           .spec.instances[0].dataVolumeClaimSpec.resources.requests.storage = "3Gi" |
-          .spec.proxy.pgBouncer.image = "perconalab/percona-postgresql-operator:main-ppg12-pgbouncer" |
-          .spec.backups.pgbackrest.image = "perconalab/percona-postgresql-operator:main-ppg12-pgbackrest" |
+          .spec.proxy.pgBouncer.image = "perconalab/percona-postgresql-operator:main-pgbouncer13" |
+          .spec.backups.pgbackrest.image = "perconalab/percona-postgresql-operator:main-pgbackrest13" |
           .spec.patroni.dynamicConfiguration.postgresql.parameters.shared_preload_libraries = "pg_cron" |
           .spec.extensions.custom += [{"name": "pg_cron", "version": "1.6.1"}]' \
         | kubectl -n "${NAMESPACE}" apply -f -
diff --git a/e2e-tests/tests/major-upgrade/20-13-to-14.yaml b/e2e-tests/tests/major-upgrade/04-13-to-14.yaml
similarity index 100%
rename from e2e-tests/tests/major-upgrade/20-13-to-14.yaml
rename to e2e-tests/tests/major-upgrade/04-13-to-14.yaml
diff --git a/e2e-tests/tests/major-upgrade/30-assert.yaml b/e2e-tests/tests/major-upgrade/04-assert.yaml
similarity index 90%
rename from e2e-tests/tests/major-upgrade/30-assert.yaml
rename to e2e-tests/tests/major-upgrade/04-assert.yaml
index b871b4faf8..23d3a30f61 100644
--- a/e2e-tests/tests/major-upgrade/30-assert.yaml
+++ b/e2e-tests/tests/major-upgrade/04-assert.yaml
@@ -11,7 +11,7 @@ kind: PerconaPGCluster
 metadata:
   name: major-upgrade
 spec:
-  postgresVersion: 15
+  postgresVersion: 14
 status:
   pgbouncer:
     ready: 3
@@ -32,7 +32,7 @@ metadata:
     postgres-operator.crunchydata.com/cluster: major-upgrade
     postgres-operator.crunchydata.com/pgbackrest: ''
     postgres-operator.crunchydata.com/pgbackrest-backup: replica-create
-    postgres-operator.crunchydata.com/pgbackrest-repo: repo3
+    postgres-operator.crunchydata.com/pgbackrest-repo: repo1
   ownerReferences:
     - apiVersion: pgv2.percona.com/v2
       kind: PerconaPGBackup
diff --git a/e2e-tests/tests/major-upgrade/46-assert.yaml b/e2e-tests/tests/major-upgrade/05-assert.yaml
similarity index 96%
rename from e2e-tests/tests/major-upgrade/46-assert.yaml
rename to e2e-tests/tests/major-upgrade/05-assert.yaml
index 1b95780c8f..47ccba03b5 100644
--- a/e2e-tests/tests/major-upgrade/46-assert.yaml
+++ b/e2e-tests/tests/major-upgrade/05-assert.yaml
@@ -16,6 +16,6 @@ status:
   pgbackrest:
     repos:
     - bound: true
-      name: repo1
+      name: repo2
       replicaCreateBackupComplete: true
       stanzaCreated: true
diff --git a/e2e-tests/tests/major-upgrade/11-change-repo.yaml b/e2e-tests/tests/major-upgrade/05-change-repo.yaml
similarity index 100%
rename from e2e-tests/tests/major-upgrade/11-change-repo.yaml
rename to e2e-tests/tests/major-upgrade/05-change-repo.yaml
diff --git a/e2e-tests/tests/major-upgrade/22-assert.yaml b/e2e-tests/tests/major-upgrade/06-assert.yaml
similarity index 88%
rename from e2e-tests/tests/major-upgrade/22-assert.yaml
rename to e2e-tests/tests/major-upgrade/06-assert.yaml
index 7a2f6c1c0f..605465e35a 100644
--- a/e2e-tests/tests/major-upgrade/22-assert.yaml
+++ b/e2e-tests/tests/major-upgrade/06-assert.yaml
@@ -9,7 +9,7 @@ metadata:
     postgres-operator.crunchydata.com/pgbackrest-backup: backup-after-13-to-14
   labels:
     postgres-operator.crunchydata.com/pgbackrest-backup: manual
-    postgres-operator.crunchydata.com/pgbackrest-repo: repo3
+    postgres-operator.crunchydata.com/pgbackrest-repo: repo2
   ownerReferences:
     - apiVersion: pgv2.percona.com/v2
       kind: PerconaPGBackup
@@ -24,7 +24,7 @@ metadata:
   name: backup-after-13-to-14
 spec:
   pgCluster: major-upgrade
-  repoName: repo3
+  repoName: repo2
   options:
     - --type=full
 status:
diff --git a/e2e-tests/tests/major-upgrade/22-run-backup.yaml b/e2e-tests/tests/major-upgrade/06-run-backup.yaml
similarity index 89%
rename from e2e-tests/tests/major-upgrade/22-run-backup.yaml
rename to e2e-tests/tests/major-upgrade/06-run-backup.yaml
index a7a1050c53..aaf7d5a7c4 100644
--- a/e2e-tests/tests/major-upgrade/22-run-backup.yaml
+++ b/e2e-tests/tests/major-upgrade/06-run-backup.yaml
@@ -4,6 +4,6 @@ metadata:
   name: backup-after-13-to-14
 spec:
   pgCluster: major-upgrade
-  repoName: repo3
+  repoName: repo2
   options:
     - --type=full
diff --git a/e2e-tests/tests/major-upgrade/24-assert.yaml b/e2e-tests/tests/major-upgrade/07-assert.yaml
similarity index 100%
rename from e2e-tests/tests/major-upgrade/24-assert.yaml
rename to e2e-tests/tests/major-upgrade/07-assert.yaml
diff --git a/e2e-tests/tests/major-upgrade/24-read-from-primary.yaml b/e2e-tests/tests/major-upgrade/07-read-from-primary.yaml
similarity index 100%
rename from e2e-tests/tests/major-upgrade/24-read-from-primary.yaml
rename to e2e-tests/tests/major-upgrade/07-read-from-primary.yaml
diff --git a/e2e-tests/tests/major-upgrade/30-14-to-15.yaml b/e2e-tests/tests/major-upgrade/08-14-to-15.yaml
similarity index 100%
rename from e2e-tests/tests/major-upgrade/30-14-to-15.yaml
rename to e2e-tests/tests/major-upgrade/08-14-to-15.yaml
diff --git a/e2e-tests/tests/major-upgrade/20-assert.yaml b/e2e-tests/tests/major-upgrade/08-assert.yaml
similarity index 97%
rename from e2e-tests/tests/major-upgrade/20-assert.yaml
rename to e2e-tests/tests/major-upgrade/08-assert.yaml
index c506a745f5..c00e35e2ae 100644
--- a/e2e-tests/tests/major-upgrade/20-assert.yaml
+++ b/e2e-tests/tests/major-upgrade/08-assert.yaml
@@ -11,7 +11,7 @@ kind: PerconaPGCluster
 metadata:
   name: major-upgrade
 spec:
-  postgresVersion: 14
+  postgresVersion: 15
 status:
   pgbouncer:
     ready: 3
diff --git a/e2e-tests/tests/major-upgrade/21-assert.yaml b/e2e-tests/tests/major-upgrade/09-assert.yaml
similarity index 100%
rename from e2e-tests/tests/major-upgrade/21-assert.yaml
rename to e2e-tests/tests/major-upgrade/09-assert.yaml
diff --git a/e2e-tests/tests/major-upgrade/21-change-repo.yaml b/e2e-tests/tests/major-upgrade/09-change-repo.yaml
similarity index 100%
rename from e2e-tests/tests/major-upgrade/21-change-repo.yaml
rename to e2e-tests/tests/major-upgrade/09-change-repo.yaml
diff --git a/e2e-tests/tests/major-upgrade/10-12-to-13.yaml b/e2e-tests/tests/major-upgrade/10-12-to-13.yaml
deleted file mode 100644
index 96a7fe9207..0000000000
--- a/e2e-tests/tests/major-upgrade/10-12-to-13.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-  - script: |-
-      set -o errexit
-      set -o xtrace
-
-      source ../../functions
-
-      kubectl apply -n ${NAMESPACE} -f - <<-EOF
-        apiVersion: pgv2.percona.com/v2
-        kind: PerconaPGUpgrade
-        metadata:
-          name: 12-to-13
-        spec:
-          postgresClusterName: major-upgrade
-          image: ${IMAGE_UPGRADE}
-          fromPostgresVersion: 12
-          toPostgresVersion: 13
-          toPostgresImage: $(get_container_image "postgres" 13)
-          toPgBouncerImage: $(get_container_image "pgbouncer" 13)
-          toPgBackRestImage: $(get_container_image "pgbackrest" 13)
-      EOF
-
diff --git a/e2e-tests/tests/major-upgrade/10-assert.yaml b/e2e-tests/tests/major-upgrade/10-assert.yaml
index ae8dcb18f8..4a603ba7e9 100644
--- a/e2e-tests/tests/major-upgrade/10-assert.yaml
+++ b/e2e-tests/tests/major-upgrade/10-assert.yaml
@@ -1,38 +1,15 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
-timeout: 360
-commands:
-- script: |-
-    kubectl -n ${NAMESPACE} get pg,pod,job
-    sleep 5
----
-apiVersion: pgv2.percona.com/v2
-kind: PerconaPGCluster
-metadata:
-  name: major-upgrade
-spec:
-  postgresVersion: 13
-status:
-  pgbouncer:
-    ready: 3
-    size: 3
-  postgres:
-    instances:
-    - name: instance1
-      ready: 3
-      size: 3
-    ready: 3
-    size: 3
-  state: ready
+timeout: 660
 ---
 kind: Job
 apiVersion: batch/v1
 metadata:
+  annotations:
+    postgres-operator.crunchydata.com/pgbackrest-backup: backup-after-14-to-15
   labels:
-    postgres-operator.crunchydata.com/cluster: major-upgrade
-    postgres-operator.crunchydata.com/pgbackrest: ''
-    postgres-operator.crunchydata.com/pgbackrest-backup: replica-create
-    postgres-operator.crunchydata.com/pgbackrest-repo: repo1
+    postgres-operator.crunchydata.com/pgbackrest-backup: manual
+    postgres-operator.crunchydata.com/pgbackrest-repo: repo3
   ownerReferences:
     - apiVersion: pgv2.percona.com/v2
       kind: PerconaPGBackup
@@ -40,3 +17,15 @@ metadata:
       blockOwnerDeletion: true
 status:
   succeeded: 1
+---
+apiVersion: pgv2.percona.com/v2
+kind: PerconaPGBackup
+metadata:
+  name: backup-after-14-to-15
+spec:
+  pgCluster: major-upgrade
+  repoName: repo3
+  options:
+    - --type=full
+status:
+  state: Succeeded
diff --git a/e2e-tests/tests/major-upgrade/32-run-backup.yaml b/e2e-tests/tests/major-upgrade/10-run-backup.yaml
similarity index 89%
rename from e2e-tests/tests/major-upgrade/32-run-backup.yaml
rename to e2e-tests/tests/major-upgrade/10-run-backup.yaml
index 792209c20c..047e0b5571 100644
--- a/e2e-tests/tests/major-upgrade/32-run-backup.yaml
+++ b/e2e-tests/tests/major-upgrade/10-run-backup.yaml
@@ -4,6 +4,6 @@ metadata:
   name: backup-after-14-to-15
 spec:
   pgCluster: major-upgrade
-  repoName: repo4
+  repoName: repo3
   options:
     - --type=full
diff --git a/e2e-tests/tests/major-upgrade/11-assert.yaml b/e2e-tests/tests/major-upgrade/11-assert.yaml
index 47ccba03b5..95d57c293f 100644
--- a/e2e-tests/tests/major-upgrade/11-assert.yaml
+++ b/e2e-tests/tests/major-upgrade/11-assert.yaml
@@ -1,21 +1,10 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
-timeout: 660
-commands:
-- script: |-
-    kubectl get postgrescluster major-upgrade \
-      -n ${NAMESPACE} \
-      -o yaml \
-    | yq eval '.status.pgbackrest.repos' -
+timeout: 30
 ---
-apiVersion: postgres-operator.crunchydata.com/v1beta1
-kind: PostgresCluster
+kind: ConfigMap
+apiVersion: v1
 metadata:
-  name: major-upgrade
-status:
-  pgbackrest:
-    repos:
-    - bound: true
-      name: repo2
-      replicaCreateBackupComplete: true
-      stanzaCreated: true
+  name: 11-read-from-primary
+data:
+  data: ' 100500'
diff --git a/e2e-tests/tests/major-upgrade/44-read-from-primary.yaml b/e2e-tests/tests/major-upgrade/11-read-from-primary.yaml
similarity index 100%
rename from e2e-tests/tests/major-upgrade/44-read-from-primary.yaml
rename to e2e-tests/tests/major-upgrade/11-read-from-primary.yaml
diff --git a/e2e-tests/tests/major-upgrade/40-15-to-16.yaml b/e2e-tests/tests/major-upgrade/12-15-to-16.yaml
similarity index 100%
rename from e2e-tests/tests/major-upgrade/40-15-to-16.yaml
rename to e2e-tests/tests/major-upgrade/12-15-to-16.yaml
diff --git a/e2e-tests/tests/major-upgrade/12-assert.yaml b/e2e-tests/tests/major-upgrade/12-assert.yaml
index d1790eabf5..8cd5dbcad3 100644
--- a/e2e-tests/tests/major-upgrade/12-assert.yaml
+++ b/e2e-tests/tests/major-upgrade/12-assert.yaml
@@ -1,15 +1,38 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
-timeout: 660
+timeout: 360
+commands:
+- script: |-
+    kubectl -n ${NAMESPACE} get pg,pod,job
+    sleep 5
+---
+apiVersion: pgv2.percona.com/v2
+kind: PerconaPGCluster
+metadata:
+  name: major-upgrade
+spec:
+  postgresVersion: 16
+status:
+  pgbouncer:
+    ready: 3
+    size: 3
+  postgres:
+    instances:
+    - name: instance1
+      ready: 3
+      size: 3
+    ready: 3
+    size: 3
+  state: ready
 ---
 kind: Job
 apiVersion: batch/v1
 metadata:
-  annotations:
-    postgres-operator.crunchydata.com/pgbackrest-backup: backup-after-12-to-13
   labels:
-    postgres-operator.crunchydata.com/pgbackrest-backup: manual
-    postgres-operator.crunchydata.com/pgbackrest-repo: repo2
+    postgres-operator.crunchydata.com/cluster: major-upgrade
+    postgres-operator.crunchydata.com/pgbackrest: ''
+    postgres-operator.crunchydata.com/pgbackrest-backup: replica-create
+    postgres-operator.crunchydata.com/pgbackrest-repo: repo3
   ownerReferences:
     - apiVersion: pgv2.percona.com/v2
       kind: PerconaPGBackup
@@ -17,15 +40,3 @@ metadata:
       blockOwnerDeletion: true
 status:
   succeeded: 1
----
-apiVersion: pgv2.percona.com/v2
-kind: PerconaPGBackup
-metadata:
-  name: backup-after-12-to-13
-spec:
-  pgCluster: major-upgrade
-  repoName: repo2
-  options:
-    - --type=full
-status:
-  state: Succeeded
diff --git a/e2e-tests/tests/major-upgrade/12-run-backup.yaml b/e2e-tests/tests/major-upgrade/12-run-backup.yaml
deleted file mode 100644
index 601008d4ca..0000000000
--- a/e2e-tests/tests/major-upgrade/12-run-backup.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-apiVersion: pgv2.percona.com/v2
-kind: PerconaPGBackup
-metadata:
-  name: backup-after-12-to-13
-spec:
-  pgCluster: major-upgrade
-  repoName: repo2
-  options:
-    - --type=full
diff --git a/e2e-tests/tests/major-upgrade/13-assert.yaml b/e2e-tests/tests/major-upgrade/13-assert.yaml
index 2d05bb7d88..6af985e4b7 100644
--- a/e2e-tests/tests/major-upgrade/13-assert.yaml
+++ b/e2e-tests/tests/major-upgrade/13-assert.yaml
@@ -1,52 +1,21 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
-timeout: 720
+timeout: 660
 commands:
 - script: |-
-      set -o errexit
-
-      kubectl -n ${NAMESPACE} get pod
-
-      for pod in $(kubectl -n ${NAMESPACE} get pods -l postgres-operator.crunchydata.com/data=postgres --no-headers | awk '{print $1}'); do
-              phase=$(kubectl -n ${NAMESPACE} get pod/${pod} -o jsonpath={".status.phase"})
-              if [[ "${phase}" != "Running" ]]; then
-                      echo "Waiting for ${pod} to start running"
-                      continue
-              fi
-              echo "PostgreSQL logs from ${pod}:"
-              echo "find /pgdata/pg13/log -type f -iname 'postgresql*.log' -exec tail -n 30 {} \;" \
-                      | kubectl -n ${NAMESPACE} exec -it ${pod} -- bash 2>/dev/null
-      done
-
-      sleep 30
-collectors:
-- type: pod
-  selector: "postgres-operator.crunchydata.com/data=postgres"
-  tail: 30
+    kubectl get postgrescluster major-upgrade \
+      -n ${NAMESPACE} \
+      -o yaml \
+    | yq eval '.status.pgbackrest.repos' -
 ---
-apiVersion: pgv2.percona.com/v2
-kind: PerconaPGRestore
-metadata:
-  name: restore-after-12-to-13
-spec:
-  pgCluster: major-upgrade
-  repoName: repo2
-status:
-  state: Succeeded
----
-apiVersion: pgv2.percona.com/v2
-kind: PerconaPGCluster
+apiVersion: postgres-operator.crunchydata.com/v1beta1
+kind: PostgresCluster
 metadata:
   name: major-upgrade
 status:
-  pgbouncer:
-    ready: 3
-    size: 3
-  postgres:
-    instances:
-    - name: instance1
-      ready: 3
-      size: 3
-    ready: 3
-    size: 3
-  state: ready
+  pgbackrest:
+    repos:
+    - bound: true
+      name: repo4
+      replicaCreateBackupComplete: true
+      stanzaCreated: true
diff --git a/e2e-tests/tests/major-upgrade/31-change-repo.yaml b/e2e-tests/tests/major-upgrade/13-change-repo.yaml
similarity index 100%
rename from e2e-tests/tests/major-upgrade/31-change-repo.yaml
rename to e2e-tests/tests/major-upgrade/13-change-repo.yaml
diff --git a/e2e-tests/tests/major-upgrade/13-run-restore.yaml b/e2e-tests/tests/major-upgrade/13-run-restore.yaml
deleted file mode 100644
index bba96fe985..0000000000
--- a/e2e-tests/tests/major-upgrade/13-run-restore.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: pgv2.percona.com/v2
-kind: PerconaPGRestore
-metadata:
-  name: restore-after-12-to-13
-spec:
-  pgCluster: major-upgrade
-  repoName: repo2
diff --git a/e2e-tests/tests/major-upgrade/14-assert.yaml b/e2e-tests/tests/major-upgrade/14-assert.yaml
index 7c65443fbe..55610fcd16 100644
--- a/e2e-tests/tests/major-upgrade/14-assert.yaml
+++ b/e2e-tests/tests/major-upgrade/14-assert.yaml
@@ -1,10 +1,31 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
-timeout: 30
+timeout: 660
 ---
-kind: ConfigMap
-apiVersion: v1
+kind: Job
+apiVersion: batch/v1
 metadata:
-  name: 05-read-from-primary
-data:
-  data: ' 100500'
+  annotations:
+    postgres-operator.crunchydata.com/pgbackrest-backup: backup-after-15-to-16
+  labels:
+    postgres-operator.crunchydata.com/pgbackrest-backup: manual
+    postgres-operator.crunchydata.com/pgbackrest-repo: repo4
+  ownerReferences:
+    - apiVersion: pgv2.percona.com/v2
+      kind: PerconaPGBackup
+      controller: true
+      blockOwnerDeletion: true
+status:
+  succeeded: 1
+---
+apiVersion: pgv2.percona.com/v2
+kind: PerconaPGBackup
+metadata:
+  name: backup-after-15-to-16
+spec:
+  pgCluster: major-upgrade
+  repoName: repo4
+  options:
+    - --type=full
+status:
+  state: Succeeded
diff --git a/e2e-tests/tests/major-upgrade/14-read-from-primary.yaml b/e2e-tests/tests/major-upgrade/14-read-from-primary.yaml
deleted file mode 100644
index ac80bb337c..0000000000
--- a/e2e-tests/tests/major-upgrade/14-read-from-primary.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-timeout: 30
-commands:
-  - script: |-
-      set -o errexit
-      set -o xtrace
-
-      source ../../functions
-      data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass major-upgrade-pguser-postgres)@$(get_psql_user_host major-upgrade-pguser-postgres)")
-
-      kubectl create configmap -n "${NAMESPACE}" 05-read-from-primary --from-literal=data="${data}"
diff --git a/e2e-tests/tests/major-upgrade/42-run-backup.yaml b/e2e-tests/tests/major-upgrade/14-run-backup.yaml
similarity index 89%
rename from e2e-tests/tests/major-upgrade/42-run-backup.yaml
rename to e2e-tests/tests/major-upgrade/14-run-backup.yaml
index 3e4fe9c94c..adc6c49ed2 100644
--- a/e2e-tests/tests/major-upgrade/42-run-backup.yaml
+++ b/e2e-tests/tests/major-upgrade/14-run-backup.yaml
@@ -4,6 +4,6 @@ metadata:
   name: backup-after-15-to-16
 spec:
   pgCluster: major-upgrade
-  repoName: repo1
+  repoName: repo4
   options:
     - --type=full
diff --git a/e2e-tests/tests/major-upgrade/44-assert.yaml b/e2e-tests/tests/major-upgrade/15-assert.yaml
similarity index 81%
rename from e2e-tests/tests/major-upgrade/44-assert.yaml
rename to e2e-tests/tests/major-upgrade/15-assert.yaml
index 95d57c293f..3590bbe99a 100644
--- a/e2e-tests/tests/major-upgrade/44-assert.yaml
+++ b/e2e-tests/tests/major-upgrade/15-assert.yaml
@@ -5,6 +5,6 @@ timeout: 30
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: 11-read-from-primary
+  name: 15-read-from-primary
 data:
   data: ' 100500'
diff --git a/e2e-tests/tests/major-upgrade/34-read-from-primary.yaml b/e2e-tests/tests/major-upgrade/15-read-from-primary.yaml
similarity index 85%
rename from e2e-tests/tests/major-upgrade/34-read-from-primary.yaml
rename to e2e-tests/tests/major-upgrade/15-read-from-primary.yaml
index 12ff6f8d79..23a10ac997 100644
--- a/e2e-tests/tests/major-upgrade/34-read-from-primary.yaml
+++ b/e2e-tests/tests/major-upgrade/15-read-from-primary.yaml
@@ -9,4 +9,4 @@ commands:
       source ../../functions
       data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass major-upgrade-pguser-postgres)@$(get_psql_user_host major-upgrade-pguser-postgres)")
 
-      kubectl create configmap -n "${NAMESPACE}" 09-read-from-primary --from-literal=data="${data}"
\ No newline at end of file
+      kubectl create configmap -n "${NAMESPACE}" 15-read-from-primary --from-literal=data="${data}"
\ No newline at end of file
diff --git a/e2e-tests/tests/major-upgrade/45-16-to-17.yaml b/e2e-tests/tests/major-upgrade/16-16-to-17.yaml
similarity index 100%
rename from e2e-tests/tests/major-upgrade/45-16-to-17.yaml
rename to e2e-tests/tests/major-upgrade/16-16-to-17.yaml
diff --git a/e2e-tests/tests/major-upgrade/45-assert.yaml b/e2e-tests/tests/major-upgrade/16-assert.yaml
similarity index 100%
rename from e2e-tests/tests/major-upgrade/45-assert.yaml
rename to e2e-tests/tests/major-upgrade/16-assert.yaml
diff --git a/e2e-tests/tests/major-upgrade/31-assert.yaml b/e2e-tests/tests/major-upgrade/17-assert.yaml
similarity index 100%
rename from e2e-tests/tests/major-upgrade/31-assert.yaml
rename to e2e-tests/tests/major-upgrade/17-assert.yaml
diff --git a/e2e-tests/tests/major-upgrade/32-assert.yaml b/e2e-tests/tests/major-upgrade/18-assert.yaml
similarity index 93%
rename from e2e-tests/tests/major-upgrade/32-assert.yaml
rename to e2e-tests/tests/major-upgrade/18-assert.yaml
index 75daf8364c..0bc5ed7dcc 100644
--- a/e2e-tests/tests/major-upgrade/32-assert.yaml
+++ b/e2e-tests/tests/major-upgrade/18-assert.yaml
@@ -6,7 +6,7 @@ kind: Job
 apiVersion: batch/v1
 metadata:
   annotations:
-    postgres-operator.crunchydata.com/pgbackrest-backup: backup-after-14-to-15
+    postgres-operator.crunchydata.com/pgbackrest-backup: backup-after-16-to-17
   labels:
     postgres-operator.crunchydata.com/pgbackrest-backup: manual
     postgres-operator.crunchydata.com/pgbackrest-repo: repo4
@@ -21,7 +21,7 @@ status:
 apiVersion: pgv2.percona.com/v2
 kind: PerconaPGBackup
 metadata:
-  name: backup-after-14-to-15
+  name: backup-after-16-to-17
 spec:
   pgCluster: major-upgrade
   repoName: repo4
diff --git a/e2e-tests/tests/major-upgrade/47-run-backup.yaml b/e2e-tests/tests/major-upgrade/18-run-backup.yaml
similarity index 89%
rename from e2e-tests/tests/major-upgrade/47-run-backup.yaml
rename to e2e-tests/tests/major-upgrade/18-run-backup.yaml
index 392bc719ea..9a378656f4 100644
--- a/e2e-tests/tests/major-upgrade/47-run-backup.yaml
+++ b/e2e-tests/tests/major-upgrade/18-run-backup.yaml
@@ -4,6 +4,6 @@ metadata:
   name: backup-after-16-to-17
 spec:
   pgCluster: major-upgrade
-  repoName: repo1
+  repoName: repo4
   options:
     - --type=full
diff --git a/e2e-tests/tests/major-upgrade/34-assert.yaml b/e2e-tests/tests/major-upgrade/19-assert.yaml
similarity index 81%
rename from e2e-tests/tests/major-upgrade/34-assert.yaml
rename to e2e-tests/tests/major-upgrade/19-assert.yaml
index 7321c61abe..381403d405 100644
--- a/e2e-tests/tests/major-upgrade/34-assert.yaml
+++ b/e2e-tests/tests/major-upgrade/19-assert.yaml
@@ -5,6 +5,6 @@ timeout: 30
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: 09-read-from-primary
+  name: 19-read-from-primary
 data:
   data: ' 100500'
diff --git a/e2e-tests/tests/major-upgrade/49-read-from-primary.yaml b/e2e-tests/tests/major-upgrade/19-read-from-primary.yaml
similarity index 85%
rename from e2e-tests/tests/major-upgrade/49-read-from-primary.yaml
rename to e2e-tests/tests/major-upgrade/19-read-from-primary.yaml
index 03c7aa852b..f835a311f5 100644
--- a/e2e-tests/tests/major-upgrade/49-read-from-primary.yaml
+++ b/e2e-tests/tests/major-upgrade/19-read-from-primary.yaml
@@ -9,4 +9,4 @@ commands:
       source ../../functions
       data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass major-upgrade-pguser-postgres)@$(get_psql_user_host major-upgrade-pguser-postgres)")
 
-      kubectl create configmap -n "${NAMESPACE}" 11-read-from-primary --from-literal=data="${data}"
+      kubectl create configmap -n "${NAMESPACE}" 19-read-from-primary --from-literal=data="${data}"
diff --git a/e2e-tests/tests/major-upgrade/23-assert.yaml b/e2e-tests/tests/major-upgrade/23-assert.yaml
deleted file mode 100644
index 75b542e689..0000000000
--- a/e2e-tests/tests/major-upgrade/23-assert.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestAssert
-timeout: 720
-commands:
-- script: |-
-      set -o errexit
-
-      kubectl -n ${NAMESPACE} get pod
-
-      for pod in $(kubectl -n ${NAMESPACE} get pods -l postgres-operator.crunchydata.com/data=postgres --no-headers | awk '{print $1}'); do
-              phase=$(kubectl -n ${NAMESPACE} get pod/${pod} -o jsonpath={".status.phase"})
-              if [[ "${phase}" != "Running" ]]; then
-                      echo "Waiting for ${pod} to start running"
-                      continue
-              fi
-              echo "PostgreSQL logs from ${pod}:"
-              echo "find /pgdata/pg14/log -type f -iname 'postgresql*.log' -exec tail -n 30 {} \;" \
-                      | kubectl -n ${NAMESPACE} exec -it ${pod} -- bash 2>/dev/null
-      done
-
-      sleep 30
-collectors:
-- type: pod
-  selector: "postgres-operator.crunchydata.com/data=postgres"
-  tail: 30
----
-apiVersion: pgv2.percona.com/v2
-kind: PerconaPGRestore
-metadata:
-  name: restore-after-13-to-14
-spec:
-  pgCluster: major-upgrade
-  repoName: repo3
-status:
-  state: Succeeded
----
-apiVersion: pgv2.percona.com/v2
-kind: PerconaPGCluster
-metadata:
-  name: major-upgrade
-status:
-  pgbouncer:
-    ready: 3
-    size: 3
-  postgres:
-    instances:
-    - name: instance1
-      ready: 3
-      size: 3
-    ready: 3
-    size: 3
-  state: ready
diff --git a/e2e-tests/tests/major-upgrade/23-run-restore.yaml b/e2e-tests/tests/major-upgrade/23-run-restore.yaml
deleted file mode 100644
index 079ebf7b77..0000000000
--- a/e2e-tests/tests/major-upgrade/23-run-restore.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: pgv2.percona.com/v2
-kind: PerconaPGRestore
-metadata:
-  name: restore-after-13-to-14
-spec:
-  pgCluster: major-upgrade
-  repoName: repo3
diff --git a/e2e-tests/tests/major-upgrade/33-assert.yaml b/e2e-tests/tests/major-upgrade/33-assert.yaml
deleted file mode 100644
index 1d3a8a9aae..0000000000
--- a/e2e-tests/tests/major-upgrade/33-assert.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestAssert
-timeout: 720
-commands:
-- script: |-
-      set -o errexit
-
-      kubectl -n ${NAMESPACE} get pod
-
-      for pod in $(kubectl -n ${NAMESPACE} get pods -l postgres-operator.crunchydata.com/data=postgres --no-headers | awk '{print $1}'); do
-              phase=$(kubectl -n ${NAMESPACE} get pod/${pod} -o jsonpath={".status.phase"})
-              if [[ "${phase}" != "Running" ]]; then
-                      echo "Waiting for ${pod} to start running"
-                      continue
-              fi
-              echo "PostgreSQL logs from ${pod}:"
-              echo "find /pgdata/pg15/log -type f -iname 'postgresql*.log' -exec tail -n 30 {} \;" \
-                      | kubectl -n ${NAMESPACE} exec -it ${pod} -- bash 2>/dev/null
-      done
-
-      sleep 30
-collectors:
-- type: pod
-  selector: "postgres-operator.crunchydata.com/data=postgres"
-  tail: 30
----
-apiVersion: pgv2.percona.com/v2
-kind: PerconaPGRestore
-metadata:
-  name: restore-after-14-to-15
-spec:
-  pgCluster: major-upgrade
-  repoName: repo4
-status:
-  state: Succeeded
----
-apiVersion: pgv2.percona.com/v2
-kind: PerconaPGCluster
-metadata:
-  name: major-upgrade
-status:
-  pgbouncer:
-    ready: 3
-    size: 3
-  postgres:
-    instances:
-    - name: instance1
-      ready: 3
-      size: 3
-    ready: 3
-    size: 3
-  state: ready
diff --git a/e2e-tests/tests/major-upgrade/33-run-restore.yaml b/e2e-tests/tests/major-upgrade/33-run-restore.yaml
deleted file mode 100644
index 8e7c7c6dab..0000000000
--- a/e2e-tests/tests/major-upgrade/33-run-restore.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-apiVersion: pgv2.percona.com/v2
-kind: PerconaPGRestore
-metadata:
-  name: restore-after-14-to-15
-spec:
-  pgCluster: major-upgrade
-  repoName: repo4
-
diff --git a/e2e-tests/tests/major-upgrade/40-assert.yaml b/e2e-tests/tests/major-upgrade/40-assert.yaml
deleted file mode 100644
index de3a338c83..0000000000
--- a/e2e-tests/tests/major-upgrade/40-assert.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestAssert
-timeout: 360
-commands:
-- script: |-
-    kubectl -n ${NAMESPACE} get pg,pod,job
-    sleep 5
----
-apiVersion: pgv2.percona.com/v2
-kind: PerconaPGCluster
-metadata:
-  name: major-upgrade
-spec:
-  postgresVersion: 16
-status:
-  pgbouncer:
-    ready: 3
-    size: 3
-  postgres:
-    instances:
-    - name: instance1
-      ready: 3
-      size: 3
-    ready: 3
-    size: 3
-  state: ready
----
-kind: Job
-apiVersion: batch/v1
-metadata:
-  labels:
-    postgres-operator.crunchydata.com/cluster: major-upgrade
-    postgres-operator.crunchydata.com/pgbackrest: ''
-    postgres-operator.crunchydata.com/pgbackrest-backup: replica-create
-    postgres-operator.crunchydata.com/pgbackrest-repo: repo4
-  ownerReferences:
-    - apiVersion: pgv2.percona.com/v2
-      kind: PerconaPGBackup
-      controller: true
-      blockOwnerDeletion: true
-status:
-  succeeded: 1
diff --git a/e2e-tests/tests/major-upgrade/41-assert.yaml b/e2e-tests/tests/major-upgrade/41-assert.yaml
deleted file mode 100644
index 1b95780c8f..0000000000
--- a/e2e-tests/tests/major-upgrade/41-assert.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestAssert
-timeout: 660
-commands:
-- script: |-
-    kubectl get postgrescluster major-upgrade \
-      -n ${NAMESPACE} \
-      -o yaml \
-    | yq eval '.status.pgbackrest.repos' -
----
-apiVersion: postgres-operator.crunchydata.com/v1beta1
-kind: PostgresCluster
-metadata:
-  name: major-upgrade
-status:
-  pgbackrest:
-    repos:
-    - bound: true
-      name: repo1
-      replicaCreateBackupComplete: true
-      stanzaCreated: true
diff --git a/e2e-tests/tests/major-upgrade/41-change-repo.yaml b/e2e-tests/tests/major-upgrade/41-change-repo.yaml
deleted file mode 100644
index d3d277599f..0000000000
--- a/e2e-tests/tests/major-upgrade/41-change-repo.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-  - script: |-
-      set -o errexit
-      set -o xtrace
-
-      kubectl patch \
-        -n $NAMESPACE \
-        perconapgcluster major-upgrade \
-        --type='json' \
-        -p='[{"op": "replace", "path": "/spec/backups/pgbackrest/repos/0/name", "value": "repo1"}]'
diff --git a/e2e-tests/tests/major-upgrade/42-assert.yaml b/e2e-tests/tests/major-upgrade/42-assert.yaml
deleted file mode 100644
index 2b003b69a9..0000000000
--- a/e2e-tests/tests/major-upgrade/42-assert.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestAssert
-timeout: 660
----
-kind: Job
-apiVersion: batch/v1
-metadata:
-  annotations:
-    postgres-operator.crunchydata.com/pgbackrest-backup: backup-after-15-to-16
-  labels:
-    postgres-operator.crunchydata.com/pgbackrest-backup: manual
-    postgres-operator.crunchydata.com/pgbackrest-repo: repo1
-  ownerReferences:
-    - apiVersion: pgv2.percona.com/v2
-      kind: PerconaPGBackup
-      controller: true
-      blockOwnerDeletion: true
-status:
-  succeeded: 1
----
-apiVersion: pgv2.percona.com/v2
-kind: PerconaPGBackup
-metadata:
-  name: backup-after-15-to-16
-spec:
-  pgCluster: major-upgrade
-  repoName: repo1
-  options:
-    - --type=full
-status:
-  state: Succeeded
diff --git a/e2e-tests/tests/major-upgrade/43-assert.yaml b/e2e-tests/tests/major-upgrade/43-assert.yaml
deleted file mode 100644
index 3114c23118..0000000000
--- a/e2e-tests/tests/major-upgrade/43-assert.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestAssert
-timeout: 720
-commands:
-- script: |-
-      set -o errexit
-
-      kubectl -n ${NAMESPACE} get pod
-
-      for pod in $(kubectl -n ${NAMESPACE} get pods -l postgres-operator.crunchydata.com/data=postgres --no-headers | awk '{print $1}'); do
-              phase=$(kubectl -n ${NAMESPACE} get pod/${pod} -o jsonpath={".status.phase"})
-              if [[ "${phase}" != "Running" ]]; then
-                      echo "Waiting for ${pod} to start running"
-                      continue
-              fi
-              echo "PostgreSQL logs from ${pod}:"
-              echo "find /pgdata/pg16/log -type f -iname 'postgresql*.log' -exec tail -n 30 {} \;" \
-                      | kubectl -n ${NAMESPACE} exec -it ${pod} -- bash 2>/dev/null
-      done
-
-      sleep 30
-collectors:
-- type: pod
-  selector: "postgres-operator.crunchydata.com/data=postgres"
-  tail: 30
----
-apiVersion: pgv2.percona.com/v2
-kind: PerconaPGRestore
-metadata:
-  name: restore-after-15-to-16
-spec:
-  pgCluster: major-upgrade
-  repoName: repo1
-status:
-  state: Succeeded
----
-apiVersion: pgv2.percona.com/v2
-kind: PerconaPGCluster
-metadata:
-  name: major-upgrade
-status:
-  pgbouncer:
-    ready: 3
-    size: 3
-  postgres:
-    instances:
-    - name: instance1
-      ready: 3
-      size: 3
-    ready: 3
-    size: 3
-  state: ready
diff --git a/e2e-tests/tests/major-upgrade/43-run-restore.yaml b/e2e-tests/tests/major-upgrade/43-run-restore.yaml
deleted file mode 100644
index c86adba0d1..0000000000
--- a/e2e-tests/tests/major-upgrade/43-run-restore.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-apiVersion: pgv2.percona.com/v2
-kind: PerconaPGRestore
-metadata:
-  name: restore-after-15-to-16
-spec:
-  pgCluster: major-upgrade
-  repoName: repo1
-
diff --git a/e2e-tests/tests/major-upgrade/47-assert.yaml b/e2e-tests/tests/major-upgrade/47-assert.yaml
deleted file mode 100644
index 0b0618774c..0000000000
--- a/e2e-tests/tests/major-upgrade/47-assert.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestAssert
-timeout: 660
----
-kind: Job
-apiVersion: batch/v1
-metadata:
-  annotations:
-    postgres-operator.crunchydata.com/pgbackrest-backup: backup-after-16-to-17
-  labels:
-    postgres-operator.crunchydata.com/pgbackrest-backup: manual
-    postgres-operator.crunchydata.com/pgbackrest-repo: repo1
-  ownerReferences:
-    - apiVersion: pgv2.percona.com/v2
-      kind: PerconaPGBackup
-      controller: true
-      blockOwnerDeletion: true
-status:
-  succeeded: 1
----
-apiVersion: pgv2.percona.com/v2
-kind: PerconaPGBackup
-metadata:
-  name: backup-after-16-to-17
-spec:
-  pgCluster: major-upgrade
-  repoName: repo1
-  options:
-    - --type=full
-status:
-  state: Succeeded
diff --git a/e2e-tests/tests/major-upgrade/48-assert.yaml b/e2e-tests/tests/major-upgrade/48-assert.yaml
deleted file mode 100644
index 95d57c293f..0000000000
--- a/e2e-tests/tests/major-upgrade/48-assert.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestAssert
-timeout: 30
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: 11-read-from-primary
-data:
-  data: ' 100500'
diff --git a/e2e-tests/tests/major-upgrade/48-run-restore.yaml b/e2e-tests/tests/major-upgrade/48-run-restore.yaml
deleted file mode 100644
index d496fe3126..0000000000
--- a/e2e-tests/tests/major-upgrade/48-run-restore.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-apiVersion: pgv2.percona.com/v2
-kind: PerconaPGRestore
-metadata:
-  name: restore-after-16-to-17
-spec:
-  pgCluster: major-upgrade
-  repoName: repo1
-