diff --git a/main.yml b/main.yml
index d034b7bee5..9f43df3be4 100644
--- a/main.yml
+++ b/main.yml
@@ -26,7 +26,7 @@
 - import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-aarch64-hypervisors.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-backend.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-dist-git.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-frontend-cloud.yml
+- import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-frontend.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-keygen.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/groups/datagrepper.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/groups/debuginfod.yml
diff --git a/playbooks/groups/copr-frontend-cloud.yml b/playbooks/groups/copr-frontend.yml
similarity index 98%
rename from playbooks/groups/copr-frontend-cloud.yml
rename to playbooks/groups/copr-frontend.yml
index 9d9469fcf4..20d7644cd8 100644
--- a/playbooks/groups/copr-frontend-cloud.yml
+++ b/playbooks/groups/copr-frontend.yml
@@ -50,5 +50,5 @@
    - base
    - { role: sudo, sudoers: "{{ private }}/files/sudo/copr-sudoers", when: devel|bool }
    - copr/copr-devel-server
-   - copr/frontend-cloud
+   - copr/frontend
    - nagios_client
diff --git a/roles/copr/frontend-cloud/files/DigiCertCA.crt b/roles/copr/frontend/files/DigiCertCA.crt
similarity index 100%
rename from roles/copr/frontend-cloud/files/DigiCertCA.crt
rename to roles/copr/frontend/files/DigiCertCA.crt
diff --git a/roles/copr/frontend-cloud/files/banner-include.html b/roles/copr/frontend/files/banner-include.html
similarity index 100%
rename from roles/copr/frontend-cloud/files/banner-include.html
rename to roles/copr/frontend/files/banner-include.html
diff --git a/roles/copr/frontend-cloud/files/cron.daily/copr-frontend-optional b/roles/copr/frontend/files/cron.daily/copr-frontend-optional
similarity index 100%
rename from roles/copr/frontend-cloud/files/cron.daily/copr-frontend-optional
rename to roles/copr/frontend/files/cron.daily/copr-frontend-optional
diff --git a/roles/copr/frontend-cloud/files/cron.hourly/copr-frontend-optional b/roles/copr/frontend/files/cron.hourly/copr-frontend-optional
similarity index 100%
rename from roles/copr/frontend-cloud/files/cron.hourly/copr-frontend-optional
rename to roles/copr/frontend/files/cron.hourly/copr-frontend-optional
diff --git a/roles/copr/frontend-cloud/files/httpd.logrotate b/roles/copr/frontend/files/httpd.logrotate
similarity index 100%
rename from roles/copr/frontend-cloud/files/httpd.logrotate
rename to roles/copr/frontend/files/httpd.logrotate
diff --git a/roles/copr/frontend-cloud/files/patches/.ingit b/roles/copr/frontend/files/patches/.ingit
similarity index 100%
rename from roles/copr/frontend-cloud/files/patches/.ingit
rename to roles/copr/frontend/files/patches/.ingit
diff --git a/roles/copr/frontend-cloud/files/patches/build_chroot_status_api.patch b/roles/copr/frontend/files/patches/build_chroot_status_api.patch
similarity index 100%
rename from roles/copr/frontend-cloud/files/patches/build_chroot_status_api.patch
rename to roles/copr/frontend/files/patches/build_chroot_status_api.patch
diff --git a/roles/copr/frontend-cloud/files/pg/pg_hba.conf b/roles/copr/frontend/files/pg/pg_hba.conf
similarity index 100%
rename from roles/copr/frontend-cloud/files/pg/pg_hba.conf
rename to roles/copr/frontend/files/pg/pg_hba.conf
diff --git a/roles/copr/frontend-cloud/files/robots.txt b/roles/copr/frontend/files/robots.txt
similarity index 100%
rename from roles/copr/frontend-cloud/files/robots.txt
rename to roles/copr/frontend/files/robots.txt
diff --git a/roles/copr/frontend-cloud/files/systemd/system/fm-consumer@copr_messaging.service.d/50-copr.conf b/roles/copr/frontend/files/systemd/system/fm-consumer@copr_messaging.service.d/50-copr.conf
similarity index 100%
rename from roles/copr/frontend-cloud/files/systemd/system/fm-consumer@copr_messaging.service.d/50-copr.conf
rename to roles/copr/frontend/files/systemd/system/fm-consumer@copr_messaging.service.d/50-copr.conf
diff --git a/roles/copr/frontend-cloud/handlers/main.yml b/roles/copr/frontend/handlers/main.yml
similarity index 100%
rename from roles/copr/frontend-cloud/handlers/main.yml
rename to roles/copr/frontend/handlers/main.yml
diff --git a/roles/copr/frontend-cloud/meta/main.yml b/roles/copr/frontend/meta/main.yml
similarity index 100%
rename from roles/copr/frontend-cloud/meta/main.yml
rename to roles/copr/frontend/meta/main.yml
diff --git a/roles/copr/frontend-cloud/tasks/httpd.yml b/roles/copr/frontend/tasks/httpd.yml
similarity index 100%
rename from roles/copr/frontend-cloud/tasks/httpd.yml
rename to roles/copr/frontend/tasks/httpd.yml
diff --git a/roles/copr/frontend-cloud/tasks/install_certs.yml b/roles/copr/frontend/tasks/install_certs.yml
similarity index 100%
rename from roles/copr/frontend-cloud/tasks/install_certs.yml
rename to roles/copr/frontend/tasks/install_certs.yml
diff --git a/roles/copr/frontend-cloud/tasks/main.yml b/roles/copr/frontend/tasks/main.yml
similarity index 100%
rename from roles/copr/frontend-cloud/tasks/main.yml
rename to roles/copr/frontend/tasks/main.yml
diff --git a/roles/copr/frontend-cloud/tasks/mount_fs.yml b/roles/copr/frontend/tasks/mount_fs.yml
similarity index 100%
rename from roles/copr/frontend-cloud/tasks/mount_fs.yml
rename to roles/copr/frontend/tasks/mount_fs.yml
diff --git a/roles/copr/frontend-cloud/tasks/psql_setup.yml b/roles/copr/frontend/tasks/psql_setup.yml
similarity index 100%
rename from roles/copr/frontend-cloud/tasks/psql_setup.yml
rename to roles/copr/frontend/tasks/psql_setup.yml
diff --git a/roles/copr/frontend-cloud/templates/copr.conf b/roles/copr/frontend/templates/copr.conf
similarity index 100%
rename from roles/copr/frontend-cloud/templates/copr.conf
rename to roles/copr/frontend/templates/copr.conf
diff --git a/roles/copr/frontend-cloud/templates/fedora-messaging/copr_messaging.toml b/roles/copr/frontend/templates/fedora-messaging/copr_messaging.toml
similarity index 100%
rename from roles/copr/frontend-cloud/templates/fedora-messaging/copr_messaging.toml
rename to roles/copr/frontend/templates/fedora-messaging/copr_messaging.toml
diff --git a/roles/copr/frontend-cloud/templates/httpd/coprs.conf b/roles/copr/frontend/templates/httpd/coprs.conf
similarity index 100%
rename from roles/copr/frontend-cloud/templates/httpd/coprs.conf
rename to roles/copr/frontend/templates/httpd/coprs.conf
diff --git a/roles/copr/frontend-cloud/templates/sysconfig/certbot b/roles/copr/frontend/templates/sysconfig/certbot
similarity index 100%
rename from roles/copr/frontend-cloud/templates/sysconfig/certbot
rename to roles/copr/frontend/templates/sysconfig/certbot