diff --git a/docker-internal/.gitignore b/docker-internal/.gitignore
index cbee8387c..e69de29bb 100644
--- a/docker-internal/.gitignore
+++ b/docker-internal/.gitignore
@@ -1 +0,0 @@
-GHE_PersonalAccessToken.txt
diff --git a/docker-internal/Dockerfile b/docker-internal/Dockerfile
index 4e38be156..9a849d276 100644
--- a/docker-internal/Dockerfile
+++ b/docker-internal/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 SHELL ["/bin/bash","-c"]
 RUN groupadd -r keydb && useradd -r -g keydb keydb
 # use gosu for easy step-down from root: https://github.com/tianon/gosu/releases
@@ -62,6 +62,7 @@ RUN set -eux; \
         [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
         find /usr/local -type f -executable -exec ldd '{}' ';' \
                | awk '/=>/ { print $(NF-1) }' \
+               | sed 's:.*/::' \
                | sort -u \
                | xargs -r dpkg-query --search \
                | cut -d: -f1 \
diff --git a/docker-internal/docker_PAT_build/Dockerfile b/docker-internal/docker_PAT_build/Dockerfile
index 00908d41d..e27c4388a 100644
--- a/docker-internal/docker_PAT_build/Dockerfile
+++ b/docker-internal/docker_PAT_build/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 SHELL ["/bin/bash","-c"]
 RUN groupadd -r keydb && useradd -r -g keydb keydb
 # use gosu for easy step-down from root: https://github.com/tianon/gosu/releases
@@ -64,6 +64,7 @@ RUN --mount=type=secret,id=PAT export $(cat /run/secrets/PAT | xargs); \
         [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
         find /usr/local -type f -executable -exec ldd '{}' ';' \
                | awk '/=>/ { print $(NF-1) }' \
+               | sed 's:.*/::' \
                | sort -u \
                | xargs -r dpkg-query --search \
                | cut -d: -f1 \
diff --git a/docker-internal/docker_PAT_build/GHE_PersonalAccessToken.txt b/docker-internal/docker_PAT_build/GHE_PersonalAccessToken.txt
new file mode 100644
index 000000000..4266d9ddf
--- /dev/null
+++ b/docker-internal/docker_PAT_build/GHE_PersonalAccessToken.txt
@@ -0,0 +1,2 @@
+PAT_ID=
+TOKEN=