diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 897f39fe6..8cc39085f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -43,7 +43,7 @@ jobs:
         env:
           PXC_OPERATOR_VERSION: 1.13.0
           PSMDB_OPERATOR_VERSION: 1.15.0
-          PG_OPERATOR_VERSION: 2.3.0
+          PG_OPERATOR_VERSION: 2.3.1
           PERCONA_VERSION_SERVICE_URL: https://check-dev.percona.com/versions/v1
 
 
@@ -126,7 +126,7 @@ jobs:
         env:
           PXC_OPERATOR_VERSION: 1.13.0
           PSMDB_OPERATOR_VERSION: 1.15.0
-          PG_OPERATOR_VERSION: 2.3.0
+          PG_OPERATOR_VERSION: 2.3.1
           PREVIOUS_PG_OPERATOR_VERSION: 2.2.0 # TODO: Revisit it after 2.3 release
           PREVIOUS_PXC_OPERATOR_VERSION: 1.12.0
           PREVIOUS_PSMDB_OPERATOR_VERSION: 1.14.0
@@ -135,6 +135,8 @@ jobs:
       - name: Clean up custom resources
         if: always()
         continue-on-error: true
+        # If this does not finish in 10 minutes, it's stuck with some resource having a finalizer.
+        timeout-minutes: 10
         run: |
           namespaces=$(kubectl get pxc -A -o jsonpath='{.items[*].metadata.namespace}')
           for namespace in ${namespaces[@]}
@@ -166,7 +168,7 @@ jobs:
         env:
           PXC_OPERATOR_VERSION: 1.13.0
           PSMDB_OPERATOR_VERSION: 1.15.0
-          PG_OPERATOR_VERSION: 2.3.0
+          PG_OPERATOR_VERSION: 2.3.1
           PERCONA_VERSION_SERVICE_URL: https://check-dev.percona.com/versions/v1
 
       - name: Run features tests
@@ -176,7 +178,7 @@ jobs:
         env:
           PXC_OPERATOR_VERSION: 1.13.0
           PSMDB_OPERATOR_VERSION: 1.15.0
-          PG_OPERATOR_VERSION: 2.3.0
+          PG_OPERATOR_VERSION: 2.3.1
           PERCONA_VERSION_SERVICE_URL: https://check-dev.percona.com/versions/v1
 
       - name: Clean up custom resources
diff --git a/e2e-tests/tests/core/pg/10-assert.yaml b/e2e-tests/tests/core/pg/10-assert.yaml
index 932eb0aae..53637c376 100644
--- a/e2e-tests/tests/core/pg/10-assert.yaml
+++ b/e2e-tests/tests/core/pg/10-assert.yaml
@@ -34,7 +34,7 @@ metadata:
 spec:
   backups:
     pgbackrest:
-      image: percona/percona-postgresql-operator:2.3.0-ppg16-pgbackrest
+      image: percona/percona-postgresql-operator:2.3.1-ppg16-pgbackrest
       repos:
       - name: repo1
         volume:
@@ -44,7 +44,7 @@ spec:
             resources:
               requests:
                 storage: 15G
-  image: percona/percona-postgresql-operator:2.3.0-ppg16-postgres
+  image: percona/percona-postgresql-operator:2.3.1-ppg16-postgres
   instances:
   - dataVolumeClaimSpec:
       accessModes:
@@ -69,7 +69,7 @@ spec:
   postgresVersion: 16
   proxy:
     pgBouncer:
-      image: percona/percona-postgresql-operator:2.3.0-ppg16-pgbouncer
+      image: percona/percona-postgresql-operator:2.3.1-ppg16-pgbouncer
       port: 5432
       replicas: 3
       expose:
diff --git a/e2e-tests/tests/core/pg/20-assert.yaml b/e2e-tests/tests/core/pg/20-assert.yaml
index f1cb04d37..a96879983 100644
--- a/e2e-tests/tests/core/pg/20-assert.yaml
+++ b/e2e-tests/tests/core/pg/20-assert.yaml
@@ -6,9 +6,4 @@ timeout: 300
 # In the test assertion 02 we assert that the cluster is stopped and in 03 we assert that the cluster is up and ready to use.
 # The test steps are still declarative so no operation is executed in 03.
 commands:
-  # This check has been disabled until a bug in PG operator has been fixed.
-  # PG operator does not pause a DB when a backup is running. PG operator shall
-  # wait until the backup has finished and only then pause the DB, but in v2.3.0
-  # this logic is broken.
-  # https://perconadev.atlassian.net/browse/K8SPG-496
-  # - command: kubectl wait --for=jsonpath='{.status.status}'=initializing db/test-pg-cluster -n "${NAMESPACE}"
+  - command: kubectl wait --for=jsonpath='{.status.status}'=initializing db/test-pg-cluster -n "${NAMESPACE}"
diff --git a/e2e-tests/tests/core/pg/30-assert.yaml b/e2e-tests/tests/core/pg/30-assert.yaml
index cd647baef..19bf0532c 100644
--- a/e2e-tests/tests/core/pg/30-assert.yaml
+++ b/e2e-tests/tests/core/pg/30-assert.yaml
@@ -31,7 +31,7 @@ metadata:
 spec:
   backups:
     pgbackrest:
-      image: percona/percona-postgresql-operator:2.3.0-ppg16-pgbackrest
+      image: percona/percona-postgresql-operator:2.3.1-ppg16-pgbackrest
       repos:
       - name: repo1
         volume:
@@ -41,7 +41,7 @@ spec:
             resources:
               requests:
                 storage: 15G
-  image: percona/percona-postgresql-operator:2.3.0-ppg16-postgres
+  image: percona/percona-postgresql-operator:2.3.1-ppg16-postgres
   instances:
   - dataVolumeClaimSpec:
       accessModes:
@@ -66,7 +66,7 @@ spec:
   postgresVersion: 16
   proxy:
     pgBouncer:
-      image: percona/percona-postgresql-operator:2.3.0-ppg16-pgbouncer
+      image: percona/percona-postgresql-operator:2.3.1-ppg16-pgbouncer
       port: 5432
       replicas: 3
       expose:
diff --git a/e2e-tests/tests/core/pg/50-assert.yaml b/e2e-tests/tests/core/pg/50-assert.yaml
index 8555c7761..de978395f 100644
--- a/e2e-tests/tests/core/pg/50-assert.yaml
+++ b/e2e-tests/tests/core/pg/50-assert.yaml
@@ -31,7 +31,7 @@ metadata:
 spec:
   backups:
     pgbackrest:
-      image: percona/percona-postgresql-operator:2.3.0-ppg16-pgbackrest
+      image: percona/percona-postgresql-operator:2.3.1-ppg16-pgbackrest
       repos:
       - name: repo1
         volume:
@@ -41,7 +41,7 @@ spec:
             resources:
               requests:
                 storage: 15G
-  image: percona/percona-postgresql-operator:2.3.0-ppg16-postgres
+  image: percona/percona-postgresql-operator:2.3.1-ppg16-postgres
   instances:
   - dataVolumeClaimSpec:
       accessModes:
@@ -66,7 +66,7 @@ spec:
   postgresVersion: 16
   proxy:
     pgBouncer:
-      image: percona/percona-postgresql-operator:2.3.0-ppg16-pgbouncer
+      image: percona/percona-postgresql-operator:2.3.1-ppg16-pgbouncer
       port: 5432
       replicas: 1
       expose:
diff --git a/e2e-tests/tests/core/pg/80-assert.yaml b/e2e-tests/tests/core/pg/80-assert.yaml
index c663bd1dc..2667d8161 100644
--- a/e2e-tests/tests/core/pg/80-assert.yaml
+++ b/e2e-tests/tests/core/pg/80-assert.yaml
@@ -31,7 +31,7 @@ metadata:
 spec:
   backups:
     pgbackrest:
-      image: percona/percona-postgresql-operator:2.3.0-ppg16-pgbackrest
+      image: percona/percona-postgresql-operator:2.3.1-ppg16-pgbackrest
       repos:
       - name: repo1
         volume:
@@ -41,7 +41,7 @@ spec:
             resources:
               requests:
                 storage: 15G
-  image: percona/percona-postgresql-operator:2.3.0-ppg16-postgres
+  image: percona/percona-postgresql-operator:2.3.1-ppg16-postgres
   instances:
   - dataVolumeClaimSpec:
       accessModes:
@@ -66,7 +66,7 @@ spec:
   postgresVersion: 16
   proxy:
     pgBouncer:
-      image: percona/percona-postgresql-operator:2.3.0-ppg16-pgbouncer
+      image: percona/percona-postgresql-operator:2.3.1-ppg16-pgbouncer
       port: 5432
       replicas: 3
       expose: