diff --git a/roles/httpd/website/tasks/main.yml b/roles/httpd/website/tasks/main.yml
index 399392ea94..483f7642c1 100644
--- a/roles/httpd/website/tasks/main.yml
+++ b/roles/httpd/website/tasks/main.yml
@@ -59,13 +59,13 @@
 - name: And lastly, the robots.txt file
   template: >
     src={{item}}
-    dest=/srv/web/robots.txt.{{site_name}}
+    dest=/srv/web/{{site_name}}-robots.txt
     mode=0644
     owner=root
     group=root
     setype=httpd_sys_content_t
   with_first_found:
-  - robots/robots.txt.{{site_name}}
+  - robots/{{site_name}}-robots.txt
   - robots/robots.txt
   notify:
   - reload proxyhttpd
diff --git a/roles/httpd/website/templates/robots/robots.txt.admin.fedoraproject.org b/roles/httpd/website/templates/robots/admin.fedoraproject.org-robots.txt
similarity index 100%
rename from roles/httpd/website/templates/robots/robots.txt.admin.fedoraproject.org
rename to roles/httpd/website/templates/robots/admin.fedoraproject.org-robots.txt
diff --git a/roles/httpd/website/templates/robots/robots.txt.apps.fedoraproject.org b/roles/httpd/website/templates/robots/apps.fedoraproject.org-robots.txt
similarity index 100%
rename from roles/httpd/website/templates/robots/robots.txt.apps.fedoraproject.org
rename to roles/httpd/website/templates/robots/apps.fedoraproject.org-robots.txt
diff --git a/roles/httpd/website/templates/robots/robots.txt.fedoraproject.org b/roles/httpd/website/templates/robots/fedoraproject.org-robots.txt
similarity index 100%
rename from roles/httpd/website/templates/robots/robots.txt.fedoraproject.org
rename to roles/httpd/website/templates/robots/fedoraproject.org-robots.txt
diff --git a/roles/httpd/website/templates/robots/robots.txt.greenwave.fedoraproject.org b/roles/httpd/website/templates/robots/greenwave.fedoraproject.org-robots.txt
similarity index 100%
rename from roles/httpd/website/templates/robots/robots.txt.greenwave.fedoraproject.org
rename to roles/httpd/website/templates/robots/greenwave.fedoraproject.org-robots.txt
diff --git a/roles/httpd/website/templates/robots/robots.txt.paste.fedoraproject.org b/roles/httpd/website/templates/robots/paste.fedoraproject.org-robots.txt
similarity index 100%
rename from roles/httpd/website/templates/robots/robots.txt.paste.fedoraproject.org
rename to roles/httpd/website/templates/robots/paste.fedoraproject.org-robots.txt
diff --git a/roles/httpd/website/templates/robots/robots.txt.translate.fedoraproject.org b/roles/httpd/website/templates/robots/translate.fedoraproject.org-robots.txt
similarity index 100%
rename from roles/httpd/website/templates/robots/robots.txt.translate.fedoraproject.org
rename to roles/httpd/website/templates/robots/translate.fedoraproject.org-robots.txt