diff --git a/.dockerignore b/.dockerignore
index 43aeac7f6f..bc2d7b8a37 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,8 +1,22 @@
-/.bundle
+/.core-bash_history
+/.env
+/.envrc
 /.git
-/tmp/
-/helpers
-/spec
-gitignored
-/bundler/helpers/helpers/
-/python/helpers/helpers/
+/.vscode-server-insiders/
+/.vscode-server/
+/.vscode/
+/dependabot-*.gem
+/dry-run
+/pkg
+/vendor
+/tmp
+**/.bundle
+**/coverage
+**/Gemfile.lock
+**/helpers
+**/node_modules
+!**/spec/fixtures/*
+git.store
+.byebug_history
+.DS_Store
+*.pyc
diff --git a/Dockerfile.ci b/Dockerfile.ci
index 5d8ef5b177..92a3f2a462 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -1,14 +1,27 @@
 FROM dependabot/dependabot-core
 
-# We pre-install these versions of python as they're known to be used in the
-# test suite. These used to be installed in-line, and pre-installing them helps
-# with the performance of the python test suite.
-RUN pyenv install -s 3.6.13 \
-  && pyenv install -s 3.7.1 \
-  && pyenv install -s 3.7.10 \
-  && git config --global user.name dependabot-ci \
+RUN git config --global user.name dependabot-ci \
   && git config --global user.email no-reply@github.com
 
 ARG CODE_DIR=/home/dependabot/dependabot-core
 WORKDIR ${CODE_DIR}
-COPY --chown=dependabot:dependabot . ${CODE_DIR}
+
+COPY --chown=dependabot:dependabot .rubocop.yml ${CODE_DIR}/.rubocop.yml
+COPY --chown=dependabot:dependabot omnibus ${CODE_DIR}/omnibus
+COPY --chown=dependabot:dependabot dep ${CODE_DIR}/dep
+COPY --chown=dependabot:dependabot git_submodules ${CODE_DIR}/git_submodules
+COPY --chown=dependabot:dependabot terraform ${CODE_DIR}/terraform
+COPY --chown=dependabot:dependabot github_actions ${CODE_DIR}/github_actions
+COPY --chown=dependabot:dependabot hex ${CODE_DIR}/hex
+COPY --chown=dependabot:dependabot elm ${CODE_DIR}/elm
+COPY --chown=dependabot:dependabot docker ${CODE_DIR}/docker
+COPY --chown=dependabot:dependabot nuget ${CODE_DIR}/nuget
+COPY --chown=dependabot:dependabot maven ${CODE_DIR}/maven
+COPY --chown=dependabot:dependabot gradle ${CODE_DIR}/gradle
+COPY --chown=dependabot:dependabot cargo ${CODE_DIR}/cargo
+COPY --chown=dependabot:dependabot composer ${CODE_DIR}/composer
+COPY --chown=dependabot:dependabot go_modules ${CODE_DIR}/go_modules
+COPY --chown=dependabot:dependabot python ${CODE_DIR}/python
+COPY --chown=dependabot:dependabot npm_and_yarn ${CODE_DIR}/npm_and_yarn
+COPY --chown=dependabot:dependabot bundler ${CODE_DIR}/bundler
+COPY --chown=dependabot:dependabot common ${CODE_DIR}/common