diff --git a/roles/bodhi2/base/tasks/main.yml b/roles/bodhi2/base/tasks/main.yml
index e9fe012a58..8991a42549 100644
--- a/roles/bodhi2/base/tasks/main.yml
+++ b/roles/bodhi2/base/tasks/main.yml
@@ -36,7 +36,7 @@
     owner=bodhi 
     group=bodhi 
     mode=0600
-  when: inventory_hostname.startswith('bodhi0') and env == 'staging'
+  when: inventory_hostname.startswith('bodhi') and env == 'staging'
   notify:
   - restart httpd
   tags:
@@ -50,7 +50,7 @@
     owner=bodhi 
     group=bodhi 
     mode=0600
-  when: inventory_hostname.startswith('bodhi0') and env == 'production'
+  when: inventory_hostname.startswith('bodhi') and env == 'production'
   notify:
   - restart httpd
   tags: