diff --git a/compose.yaml b/compose.yaml
index 6a035b13..018067ae 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -48,6 +48,7 @@ services:
       - -ce
       - |
         ansible -m metalstack.base.metal_stack_release_vector localhost --extra-vars "@.extra_vars.yaml"
+        ansible-playbook install_v2_client.yaml
         ansible-playbook deploy_partition.yaml --extra-vars "@.extra_vars.yaml"
 
   metalctl:
diff --git a/deploy_partition.yaml b/deploy_partition.yaml
index eb110445..f949c0c0 100644
--- a/deploy_partition.yaml
+++ b/deploy_partition.yaml
@@ -62,7 +62,6 @@
 
   roles:
     - name: ansible-common
-    - name: metal-roles/common/roles/metal-v2-client
     - name: metal-roles/common/roles/metal-deployment-token
 
 - name: Set deployment token for leaves
@@ -101,6 +100,7 @@
   roles:
     - name: ansible-common
       tags: always
+    - name: metal-roles/common/roles/metal-deployment-token
     - name: metal-roles/partition/roles/metal-core
       tags: metal-core
       vars:
@@ -119,6 +119,7 @@
   roles:
     - name: ansible-common
       tags: always
+    - name: metal-roles/common/roles/metal-deployment-token
     - name: metal-roles/partition/roles/metal-core
       tags: metal-core
 
diff --git a/install_v2_client.yaml b/install_v2_client.yaml
new file mode 100644
index 00000000..5a26b402
--- /dev/null
+++ b/install_v2_client.yaml
@@ -0,0 +1,7 @@
+---
+- name: Install python client
+  hosts: localhost
+  connection: local
+  gather_facts: false
+  roles:
+    - name: metal-roles/common/roles/metal-v2-client
diff --git a/inventories/group_vars/partition/common.yaml b/inventories/group_vars/partition/common.yaml
index bb3791fe..0d800035 100644
--- a/inventories/group_vars/partition/common.yaml
+++ b/inventories/group_vars/partition/common.yaml
@@ -3,6 +3,7 @@ metal_partition_timezone: Europe/Berlin
 metal_partition_id: mini-lab
 
 metal_partition_metal_api_protocol: http
+metal_partition_metal_apiserver_url: http://v2.{{ metal_control_plane_gateway_dns }}
 metal_partition_metal_api_addr: api.{{ metal_control_plane_gateway_dns }}
 metal_partition_metal_api_port: 80
 metal_partition_metal_api_basepath: /metal/