diff --git a/.dockerignore b/.dockerignore
index 21983157ae3d737d429b75e5aa69f6fa4270c781..8f451094af8b23763550a96607dbcdb1d86af9b2 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,7 +1,4 @@
 *
-!mongodb.sources
-!google-cloud.sources
-!heroku.list
-!hashicorp.list
+!sources.d/*
 !bfg
 !bash_completion.d/*
diff --git a/Dockerfile b/Dockerfile
index e7e41bc19c3fc692bd9f6e133b16f31d00e37624..fa58e697a5bcf8ecf12a04848e52139bb9ed8fde 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,13 +20,10 @@ RUN apt-get update && \
     && \
     rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/* /var/cache/apt/archives/*
 COPY --from=repo-key /gnupghome/mongodb.gpg /usr/share/keyrings/mongodb.gpg
-COPY --chown=root:root mongodb.sources /etc/apt/sources.list.d/
 COPY --from=repo-key /gnupghome/google-cloud.gpg /usr/share/keyrings/google-cloud.gpg
-COPY --chown=root:root google-cloud.sources /etc/apt/sources.list.d/
 COPY --from=repo-key /gnupghome/heroku.gpg /usr/share/keyrings/heroku.gpg
-COPY --chown=root:root heroku.list /etc/apt/sources.list.d/
 COPY --from=repo-key /gnupghome/hashicorp.gpg /usr/share/keyrings/hashicorp.gpg
-COPY --chown=root:root hashicorp.list /etc/apt/sources.list.d/
+COPY --chown=root:root sources.d/* /etc/apt/sources.list.d/
 # hadolint ignore=DL3008,DL3013,DL3027
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends \
diff --git a/hashicorp.list b/hashicorp.list
deleted file mode 100644
index 12205dfd350800230ad8ff4fe4e72caca6ffa37d..0000000000000000000000000000000000000000
--- a/hashicorp.list
+++ /dev/null
@@ -1 +0,0 @@
-deb [signed-by=/usr/share/keyrings/hashicorp.gpg] https://apt.releases.hashicorp.com buster main
diff --git a/google-cloud.sources b/sources.d/google-cloud.sources
similarity index 100%
rename from google-cloud.sources
rename to sources.d/google-cloud.sources
diff --git a/sources.d/hashicorp.sources b/sources.d/hashicorp.sources
new file mode 100644
index 0000000000000000000000000000000000000000..f01300c8b64145a7f73aedddcda34cff8feef990
--- /dev/null
+++ b/sources.d/hashicorp.sources
@@ -0,0 +1,5 @@
+Types: deb
+URIs: https://apt.releases.hashicorp.com
+Suites: buster
+Components: main
+Signed-By: /usr/share/keyrings/hashicorp.gpg
diff --git a/heroku.list b/sources.d/heroku.list
similarity index 100%
rename from heroku.list
rename to sources.d/heroku.list
diff --git a/mongodb.sources b/sources.d/mongodb.sources
similarity index 100%
rename from mongodb.sources
rename to sources.d/mongodb.sources