diff --git a/Jenkinsfile b/Jenkinsfile
index 5b5bd38c3..6f9b5b866 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -259,6 +259,7 @@ void runTest(Integer TEST_ID) {
                     if [ ! -d "e2e-tests/logs" ]; then
                         mkdir "e2e-tests/logs"
                     fi
+                    export PG_DISTRIBUTION=community
                     export KUBECONFIG=/tmp/$CLUSTER_NAME-$clusterSuffix
                     export PATH="\${KREW_ROOT:-\$HOME/.krew}/bin:\$PATH"
                     set -o pipefail
diff --git a/e2e-tests/vars.sh b/e2e-tests/vars.sh
index b3a1d6c44..143c4a0bf 100755
--- a/e2e-tests/vars.sh
+++ b/e2e-tests/vars.sh
@@ -38,13 +38,14 @@ else
 	export PG_VER="${PG_VER:-18}"
 fi
 
+PG_DISTRIBUTION='community'
 export PG_DISTRIBUTION="${PG_DISTRIBUTION:-}"
 
 if [[ $PG_DISTRIBUTION == "community" ]]; then
-	export IMAGE_PGBOUNCER=${IMAGE_PGBOUNCER:-"${IMAGE_BASE}:main-pgbouncer-community"}
-	export IMAGE_POSTGRESQL=${IMAGE_POSTGRESQL:-"${IMAGE_BASE}:main-postgres${PG_VER}-community"}
-	export IMAGE_BACKREST=${IMAGE_BACKREST:-"${IMAGE_BASE}:main-pgbackrest-community"}
-	export IMAGE_UPGRADE=${IMAGE_UPGRADE:-"${IMAGE_BASE}:main-upgrade-community"}
+	export IMAGE_PGBOUNCER=${IMAGE_PGBOUNCER:-"${IMAGE_BASE}:main-ubi8-pgbouncer-community"}
+	export IMAGE_POSTGRESQL=${IMAGE_POSTGRESQL:-"${IMAGE_BASE}:main-ubi8-postgres${PG_VER}-community"}
+	export IMAGE_BACKREST=${IMAGE_BACKREST:-"${IMAGE_BASE}:main-ubi8-pgbackrest-community"}
+	export IMAGE_UPGRADE=${IMAGE_UPGRADE:-"${IMAGE_BASE}:main-ubi8-upgrade-community"}
 else
 	export IMAGE_PGBOUNCER=${IMAGE_PGBOUNCER:-"${IMAGE_BASE}:main-pgbouncer$PG_VER"}
 	export IMAGE_POSTGRESQL=${IMAGE_POSTGRESQL:-"${IMAGE_BASE}:main-ppg$PG_VER-postgres"}