diff --git a/.gitignore b/.gitignore
index 500983c..d6f3d99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /README.html
 __pycache__/
+ansible/kubeconfigs/
diff --git a/README.md b/README.md
index 93b4d3c..cdea228 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ frontend in another and maintain connectivity between the two
 services without exposing the backend to the public internet.
 
 [hello-world]: https://github.com/skupperproject/skupper-example-hello-world
-[skupper-ansible]: https://galaxy.ansible.com/ui/repo/published/skupper/network/
+[skupper-ansible]: https://galaxy.ansible.com/ui/repo/published/skupper/skupper/
 
 ## Prerequisites
 
@@ -69,12 +69,12 @@ services without exposing the backend to the public internet.
 ## Step 1: Install the Skupper Ansible collection
 
 Use the `ansible-galaxy` command to install the
-`skupper.network` collection.
+`skupper.skupper` collection.
 
 _**Terminal:**_
 
 ~~~ shell
-ansible-galaxy collection install skupper.network
+ansible-galaxy collection install skupper.skupper
 ~~~
 
 ## Step 2: Install the Skupper command-line tool
@@ -195,16 +195,16 @@ Now let's look at the setup playbook.
 
 - hosts: all
   collections:
-    - skupper.network
+    - skupper.skupper
   tasks:
     - import_role:
-        name: skupper
+        name: skupper_setup
 ~~~
 
 The two `kubectl` tasks deploy our example application.
 
-The last task is to use the `skupper` role from the
-`skupper.network` collection to deploy the Skupper network.
+The last task is to use the `skupper_setup` role from the
+`skupper.skupper` collection to deploy the Skupper network.
 
 Use the `ansible-playbook` command to run the playbook:
 
@@ -252,10 +252,10 @@ To clean everything up, run the teardown playbook.
 ~~~ yaml
 - hosts: all
   collections:
-    - skupper.network
+    - skupper.skupper
   tasks:
   - import_role:
-      name: skupper_delete
+      name: skupper_teardown
 
 - hosts: west
   tasks:
@@ -266,7 +266,7 @@ To clean everything up, run the teardown playbook.
     - command: "kubectl delete -f {{ playbook_dir }}/kubernetes/east.yaml"
 ~~~
 
-The `skupper_delete` role from the `skupper.network` collection
+The `skupper_teardown` role from the `skupper.skupper` collection
 removes all the Skupper resources.
 
 _**Terminal:**_
diff --git a/ansible/inventory.yml b/ansible/inventory.yml
index 76c1ac3..31e09da 100644
--- a/ansible/inventory.yml
+++ b/ansible/inventory.yml
@@ -3,15 +3,15 @@ all:
     ansible_connection: local
   hosts:
     west:
-      kubeconfig: "{{ inventory_dir }}/kubeconfigs/west"
-      namespace: west
+      skupper_option_kubeconfig: "{{ inventory_dir }}/kubeconfigs/west"
+      skupper_option_namespace: west
     east:
-      kubeconfig: "{{ inventory_dir }}/kubeconfigs/east"
-      namespace: east
-      links:
+      skupper_option_kubeconfig: "{{ inventory_dir }}/kubeconfigs/east"
+      skupper_option_namespace: east
+      skupper_link_list:
         - host: west
-      services:
-        backend:
+      skupper_service_list:
+        - name: backend
           ports:
             - 8080
           targets:
diff --git a/ansible/setup.yml b/ansible/setup.yml
index ac6f8ed..1d37350 100644
--- a/ansible/setup.yml
+++ b/ansible/setup.yml
@@ -8,7 +8,7 @@
 
 - hosts: all
   collections:
-    - skupper.network
+    - skupper.skupper
   tasks:
     - import_role:
-        name: skupper
+        name: skupper_setup
diff --git a/ansible/teardown.yml b/ansible/teardown.yml
index f613d97..c038de6 100644
--- a/ansible/teardown.yml
+++ b/ansible/teardown.yml
@@ -1,9 +1,9 @@
 - hosts: all
   collections:
-    - skupper.network
+    - skupper.skupper
   tasks:
   - import_role:
-      name: skupper_delete
+      name: skupper_teardown
 
 - hosts: west
   tasks:
diff --git a/skewer.yaml b/skewer.yaml
index 7560367..202f28a 100644
--- a/skewer.yaml
+++ b/skewer.yaml
@@ -24,7 +24,7 @@ overview: |
   services without exposing the backend to the public internet.
 
   [hello-world]: https://github.com/skupperproject/skupper-example-hello-world
-  [skupper-ansible]: https://galaxy.ansible.com/ui/repo/published/skupper/network/
+  [skupper-ansible]: https://galaxy.ansible.com/ui/repo/published/skupper/skupper/
 prerequisites: |
   @default@
   * Ansible, version 2.14 or later ([installation guide](https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html))
@@ -44,10 +44,10 @@ steps:
   - title: Install the Skupper Ansible collection
     preamble: |
       Use the `ansible-galaxy` command to install the
-      `skupper.network` collection.
+      `skupper.skupper` collection.
     commands:
       west:
-        - run: ansible-galaxy collection install skupper.network
+        - run: ansible-galaxy collection install skupper.skupper
   - title: Install the Skupper command-line tool
     preamble: |
       The Skupper Ansible collection uses the Skupper command-line
@@ -162,16 +162,16 @@ steps:
 
       - hosts: all
         collections:
-          - skupper.network
+          - skupper.skupper
         tasks:
           - import_role:
-              name: skupper
+              name: skupper_setup
       ~~~
 
       The two `kubectl` tasks deploy our example application.
 
-      The last task is to use the `skupper` role from the
-      `skupper.network` collection to deploy the Skupper network.
+      The last task is to use the `skupper_setup` role from the
+      `skupper.skupper` collection to deploy the Skupper network.
 
       Use the `ansible-playbook` command to run the playbook:
     commands:
@@ -206,10 +206,10 @@ steps:
       ~~~ yaml
       - hosts: all
         collections:
-          - skupper.network
+          - skupper.skupper
         tasks:
         - import_role:
-            name: skupper_delete
+            name: skupper_teardown
 
       - hosts: west
         tasks:
@@ -220,7 +220,7 @@ steps:
           - command: "kubectl delete -f {{ playbook_dir }}/kubernetes/east.yaml"
       ~~~
 
-      The `skupper_delete` role from the `skupper.network` collection
+      The `skupper_teardown` role from the `skupper.skupper` collection
       removes all the Skupper resources.
     commands:
       west: