diff --git a/.github/workflows/collect-u18-binaries.yml b/.github/workflows/collect-u18-binaries.yml
index 61033037b..21116a809 100644
--- a/.github/workflows/collect-u18-binaries.yml
+++ b/.github/workflows/collect-u18-binaries.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - develop
+      - pcnc/pg-upgrade-fixes
     paths:
       - '.github/workflows/collect-u18-binaries.yml'
       - 'common.vars.pkr.hcl'
@@ -99,7 +100,7 @@ jobs:
         with:
           push: false
           load: true
-          file: docker/Dockerfile-u18
+          file: Dockerfile-u18
           target: pg_binary_collection
           build-args: |
             ubuntu_release=${{ matrix.ubuntu_release }}
diff --git a/Dockerfile b/Dockerfile
index e72bf0a09..89e948110 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -51,7 +51,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 # Add Postgres PPA
 ARG postgresql_gpg_key=B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8
 RUN mkdir -p /root/.gnupg && chmod 700 /root/.gnupg && \
-    gpg --recv-keys --no-default-keyring --keyring /tmp/pgdg.key --keyserver pgp.mit.edu --recv-keys "${postgresql_gpg_key}" && \
+    gpg --recv-keys --no-default-keyring --keyring /tmp/pgdg.key --keyserver keyserver.ubuntu.com --recv-keys "${postgresql_gpg_key}" && \
     gpg --no-default-keyring --keyring /tmp/pgdg.key --export "${postgresql_gpg_key}" > /etc/apt/trusted.gpg.d/pgdg.gpg && \
     echo "deb https://apt-archive.postgresql.org/pub/repos/apt focal-pgdg-archive main" > /etc/apt/sources.list.d/pgdg.list
 
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 35dd28403..3a4ff5800 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -18,7 +18,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 # Add Postgres PPA
 ARG postgresql_gpg_key=B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8
 RUN mkdir -p /root/.gnupg && chmod 700 /root/.gnupg && \
-    gpg --recv-keys --no-default-keyring --keyring /tmp/pgdg.key --keyserver pgp.mit.edu --recv-keys "${postgresql_gpg_key}" && \
+    gpg --recv-keys --no-default-keyring --keyring /tmp/pgdg.key --keyserver keyserver.ubuntu.com --recv-keys "${postgresql_gpg_key}" && \
     gpg --no-default-keyring --keyring /tmp/pgdg.key --export "${postgresql_gpg_key}" > /etc/apt/trusted.gpg.d/pgdg.gpg && \
     echo "deb https://apt-archive.postgresql.org/pub/repos/apt ${ubuntu_release}-pgdg-archive main" > /etc/apt/sources.list.d/pgdg.list && \
     echo "deb-src https://apt-archive.postgresql.org/pub/repos/apt ${ubuntu_release}-pgdg-archive main" > /etc/apt/sources.list.d/pgdg.list