diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cefb781..7d5a016 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,7 +15,7 @@ stages:
     - docker login registry.gitlab.com -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD"
   script:
     - docker pull "$TAG" || docker pull "$COMMON_TAG" || true
-    - docker build --cache-from "$TAG" --cache-from "$COMMON_TAG" --tag "$TAG" -f "ci/$NAME.Dockerfile" ci
+    - docker build --cache-from "$TAG" --cache-from "$COMMON_TAG" --tag "$TAG" -f "ci/containers/$NAME.Dockerfile" ci/containers
     - docker push "$TAG"
   after_script:
     - docker logout
diff --git a/ci/centos-7.Dockerfile b/ci/containers/centos-7.Dockerfile
similarity index 100%
rename from ci/centos-7.Dockerfile
rename to ci/containers/centos-7.Dockerfile
diff --git a/ci/centos-8.Dockerfile b/ci/containers/centos-8.Dockerfile
similarity index 100%
rename from ci/centos-8.Dockerfile
rename to ci/containers/centos-8.Dockerfile
diff --git a/ci/centos-stream.Dockerfile b/ci/containers/centos-stream.Dockerfile
similarity index 100%
rename from ci/centos-stream.Dockerfile
rename to ci/containers/centos-stream.Dockerfile
diff --git a/ci/debian-10.Dockerfile b/ci/containers/debian-10.Dockerfile
similarity index 100%
rename from ci/debian-10.Dockerfile
rename to ci/containers/debian-10.Dockerfile
diff --git a/ci/debian-sid.Dockerfile b/ci/containers/debian-sid.Dockerfile
similarity index 100%
rename from ci/debian-sid.Dockerfile
rename to ci/containers/debian-sid.Dockerfile
diff --git a/ci/fedora-31.Dockerfile b/ci/containers/fedora-31.Dockerfile
similarity index 100%
rename from ci/fedora-31.Dockerfile
rename to ci/containers/fedora-31.Dockerfile
diff --git a/ci/fedora-32.Dockerfile b/ci/containers/fedora-32.Dockerfile
similarity index 100%
rename from ci/fedora-32.Dockerfile
rename to ci/containers/fedora-32.Dockerfile
diff --git a/ci/fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
similarity index 100%
rename from ci/fedora-rawhide-cross-mingw32.Dockerfile
rename to ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
diff --git a/ci/fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
similarity index 100%
rename from ci/fedora-rawhide-cross-mingw64.Dockerfile
rename to ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
diff --git a/ci/fedora-rawhide.Dockerfile b/ci/containers/fedora-rawhide.Dockerfile
similarity index 100%
rename from ci/fedora-rawhide.Dockerfile
rename to ci/containers/fedora-rawhide.Dockerfile
diff --git a/ci/opensuse-151.Dockerfile b/ci/containers/opensuse-151.Dockerfile
similarity index 100%
rename from ci/opensuse-151.Dockerfile
rename to ci/containers/opensuse-151.Dockerfile
diff --git a/ci/refresh b/ci/containers/refresh
similarity index 100%
rename from ci/refresh
rename to ci/containers/refresh
diff --git a/ci/ubuntu-1804.Dockerfile b/ci/containers/ubuntu-1804.Dockerfile
similarity index 100%
rename from ci/ubuntu-1804.Dockerfile
rename to ci/containers/ubuntu-1804.Dockerfile
diff --git a/ci/ubuntu-2004.Dockerfile b/ci/containers/ubuntu-2004.Dockerfile
similarity index 100%
rename from ci/ubuntu-2004.Dockerfile
rename to ci/containers/ubuntu-2004.Dockerfile