diff --git a/deploy/cr.yaml b/deploy/cr.yaml
index 5717ffab1..9321457f9 100644
--- a/deploy/cr.yaml
+++ b/deploy/cr.yaml
@@ -240,7 +240,7 @@ spec:
   proxy:
     pgBouncer:
       replicas: 3
-      image: perconalab/percona-postgresql-operator:main-ppg17-pgbouncer
+      image: perconalab/percona-postgresql-operator:main-pgbouncer17
 #      exposeSuperusers: true
 #      resources:
 #        limits:
diff --git a/deploy/upgrade.yaml b/deploy/upgrade.yaml
index 104ebb6f9..3a9b80db2 100644
--- a/deploy/upgrade.yaml
+++ b/deploy/upgrade.yaml
@@ -8,5 +8,5 @@ spec:
   fromPostgresVersion: 16
   toPostgresVersion: 17
   toPostgresImage: perconalab/percona-postgresql-operator:main-ppg17-postgres
-  toPgBouncerImage: perconalab/percona-postgresql-operator:main-ppg17-pgbouncer
+  toPgBouncerImage: perconalab/percona-postgresql-operator:main-pgbouncer17
   toPgBackRestImage: perconalab/percona-postgresql-operator:main-ppg17-pgbackrest
diff --git a/e2e-tests/vars.sh b/e2e-tests/vars.sh
index 3cc511980..63766bc37 100755
--- a/e2e-tests/vars.sh
+++ b/e2e-tests/vars.sh
@@ -13,7 +13,7 @@ export VERSION=${VERSION:-$(echo "${GIT_BRANCH}" | sed -e 's^/^-^g; s^[.]^-^g;'
 export IMAGE_BASE=${IMAGE_BASE:-"perconalab/percona-postgresql-operator"}
 export IMAGE=${IMAGE:-"${IMAGE_BASE}:${VERSION}"}
 export PG_VER="${PG_VER:-16}"
-export IMAGE_PGBOUNCER=${IMAGE_PGBOUNCER:-"${IMAGE_BASE}:main-ppg$PG_VER-pgbouncer"}
+export IMAGE_PGBOUNCER=${IMAGE_PGBOUNCER:-"${IMAGE_BASE}:main-pgbouncer$PG_VER"}
 export IMAGE_POSTGRESQL=${IMAGE_POSTGRESQL:-"${IMAGE_BASE}:main-ppg$PG_VER-postgres"}
 export IMAGE_BACKREST=${IMAGE_BACKREST:-"${IMAGE_BASE}:main-ppg$PG_VER-pgbackrest"}
 export IMAGE_UPGRADE=${IMAGE_UPGRADE:-"${IMAGE_BASE}:main-upgrade"}
diff --git a/percona/controller/testdata/sidecar-resources-cr.yaml b/percona/controller/testdata/sidecar-resources-cr.yaml
index 0c26828bd..290d4ad9b 100644
--- a/percona/controller/testdata/sidecar-resources-cr.yaml
+++ b/percona/controller/testdata/sidecar-resources-cr.yaml
@@ -39,7 +39,7 @@ spec:
   proxy:
     pgBouncer:
       replicas: 3
-      image: perconalab/percona-postgresql-operator:main-ppg17-pgbouncer
+      image: perconalab/percona-postgresql-operator:main-pgbouncer17
       containers:
         pgbouncerConfig:
           resources: