diff --git a/.dockerignore b/.dockerignore
index c914d5637dc73..7d295613004b7 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -38,7 +38,6 @@
 # Add those folders to the context so that they are available in the CI container
 !scripts/in_container
 !scripts/docker
-!scripts/ci/dockerfiles/bats
 
 # Add tests and kubernetes_tests to context.
 !tests
diff --git a/Dockerfile.ci b/Dockerfile.ci
index 2bbc9acdf6486..02a9a5364e0b9 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -216,7 +216,7 @@ RUN mkdir -p /opt/bats/lib/bats-file \
 RUN echo "export PATH=/opt/bats/bin:${PATH}" >> /root/.bashrc
 
 # Additional scripts for managing BATS addons
-COPY scripts/ci/dockerfiles/bats/load.bash /opt/bats/lib/
+COPY scripts/docker/load.bash /opt/bats/lib/
 RUN chmod a+x /opt/bats/lib/load.bash
 
 
diff --git a/scripts/docker/load.bash b/scripts/docker/load.bash
new file mode 100644
index 0000000000000..fe7e1d29402dc
--- /dev/null
+++ b/scripts/docker/load.bash
@@ -0,0 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# shellcheck disable=SC1091
+source "/opt/bats/lib/bats-support/load.bash"
+# shellcheck disable=SC1091
+source "/opt/bats/lib/bats-assert/load.bash"
+# shellcheck disable=SC1091
+source "/opt/bats/lib/bats-file/load.bash"