diff --git a/playbooks/generate_workspace.yml b/playbooks/generate_workspace.yml
index da0a52a..984eb71 100644
--- a/playbooks/generate_workspace.yml
+++ b/playbooks/generate_workspace.yml
@@ -261,11 +261,11 @@
       #               so we generate a stub one if and only if it doesn't exist
       when: item.key not in neutron
       with_dict:
-        openstack_helm_neutron_helm_values:
+        neutron_helm_values:
           conf:
             auto_bridge_add:
               br-ex: ens4
-        openstack_helm_neutron_networks:
+        neutron_networks:
           - name: public
             external: true
             shared: true
@@ -310,7 +310,7 @@
       #               so we generate a stub one if and only if it doesn't exist
       when: item.key not in nova
       with_dict:
-        openstack_helm_nova_flavors:
+        nova_flavors:
           - name: m1.tiny
             ram: 512
             disk: 1
diff --git a/playbooks/openstack.yml b/playbooks/openstack.yml
index 8543a0d..6abcbaa 100644
--- a/playbooks/openstack.yml
+++ b/playbooks/openstack.yml
@@ -88,78 +88,77 @@
       tags:
         - memcached
 
-    - role: openstack_helm_keystone
+    - role: keystone
       tags:
-        - openstack-helm-keystone
+        - keystone
 
-    - role: openstack_helm_barbican
+    - role: barbican
       tags:
-        - openstack-helm-barbican
+        - barbican
 
-    - role: openstack_helm_infra_ceph_provisioners
+    - role: ceph_provisioners
       when: atmosphere_ceph_enabled | default(true)
       tags:
-        - openstack-helm-infra-ceph-provisioners
+        - ceph-provisioners
 
-    - role: openstack_helm_glance
+    - role: glance
       tags:
-        - openstack-helm-glance
+        - glance
 
-    - role: openstack_helm_cinder
+    - role: cinder
       tags:
-        - openstack-helm-cinder
+        - cinder
 
-    - role: openstack_helm_placement
+    - role: placement
       tags:
-        - openstack-helm-placement
+        - placement
 
-
-    - role: openstack_helm_infra_openvswitch
+    - role: openvswitch
       tags:
-        - openstack-helm-infra-openvswitch
+        - openvswitch
 
-    - role: openstack_helm_infra_libvirt
+    - role: libvirt
       tags:
-        - openstack-helm-infra-libvirt
+        - libvirt
 
     - role: coredns
       tags:
         - coredns
 
-    - role: openstack_helm_neutron
+    - role: neutron
       tags:
-        - openstack-helm-neutron
+        - neutron
 
-    - role: openstack_helm_nova
+    - role: nova
       tags:
-        - openstack-helm-nova
+        - nova
 
-    - role: openstack_helm_senlin
+    - role: senlin
       tags:
-        - openstack-helm-senlin
+        - senlin
 
     # NOTE(mnaser): This is disabled out of the box until we have a native way
     #               of configuring it with a pre-configured backend out of the
     #               box.
-    # - role: openstack_helm_designate
+    # - role: designate
     #   tags:
-    #     - openstack-helm-designate
+    #     - designate
 
-    - role: openstack_helm_heat
+    - role: heat
       tags:
-        - openstack-helm-heat
+        - heat
 
-    - role: openstack_helm_octavia
+    - role: octavia
       tags:
-        - openstack-helm-octavia
+        - octavia
 
-    - role: openstack_helm_magnum
+    - role: magnum
       tags:
-        - openstack-helm-magnum
+        - magnum
 
-    - role: openstack_helm_horizon
+    - role: horizon
       tags:
-        - openstack-helm-horizon
+        - horizon
 
     - role: openstack_exporter
       tags:
diff --git a/playbooks/tempest.yml b/playbooks/tempest.yml
index c633817..3032564 100644
--- a/playbooks/tempest.yml
+++ b/playbooks/tempest.yml
@@ -16,6 +16,6 @@
   gather_facts: false
   become: true
   roles:
-    - role: openstack_helm_tempest
+    - role: tempest
       tags:
-        - openstack-helm-tempest
+        - tempest