diff --git a/playbooks/groups/bastion.yml b/playbooks/groups/bastion.yml
index c3bd96677b..1490da2919 100644
--- a/playbooks/groups/bastion.yml
+++ b/playbooks/groups/bastion.yml
@@ -18,9 +18,8 @@
   - fas_client
   - sudo
   - collectd/base
-  - { role: openvpn/server, when: not inventory_hostname.startswith('bastion-comm01') or inventory_hostname.startswith('bastion13') }
-  - { role: openvpn/client, when: inventory_hostname.startswith('bastion13') }
-  - { role: packager_alias, when: not inventory_hostname.startswith('bastion-comm01') or inventory_hostname.startswith('bastion13') }
+  - openvpn/server
+  - packager_alias
   - opendkim
 
   pre_tasks: