diff --git a/playbooks/remote_puppet_else.yaml b/playbooks/remote_puppet_else.yaml
index e4afd0a5fe..1e6f52dfe6 100644
--- a/playbooks/remote_puppet_else.yaml
+++ b/playbooks/remote_puppet_else.yaml
@@ -1,4 +1,4 @@
-- hosts: '!review.openstack.org:!git0*:!zuul-scheduler:!afs*:!baremetal*:!controller*:!compute*:!puppetmaster*:!disabled'
+- hosts: '!review:!git0*:!zuul-scheduler:!afs*:!baremetal*:!controller*:!compute*:!puppetmaster*:!disabled'
   strategy: free
   gather_facts: true
   roles:
diff --git a/playbooks/remote_puppet_git.yaml b/playbooks/remote_puppet_git.yaml
index a36f948af8..2a48f8ef23 100644
--- a/playbooks/remote_puppet_git.yaml
+++ b/playbooks/remote_puppet_git.yaml
@@ -24,7 +24,7 @@
         project_config_ref: "{{ hostvars.localhost.gitinfo.after }}"
       manage_config: True
       puppet_reports: none
-- hosts: "review.openstack.org:!disabled"
+- hosts: "review:!disabled"
   strategy: free
   gather_facts: true
   roles:
diff --git a/playbooks/rename_repos.yaml b/playbooks/rename_repos.yaml
index 8ad32d79c5..562106a92f 100644
--- a/playbooks/rename_repos.yaml
+++ b/playbooks/rename_repos.yaml
@@ -1,4 +1,4 @@
-- hosts: review.openstack.org
+- hosts: review
   gather_facts: False
   remote_user: root
   tasks:
@@ -45,7 +45,7 @@
       shell: echo 'update projects set name="{{ item.new }}" where name="{{ item.old }}";' | mysql --defaults-file=/root/.storyboard_db.cnf storyboard
       with_items: "{{ repos }}"
 
-- hosts: review.openstack.org
+- hosts: review
   gather_facts: False
   remote_user: root
   become: yes
@@ -55,7 +55,7 @@
     - name: Make backup of gerrit index
       shell: cp -ax /home/gerrit2/review_site/index /home/gerrit2/index.backup.$(date +%s)
 
-- hosts: review.openstack.org
+- hosts: review
   gather_facts: False
   remote_user: root
   tasks:
@@ -64,7 +64,7 @@
     - name: Start gerrit
       shell: invoke-rc.d gerrit start
 
-- hosts: review.openstack.org
+- hosts: review
   gather_facts: False
   remote_user: root
   become: yes