diff --git a/.ci/set_tag_version_images.sh b/.ci/set_tag_version_images.sh
index 085fb32edef..12f33199bd3 100755
--- a/.ci/set_tag_version_images.sh
+++ b/.ci/set_tag_version_images.sh
@@ -23,7 +23,6 @@ sed_in_place -r -e "s#che.workspace.devfile.default_editor=eclipse/che-theia/.*#
 image_version="$1"
 sed_in_place -r -e "s#che-plugin-registry:.*#che-plugin-registry:$image_version#g" ../deploy/kubernetes/helm/che/custom-charts/che-plugin-registry/values.yaml
 sed_in_place -r -e "s#che-devfile-registry:.*#che-devfile-registry:$image_version#g" ../deploy/kubernetes/helm/che/custom-charts/che-devfile-registry/values.yaml
-sed_in_place -r -e "s#che-postgres:.*#che-postgres:$image_version#g" ../deploy/kubernetes/helm/che/custom-charts/che-postgres/values.yaml
 sed_in_place -r -e "s#che-keycloak:.*#che-keycloak:$image_version#g" ../deploy/kubernetes/helm/che/custom-charts/che-keycloak/values.yaml
 sed_in_place -r -e "s#eclipse/che-server:.*#eclipse/che-server:$image_version#g" ../deploy/kubernetes/helm/che/values.yaml
 sed_in_place -r -e "s#eclipse/che-dashboard:.*#eclipse/che-dashboard:$image_version#g" ../deploy/kubernetes/helm/che/values.yaml
diff --git a/.github/workflows/next-build.yml b/.github/workflows/next-build.yml
index d4b8155627c..002afc2acd3 100644
--- a/.github/workflows/next-build.yml
+++ b/.github/workflows/next-build.yml
@@ -55,10 +55,7 @@ jobs:
 
         docker push quay.io/eclipse/che-keycloak:next
         docker push quay.io/eclipse/che-keycloak:${{ steps.build.outputs.short_sha1 }}
-
-        docker push quay.io/eclipse/che-postgres:next
-        docker push quay.io/eclipse/che-postgres:${{ steps.build.outputs.short_sha1 }}
-
+        
         docker push quay.io/eclipse/che-server:next
         docker push quay.io/eclipse/che-server:${{ steps.build.outputs.short_sha1 }}
     - name: Create failure MM message
diff --git a/deploy/kubernetes/helm/che/custom-charts/che-postgres/values.yaml b/deploy/kubernetes/helm/che/custom-charts/che-postgres/values.yaml
index 4e682280593..df2b458d985 100644
--- a/deploy/kubernetes/helm/che/custom-charts/che-postgres/values.yaml
+++ b/deploy/kubernetes/helm/che/custom-charts/che-postgres/values.yaml
@@ -10,4 +10,4 @@
 # Default values for postgres.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
-image: quay.io/eclipse/che-postgres:next
+image: quay.io/eclipse/che--centos-postgresql-96-centos7:9.6-b681d78125361519180a6ac05242c296f8906c11eab7e207b5ca9a89b6344392
diff --git a/dockerfiles/postgres/Dockerfile b/dockerfiles/postgres/Dockerfile
deleted file mode 100644
index fe02d72cc07..00000000000
--- a/dockerfiles/postgres/Dockerfile
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (c) 2018 Red Hat, Inc.
-# This program and the accompanying materials are made
-# available under the terms of the Eclipse Public License 2.0
-# which is available at https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-
-FROM centos/postgresql-96-centos7
-ADD init-che-user-and-run.sh.erb init-che-user.sh.erb /var/lib/pgsql/
-RUN cat /var/lib/pgsql/init-che-user.sh.erb | \
-    sed -e "/exit 0/d" > /var/lib/pgsql/init-che-user-and-run.sh && \
-    echo "exec run-postgresql \"\$@\"" >> /var/lib/pgsql/init-che-user-and-run.sh
-USER root
-RUN chmod +x /var/lib/pgsql/init-che-user-and-run.sh
-USER postgres
-ADD --chown=postgres postgresql.conf.debug /opt/app-root/src/postgresql-cfg/
-ADD init-debug.sh /opt/app-root/src/postgresql-pre-start/
-RUN chgrp -R 0 /opt/app-root/src/postgresql-cfg/ && chmod -R g+rwX /opt/app-root/src/postgresql-cfg/
-CMD ["/var/lib/pgsql/init-che-user-and-run.sh"]
diff --git a/dockerfiles/postgres/build.sh b/dockerfiles/postgres/build.sh
deleted file mode 100755
index cdbc81d8acc..00000000000
--- a/dockerfiles/postgres/build.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2018 Red Hat, Inc.
-# This program and the accompanying materials are made
-# available under the terms of the Eclipse Public License 2.0
-# which is available at https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-base_dir=$(cd "$(dirname "$0")"; pwd)
-. "${base_dir}"/../build.include
-
-init --name:postgres "$@"
-build
diff --git a/dockerfiles/postgres/init-che-user-and-run.sh.erb b/dockerfiles/postgres/init-che-user-and-run.sh.erb
deleted file mode 100644
index 163ce091e21..00000000000
--- a/dockerfiles/postgres/init-che-user-and-run.sh.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-$(dirname "$0")/init-che-user.sh
-exec run-postgresql
diff --git a/dockerfiles/postgres/init-che-user.sh.erb b/dockerfiles/postgres/init-che-user.sh.erb
deleted file mode 100644
index 8eb5f7a8341..00000000000
--- a/dockerfiles/postgres/init-che-user.sh.erb
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-echo "Initial call to run-postgresql..."
-run-postgresql --version
-export PGDATA=/var/lib/pgsql/data/userdata
-pg_ctl -w start -o "-h ''"
-echo "Initializing Che user..."
-
-psql -v ON_ERROR_STOP=1 --username "postgres" <<-EOSQL
-    ALTER USER $POSTGRESQL_USER WITH SUPERUSER;
-EOSQL
-
-psql -v ON_ERROR_STOP=1 --username "$POSTGRESQL_USER" <<-EOSQL
-    CREATE USER $CHE_POSTGRES_USERNAME WITH PASSWORD '$CHE_POSTGRES_PASSWORD';
-    CREATE DATABASE $CHE_POSTGRES_DATABASE;
-    GRANT ALL PRIVILEGES ON DATABASE $CHE_POSTGRES_DATABASE TO $CHE_POSTGRES_USERNAME;
-    ALTER USER $CHE_POSTGRES_USERNAME WITH SUPERUSER;
-EOSQL
-if [[ $? -ne 0 ]]
-then
-  echo "Warning: Failed initializing the Che user and database"
-fi
-
-psql -v ON_ERROR_STOP=1 --username "postgres" <<-EOSQL
-    ALTER USER $POSTGRESQL_USER WITH NOSUPERUSER;
-EOSQL
-
-pg_ctl -w stop
-
-unset CHE_POSTGRES_DATABASE
-unset CHE_POSTGRES_USERNAME
-unset CHE_POSTGRES_PASSWORD
-
-exit 0
diff --git a/dockerfiles/postgres/init-debug.sh b/dockerfiles/postgres/init-debug.sh
deleted file mode 100755
index 840165ba26d..00000000000
--- a/dockerfiles/postgres/init-debug.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2012-2018 Red Hat, Inc.
-# This program and the accompanying materials are made
-# available under the terms of the Eclipse Public License 2.0
-# which is available at https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#   Red Hat, Inc. - initial API and implementation
-#
-if [ -n "${POSTGRESQL_LOG_DEBUG+set}" ] && [ "${POSTGRESQL_LOG_DEBUG}" == "true" ]; then
-    echo "POSTGRESQL_LOG_DEBUG is set, enabling additional logging configuration"
-
-    if [ ! -f /opt/app-root/src/postgresql-cfg/postgresql.log.debug.conf ]; then
-        echo "postgresql.conf not found!"
-        mv /opt/app-root/src/postgresql-cfg/postgresql.conf.debug /opt/app-root/src/postgresql-cfg/postgresql.log.debug.conf
-     else
-        echo OK
-     fi
-fi
diff --git a/dockerfiles/postgres/postgresql.conf.debug b/dockerfiles/postgres/postgresql.conf.debug
deleted file mode 100644
index 4da21b57ca0..00000000000
--- a/dockerfiles/postgres/postgresql.conf.debug
+++ /dev/null
@@ -1,24 +0,0 @@
-#------------------------------------------------------------------------------
-# ERROR REPORTING AND LOGGING
-#------------------------------------------------------------------------------
-log_destination = 'stderr'
-log_directory = 'pg_logs'
-log_filename = 'postgresql-%Y-%m-%d_%H%M%S.log'
-log_file_mode = 0644
-log_truncate_on_rotation = off
-log_rotation_size = 10MB
-client_min_messages = notice
-log_min_messages = warning
-log_min_error_statement = error
-log_min_duration_statement = 0
-log_checkpoints = on
-log_connections = on
-log_disconnections = on
-log_duration = off
-log_error_verbosity = default
-log_line_prefix = '%t [%p]: [%l-1] user=%u,db=%d '
-log_lock_waits = on
-log_statement = 'none'
-log_temp_files = 0
-log_autovacuum_min_duration = 0
-lc_messages='C'
diff --git a/make-release.sh b/make-release.sh
index 4b4c45c50ec..2652215c6aa 100755
--- a/make-release.sh
+++ b/make-release.sh
@@ -17,7 +17,6 @@ DOCKER_FILES_LOCATIONS=(
 IMAGES_LIST=(
     quay.io/eclipse/che-endpoint-watcher
     quay.io/eclipse/che-keycloak
-    quay.io/eclipse/che-postgres
     quay.io/eclipse/che-server
 )