diff --git a/README.rst b/README.rst
index a459010..ad0d4a5 100644
--- a/README.rst
+++ b/README.rst
@@ -17,17 +17,12 @@ packages. For example:
 
    $ virtualenv venv
    $ source venv/bin/activate
-   $ pip install -U pip
+   $ python -m pip install --upgrade pip
    $ pip install -r requirements.txt
 
 Install Ansible role and collection dependencies from Ansible Galaxy:
 
 .. code-block::
-
-   $ ansible-galaxy role install \
-        -p ansible/roles \
-        -r requirements.yml
-
    $ ansible-galaxy collection install \
        -p ansible/collections \
        -r requirements.yml
diff --git a/ansible/openstack-container-clusters.yml b/ansible/openstack-container-clusters.yml
index 0194742..5df9a4c 100644
--- a/ansible/openstack-container-clusters.yml
+++ b/ansible/openstack-container-clusters.yml
@@ -4,7 +4,7 @@
   tags:
     - container-clusters-templates
   roles:
-    - role: stackhpc.os-container-clusters
+    - role: stackhpc.openstack.os_container_clusters
       os_container_clusters_venv: "{{ openstack_venv }}"
       os_container_clusters_auth_type: "{{ openstack_auth_type }}"
       os_container_clusters_auth: "{{ openstack_auth }}"
diff --git a/ansible/openstack-flavors.yml b/ansible/openstack-flavors.yml
index 16a06b3..69b94f2 100644
--- a/ansible/openstack-flavors.yml
+++ b/ansible/openstack-flavors.yml
@@ -4,7 +4,7 @@
   tags:
     - flavors
   roles:
-    - role: stackhpc.os-flavors
+    - role: stackhpc.openstack.os_flavors
       os_flavors_venv: "{{ openstack_venv }}"
       os_flavors_auth_type: "{{ openstack_auth_type }}"
       os_flavors_auth: "{{ openstack_auth }}"
diff --git a/ansible/openstack-host-aggregates.yml b/ansible/openstack-host-aggregates.yml
index 3826904..f37449e 100644
--- a/ansible/openstack-host-aggregates.yml
+++ b/ansible/openstack-host-aggregates.yml
@@ -4,7 +4,7 @@
   tags:
     - host_aggregates
   roles:
-    - role: stackhpc.os_host_aggregates
+    - role: stackhpc.openstack.os_host_aggregates
       os_host_aggregates_venv: "{{ openstack_venv }}"
       os_host_aggregates_auth_type: "{{ openstack_auth_type }}"
       os_host_aggregates_auth: "{{ openstack_auth }}"
diff --git a/ansible/openstack-images.yml b/ansible/openstack-images.yml
index 3c89df6..8fafc3c 100644
--- a/ansible/openstack-images.yml
+++ b/ansible/openstack-images.yml
@@ -4,7 +4,7 @@
   tags:
     - images
   roles:
-    - role: stackhpc.os-images
+    - role: stackhpc.openstack.os_images
       os_images_venv: "{{ openstack_venv }}"
       os_images_cache: "{{ ansible_env.PWD }}/openstack-config-image-cache"
       os_images_auth_type: "{{ openstack_auth_type }}"
diff --git a/ansible/openstack-networks.yml b/ansible/openstack-networks.yml
index b3de6dc..5f175d0 100644
--- a/ansible/openstack-networks.yml
+++ b/ansible/openstack-networks.yml
@@ -4,7 +4,7 @@
   tags:
     - networks
   roles:
-    - role: stackhpc.os-networks
+    - role: stackhpc.openstack.os_networks
       os_networks_venv: "{{ openstack_venv }}"
       os_networks_auth_type: "{{ openstack_auth_type }}"
       os_networks_auth: "{{ openstack_auth }}"
diff --git a/ansible/openstack-project.yml b/ansible/openstack-project.yml
index bc22c5b..2de1fb9 100644
--- a/ansible/openstack-project.yml
+++ b/ansible/openstack-project.yml
@@ -4,7 +4,7 @@
   tags:
     - project
   roles:
-    - role: stackhpc.os-projects
+    - role: stackhpc.openstack.os_projects
       os_projects_venv: "{{ openstack_venv }}"
       os_projects_auth_type: "{{ openstack_auth_type }}"
       os_projects_admin_auth: "{{ openstack_auth }}"
diff --git a/ansible/roles/.keep b/ansible/roles/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/examples/projects.yml b/examples/projects.yml
index ab5250d..911cbe4 100644
--- a/examples/projects.yml
+++ b/examples/projects.yml
@@ -57,7 +57,6 @@ openstack_unlimited_quotas:
   backup_gigabytes: -1
   backups: -1
   cores: -1
-  fixed_ips: -1
   floatingip: -1
   gigabytes: -1
   injected_file_size: -1
diff --git a/requirements.yml b/requirements.yml
index fda082e..2657e4c 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -1,12 +1,6 @@
 ---
-roles:
-  - name: stackhpc.os-flavors
-  - name: stackhpc.os-images
-  - name: stackhpc.os-networks
-  - name: stackhpc.os-projects
-  - name: stackhpc.os_host_aggregates
-  - name: stackhpc.os-container-clusters
-
 collections:
   - name: openstack.cloud
-    version: '<2'
+    version: 2.1.0
+  - name: stackhpc.openstack
+    version: 0.1.0