diff --git a/.gitignore b/.gitignore
index df8e92d3..ec84c0b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ metal-hammer*
 requirements.yaml
 .extra_vars.yaml
 sonic-vs.img
+.mini-lab.cumulus.yml.*
diff --git a/deploy_control_plane.yaml b/deploy_control_plane.yaml
index edbdef95..91c7e24b 100644
--- a/deploy_control_plane.yaml
+++ b/deploy_control_plane.yaml
@@ -20,7 +20,9 @@
       tags: metal-db
     - name: metal-roles/control-plane/roles/ipam-db
       tags: ipam-db
+    - name: metal-roles/control-plane/roles/headscale
+      tags: headscale
     - name: metal-roles/control-plane/roles/masterdata-db
       tags: masterdata-db
     - name: metal-roles/control-plane/roles/metal
-      tags: metal
+      tags: metal
\ No newline at end of file
diff --git a/inventories/group_vars/all/images.yaml b/inventories/group_vars/all/images.yaml
index 6a7dce3a..a7a6d566 100644
--- a/inventories/group_vars/all/images.yaml
+++ b/inventories/group_vars/all/images.yaml
@@ -1,5 +1,5 @@
 ---
-metal_stack_release_version: v0.11.0
+metal_stack_release_version: v0.11.3
 
 ##
 ## for development purposes, you can override releases from our image vector here
diff --git a/inventories/group_vars/control-plane/headscale.yaml b/inventories/group_vars/control-plane/headscale.yaml
new file mode 100644
index 00000000..aaa92a37
--- /dev/null
+++ b/inventories/group_vars/control-plane/headscale.yaml
@@ -0,0 +1,6 @@
+---
+headscale_tls: no
+headscale_db_storage_size: 200Mi
+headscale_private_key: c8e07b737d04715f1f5c1318334e888f65e6a704ea85d0cddaa31b2c5589ef7f
+headscale_noise_private_key: 580b8691e0e1f7cd74cf6154e890df015b3d7a0611a06efa5e2fd543ab13be4b
+headscale_db_resources: {}
diff --git a/inventories/group_vars/control-plane/metal.yml b/inventories/group_vars/control-plane/metal.yml
index a37b3a25..447512f5 100644
--- a/inventories/group_vars/control-plane/metal.yml
+++ b/inventories/group_vars/control-plane/metal.yml
@@ -1,6 +1,7 @@
 ---
 metal_set_resource_limits: no
 metal_check_api_health_endpoint: http://api.172.17.0.1.nip.io:8080/metal/v1/health
+metal_api_headscale_control_plane_address: "http://headscale.{{ metal_control_plane_ingress_dns }}:8080"
 
 # metal_helm_chart_local_path: /helm-charts/charts/metal-control-plane
 
@@ -12,16 +13,16 @@ metal_api_admin_key: metal-admin
 metal_api_nsq_tcp_address: nsqd:4150
 
 metal_api_images:
-- id: firewall-ubuntu-2.0.20220830
-  name: Firewall 2 Ubuntu 20220830
-  description: Firewall 2 Ubuntu 20220830
-  url: http://images.metal-stack.io/metal-os/firewall/2.0-ubuntu/20220830/img.tar.lz4
+- id: firewall-ubuntu-2.0.20221025
+  name: Firewall 2 Ubuntu 20221025
+  description: Firewall 2 Ubuntu 20221025
+  url: http://images.metal-stack.io/metal-os/firewall/2.0-ubuntu/20221025/img.tar.lz4
   features:
     - firewall
-- id: ubuntu-20.04.20220830
-  name: Ubuntu 20.04 20220830
-  description: Ubuntu 20.04 20220830
-  url: http://images.metal-stack.io/metal-os/ubuntu/20.04/20220830/img.tar.lz4
+- id: ubuntu-20.04.20221025
+  name: Ubuntu 20.04 20221025
+  description: Ubuntu 20.04 20221025
+  url: http://images.metal-stack.io/metal-os/ubuntu/20.04/20221025/img.tar.lz4
   features:
     - machine
 
@@ -122,3 +123,6 @@ metal_api_grpc_certs_server_cert: "{{  lookup('file', 'certs/grpc/server.pem') }
 metal_api_grpc_certs_client_key: "{{ lookup('file', 'certs/grpc/client-key.pem') }}"
 metal_api_grpc_certs_client_cert: "{{  lookup('file', 'certs/grpc/client.pem') }}"
 metal_api_grpc_certs_ca_cert: "{{ lookup('file', 'certs/ca.pem') }}"
+
+metal_api_headscale_enabled: true
+metal_api_headscale_tls: no
\ No newline at end of file