diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e668b9a..5ec7864 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,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/containers/libvirt-$NAME.Dockerfile" ci/containers
+    - docker build --cache-from "$TAG" --cache-from "$COMMON_TAG" --tag "$TAG" -f "ci/containers/ci-$NAME.Dockerfile" ci/containers
     - docker push "$TAG"
   after_script:
     - docker logout
diff --git a/ci/containers/libvirt-centos-7.Dockerfile b/ci/containers/ci-centos-7.Dockerfile
similarity index 100%
rename from ci/containers/libvirt-centos-7.Dockerfile
rename to ci/containers/ci-centos-7.Dockerfile
diff --git a/ci/containers/libvirt-centos-8.Dockerfile b/ci/containers/ci-centos-8.Dockerfile
similarity index 100%
rename from ci/containers/libvirt-centos-8.Dockerfile
rename to ci/containers/ci-centos-8.Dockerfile
diff --git a/ci/containers/libvirt-centos-stream.Dockerfile b/ci/containers/ci-centos-stream.Dockerfile
similarity index 100%
rename from ci/containers/libvirt-centos-stream.Dockerfile
rename to ci/containers/ci-centos-stream.Dockerfile
diff --git a/ci/containers/libvirt-debian-10.Dockerfile b/ci/containers/ci-debian-10.Dockerfile
similarity index 100%
rename from ci/containers/libvirt-debian-10.Dockerfile
rename to ci/containers/ci-debian-10.Dockerfile
diff --git a/ci/containers/libvirt-debian-sid.Dockerfile b/ci/containers/ci-debian-sid.Dockerfile
similarity index 100%
rename from ci/containers/libvirt-debian-sid.Dockerfile
rename to ci/containers/ci-debian-sid.Dockerfile
diff --git a/ci/containers/libvirt-fedora-32.Dockerfile b/ci/containers/ci-fedora-32.Dockerfile
similarity index 100%
rename from ci/containers/libvirt-fedora-32.Dockerfile
rename to ci/containers/ci-fedora-32.Dockerfile
diff --git a/ci/containers/libvirt-fedora-33.Dockerfile b/ci/containers/ci-fedora-33.Dockerfile
similarity index 100%
rename from ci/containers/libvirt-fedora-33.Dockerfile
rename to ci/containers/ci-fedora-33.Dockerfile
diff --git a/ci/containers/libvirt-fedora-rawhide.Dockerfile b/ci/containers/ci-fedora-rawhide.Dockerfile
similarity index 100%
rename from ci/containers/libvirt-fedora-rawhide.Dockerfile
rename to ci/containers/ci-fedora-rawhide.Dockerfile
diff --git a/ci/containers/libvirt-opensuse-151.Dockerfile b/ci/containers/ci-opensuse-151.Dockerfile
similarity index 100%
rename from ci/containers/libvirt-opensuse-151.Dockerfile
rename to ci/containers/ci-opensuse-151.Dockerfile
diff --git a/ci/containers/libvirt-ubuntu-1804.Dockerfile b/ci/containers/ci-ubuntu-1804.Dockerfile
similarity index 100%
rename from ci/containers/libvirt-ubuntu-1804.Dockerfile
rename to ci/containers/ci-ubuntu-1804.Dockerfile
diff --git a/ci/containers/libvirt-ubuntu-2004.Dockerfile b/ci/containers/ci-ubuntu-2004.Dockerfile
similarity index 100%
rename from ci/containers/libvirt-ubuntu-2004.Dockerfile
rename to ci/containers/ci-ubuntu-2004.Dockerfile
diff --git a/ci/containers/refresh b/ci/containers/refresh
index 0f21a53..6b9a639 100755
--- a/ci/containers/refresh
+++ b/ci/containers/refresh
@@ -18,10 +18,10 @@ HOSTS=$($LCITOOL hosts | grep -v -E '(freebsd|macos)')
 
 for host in $HOSTS
 do
-    if test "$host" = "libvirt-centos-8"
+    if test "$host" = "centos-8"
     then
-        $LCITOOL dockerfile $host libvirt+minimal,libvirt+dist,libvirt-python > $host.Dockerfile
+        $LCITOOL dockerfile $host libvirt+minimal,libvirt+dist,libvirt-python > ci-$host.Dockerfile
     else
-        $LCITOOL dockerfile $host libvirt+dist,libvirt-python > $host.Dockerfile
+        $LCITOOL dockerfile $host libvirt+dist,libvirt-python > ci-$host.Dockerfile
     fi
 done