diff --git a/build/base/Dockerfile b/build/base/Dockerfile
index 240bd4f6d..775fda2cf 100644
--- a/build/base/Dockerfile
+++ b/build/base/Dockerfile
@@ -81,7 +81,7 @@ ADD conf/*KEY* /
 # Add any available Crunchy PG repo files
 ADD conf/crunchypg${PG_LBL}.repo /etc/yum.repos.d/
 # Import both keys to support all required repos
-RUN rpm --import RPM-GPG-KEY-crunchydata*
+RUN rpm --import *GPG-KEY-crunchydata*
 RUN if [ "$DFSET" = "rhel" ] ; then rpm --import CRUNCHY-GPG-KEY.public ; fi
 
 RUN if [ "$BASEOS" = "centos8" ] ; then \
diff --git a/conf/.gitignore b/conf/.gitignore
index 2212b52b1..892543504 100644
--- a/conf/.gitignore
+++ b/conf/.gitignore
@@ -1,4 +1,4 @@
 *.repo
 *.public
 *.private
-RPM-GPG-KEY-*
+*KEY*