diff --git a/Dockerfile b/Dockerfile
index 34ad8f677..154b8d932 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@
 # and clean up the web/ source code
 #########################################################################
 
-FROM alpine:3.13 AS app-builder
+FROM alpine:3.14 AS app-builder
 
 RUN apk add --no-cache \
     autoconf \
@@ -60,7 +60,7 @@ RUN export CPPFLAGS="-DPNG_ARM_NEON_OPT=0" && \
 # Next, create the base environment for Python
 #########################################################################
 
-FROM alpine:3.13 as env-builder
+FROM alpine:3.14 as env-builder
 
 # Install dependencies
 COPY requirements.txt /
@@ -113,8 +113,9 @@ FROM postgres:10-alpine as pg10-builder
 FROM postgres:11-alpine as pg11-builder
 FROM postgres:12-alpine as pg12-builder
 FROM postgres:13-alpine as pg13-builder
+FROM postgres:14-alpine as pg14-builder
 
-FROM alpine:3.13 as tool-builder
+FROM alpine:3.14 as tool-builder
 
 # Copy the PG binaries
 COPY --from=pg96-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-9.6/
@@ -142,11 +143,15 @@ COPY --from=pg13-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-13/
 COPY --from=pg13-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-13/
 COPY --from=pg13-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-13/
 
+COPY --from=pg14-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-14/
+COPY --from=pg14-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-14/
+COPY --from=pg14-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-14/
+COPY --from=pg14-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-14/
 #########################################################################
 # Assemble everything into the final container.
 #########################################################################
 
-FROM alpine:3.13
+FROM alpine:3.14
 
 # Copy in the Python packages
 COPY --from=env-builder /venv /venv
diff --git a/docs/en_US/container_deployment.rst b/docs/en_US/container_deployment.rst
index 7ed0c679f..2340ab034 100644
--- a/docs/en_US/container_deployment.rst
+++ b/docs/en_US/container_deployment.rst
@@ -22,17 +22,19 @@ server:
 * PostgreSQL 11: */usr/local/pgsql-11*
 * PostgreSQL 12: */usr/local/pgsql-12*
 * PostgreSQL 13: */usr/local/pgsql-13*
+* PostgreSQL 14: */usr/local/pgsql-14*
 
 The default binary paths set in the container are as follows:
 
 .. code-block:: bash
 
     DEFAULT_BINARY_PATHS = {
-            'pg-13': '/usr/local/pgsql-13'
-            'pg-12': '/usr/local/pgsql-12'
-            'pg-11': '/usr/local/pgsql-11'
-            'pg-10': '/usr/local/pgsql-10'
-            'pg-9.6': '/usr/local/pgsql-9.6'
+        'pg-14': '/usr/local/pgsql-14',
+        'pg-13': '/usr/local/pgsql-13',
+        'pg-12': '/usr/local/pgsql-12',
+        'pg-11': '/usr/local/pgsql-11',
+        'pg-10': '/usr/local/pgsql-10',
+        'pg-9.6': '/usr/local/pgsql-9.6'
     }
 
 this may be changed in the :ref:`preferences`.
diff --git a/pkg/debian/build.sh b/pkg/debian/build.sh
index 1e59449ff..6e7c3bd39 100755
--- a/pkg/debian/build.sh
+++ b/pkg/debian/build.sh
@@ -35,7 +35,7 @@ Package: ${APP_NAME}-server
 Version: ${APP_LONG_VERSION}
 Architecture: ${OS_ARCH}
 Depends: python3, libpq5 (>= 11.0), libgssapi-krb5-2
-Recommends: postgresql-client | postgresql-client-13 | postgresql-client-12 | postgresql-client-11 | postgresql-client-10
+Recommends: postgresql-client | postgresql-client-14 | postgresql-client-13 | postgresql-client-12 | postgresql-client-11 | postgresql-client-10
 Maintainer: pgAdmin Development Team <pgadmin-hackers@postgresql.org>
 Description: The core server package for pgAdmin. pgAdmin is the most popular and feature rich Open Source administration and development platform for PostgreSQL, the most advanced Open Source database in the world.
 EOF
diff --git a/pkg/docker/entrypoint.sh b/pkg/docker/entrypoint.sh
index 90099ec12..da17d9d98 100755
--- a/pkg/docker/entrypoint.sh
+++ b/pkg/docker/entrypoint.sh
@@ -10,7 +10,8 @@ CA_FILE = '/etc/ssl/certs/ca-certificates.crt'
 LOG_FILE = '/dev/null'
 HELP_PATH = '../../docs'
 DEFAULT_BINARY_PATHS = {
-        'pg': '/usr/local/pgsql-13',
+        'pg': '/usr/local/pgsql-14',
+        'pg-14': '/usr/local/pgsql-14',
         'pg-13': '/usr/local/pgsql-13',
         'pg-12': '/usr/local/pgsql-12',
         'pg-11': '/usr/local/pgsql-11',
diff --git a/pkg/redhat/build.sh b/pkg/redhat/build.sh
index 8d66c65e0..a7ea4c9a7 100755
--- a/pkg/redhat/build.sh
+++ b/pkg/redhat/build.sh
@@ -11,7 +11,7 @@ OS_NAME=$(cat /etc/os-release | grep "^ID=" | awk -F "=" '{ print $2 }' | sed 's
 OS_ARCH=$(arch)
 
 # Make sure we get the right libpq
-export PATH=/usr/pgsql-12/bin:$PATH
+export PATH=/usr/pgsql-14/bin:$PATH
 
 # Common Linux build functions
 source pkg/linux/build-functions.sh
@@ -216,7 +216,7 @@ if [ ${OS_VERSION} == 7 ]; then
 fi
 
 # Get the libpq we need
-yumdownloader -y --downloadonly --destdir=$DISTROOT postgresql13-libs
+yumdownloader -y --downloadonly --destdir=$DISTROOT postgresql14-libs
 
 #
 # Get the results!
diff --git a/pkg/redhat/setup.sh b/pkg/redhat/setup.sh
index a44fd1ec3..9d5e1f89c 100755
--- a/pkg/redhat/setup.sh
+++ b/pkg/redhat/setup.sh
@@ -35,10 +35,10 @@ echo "Installing build pre-requisites..."
 yum groupinstall -y "Development Tools"
 
 if [ ${OS_VERSION} == 7 ]; then
-    yum install -y expect fakeroot httpd-devel postgresql12-devel python3-devel nodejs yarn rpm-build rpm-sign yum-utils krb5-devel
+    yum install -y expect fakeroot httpd-devel postgresql14-devel python3-devel nodejs yarn rpm-build rpm-sign yum-utils krb5-devel
     pip3 install sphinx
 else
-    yum install -y expect fakeroot postgresql12-devel python3-devel python3-sphinx nodejs yarn rpm-build rpm-sign yum-utils krb5-devel
+    yum install -y expect fakeroot postgresql14-devel python3-devel python3-sphinx nodejs yarn rpm-build rpm-sign yum-utils krb5-devel
 fi
 
 # Setup RPM macros for signing