From f7307d4f51d95681318d741bdba43b3aa88102ae Mon Sep 17 00:00:00 2001
From: Stefan Majer <stefan.majer@f-i-ts.de>
Date: Mon, 16 Feb 2026 15:46:26 +0100
Subject: [PATCH] Introduce component ping

---
 doc/index.html                                | 14543 ++++++++--------
 generate/Makefile                             |     2 +-
 go.mod                                        |     6 +-
 go.sum                                        |     8 +-
 go/client/client.go                           |    30 +-
 .../v2/adminv2connect/component.connect.go    |   114 +
 go/metalstack/admin/v2/component.pb.go        |   287 +
 go/metalstack/admin/v2/partition.pb.go        |    12 +-
 go/metalstack/infra/v2/component.pb.go        |   291 +
 .../v2/infrav2connect/component.connect.go    |   116 +
 go/permissions/servicepermissions.go          |    11 +
 go/tests/mock_clients.go                      |    42 +-
 go/tests/mocks/client/Adminv2.go              |    46 +
 go/tests/mocks/client/Infrav2.go              |    46 +
 .../adminv2connect/ComponentServiceClient.go  |   107 +
 .../adminv2connect/ComponentServiceHandler.go |   107 +
 .../infrav2connect/ComponentServiceClient.go  |   107 +
 .../infrav2connect/ComponentServiceHandler.go |   107 +
 js/metalstack/admin/v2/component_pb.d.ts      |   105 +
 js/metalstack/admin/v2/component_pb.js        |    36 +
 js/metalstack/admin/v2/component_pb.ts        |   137 +
 js/metalstack/admin/v2/partition_pb.js        |     2 +-
 js/metalstack/admin/v2/partition_pb.ts        |     2 +-
 js/metalstack/infra/v2/component_pb.d.ts      |   130 +
 js/metalstack/infra/v2/component_pb.js        |    86 +
 js/metalstack/infra/v2/component_pb.ts        |   164 +
 proto/metalstack/admin/v2/component.proto     |    47 +
 proto/metalstack/admin/v2/partition.proto     |     4 +-
 proto/metalstack/infra/v2/component.proto     |    55 +
 .../metalstack/admin/v2/component_connect.py  |   120 +
 python/metalstack/admin/v2/component_pb2.py   |    58 +
 python/metalstack/admin/v2/component_pb2.pyi  |    42 +
 python/metalstack/admin/v2/partition_pb2.py   |    16 +-
 python/metalstack/client/client.py            |     8 +
 .../metalstack/infra/v2/component_connect.py  |   120 +
 python/metalstack/infra/v2/component_pb2.py   |    70 +
 python/metalstack/infra/v2/component_pb2.pyi  |    47 +
 37 files changed, 10080 insertions(+), 7151 deletions(-)
 create mode 100644 go/metalstack/admin/v2/adminv2connect/component.connect.go
 create mode 100644 go/metalstack/admin/v2/component.pb.go
 create mode 100644 go/metalstack/infra/v2/component.pb.go
 create mode 100644 go/metalstack/infra/v2/infrav2connect/component.connect.go
 create mode 100644 go/tests/mocks/metalstack/admin/v2/adminv2connect/ComponentServiceClient.go
 create mode 100644 go/tests/mocks/metalstack/admin/v2/adminv2connect/ComponentServiceHandler.go
 create mode 100644 go/tests/mocks/metalstack/infra/v2/infrav2connect/ComponentServiceClient.go
 create mode 100644 go/tests/mocks/metalstack/infra/v2/infrav2connect/ComponentServiceHandler.go
 create mode 100644 js/metalstack/admin/v2/component_pb.d.ts
 create mode 100644 js/metalstack/admin/v2/component_pb.js
 create mode 100644 js/metalstack/admin/v2/component_pb.ts
 create mode 100644 js/metalstack/infra/v2/component_pb.d.ts
 create mode 100644 js/metalstack/infra/v2/component_pb.js
 create mode 100644 js/metalstack/infra/v2/component_pb.ts
 create mode 100644 proto/metalstack/admin/v2/component.proto
 create mode 100644 proto/metalstack/infra/v2/component.proto
 create mode 100644 python/metalstack/admin/v2/component_connect.py
 create mode 100644 python/metalstack/admin/v2/component_pb2.py
 create mode 100644 python/metalstack/admin/v2/component_pb2.pyi
 create mode 100644 python/metalstack/infra/v2/component_connect.py
 create mode 100644 python/metalstack/infra/v2/component_pb2.py
 create mode 100644 python/metalstack/infra/v2/component_pb2.pyi

diff --git a/doc/index.html b/doc/index.html
index b4086d61..10d275e1 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -320,6 +320,198 @@ <h2>Table of Contents</h2>
           </li>
         
           
+          <li>
+            <a href="#metalstack%2fapi%2fv2%2ftoken.proto">metalstack/api/v2/token.proto</a>
+            <ul>
+              
+                <li>
+                  <a href="#metalstack.api.v2.MethodPermission"><span class="badge">M</span>MethodPermission</a>
+                </li>
+              
+                <li>
+                  <a href="#metalstack.api.v2.Token"><span class="badge">M</span>Token</a>
+                </li>
+              
+                <li>
+                  <a href="#metalstack.api.v2.Token.MachineRolesEntry"><span class="badge">M</span>Token.MachineRolesEntry</a>
+                </li>
+              
+                <li>
+                  <a href="#metalstack.api.v2.Token.ProjectRolesEntry"><span class="badge">M</span>Token.ProjectRolesEntry</a>
+                </li>
+              
+                <li>
+                  <a href="#metalstack.api.v2.Token.TenantRolesEntry"><span class="badge">M</span>Token.TenantRolesEntry</a>
+                </li>
+              
+                <li>
+                  <a href="#metalstack.api.v2.TokenServiceCreateRequest"><span class="badge">M</span>TokenServiceCreateRequest</a>
+                </li>
+              
+                <li>
+                  <a href="#metalstack.api.v2.TokenServiceCreateRequest.MachineRolesEntry"><span class="badge">M</span>TokenServiceCreateRequest.MachineRolesEntry</a>
+                </li>
+              
+                <li>
+                  <a href="#metalstack.api.v2.TokenServiceCreateRequest.ProjectRolesEntry"><span class="badge">M</span>TokenServiceCreateRequest.ProjectRolesEntry</a>
+                </li>
+              
+                <li>
+                  <a href="#metalstack.api.v2.TokenServiceCreateRequest.TenantRolesEntry"><span class="badge">M</span>TokenServiceCreateRequest.TenantRolesEntry</a>
+                </li>
+              
+                <li>
+                  <a href="#metalstack.api.v2.TokenServiceCreateResponse"><span class="badge">M</span>TokenServiceCreateResponse</a>
+                </li>
+              
+                <li>
+                  <a href="#metalstack.api.v2.TokenServiceGetRequest"><span class="badge">M</span>TokenServiceGetRequest</a>
+                </li>
+              
+                <li>
+                  <a href="#metalstack.api.v2.TokenServiceGetResponse"><span class="badge">M</span>TokenServiceGetResponse</a>
+                </li>
+              
+                <li>
+                  <a href="#metalstack.api.v2.TokenServiceListRequest"><span class="badge">M</span>TokenServiceListRequest</a>
+                </li>
+              
+                <li>
+                  <a href="#metalstack.api.v2.TokenServiceListResponse"><span class="badge">M</span>TokenServiceListResponse</a>
+                </li>
+              
+                <li>
+                  <a href="#metalstack.api.v2.TokenServiceRefreshRequest"><span class="badge">M</span>TokenServiceRefreshRequest</a>
+                </li>
+              
+                <li>
+                  <a href="#metalstack.api.v2.TokenServiceRefreshResponse"><span class="badge">M</span>TokenServiceRefreshResponse</a>
+                </li>
+              
+                <li>
+                  <a href="#metalstack.api.v2.TokenServiceRevokeRequest"><span class="badge">M</span>TokenServiceRevokeRequest</a>
+                </li>
+              
+                <li>
+                  <a href="#metalstack.api.v2.TokenServiceRevokeResponse"><span class="badge">M</span>TokenServiceRevokeResponse</a>
+                </li>
+              
+                <li>
+                  <a href="#metalstack.api.v2.TokenServiceUpdateRequest"><span class="badge">M</span>TokenServiceUpdateRequest</a>
+                </li>
+              
+                <li>
+                  <a href="#metalstack.api.v2.TokenServiceUpdateRequest.MachineRolesEntry"><span class="badge">M</span>TokenServiceUpdateRequest.MachineRolesEntry</a>
+                </li>
+              
+                <li>
+                  <a href="#metalstack.api.v2.TokenServiceUpdateRequest.ProjectRolesEntry"><span class="badge">M</span>TokenServiceUpdateRequest.ProjectRolesEntry</a>
+                </li>
+              
+                <li>
+                  <a href="#metalstack.api.v2.TokenServiceUpdateRequest.TenantRolesEntry"><span class="badge">M</span>TokenServiceUpdateRequest.TenantRolesEntry</a>
+                </li>
+              
+                <li>
+                  <a href="#metalstack.api.v2.TokenServiceUpdateResponse"><span class="badge">M</span>TokenServiceUpdateResponse</a>
+                </li>
+              
+              
+                <li>
+                  <a href="#metalstack.api.v2.TokenType"><span class="badge">E</span>TokenType</a>
+                </li>
+              
+              
+              
+                <li>
+                  <a href="#metalstack.api.v2.TokenService"><span class="badge">S</span>TokenService</a>
+                </li>
+              
+            </ul>
+          </li>
+        
+          
+          <li>
+            <a href="#metalstack%2fapi%2fv2%2fversion.proto">metalstack/api/v2/version.proto</a>
+            <ul>
+              
+                <li>
+                  <a href="#metalstack.api.v2.Version"><span class="badge">M</span>Version</a>
+                </li>
+              
+                <li>
+                  <a href="#metalstack.api.v2.VersionServiceGetRequest"><span class="badge">M</span>VersionServiceGetRequest</a>
+                </li>
+              
+                <li>
+                  <a href="#metalstack.api.v2.VersionServiceGetResponse"><span class="badge">M</span>VersionServiceGetResponse</a>
+                </li>
+              
+              
+              
+              
+                <li>
+                  <a href="#metalstack.api.v2.VersionService"><span class="badge">S</span>VersionService</a>
+                </li>
+              
+            </ul>
+          </li>
+        
+          
+          <li>
+            <a href="#metalstack%2finfra%2fv2%2fcomponent.proto">metalstack/infra/v2/component.proto</a>
+            <ul>
+              
+                <li>
+                  <a href="#metalstack.infra.v2.ComponentServicePingRequest"><span class="badge">M</span>ComponentServicePingRequest</a>
+                </li>
+              
+                <li>
+                  <a href="#metalstack.infra.v2.ComponentServicePingResponse"><span class="badge">M</span>ComponentServicePingResponse</a>
+                </li>
+              
+              
+                <li>
+                  <a href="#metalstack.infra.v2.ComponentType"><span class="badge">E</span>ComponentType</a>
+                </li>
+              
+              
+              
+                <li>
+                  <a href="#metalstack.infra.v2.ComponentService"><span class="badge">S</span>ComponentService</a>
+                </li>
+              
+            </ul>
+          </li>
+        
+          
+          <li>
+            <a href="#metalstack%2fadmin%2fv2%2fcomponent.proto">metalstack/admin/v2/component.proto</a>
+            <ul>
+              
+                <li>
+                  <a href="#metalstack.admin.v2.Component"><span class="badge">M</span>Component</a>
+                </li>
+              
+                <li>
+                  <a href="#metalstack.admin.v2.ComponentServiceListRequest"><span class="badge">M</span>ComponentServiceListRequest</a>
+                </li>
+              
+                <li>
+                  <a href="#metalstack.admin.v2.ComponentServiceListResponse"><span class="badge">M</span>ComponentServiceListResponse</a>
+                </li>
+              
+              
+              
+              
+                <li>
+                  <a href="#metalstack.admin.v2.ComponentService"><span class="badge">S</span>ComponentService</a>
+                </li>
+              
+            </ul>
+          </li>
+        
+          
           <li>
             <a href="#metalstack%2fapi%2fv2%2ffilesystem.proto">metalstack/api/v2/filesystem.proto</a>
             <ul>
@@ -1886,229 +2078,118 @@ <h2>Table of Contents</h2>
         
           
           <li>
-            <a href="#metalstack%2fapi%2fv2%2ftoken.proto">metalstack/api/v2/token.proto</a>
+            <a href="#metalstack%2fadmin%2fv2%2ftoken.proto">metalstack/admin/v2/token.proto</a>
             <ul>
               
                 <li>
-                  <a href="#metalstack.api.v2.MethodPermission"><span class="badge">M</span>MethodPermission</a>
+                  <a href="#metalstack.admin.v2.TokenServiceCreateRequest"><span class="badge">M</span>TokenServiceCreateRequest</a>
                 </li>
               
                 <li>
-                  <a href="#metalstack.api.v2.Token"><span class="badge">M</span>Token</a>
+                  <a href="#metalstack.admin.v2.TokenServiceCreateResponse"><span class="badge">M</span>TokenServiceCreateResponse</a>
                 </li>
               
                 <li>
-                  <a href="#metalstack.api.v2.Token.MachineRolesEntry"><span class="badge">M</span>Token.MachineRolesEntry</a>
+                  <a href="#metalstack.admin.v2.TokenServiceListRequest"><span class="badge">M</span>TokenServiceListRequest</a>
                 </li>
               
                 <li>
-                  <a href="#metalstack.api.v2.Token.ProjectRolesEntry"><span class="badge">M</span>Token.ProjectRolesEntry</a>
+                  <a href="#metalstack.admin.v2.TokenServiceListResponse"><span class="badge">M</span>TokenServiceListResponse</a>
                 </li>
               
                 <li>
-                  <a href="#metalstack.api.v2.Token.TenantRolesEntry"><span class="badge">M</span>Token.TenantRolesEntry</a>
+                  <a href="#metalstack.admin.v2.TokenServiceRevokeRequest"><span class="badge">M</span>TokenServiceRevokeRequest</a>
                 </li>
               
                 <li>
-                  <a href="#metalstack.api.v2.TokenServiceCreateRequest"><span class="badge">M</span>TokenServiceCreateRequest</a>
+                  <a href="#metalstack.admin.v2.TokenServiceRevokeResponse"><span class="badge">M</span>TokenServiceRevokeResponse</a>
                 </li>
               
+              
+              
+              
                 <li>
-                  <a href="#metalstack.api.v2.TokenServiceCreateRequest.MachineRolesEntry"><span class="badge">M</span>TokenServiceCreateRequest.MachineRolesEntry</a>
+                  <a href="#metalstack.admin.v2.TokenService"><span class="badge">S</span>TokenService</a>
                 </li>
               
+            </ul>
+          </li>
+        
+          
+          <li>
+            <a href="#metalstack%2fapi%2fv2%2fvpn.proto">metalstack/api/v2/vpn.proto</a>
+            <ul>
+              
                 <li>
-                  <a href="#metalstack.api.v2.TokenServiceCreateRequest.ProjectRolesEntry"><span class="badge">M</span>TokenServiceCreateRequest.ProjectRolesEntry</a>
+                  <a href="#metalstack.api.v2.VPNNode"><span class="badge">M</span>VPNNode</a>
                 </li>
               
+              
+              
+              
+            </ul>
+          </li>
+        
+          
+          <li>
+            <a href="#metalstack%2fadmin%2fv2%2fvpn.proto">metalstack/admin/v2/vpn.proto</a>
+            <ul>
+              
                 <li>
-                  <a href="#metalstack.api.v2.TokenServiceCreateRequest.TenantRolesEntry"><span class="badge">M</span>TokenServiceCreateRequest.TenantRolesEntry</a>
+                  <a href="#metalstack.admin.v2.VPNServiceAuthKeyRequest"><span class="badge">M</span>VPNServiceAuthKeyRequest</a>
                 </li>
               
                 <li>
-                  <a href="#metalstack.api.v2.TokenServiceCreateResponse"><span class="badge">M</span>TokenServiceCreateResponse</a>
+                  <a href="#metalstack.admin.v2.VPNServiceAuthKeyResponse"><span class="badge">M</span>VPNServiceAuthKeyResponse</a>
                 </li>
               
                 <li>
-                  <a href="#metalstack.api.v2.TokenServiceGetRequest"><span class="badge">M</span>TokenServiceGetRequest</a>
+                  <a href="#metalstack.admin.v2.VPNServiceListNodesRequest"><span class="badge">M</span>VPNServiceListNodesRequest</a>
                 </li>
               
                 <li>
-                  <a href="#metalstack.api.v2.TokenServiceGetResponse"><span class="badge">M</span>TokenServiceGetResponse</a>
+                  <a href="#metalstack.admin.v2.VPNServiceListNodesResponse"><span class="badge">M</span>VPNServiceListNodesResponse</a>
                 </li>
               
+              
+              
+              
                 <li>
-                  <a href="#metalstack.api.v2.TokenServiceListRequest"><span class="badge">M</span>TokenServiceListRequest</a>
+                  <a href="#metalstack.admin.v2.VPNService"><span class="badge">S</span>VPNService</a>
                 </li>
               
+            </ul>
+          </li>
+        
+          
+          <li>
+            <a href="#metalstack%2fapi%2fv2%2fhealth.proto">metalstack/api/v2/health.proto</a>
+            <ul>
+              
                 <li>
-                  <a href="#metalstack.api.v2.TokenServiceListResponse"><span class="badge">M</span>TokenServiceListResponse</a>
+                  <a href="#metalstack.api.v2.Health"><span class="badge">M</span>Health</a>
                 </li>
               
                 <li>
-                  <a href="#metalstack.api.v2.TokenServiceRefreshRequest"><span class="badge">M</span>TokenServiceRefreshRequest</a>
+                  <a href="#metalstack.api.v2.HealthServiceGetRequest"><span class="badge">M</span>HealthServiceGetRequest</a>
                 </li>
               
                 <li>
-                  <a href="#metalstack.api.v2.TokenServiceRefreshResponse"><span class="badge">M</span>TokenServiceRefreshResponse</a>
+                  <a href="#metalstack.api.v2.HealthServiceGetResponse"><span class="badge">M</span>HealthServiceGetResponse</a>
                 </li>
               
                 <li>
-                  <a href="#metalstack.api.v2.TokenServiceRevokeRequest"><span class="badge">M</span>TokenServiceRevokeRequest</a>
+                  <a href="#metalstack.api.v2.HealthStatus"><span class="badge">M</span>HealthStatus</a>
                 </li>
               
                 <li>
-                  <a href="#metalstack.api.v2.TokenServiceRevokeResponse"><span class="badge">M</span>TokenServiceRevokeResponse</a>
+                  <a href="#metalstack.api.v2.HealthStatus.PartitionsEntry"><span class="badge">M</span>HealthStatus.PartitionsEntry</a>
                 </li>
               
                 <li>
-                  <a href="#metalstack.api.v2.TokenServiceUpdateRequest"><span class="badge">M</span>TokenServiceUpdateRequest</a>
+                  <a href="#metalstack.api.v2.PartitionHealth"><span class="badge">M</span>PartitionHealth</a>
                 </li>
-              
-                <li>
-                  <a href="#metalstack.api.v2.TokenServiceUpdateRequest.MachineRolesEntry"><span class="badge">M</span>TokenServiceUpdateRequest.MachineRolesEntry</a>
-                </li>
-              
-                <li>
-                  <a href="#metalstack.api.v2.TokenServiceUpdateRequest.ProjectRolesEntry"><span class="badge">M</span>TokenServiceUpdateRequest.ProjectRolesEntry</a>
-                </li>
-              
-                <li>
-                  <a href="#metalstack.api.v2.TokenServiceUpdateRequest.TenantRolesEntry"><span class="badge">M</span>TokenServiceUpdateRequest.TenantRolesEntry</a>
-                </li>
-              
-                <li>
-                  <a href="#metalstack.api.v2.TokenServiceUpdateResponse"><span class="badge">M</span>TokenServiceUpdateResponse</a>
-                </li>
-              
-              
-                <li>
-                  <a href="#metalstack.api.v2.TokenType"><span class="badge">E</span>TokenType</a>
-                </li>
-              
-              
-              
-                <li>
-                  <a href="#metalstack.api.v2.TokenService"><span class="badge">S</span>TokenService</a>
-                </li>
-              
-            </ul>
-          </li>
-        
-          
-          <li>
-            <a href="#metalstack%2fadmin%2fv2%2ftoken.proto">metalstack/admin/v2/token.proto</a>
-            <ul>
-              
-                <li>
-                  <a href="#metalstack.admin.v2.TokenServiceCreateRequest"><span class="badge">M</span>TokenServiceCreateRequest</a>
-                </li>
-              
-                <li>
-                  <a href="#metalstack.admin.v2.TokenServiceCreateResponse"><span class="badge">M</span>TokenServiceCreateResponse</a>
-                </li>
-              
-                <li>
-                  <a href="#metalstack.admin.v2.TokenServiceListRequest"><span class="badge">M</span>TokenServiceListRequest</a>
-                </li>
-              
-                <li>
-                  <a href="#metalstack.admin.v2.TokenServiceListResponse"><span class="badge">M</span>TokenServiceListResponse</a>
-                </li>
-              
-                <li>
-                  <a href="#metalstack.admin.v2.TokenServiceRevokeRequest"><span class="badge">M</span>TokenServiceRevokeRequest</a>
-                </li>
-              
-                <li>
-                  <a href="#metalstack.admin.v2.TokenServiceRevokeResponse"><span class="badge">M</span>TokenServiceRevokeResponse</a>
-                </li>
-              
-              
-              
-              
-                <li>
-                  <a href="#metalstack.admin.v2.TokenService"><span class="badge">S</span>TokenService</a>
-                </li>
-              
-            </ul>
-          </li>
-        
-          
-          <li>
-            <a href="#metalstack%2fapi%2fv2%2fvpn.proto">metalstack/api/v2/vpn.proto</a>
-            <ul>
-              
-                <li>
-                  <a href="#metalstack.api.v2.VPNNode"><span class="badge">M</span>VPNNode</a>
-                </li>
-              
-              
-              
-              
-            </ul>
-          </li>
-        
-          
-          <li>
-            <a href="#metalstack%2fadmin%2fv2%2fvpn.proto">metalstack/admin/v2/vpn.proto</a>
-            <ul>
-              
-                <li>
-                  <a href="#metalstack.admin.v2.VPNServiceAuthKeyRequest"><span class="badge">M</span>VPNServiceAuthKeyRequest</a>
-                </li>
-              
-                <li>
-                  <a href="#metalstack.admin.v2.VPNServiceAuthKeyResponse"><span class="badge">M</span>VPNServiceAuthKeyResponse</a>
-                </li>
-              
-                <li>
-                  <a href="#metalstack.admin.v2.VPNServiceListNodesRequest"><span class="badge">M</span>VPNServiceListNodesRequest</a>
-                </li>
-              
-                <li>
-                  <a href="#metalstack.admin.v2.VPNServiceListNodesResponse"><span class="badge">M</span>VPNServiceListNodesResponse</a>
-                </li>
-              
-              
-              
-              
-                <li>
-                  <a href="#metalstack.admin.v2.VPNService"><span class="badge">S</span>VPNService</a>
-                </li>
-              
-            </ul>
-          </li>
-        
-          
-          <li>
-            <a href="#metalstack%2fapi%2fv2%2fhealth.proto">metalstack/api/v2/health.proto</a>
-            <ul>
-              
-                <li>
-                  <a href="#metalstack.api.v2.Health"><span class="badge">M</span>Health</a>
-                </li>
-              
-                <li>
-                  <a href="#metalstack.api.v2.HealthServiceGetRequest"><span class="badge">M</span>HealthServiceGetRequest</a>
-                </li>
-              
-                <li>
-                  <a href="#metalstack.api.v2.HealthServiceGetResponse"><span class="badge">M</span>HealthServiceGetResponse</a>
-                </li>
-              
-                <li>
-                  <a href="#metalstack.api.v2.HealthStatus"><span class="badge">M</span>HealthStatus</a>
-                </li>
-              
-                <li>
-                  <a href="#metalstack.api.v2.HealthStatus.PartitionsEntry"><span class="badge">M</span>HealthStatus.PartitionsEntry</a>
-                </li>
-              
-                <li>
-                  <a href="#metalstack.api.v2.PartitionHealth"><span class="badge">M</span>PartitionHealth</a>
-                </li>
-              
+              
               
                 <li>
                   <a href="#metalstack.api.v2.Service"><span class="badge">E</span>Service</a>
@@ -2198,33 +2279,6 @@ <h2>Table of Contents</h2>
           </li>
         
           
-          <li>
-            <a href="#metalstack%2fapi%2fv2%2fversion.proto">metalstack/api/v2/version.proto</a>
-            <ul>
-              
-                <li>
-                  <a href="#metalstack.api.v2.Version"><span class="badge">M</span>Version</a>
-                </li>
-              
-                <li>
-                  <a href="#metalstack.api.v2.VersionServiceGetRequest"><span class="badge">M</span>VersionServiceGetRequest</a>
-                </li>
-              
-                <li>
-                  <a href="#metalstack.api.v2.VersionServiceGetResponse"><span class="badge">M</span>VersionServiceGetResponse</a>
-                </li>
-              
-              
-              
-              
-                <li>
-                  <a href="#metalstack.api.v2.VersionService"><span class="badge">S</span>VersionService</a>
-                </li>
-              
-            </ul>
-          </li>
-        
-          
           <li>
             <a href="#metalstack%2finfra%2fv2%2fbmc.proto">metalstack/infra/v2/bmc.proto</a>
             <ul>
@@ -3052,13 +3106,13 @@ <h3 id="metalstack/api/v2/predefined_rules.proto-extensions">File-level Extensio
     
       
       <div class="file-heading">
-        <h2 id="metalstack/api/v2/filesystem.proto">metalstack/api/v2/filesystem.proto</h2><a href="#title">Top</a>
+        <h2 id="metalstack/api/v2/token.proto">metalstack/api/v2/token.proto</h2><a href="#title">Top</a>
       </div>
       <p></p>
 
       
-        <h3 id="metalstack.api.v2.Disk">Disk</h3>
-        <p>Disk</p>
+        <h3 id="metalstack.api.v2.MethodPermission">MethodPermission</h3>
+        <p>MethodPermission is a mapping from a subject/project to a service method</p>
 
         
           <table class="field-table">
@@ -3068,17 +3122,22 @@ <h3 id="metalstack.api.v2.Disk">Disk</h3>
             <tbody>
               
                 <tr>
-                  <td>device</td>
+                  <td>subject</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Device the device to create the partitions </p></td>
+                  <td><p>Subject maybe either the project or the tenant
+for which the methods should be allowed
+
+asterisk (*) can be specified to match any subject
+empty string (&#34;&#34;) can be specified for requests that do not require a subject, e.g. partition list
+otherwise either a projectid or a tenant login should be specified </p></td>
                 </tr>
               
                 <tr>
-                  <td>partitions</td>
-                  <td><a href="#metalstack.api.v2.DiskPartition">DiskPartition</a></td>
+                  <td>methods</td>
+                  <td><a href="#string">string</a></td>
                   <td>repeated</td>
-                  <td><p>Partitions list of partitions to create on this disk </p></td>
+                  <td><p>Methods which should be accessible </p></td>
                 </tr>
               
             </tbody>
@@ -3088,8 +3147,8 @@ <h3 id="metalstack.api.v2.Disk">Disk</h3>
 
         
       
-        <h3 id="metalstack.api.v2.DiskPartition">DiskPartition</h3>
-        <p>DiskPartition</p>
+        <h3 id="metalstack.api.v2.Token">Token</h3>
+        <p>Token generates a jwt authentication token to access the api</p><p>There are two different types of tokens, api- and user- tokens</p><p>A user token is used to authenticate end user requests for example from a cli.</p><p>The configured roles in a user token are expanded in the api server</p><p>based on the memberships in other projects and tenants based on the role granted there.</p><p>User tokens will never contain permissions.</p><p>Permissions are always derived from the tenant and project roles and memberships.</p><p>The api token should be used to authenticate services.</p><p>In contrast to a user token, the api token permissions and roles apply as configured during the token create process.</p>
 
         
           <table class="field-table">
@@ -3099,104 +3158,126 @@ <h3 id="metalstack.api.v2.DiskPartition">DiskPartition</h3>
             <tbody>
               
                 <tr>
-                  <td>number</td>
-                  <td><a href="#uint32">uint32</a></td>
+                  <td>uuid</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Number partition number, will be appended to partitionprefix to create the final devicename </p></td>
+                  <td><p>Uuid of the jwt token, used to reference it by revoke </p></td>
                 </tr>
               
                 <tr>
-                  <td>label</td>
+                  <td>user</td>
                   <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>optional label for this this partition </p></td>
+                  <td></td>
+                  <td><p>User who created this token </p></td>
                 </tr>
               
                 <tr>
-                  <td>size</td>
-                  <td><a href="#uint64">uint64</a></td>
+                  <td>meta</td>
+                  <td><a href="#metalstack.api.v2.Meta">Meta</a></td>
                   <td></td>
-                  <td><p>Size size in mebibytes (MiB) of this partition&#34; </p></td>
+                  <td><p>Meta for this token </p></td>
                 </tr>
               
                 <tr>
-                  <td>gpt_type</td>
-                  <td><a href="#metalstack.api.v2.GPTType">GPTType</a></td>
-                  <td>optional</td>
-                  <td><p>GPTType the gpt partition table type of this partition </p></td>
+                  <td>description</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Description is a user given description of this token. </p></td>
                 </tr>
               
-            </tbody>
-          </table>
-
-          
-
-        
-      
-        <h3 id="metalstack.api.v2.Filesystem">Filesystem</h3>
-        <p>Filesystem</p>
-
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
-              
                 <tr>
-                  <td>device</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Device the underlying device where this filesystem should be created </p></td>
+                  <td>permissions</td>
+                  <td><a href="#metalstack.api.v2.MethodPermission">MethodPermission</a></td>
+                  <td>repeated</td>
+                  <td><p>Permissions is a list of service methods this token can be used for </p></td>
                 </tr>
               
                 <tr>
-                  <td>format</td>
-                  <td><a href="#metalstack.api.v2.Format">Format</a></td>
+                  <td>expires</td>
+                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
                   <td></td>
-                  <td><p>Format of the filesystem format </p></td>
+                  <td><p>Expires gives the date in the future after which this token can not be used anymore </p></td>
                 </tr>
               
                 <tr>
-                  <td>name</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Name of this filesystem </p></td>
+                  <td>issued_at</td>
+                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
+                  <td></td>
+                  <td><p>IssuedAt gives the date when this token was created </p></td>
                 </tr>
               
                 <tr>
-                  <td>description</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Description of this filesystem </p></td>
+                  <td>token_type</td>
+                  <td><a href="#metalstack.api.v2.TokenType">TokenType</a></td>
+                  <td></td>
+                  <td><p>TokenType describes the type of this token </p></td>
                 </tr>
               
                 <tr>
-                  <td>path</td>
-                  <td><a href="#string">string</a></td>
+                  <td>project_roles</td>
+                  <td><a href="#metalstack.api.v2.Token.ProjectRolesEntry">Token.ProjectRolesEntry</a></td>
+                  <td>repeated</td>
+                  <td><p>ProjectRoles associates a project id with the corresponding role of the token owner </p></td>
+                </tr>
+              
+                <tr>
+                  <td>tenant_roles</td>
+                  <td><a href="#metalstack.api.v2.Token.TenantRolesEntry">Token.TenantRolesEntry</a></td>
+                  <td>repeated</td>
+                  <td><p>TenantRoles associates a tenant id with the corresponding role of the token owner </p></td>
+                </tr>
+              
+                <tr>
+                  <td>admin_role</td>
+                  <td><a href="#metalstack.api.v2.AdminRole">AdminRole</a></td>
                   <td>optional</td>
-                  <td><p>Path the mountpoint where this filesystem should be mounted on </p></td>
+                  <td><p>AdminRole defines the admin role of the token owner </p></td>
                 </tr>
               
                 <tr>
-                  <td>label</td>
-                  <td><a href="#string">string</a></td>
+                  <td>infra_role</td>
+                  <td><a href="#metalstack.api.v2.InfraRole">InfraRole</a></td>
                   <td>optional</td>
-                  <td><p>Label optional label for this this filesystem </p></td>
+                  <td><p>InfraRole defines the infrastructure role of the token owner </p></td>
                 </tr>
               
                 <tr>
-                  <td>mount_options</td>
-                  <td><a href="#string">string</a></td>
+                  <td>machine_roles</td>
+                  <td><a href="#metalstack.api.v2.Token.MachineRolesEntry">Token.MachineRolesEntry</a></td>
                   <td>repeated</td>
-                  <td><p>MountOptions the options to use to mount this filesystem </p></td>
+                  <td><p>MachineRoles associates a machine uuid with the corresponding role of the token owner
+TODO: decide if we need this map from machine.uuid-&gt;role, we could instead use the subject in the token instead </p></td>
                 </tr>
               
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.api.v2.Token.MachineRolesEntry">Token.MachineRolesEntry</h3>
+        <p></p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
                 <tr>
-                  <td>create_options</td>
+                  <td>key</td>
                   <td><a href="#string">string</a></td>
-                  <td>repeated</td>
-                  <td><p>CreateOptions the options to use to create (mkfs) this filesystem </p></td>
+                  <td></td>
+                  <td><p> </p></td>
+                </tr>
+              
+                <tr>
+                  <td>value</td>
+                  <td><a href="#metalstack.api.v2.MachineRole">MachineRole</a></td>
+                  <td></td>
+                  <td><p> </p></td>
                 </tr>
               
             </tbody>
@@ -3206,8 +3287,8 @@ <h3 id="metalstack.api.v2.Filesystem">Filesystem</h3>
 
         
       
-        <h3 id="metalstack.api.v2.FilesystemLayout">FilesystemLayout</h3>
-        <p>FilesystemLayout</p>
+        <h3 id="metalstack.api.v2.Token.ProjectRolesEntry">Token.ProjectRolesEntry</h3>
+        <p></p>
 
         
           <table class="field-table">
@@ -3217,73 +3298,128 @@ <h3 id="metalstack.api.v2.FilesystemLayout">FilesystemLayout</h3>
             <tbody>
               
                 <tr>
-                  <td>id</td>
+                  <td>key</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Id of this filesystemLayout </p></td>
+                  <td><p> </p></td>
                 </tr>
               
                 <tr>
-                  <td>meta</td>
-                  <td><a href="#metalstack.api.v2.Meta">Meta</a></td>
+                  <td>value</td>
+                  <td><a href="#metalstack.api.v2.ProjectRole">ProjectRole</a></td>
                   <td></td>
-                  <td><p>Meta for this filesystemLayout </p></td>
+                  <td><p> </p></td>
                 </tr>
               
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.api.v2.Token.TenantRolesEntry">Token.TenantRolesEntry</h3>
+        <p></p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
                 <tr>
-                  <td>name</td>
+                  <td>key</td>
                   <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Name of this filesystemLayout </p></td>
+                  <td></td>
+                  <td><p> </p></td>
+                </tr>
+              
+                <tr>
+                  <td>value</td>
+                  <td><a href="#metalstack.api.v2.TenantRole">TenantRole</a></td>
+                  <td></td>
+                  <td><p> </p></td>
                 </tr>
               
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.api.v2.TokenServiceCreateRequest">TokenServiceCreateRequest</h3>
+        <p>TokenServiceCreateRequest is the request payload to create a token</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
                 <tr>
                   <td>description</td>
                   <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Description of this filesystemLayout </p></td>
+                  <td></td>
+                  <td><p>Description of the token </p></td>
                 </tr>
               
                 <tr>
-                  <td>filesystems</td>
-                  <td><a href="#metalstack.api.v2.Filesystem">Filesystem</a></td>
+                  <td>permissions</td>
+                  <td><a href="#metalstack.api.v2.MethodPermission">MethodPermission</a></td>
                   <td>repeated</td>
-                  <td><p>Filesystems is a list of filesystems to create on a machine </p></td>
+                  <td><p>Permissions is a list of service methods this token can be used for </p></td>
                 </tr>
               
                 <tr>
-                  <td>disks</td>
-                  <td><a href="#metalstack.api.v2.Disk">Disk</a></td>
-                  <td>repeated</td>
-                  <td><p>Disks list of disks that belong to this layout </p></td>
+                  <td>expires</td>
+                  <td><a href="#google.protobuf.Duration">google.protobuf.Duration</a></td>
+                  <td></td>
+                  <td><p>Expires gives the duration since now, after which this token can not be used anymore </p></td>
                 </tr>
               
                 <tr>
-                  <td>raid</td>
-                  <td><a href="#metalstack.api.v2.Raid">Raid</a></td>
+                  <td>project_roles</td>
+                  <td><a href="#metalstack.api.v2.TokenServiceCreateRequest.ProjectRolesEntry">TokenServiceCreateRequest.ProjectRolesEntry</a></td>
                   <td>repeated</td>
-                  <td><p>raid arrays to create </p></td>
+                  <td><p>ProjectRoles associates a project id with the corresponding role of the token owner </p></td>
                 </tr>
               
                 <tr>
-                  <td>volume_groups</td>
-                  <td><a href="#metalstack.api.v2.VolumeGroup">VolumeGroup</a></td>
+                  <td>tenant_roles</td>
+                  <td><a href="#metalstack.api.v2.TokenServiceCreateRequest.TenantRolesEntry">TokenServiceCreateRequest.TenantRolesEntry</a></td>
                   <td>repeated</td>
-                  <td><p>VolumeGroups list of volumegroups to create </p></td>
+                  <td><p>TenantRoles associates a tenant id with the corresponding role of the token owner </p></td>
                 </tr>
               
                 <tr>
-                  <td>logical_volumes</td>
-                  <td><a href="#metalstack.api.v2.LogicalVolume">LogicalVolume</a></td>
+                  <td>admin_role</td>
+                  <td><a href="#metalstack.api.v2.AdminRole">AdminRole</a></td>
+                  <td>optional</td>
+                  <td><p>AdminRole defines the admin role of the token owner </p></td>
+                </tr>
+              
+                <tr>
+                  <td>infra_role</td>
+                  <td><a href="#metalstack.api.v2.InfraRole">InfraRole</a></td>
+                  <td>optional</td>
+                  <td><p>InfraRole defines the infrastructure role of the token owner </p></td>
+                </tr>
+              
+                <tr>
+                  <td>machine_roles</td>
+                  <td><a href="#metalstack.api.v2.TokenServiceCreateRequest.MachineRolesEntry">TokenServiceCreateRequest.MachineRolesEntry</a></td>
                   <td>repeated</td>
-                  <td><p>LogicalVolumes list of logicalvolumes to create </p></td>
+                  <td><p>MachineRoles associates a machine uuid with the corresponding role of the token owner </p></td>
                 </tr>
               
                 <tr>
-                  <td>constraints</td>
-                  <td><a href="#metalstack.api.v2.FilesystemLayoutConstraints">FilesystemLayoutConstraints</a></td>
+                  <td>labels</td>
+                  <td><a href="#metalstack.api.v2.Labels">Labels</a></td>
                   <td></td>
-                  <td><p>Constraints which must match that this layout is taken, if sizes and images are empty these are develop layouts </p></td>
+                  <td><p>Labels on this token </p></td>
                 </tr>
               
             </tbody>
@@ -3293,8 +3429,8 @@ <h3 id="metalstack.api.v2.FilesystemLayout">FilesystemLayout</h3>
 
         
       
-        <h3 id="metalstack.api.v2.FilesystemLayoutConstraints">FilesystemLayoutConstraints</h3>
-        <p>FilesystemLayoutConstraints</p>
+        <h3 id="metalstack.api.v2.TokenServiceCreateRequest.MachineRolesEntry">TokenServiceCreateRequest.MachineRolesEntry</h3>
+        <p></p>
 
         
           <table class="field-table">
@@ -3304,17 +3440,17 @@ <h3 id="metalstack.api.v2.FilesystemLayoutConstraints">FilesystemLayoutConstrain
             <tbody>
               
                 <tr>
-                  <td>sizes</td>
+                  <td>key</td>
                   <td><a href="#string">string</a></td>
-                  <td>repeated</td>
-                  <td><p>Sizes list of sizes this layout applies to </p></td>
+                  <td></td>
+                  <td><p> </p></td>
                 </tr>
               
                 <tr>
-                  <td>images</td>
-                  <td><a href="#metalstack.api.v2.FilesystemLayoutConstraints.ImagesEntry">FilesystemLayoutConstraints.ImagesEntry</a></td>
-                  <td>repeated</td>
-                  <td><p>Images list of images this layout applies to </p></td>
+                  <td>value</td>
+                  <td><a href="#metalstack.api.v2.MachineRole">MachineRole</a></td>
+                  <td></td>
+                  <td><p> </p></td>
                 </tr>
               
             </tbody>
@@ -3324,7 +3460,7 @@ <h3 id="metalstack.api.v2.FilesystemLayoutConstraints">FilesystemLayoutConstrain
 
         
       
-        <h3 id="metalstack.api.v2.FilesystemLayoutConstraints.ImagesEntry">FilesystemLayoutConstraints.ImagesEntry</h3>
+        <h3 id="metalstack.api.v2.TokenServiceCreateRequest.ProjectRolesEntry">TokenServiceCreateRequest.ProjectRolesEntry</h3>
         <p></p>
 
         
@@ -3343,7 +3479,7 @@ <h3 id="metalstack.api.v2.FilesystemLayoutConstraints.ImagesEntry">FilesystemLay
               
                 <tr>
                   <td>value</td>
-                  <td><a href="#string">string</a></td>
+                  <td><a href="#metalstack.api.v2.ProjectRole">ProjectRole</a></td>
                   <td></td>
                   <td><p> </p></td>
                 </tr>
@@ -3355,8 +3491,8 @@ <h3 id="metalstack.api.v2.FilesystemLayoutConstraints.ImagesEntry">FilesystemLay
 
         
       
-        <h3 id="metalstack.api.v2.FilesystemServiceGetRequest">FilesystemServiceGetRequest</h3>
-        <p>FilesystemServiceGetRequest is the request payload for a filesystem get request</p>
+        <h3 id="metalstack.api.v2.TokenServiceCreateRequest.TenantRolesEntry">TokenServiceCreateRequest.TenantRolesEntry</h3>
+        <p></p>
 
         
           <table class="field-table">
@@ -3366,10 +3502,17 @@ <h3 id="metalstack.api.v2.FilesystemServiceGetRequest">FilesystemServiceGetReque
             <tbody>
               
                 <tr>
-                  <td>id</td>
+                  <td>key</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>ID of the filesystem to get </p></td>
+                  <td><p> </p></td>
+                </tr>
+              
+                <tr>
+                  <td>value</td>
+                  <td><a href="#metalstack.api.v2.TenantRole">TenantRole</a></td>
+                  <td></td>
+                  <td><p> </p></td>
                 </tr>
               
             </tbody>
@@ -3379,8 +3522,8 @@ <h3 id="metalstack.api.v2.FilesystemServiceGetRequest">FilesystemServiceGetReque
 
         
       
-        <h3 id="metalstack.api.v2.FilesystemServiceGetResponse">FilesystemServiceGetResponse</h3>
-        <p>FilesystemServiceGetResponse is the response payload for a filesystem get request</p>
+        <h3 id="metalstack.api.v2.TokenServiceCreateResponse">TokenServiceCreateResponse</h3>
+        <p>TokenServiceCreateResponse is the response payload of a token create request</p>
 
         
           <table class="field-table">
@@ -3390,10 +3533,17 @@ <h3 id="metalstack.api.v2.FilesystemServiceGetResponse">FilesystemServiceGetResp
             <tbody>
               
                 <tr>
-                  <td>filesystem_layout</td>
-                  <td><a href="#metalstack.api.v2.FilesystemLayout">FilesystemLayout</a></td>
+                  <td>token</td>
+                  <td><a href="#metalstack.api.v2.Token">Token</a></td>
                   <td></td>
-                  <td><p>FilesystemLayout the filesystemlayout </p></td>
+                  <td><p>Token which was created </p></td>
+                </tr>
+              
+                <tr>
+                  <td>secret</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Secret is the body if the jwt token, should be used in api requests as bearer token </p></td>
                 </tr>
               
             </tbody>
@@ -3403,8 +3553,8 @@ <h3 id="metalstack.api.v2.FilesystemServiceGetResponse">FilesystemServiceGetResp
 
         
       
-        <h3 id="metalstack.api.v2.FilesystemServiceListRequest">FilesystemServiceListRequest</h3>
-        <p>FilesystemServiceListRequest is the request payload for a filesystem list request</p>
+        <h3 id="metalstack.api.v2.TokenServiceGetRequest">TokenServiceGetRequest</h3>
+        <p>TokenServiceGetRequest is the request payload of a token get request</p>
 
         
           <table class="field-table">
@@ -3414,10 +3564,10 @@ <h3 id="metalstack.api.v2.FilesystemServiceListRequest">FilesystemServiceListReq
             <tbody>
               
                 <tr>
-                  <td>id</td>
+                  <td>uuid</td>
                   <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>ID of the filesystem to get </p></td>
+                  <td></td>
+                  <td><p>Uuid of the token to get </p></td>
                 </tr>
               
             </tbody>
@@ -3427,8 +3577,8 @@ <h3 id="metalstack.api.v2.FilesystemServiceListRequest">FilesystemServiceListReq
 
         
       
-        <h3 id="metalstack.api.v2.FilesystemServiceListResponse">FilesystemServiceListResponse</h3>
-        <p>FilesystemServiceListResponse is the response payload for a filesystem list request</p>
+        <h3 id="metalstack.api.v2.TokenServiceGetResponse">TokenServiceGetResponse</h3>
+        <p>TokenServiceGetResponse is the response payload of a token get request</p>
 
         
           <table class="field-table">
@@ -3438,10 +3588,41 @@ <h3 id="metalstack.api.v2.FilesystemServiceListResponse">FilesystemServiceListRe
             <tbody>
               
                 <tr>
-                  <td>filesystem_layouts</td>
-                  <td><a href="#metalstack.api.v2.FilesystemLayout">FilesystemLayout</a></td>
+                  <td>token</td>
+                  <td><a href="#metalstack.api.v2.Token">Token</a></td>
+                  <td></td>
+                  <td><p>Token is the token </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.api.v2.TokenServiceListRequest">TokenServiceListRequest</h3>
+        <p>TokenServiceListRequest is the request payload to list tokens</p>
+
+        
+
+        
+      
+        <h3 id="metalstack.api.v2.TokenServiceListResponse">TokenServiceListResponse</h3>
+        <p>TokenServiceListResponse is the response payload of a token list request</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>tokens</td>
+                  <td><a href="#metalstack.api.v2.Token">Token</a></td>
                   <td>repeated</td>
-                  <td><p>FilesystemLayouts the filesystemlayouts </p></td>
+                  <td><p>Tokens is a list of tokens without the secrets </p></td>
                 </tr>
               
             </tbody>
@@ -3451,8 +3632,15 @@ <h3 id="metalstack.api.v2.FilesystemServiceListResponse">FilesystemServiceListRe
 
         
       
-        <h3 id="metalstack.api.v2.FilesystemServiceMatchRequest">FilesystemServiceMatchRequest</h3>
-        <p>FilesystemServiceMatchRequest</p>
+        <h3 id="metalstack.api.v2.TokenServiceRefreshRequest">TokenServiceRefreshRequest</h3>
+        <p>TokenServiceRefreshRequest is the request payload of a token refresh request</p><p>Permissions, Roles and Expiration duration and all other properties are inherited from the calling token.</p><p>The expiration duration will be calculated from the existing token (exp - iat)</p>
+
+        
+
+        
+      
+        <h3 id="metalstack.api.v2.TokenServiceRefreshResponse">TokenServiceRefreshResponse</h3>
+        <p>TokenServiceRefreshResponse is the response payload of a token refresh request</p>
 
         
           <table class="field-table">
@@ -3462,17 +3650,17 @@ <h3 id="metalstack.api.v2.FilesystemServiceMatchRequest">FilesystemServiceMatchR
             <tbody>
               
                 <tr>
-                  <td>size_and_image</td>
-                  <td><a href="#metalstack.api.v2.MatchImageAndSize">MatchImageAndSize</a></td>
+                  <td>token</td>
+                  <td><a href="#metalstack.api.v2.Token">Token</a></td>
                   <td></td>
-                  <td><p>SizeAndImage </p></td>
+                  <td><p>Token which was refreshed </p></td>
                 </tr>
               
                 <tr>
-                  <td>machine_and_filesystemlayout</td>
-                  <td><a href="#metalstack.api.v2.MatchMachine">MatchMachine</a></td>
+                  <td>secret</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>MachineAndFilesystemlayout </p></td>
+                  <td><p>Secret is the body if the jwt token, should be used in api requests as bearer token </p></td>
                 </tr>
               
             </tbody>
@@ -3482,8 +3670,8 @@ <h3 id="metalstack.api.v2.FilesystemServiceMatchRequest">FilesystemServiceMatchR
 
         
       
-        <h3 id="metalstack.api.v2.FilesystemServiceMatchResponse">FilesystemServiceMatchResponse</h3>
-        <p>FilesystemServiceMatchResponse</p>
+        <h3 id="metalstack.api.v2.TokenServiceRevokeRequest">TokenServiceRevokeRequest</h3>
+        <p>TokenServiceRevokeRequest is the request payload of a token revoke request</p>
 
         
           <table class="field-table">
@@ -3493,10 +3681,10 @@ <h3 id="metalstack.api.v2.FilesystemServiceMatchResponse">FilesystemServiceMatch
             <tbody>
               
                 <tr>
-                  <td>filesystem_layout</td>
-                  <td><a href="#metalstack.api.v2.FilesystemLayout">FilesystemLayout</a></td>
+                  <td>uuid</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>FilesystemLayout the filesystemlayout </p></td>
+                  <td><p>Uuid of the token to revoke </p></td>
                 </tr>
               
             </tbody>
@@ -3506,8 +3694,15 @@ <h3 id="metalstack.api.v2.FilesystemServiceMatchResponse">FilesystemServiceMatch
 
         
       
-        <h3 id="metalstack.api.v2.LogicalVolume">LogicalVolume</h3>
-        <p>LogicalVolume</p>
+        <h3 id="metalstack.api.v2.TokenServiceRevokeResponse">TokenServiceRevokeResponse</h3>
+        <p>TokenServiceRevokeResponse is the response payload of a token revoke request</p>
+
+        
+
+        
+      
+        <h3 id="metalstack.api.v2.TokenServiceUpdateRequest">TokenServiceUpdateRequest</h3>
+        <p>TokenServiceUpdateRequest is the request payload of a token update request</p>
 
         
           <table class="field-table">
@@ -3517,31 +3712,74 @@ <h3 id="metalstack.api.v2.LogicalVolume">LogicalVolume</h3>
             <tbody>
               
                 <tr>
-                  <td>name</td>
+                  <td>uuid</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Name the name of the logical volume </p></td>
+                  <td><p>Uuid of the token to update </p></td>
                 </tr>
               
                 <tr>
-                  <td>volume_group</td>
-                  <td><a href="#string">string</a></td>
+                  <td>update_meta</td>
+                  <td><a href="#metalstack.api.v2.UpdateMeta">UpdateMeta</a></td>
                   <td></td>
-                  <td><p>VolumeGroup the name of the volume group where to create the logical volume onto </p></td>
+                  <td><p>UpdateMeta contains the timestamp and strategy to be used in this update request
+TokenUpdate is not guarded with optlock in the backend </p></td>
                 </tr>
               
                 <tr>
-                  <td>size</td>
-                  <td><a href="#uint64">uint64</a></td>
-                  <td></td>
-                  <td><p>Size size in mebibytes (MiB) of this volume </p></td>
+                  <td>description</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Description is a user given description of this token. </p></td>
                 </tr>
               
                 <tr>
-                  <td>lvm_type</td>
-                  <td><a href="#metalstack.api.v2.LVMType">LVMType</a></td>
+                  <td>permissions</td>
+                  <td><a href="#metalstack.api.v2.MethodPermission">MethodPermission</a></td>
+                  <td>repeated</td>
+                  <td><p>Permissions is a list of service methods this token can be used for </p></td>
+                </tr>
+              
+                <tr>
+                  <td>project_roles</td>
+                  <td><a href="#metalstack.api.v2.TokenServiceUpdateRequest.ProjectRolesEntry">TokenServiceUpdateRequest.ProjectRolesEntry</a></td>
+                  <td>repeated</td>
+                  <td><p>ProjectRoles associates a project id with the corresponding role of the token owner </p></td>
+                </tr>
+              
+                <tr>
+                  <td>tenant_roles</td>
+                  <td><a href="#metalstack.api.v2.TokenServiceUpdateRequest.TenantRolesEntry">TokenServiceUpdateRequest.TenantRolesEntry</a></td>
+                  <td>repeated</td>
+                  <td><p>TenantRoles associates a tenant id with the corresponding role of the token owner </p></td>
+                </tr>
+              
+                <tr>
+                  <td>admin_role</td>
+                  <td><a href="#metalstack.api.v2.AdminRole">AdminRole</a></td>
+                  <td>optional</td>
+                  <td><p>AdminRole defines the admin role of the token owner </p></td>
+                </tr>
+              
+                <tr>
+                  <td>infra_role</td>
+                  <td><a href="#metalstack.api.v2.InfraRole">InfraRole</a></td>
+                  <td>optional</td>
+                  <td><p>InfraRole defines the infrastructure role of the token owner </p></td>
+                </tr>
+              
+                <tr>
+                  <td>machine_roles</td>
+                  <td><a href="#metalstack.api.v2.TokenServiceUpdateRequest.MachineRolesEntry">TokenServiceUpdateRequest.MachineRolesEntry</a></td>
+                  <td>repeated</td>
+                  <td><p>MachineRoles associates a machine uuid with the corresponding role of the token owner </p></td>
+                </tr>
+              
+                <tr>
+                  <td>labels</td>
+                  <td><a href="#metalstack.api.v2.UpdateLabels">UpdateLabels</a></td>
                   <td></td>
-                  <td><p>LVMType the type of this logical volume can be either linear|striped|raid1 </p></td>
+                  <td><p>Labels on this token </p></td>
                 </tr>
               
             </tbody>
@@ -3551,8 +3789,8 @@ <h3 id="metalstack.api.v2.LogicalVolume">LogicalVolume</h3>
 
         
       
-        <h3 id="metalstack.api.v2.MatchImageAndSize">MatchImageAndSize</h3>
-        <p>MatchImageAndSize</p>
+        <h3 id="metalstack.api.v2.TokenServiceUpdateRequest.MachineRolesEntry">TokenServiceUpdateRequest.MachineRolesEntry</h3>
+        <p></p>
 
         
           <table class="field-table">
@@ -3562,17 +3800,17 @@ <h3 id="metalstack.api.v2.MatchImageAndSize">MatchImageAndSize</h3>
             <tbody>
               
                 <tr>
-                  <td>size</td>
+                  <td>key</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Size, machine size to try </p></td>
+                  <td><p> </p></td>
                 </tr>
               
                 <tr>
-                  <td>image</td>
-                  <td><a href="#string">string</a></td>
+                  <td>value</td>
+                  <td><a href="#metalstack.api.v2.MachineRole">MachineRole</a></td>
                   <td></td>
-                  <td><p>Image machine image to try </p></td>
+                  <td><p> </p></td>
                 </tr>
               
             </tbody>
@@ -3582,8 +3820,8 @@ <h3 id="metalstack.api.v2.MatchImageAndSize">MatchImageAndSize</h3>
 
         
       
-        <h3 id="metalstack.api.v2.MatchMachine">MatchMachine</h3>
-        <p>MatchMachine</p>
+        <h3 id="metalstack.api.v2.TokenServiceUpdateRequest.ProjectRolesEntry">TokenServiceUpdateRequest.ProjectRolesEntry</h3>
+        <p></p>
 
         
           <table class="field-table">
@@ -3593,17 +3831,17 @@ <h3 id="metalstack.api.v2.MatchMachine">MatchMachine</h3>
             <tbody>
               
                 <tr>
-                  <td>machine</td>
+                  <td>key</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Machine to check </p></td>
+                  <td><p> </p></td>
                 </tr>
               
                 <tr>
-                  <td>filesystem_layout</td>
-                  <td><a href="#string">string</a></td>
+                  <td>value</td>
+                  <td><a href="#metalstack.api.v2.ProjectRole">ProjectRole</a></td>
                   <td></td>
-                  <td><p>FilesystemLayout to check </p></td>
+                  <td><p> </p></td>
                 </tr>
               
             </tbody>
@@ -3613,8 +3851,8 @@ <h3 id="metalstack.api.v2.MatchMachine">MatchMachine</h3>
 
         
       
-        <h3 id="metalstack.api.v2.Raid">Raid</h3>
-        <p>Raid</p>
+        <h3 id="metalstack.api.v2.TokenServiceUpdateRequest.TenantRolesEntry">TokenServiceUpdateRequest.TenantRolesEntry</h3>
+        <p></p>
 
         
           <table class="field-table">
@@ -3624,38 +3862,17 @@ <h3 id="metalstack.api.v2.Raid">Raid</h3>
             <tbody>
               
                 <tr>
-                  <td>array_name</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>ArrayName the name of the resulting array device </p></td>
-                </tr>
-              
-                <tr>
-                  <td>devices</td>
+                  <td>key</td>
                   <td><a href="#string">string</a></td>
-                  <td>repeated</td>
-                  <td><p>Devices list of devices to form the raid array from </p></td>
-                </tr>
-              
-                <tr>
-                  <td>level</td>
-                  <td><a href="#metalstack.api.v2.RaidLevel">RaidLevel</a></td>
                   <td></td>
-                  <td><p>Level raid level to create, should be 0 or 1 </p></td>
-                </tr>
-              
-                <tr>
-                  <td>create_options</td>
-                  <td><a href="#string">string</a></td>
-                  <td>repeated</td>
-                  <td><p>CreateOptions the options to use to create the raid array </p></td>
+                  <td><p> </p></td>
                 </tr>
               
                 <tr>
-                  <td>spares</td>
-                  <td><a href="#int32">int32</a></td>
+                  <td>value</td>
+                  <td><a href="#metalstack.api.v2.TenantRole">TenantRole</a></td>
                   <td></td>
-                  <td><p>Spares number of spares for the raid array </p></td>
+                  <td><p> </p></td>
                 </tr>
               
             </tbody>
@@ -3665,8 +3882,8 @@ <h3 id="metalstack.api.v2.Raid">Raid</h3>
 
         
       
-        <h3 id="metalstack.api.v2.VolumeGroup">VolumeGroup</h3>
-        <p>VolumeGroup</p>
+        <h3 id="metalstack.api.v2.TokenServiceUpdateResponse">TokenServiceUpdateResponse</h3>
+        <p>TokenServiceUpdateResponse is the response payload of a token update request</p>
 
         
           <table class="field-table">
@@ -3676,24 +3893,10 @@ <h3 id="metalstack.api.v2.VolumeGroup">VolumeGroup</h3>
             <tbody>
               
                 <tr>
-                  <td>name</td>
-                  <td><a href="#string">string</a></td>
+                  <td>token</td>
+                  <td><a href="#metalstack.api.v2.Token">Token</a></td>
                   <td></td>
-                  <td><p>Name the name of the resulting volume group </p></td>
-                </tr>
-              
-                <tr>
-                  <td>devices</td>
-                  <td><a href="#string">string</a></td>
-                  <td>repeated</td>
-                  <td><p>Devices list of devices to form the volume group from </p></td>
-                </tr>
-              
-                <tr>
-                  <td>tags</td>
-                  <td><a href="#string">string</a></td>
-                  <td>repeated</td>
-                  <td><p>Tags list of tags to add to the volume group </p></td>
+                  <td><p>Token is the updated token </p></td>
                 </tr>
               
             </tbody>
@@ -3705,8 +3908,8 @@ <h3 id="metalstack.api.v2.VolumeGroup">VolumeGroup</h3>
       
 
       
-        <h3 id="metalstack.api.v2.Format">Format</h3>
-        <p>Format specifies the filesystem to use on a volume</p>
+        <h3 id="metalstack.api.v2.TokenType">TokenType</h3>
+        <p>TokenType specifies different use cases of tokens</p>
         <table class="enum-table">
           <thead>
             <tr><td>Name</td><td>Number</td><td>Description</td></tr>
@@ -3714,186 +3917,78 @@ <h3 id="metalstack.api.v2.Format">Format</h3>
           <tbody>
             
               <tr>
-                <td>FORMAT_UNSPECIFIED</td>
+                <td>TOKEN_TYPE_UNSPECIFIED</td>
                 <td>0</td>
-                <td><p>FORMAT_UNSPECIFIED</p></td>
+                <td><p>TOKEN_TYPE_UNSPECIFIED is not specified</p></td>
               </tr>
             
               <tr>
-                <td>FORMAT_VFAT</td>
+                <td>TOKEN_TYPE_API</td>
                 <td>1</td>
-                <td><p>FORMAT_VFAT is used for the UEFI boot partition</p></td>
+                <td><p>TOKEN_TYPE_API is a token for api usage</p></td>
               </tr>
             
               <tr>
-                <td>FORMAT_EXT3</td>
+                <td>TOKEN_TYPE_USER</td>
                 <td>2</td>
-                <td><p>FORMAT_EXT3 is usually only used for /boot</p></td>
-              </tr>
-            
-              <tr>
-                <td>FORMAT_EXT4</td>
-                <td>3</td>
-                <td><p>FORMAT_EXT4 is the default fs</p></td>
-              </tr>
-            
-              <tr>
-                <td>FORMAT_SWAP</td>
-                <td>4</td>
-                <td><p>FORMAT_SWAP is for the swap partition</p></td>
-              </tr>
-            
-              <tr>
-                <td>FORMAT_TMPFS</td>
-                <td>5</td>
-                <td><p>FORMAT_TMPFS is used for a memory filesystem typically /tmp</p></td>
-              </tr>
-            
-              <tr>
-                <td>FORMAT_NONE</td>
-                <td>6</td>
-                <td><p>FORMAT_NONE</p></td>
+                <td><p>TOKEN_TYPE_USER is a token to access the api with cli, a web application or other user induced actions.</p></td>
               </tr>
             
           </tbody>
         </table>
       
-        <h3 id="metalstack.api.v2.GPTType">GPTType</h3>
-        <p>GPTType specifies the partition type in uefi systems</p>
-        <table class="enum-table">
-          <thead>
-            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
-          </thead>
-          <tbody>
-            
-              <tr>
-                <td>GPT_TYPE_UNSPECIFIED</td>
-                <td>0</td>
-                <td><p>GPT_TYPE_UNSPECIFIED is no specified</p></td>
-              </tr>
-            
-              <tr>
-                <td>GPT_TYPE_BOOT</td>
-                <td>1</td>
-                <td><p>GPT_TYPE_BOOT EFI Boot Partition</p></td>
-              </tr>
-            
-              <tr>
-                <td>GPT_TYPE_LINUX</td>
-                <td>2</td>
-                <td><p>GPT_TYPE_LINUX Linux Partition</p></td>
-              </tr>
-            
-              <tr>
-                <td>GPT_TYPE_LINUX_RAID</td>
-                <td>3</td>
-                <td><p>GPT_TYPE_LINUX_RAID Linux Raid Partition</p></td>
-              </tr>
-            
-              <tr>
-                <td>GPT_TYPE_LINUX_LVM</td>
-                <td>4</td>
-                <td><p>GPT_TYPE_LINUX_LVM Linux LVM Partition</p></td>
-              </tr>
-            
-          </tbody>
-        </table>
+
       
-        <h3 id="metalstack.api.v2.LVMType">LVMType</h3>
-        <p>LVMType</p>
-        <table class="enum-table">
-          <thead>
-            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
-          </thead>
-          <tbody>
-            
-              <tr>
-                <td>LVM_TYPE_UNSPECIFIED</td>
-                <td>0</td>
-                <td><p>LVM_TYPE_UNSPECIFIED is not specified</p></td>
-              </tr>
-            
-              <tr>
-                <td>LVM_TYPE_LINEAR</td>
-                <td>1</td>
-                <td><p>LVM_TYPE_LINEAR append across all physical volumes</p></td>
-              </tr>
-            
-              <tr>
-                <td>LVM_TYPE_STRIPED</td>
-                <td>2</td>
-                <td><p>LVM_TYPE_STRIPED stripe across all physical volumes</p></td>
-              </tr>
-            
-              <tr>
-                <td>LVM_TYPE_RAID1</td>
-                <td>3</td>
-                <td><p>LVM_TYPE_RAID1 mirror with raid across all physical volumes</p></td>
-              </tr>
-            
-          </tbody>
-        </table>
+
       
-        <h3 id="metalstack.api.v2.RaidLevel">RaidLevel</h3>
-        <p>RaidLevel defines howto mirror two or more block devices</p>
+        <h3 id="metalstack.api.v2.TokenService">TokenService</h3>
+        <p>TokenService serves token related functions</p>
         <table class="enum-table">
           <thead>
-            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
+            <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
           </thead>
           <tbody>
             
               <tr>
-                <td>RAID_LEVEL_UNSPECIFIED</td>
-                <td>0</td>
-                <td><p>RAID_LEVEL_UNSPECIFIED is not specified</p></td>
+                <td>Get</td>
+                <td><a href="#metalstack.api.v2.TokenServiceGetRequest">TokenServiceGetRequest</a></td>
+                <td><a href="#metalstack.api.v2.TokenServiceGetResponse">TokenServiceGetResponse</a></td>
+                <td><p>Get a token</p></td>
               </tr>
             
               <tr>
-                <td>RAID_LEVEL_0</td>
-                <td>1</td>
-                <td><p>RAID_LEVEL_0 is a stripe of two or more disks</p></td>
+                <td>Create</td>
+                <td><a href="#metalstack.api.v2.TokenServiceCreateRequest">TokenServiceCreateRequest</a></td>
+                <td><a href="#metalstack.api.v2.TokenServiceCreateResponse">TokenServiceCreateResponse</a></td>
+                <td><p>Create a token to authenticate against the platform, the secret will be only visible in the response.</p></td>
               </tr>
             
               <tr>
-                <td>RAID_LEVEL_1</td>
-                <td>2</td>
-                <td><p>RAID_LEVEL_1 is a mirror of two disks</p></td>
+                <td>Update</td>
+                <td><a href="#metalstack.api.v2.TokenServiceUpdateRequest">TokenServiceUpdateRequest</a></td>
+                <td><a href="#metalstack.api.v2.TokenServiceUpdateResponse">TokenServiceUpdateResponse</a></td>
+                <td><p>Update a token</p></td>
               </tr>
             
-          </tbody>
-        </table>
-      
-
-      
-
-      
-        <h3 id="metalstack.api.v2.FilesystemService">FilesystemService</h3>
-        <p>FilesystemService serves filesystem related functions</p>
-        <table class="enum-table">
-          <thead>
-            <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
-          </thead>
-          <tbody>
-            
               <tr>
-                <td>Get</td>
-                <td><a href="#metalstack.api.v2.FilesystemServiceGetRequest">FilesystemServiceGetRequest</a></td>
-                <td><a href="#metalstack.api.v2.FilesystemServiceGetResponse">FilesystemServiceGetResponse</a></td>
-                <td><p>Get a filesystem</p></td>
+                <td>List</td>
+                <td><a href="#metalstack.api.v2.TokenServiceListRequest">TokenServiceListRequest</a></td>
+                <td><a href="#metalstack.api.v2.TokenServiceListResponse">TokenServiceListResponse</a></td>
+                <td><p>List all your tokens</p></td>
               </tr>
             
               <tr>
-                <td>List</td>
-                <td><a href="#metalstack.api.v2.FilesystemServiceListRequest">FilesystemServiceListRequest</a></td>
-                <td><a href="#metalstack.api.v2.FilesystemServiceListResponse">FilesystemServiceListResponse</a></td>
-                <td><p>List all filesystems</p></td>
+                <td>Revoke</td>
+                <td><a href="#metalstack.api.v2.TokenServiceRevokeRequest">TokenServiceRevokeRequest</a></td>
+                <td><a href="#metalstack.api.v2.TokenServiceRevokeResponse">TokenServiceRevokeResponse</a></td>
+                <td><p>Revoke a token, no further usage is possible afterwards</p></td>
               </tr>
             
               <tr>
-                <td>Match</td>
-                <td><a href="#metalstack.api.v2.FilesystemServiceMatchRequest">FilesystemServiceMatchRequest</a></td>
-                <td><a href="#metalstack.api.v2.FilesystemServiceMatchResponse">FilesystemServiceMatchResponse</a></td>
-                <td><p>Match a filesystems</p></td>
+                <td>Refresh</td>
+                <td><a href="#metalstack.api.v2.TokenServiceRefreshRequest">TokenServiceRefreshRequest</a></td>
+                <td><a href="#metalstack.api.v2.TokenServiceRefreshResponse">TokenServiceRefreshResponse</a></td>
+                <td><p>Refresh a token, this will create a new token with the exact same permissions as the calling token contains</p></td>
               </tr>
             
           </tbody>
@@ -3903,13 +3998,13 @@ <h3 id="metalstack.api.v2.FilesystemService">FilesystemService</h3>
     
       
       <div class="file-heading">
-        <h2 id="metalstack/admin/v2/filesystem.proto">metalstack/admin/v2/filesystem.proto</h2><a href="#title">Top</a>
+        <h2 id="metalstack/api/v2/version.proto">metalstack/api/v2/version.proto</h2><a href="#title">Top</a>
       </div>
       <p></p>
 
       
-        <h3 id="metalstack.admin.v2.FilesystemServiceCreateRequest">FilesystemServiceCreateRequest</h3>
-        <p>FilesystemServiceCreateRequest</p>
+        <h3 id="metalstack.api.v2.Version">Version</h3>
+        <p>Version of the application</p>
 
         
           <table class="field-table">
@@ -3919,10 +4014,31 @@ <h3 id="metalstack.admin.v2.FilesystemServiceCreateRequest">FilesystemServiceCre
             <tbody>
               
                 <tr>
-                  <td>filesystem_layout</td>
-                  <td><a href="#metalstack.api.v2.FilesystemLayout">metalstack.api.v2.FilesystemLayout</a></td>
+                  <td>version</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>FilesystemLayout the filesystemlayout </p></td>
+                  <td><p>Version of the application </p></td>
+                </tr>
+              
+                <tr>
+                  <td>revision</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Revision of the application </p></td>
+                </tr>
+              
+                <tr>
+                  <td>git_sha1</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>GitSHA1 of the application </p></td>
+                </tr>
+              
+                <tr>
+                  <td>build_date</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>BuildDate of the application </p></td>
                 </tr>
               
             </tbody>
@@ -3932,8 +4048,15 @@ <h3 id="metalstack.admin.v2.FilesystemServiceCreateRequest">FilesystemServiceCre
 
         
       
-        <h3 id="metalstack.admin.v2.FilesystemServiceCreateResponse">FilesystemServiceCreateResponse</h3>
-        <p>FilesystemServiceCreateResponse</p>
+        <h3 id="metalstack.api.v2.VersionServiceGetRequest">VersionServiceGetRequest</h3>
+        <p>VersionServiceGetRequest is the request payload to get the version</p>
+
+        
+
+        
+      
+        <h3 id="metalstack.api.v2.VersionServiceGetResponse">VersionServiceGetResponse</h3>
+        <p>VersionServiceGetResponse is the response payload with the version</p>
 
         
           <table class="field-table">
@@ -3943,10 +4066,10 @@ <h3 id="metalstack.admin.v2.FilesystemServiceCreateResponse">FilesystemServiceCr
             <tbody>
               
                 <tr>
-                  <td>filesystem_layout</td>
-                  <td><a href="#metalstack.api.v2.FilesystemLayout">metalstack.api.v2.FilesystemLayout</a></td>
+                  <td>version</td>
+                  <td><a href="#metalstack.api.v2.Version">Version</a></td>
                   <td></td>
-                  <td><p>FilesystemLayout the filesystemlayout </p></td>
+                  <td><p>Version of the application </p></td>
                 </tr>
               
             </tbody>
@@ -3956,8 +4079,41 @@ <h3 id="metalstack.admin.v2.FilesystemServiceCreateResponse">FilesystemServiceCr
 
         
       
-        <h3 id="metalstack.admin.v2.FilesystemServiceDeleteRequest">FilesystemServiceDeleteRequest</h3>
-        <p>FilesystemServiceDeleteRequest</p>
+
+      
+
+      
+
+      
+        <h3 id="metalstack.api.v2.VersionService">VersionService</h3>
+        <p>VersionService serves version related functions</p>
+        <table class="enum-table">
+          <thead>
+            <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>Get</td>
+                <td><a href="#metalstack.api.v2.VersionServiceGetRequest">VersionServiceGetRequest</a></td>
+                <td><a href="#metalstack.api.v2.VersionServiceGetResponse">VersionServiceGetResponse</a></td>
+                <td><p>Get the version</p></td>
+              </tr>
+            
+          </tbody>
+        </table>
+
+        
+    
+      
+      <div class="file-heading">
+        <h2 id="metalstack/infra/v2/component.proto">metalstack/infra/v2/component.proto</h2><a href="#title">Top</a>
+      </div>
+      <p></p>
+
+      
+        <h3 id="metalstack.infra.v2.ComponentServicePingRequest">ComponentServicePingRequest</h3>
+        <p>ComponentServicePingRequest is sent from a microservice to report its state regularly</p>
 
         
           <table class="field-table">
@@ -3967,34 +4123,32 @@ <h3 id="metalstack.admin.v2.FilesystemServiceDeleteRequest">FilesystemServiceDel
             <tbody>
               
                 <tr>
-                  <td>id</td>
-                  <td><a href="#string">string</a></td>
+                  <td>type</td>
+                  <td><a href="#metalstack.infra.v2.ComponentType">ComponentType</a></td>
                   <td></td>
-                  <td><p>ID of the filesystem to delete </p></td>
+                  <td><p>Type defines which service is actually pinging </p></td>
                 </tr>
               
-            </tbody>
-          </table>
-
-          
-
-        
-      
-        <h3 id="metalstack.admin.v2.FilesystemServiceDeleteResponse">FilesystemServiceDeleteResponse</h3>
-        <p>message FilesystemServiceDeleteResponse {</p>
-
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
+                <tr>
+                  <td>identifier</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Identifier is a unique identifier of this service, e.g. if two instance are running, this might be the pod id.
+micro_service and identifier guarantee uniqueness. </p></td>
+                </tr>
               
                 <tr>
-                  <td>filesystem_layout</td>
-                  <td><a href="#metalstack.api.v2.FilesystemLayout">metalstack.api.v2.FilesystemLayout</a></td>
+                  <td>started_at</td>
+                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
                   <td></td>
-                  <td><p>FilesystemLayout the filesystemlayout </p></td>
+                  <td><p>StartedAt is the timestamp this service was started </p></td>
+                </tr>
+              
+                <tr>
+                  <td>version</td>
+                  <td><a href="#metalstack.api.v2.Version">metalstack.api.v2.Version</a></td>
+                  <td></td>
+                  <td><p>Version of this service </p></td>
                 </tr>
               
             </tbody>
@@ -4004,8 +4158,105 @@ <h3 id="metalstack.admin.v2.FilesystemServiceDeleteResponse">FilesystemServiceDe
 
         
       
-        <h3 id="metalstack.admin.v2.FilesystemServiceUpdateRequest">FilesystemServiceUpdateRequest</h3>
-        <p>FilesystemServiceUpdateRequest</p>
+        <h3 id="metalstack.infra.v2.ComponentServicePingResponse">ComponentServicePingResponse</h3>
+        <p>ComponentServicePingResponse is the response to a ping request</p>
+
+        
+
+        
+      
+
+      
+        <h3 id="metalstack.infra.v2.ComponentType">ComponentType</h3>
+        <p>ComponentType defines which service is actually pinging</p>
+        <table class="enum-table">
+          <thead>
+            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>COMPONENT_TYPE_UNSPECIFIED</td>
+                <td>0</td>
+                <td><p>COMPONENT_TYPE_UNSPECIFIED is unspecified</p></td>
+              </tr>
+            
+              <tr>
+                <td>COMPONENT_TYPE_PIXIECORE</td>
+                <td>1</td>
+                <td><p>COMPONENT_TYPE_PIXIECORE is pixiecore</p></td>
+              </tr>
+            
+              <tr>
+                <td>COMPONENT_TYPE_METAL_CORE</td>
+                <td>2</td>
+                <td><p>COMPONENT_TYPE_METAL_CORE is metal-core</p></td>
+              </tr>
+            
+              <tr>
+                <td>COMPONENT_TYPE_METAL_BMC</td>
+                <td>3</td>
+                <td><p>COMPONENT_TYPE_METAL_BMC is metal-bmc</p></td>
+              </tr>
+            
+              <tr>
+                <td>COMPONENT_TYPE_METAL_IMAGE_CACHE_SYNC</td>
+                <td>4</td>
+                <td><p>COMPONENT_TYPE_METAL_IMAGE_CACHE_SYNC is metal-image-cache-sync</p></td>
+              </tr>
+            
+              <tr>
+                <td>COMPONENT_TYPE_METAL_CONSOLE</td>
+                <td>5</td>
+                <td><p>COMPONENT_TYPE_METAL_CONSOLE is metal-console</p></td>
+              </tr>
+            
+              <tr>
+                <td>COMPONENT_TYPE_METAL_METRICS_EXPORTER</td>
+                <td>6</td>
+                <td><p>COMPONENT_TYPE_METAL_METRICS_EXPORTER is metal-metrics-exporter
+
+TODO what about gepm, ccm, etc. I would allow them to call this service but would not introduce
+enums for all of them as they are not strictly metal-stack components.</p></td>
+              </tr>
+            
+          </tbody>
+        </table>
+      
+
+      
+
+      
+        <h3 id="metalstack.infra.v2.ComponentService">ComponentService</h3>
+        <p>ComponentService serves component, e.g. microservices related functions.</p>
+        <table class="enum-table">
+          <thead>
+            <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>Ping</td>
+                <td><a href="#metalstack.infra.v2.ComponentServicePingRequest">ComponentServicePingRequest</a></td>
+                <td><a href="#metalstack.infra.v2.ComponentServicePingResponse">ComponentServicePingResponse</a></td>
+                <td><p>Ping must be called from every connected microservice in a recurring manner
+to get visibility of all required microservices.</p></td>
+              </tr>
+            
+          </tbody>
+        </table>
+
+        
+    
+      
+      <div class="file-heading">
+        <h2 id="metalstack/admin/v2/component.proto">metalstack/admin/v2/component.proto</h2><a href="#title">Top</a>
+      </div>
+      <p></p>
+
+      
+        <h3 id="metalstack.admin.v2.Component">Component</h3>
+        <p>Component represents a microservice connected to our apiserver</p>
 
         
           <table class="field-table">
@@ -4015,73 +4266,46 @@ <h3 id="metalstack.admin.v2.FilesystemServiceUpdateRequest">FilesystemServiceUpd
             <tbody>
               
                 <tr>
-                  <td>id</td>
+                  <td>uuid</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Id of this filesystemLayout </p></td>
+                  <td><p>UUID identifies this component event </p></td>
                 </tr>
               
                 <tr>
-                  <td>update_meta</td>
-                  <td><a href="#metalstack.api.v2.UpdateMeta">metalstack.api.v2.UpdateMeta</a></td>
+                  <td>type</td>
+                  <td><a href="#metalstack.infra.v2.ComponentType">metalstack.infra.v2.ComponentType</a></td>
                   <td></td>
-                  <td><p>UpdateMeta contains the timestamp and strategy to be used in this update request </p></td>
-                </tr>
-              
-                <tr>
-                  <td>name</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Name of this filesystemLayout </p></td>
+                  <td><p>Type defines which service is actually pinging </p></td>
                 </tr>
               
                 <tr>
-                  <td>description</td>
+                  <td>identifier</td>
                   <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Description of this filesystemLayout </p></td>
-                </tr>
-              
-                <tr>
-                  <td>filesystems</td>
-                  <td><a href="#metalstack.api.v2.Filesystem">metalstack.api.v2.Filesystem</a></td>
-                  <td>repeated</td>
-                  <td><p>Filesystems is a list of filesystems to create on a machine </p></td>
-                </tr>
-              
-                <tr>
-                  <td>disks</td>
-                  <td><a href="#metalstack.api.v2.Disk">metalstack.api.v2.Disk</a></td>
-                  <td>repeated</td>
-                  <td><p>Disks list of disks that belong to this layout </p></td>
-                </tr>
-              
-                <tr>
-                  <td>raid</td>
-                  <td><a href="#metalstack.api.v2.Raid">metalstack.api.v2.Raid</a></td>
-                  <td>repeated</td>
-                  <td><p>raid arrays to create </p></td>
+                  <td></td>
+                  <td><p>Identifier is a unique identifier of this service, e.g. if two instance are running, this might be the pod id.
+micro_service and identifier guarantee uniqueness. </p></td>
                 </tr>
               
                 <tr>
-                  <td>volume_groups</td>
-                  <td><a href="#metalstack.api.v2.VolumeGroup">metalstack.api.v2.VolumeGroup</a></td>
-                  <td>repeated</td>
-                  <td><p>VolumeGroups list of volumegroups to create </p></td>
+                  <td>started_at</td>
+                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
+                  <td></td>
+                  <td><p>StartedAt is the timestamp this service was started </p></td>
                 </tr>
               
                 <tr>
-                  <td>logical_volumes</td>
-                  <td><a href="#metalstack.api.v2.LogicalVolume">metalstack.api.v2.LogicalVolume</a></td>
-                  <td>repeated</td>
-                  <td><p>LogicalVolumes list of logicalvolumes to create </p></td>
+                  <td>version</td>
+                  <td><a href="#metalstack.api.v2.Version">metalstack.api.v2.Version</a></td>
+                  <td></td>
+                  <td><p>Version of this service </p></td>
                 </tr>
               
                 <tr>
-                  <td>constraints</td>
-                  <td><a href="#metalstack.api.v2.FilesystemLayoutConstraints">metalstack.api.v2.FilesystemLayoutConstraints</a></td>
+                  <td>token</td>
+                  <td><a href="#metalstack.api.v2.Token">metalstack.api.v2.Token</a></td>
                   <td></td>
-                  <td><p>Constraints which must match that this layout is taken, if sizes and images are empty these are develop layouts </p></td>
+                  <td><p>Token is the token which is actually used by this microservice. </p></td>
                 </tr>
               
             </tbody>
@@ -4091,8 +4315,15 @@ <h3 id="metalstack.admin.v2.FilesystemServiceUpdateRequest">FilesystemServiceUpd
 
         
       
-        <h3 id="metalstack.admin.v2.FilesystemServiceUpdateResponse">FilesystemServiceUpdateResponse</h3>
-        <p>FilesystemServiceUpdateResponse</p>
+        <h3 id="metalstack.admin.v2.ComponentServiceListRequest">ComponentServiceListRequest</h3>
+        <p>ComponentServiceListRequest</p>
+
+        
+
+        
+      
+        <h3 id="metalstack.admin.v2.ComponentServiceListResponse">ComponentServiceListResponse</h3>
+        <p>ComponentServiceListResponse</p>
 
         
           <table class="field-table">
@@ -4102,10 +4333,10 @@ <h3 id="metalstack.admin.v2.FilesystemServiceUpdateResponse">FilesystemServiceUp
             <tbody>
               
                 <tr>
-                  <td>filesystem_layout</td>
-                  <td><a href="#metalstack.api.v2.FilesystemLayout">metalstack.api.v2.FilesystemLayout</a></td>
-                  <td></td>
-                  <td><p>FilesystemLayout the filesystemlayout </p></td>
+                  <td>components</td>
+                  <td><a href="#metalstack.admin.v2.Component">Component</a></td>
+                  <td>repeated</td>
+                  <td><p>Components </p></td>
                 </tr>
               
             </tbody>
@@ -4121,8 +4352,8 @@ <h3 id="metalstack.admin.v2.FilesystemServiceUpdateResponse">FilesystemServiceUp
       
 
       
-        <h3 id="metalstack.admin.v2.FilesystemService">FilesystemService</h3>
-        <p>FilesystemService serves filesystem related functions</p>
+        <h3 id="metalstack.admin.v2.ComponentService">ComponentService</h3>
+        <p>ComponentService serves microservice related functions</p>
         <table class="enum-table">
           <thead>
             <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
@@ -4130,24 +4361,10 @@ <h3 id="metalstack.admin.v2.FilesystemService">FilesystemService</h3>
           <tbody>
             
               <tr>
-                <td>Create</td>
-                <td><a href="#metalstack.admin.v2.FilesystemServiceCreateRequest">FilesystemServiceCreateRequest</a></td>
-                <td><a href="#metalstack.admin.v2.FilesystemServiceCreateResponse">FilesystemServiceCreateResponse</a></td>
-                <td><p>Create a filesystem</p></td>
-              </tr>
-            
-              <tr>
-                <td>Update</td>
-                <td><a href="#metalstack.admin.v2.FilesystemServiceUpdateRequest">FilesystemServiceUpdateRequest</a></td>
-                <td><a href="#metalstack.admin.v2.FilesystemServiceUpdateResponse">FilesystemServiceUpdateResponse</a></td>
-                <td><p>Update a filesystem</p></td>
-              </tr>
-            
-              <tr>
-                <td>Delete</td>
-                <td><a href="#metalstack.admin.v2.FilesystemServiceDeleteRequest">FilesystemServiceDeleteRequest</a></td>
-                <td><a href="#metalstack.admin.v2.FilesystemServiceDeleteResponse">FilesystemServiceDeleteResponse</a></td>
-                <td><p>Delete a filesystem</p></td>
+                <td>List</td>
+                <td><a href="#metalstack.admin.v2.ComponentServiceListRequest">ComponentServiceListRequest</a></td>
+                <td><a href="#metalstack.admin.v2.ComponentServiceListResponse">ComponentServiceListResponse</a></td>
+                <td><p>List all components with their status</p></td>
               </tr>
             
           </tbody>
@@ -4157,13 +4374,13 @@ <h3 id="metalstack.admin.v2.FilesystemService">FilesystemService</h3>
     
       
       <div class="file-heading">
-        <h2 id="metalstack/api/v2/image.proto">metalstack/api/v2/image.proto</h2><a href="#title">Top</a>
+        <h2 id="metalstack/api/v2/filesystem.proto">metalstack/api/v2/filesystem.proto</h2><a href="#title">Top</a>
       </div>
       <p></p>
 
       
-        <h3 id="metalstack.api.v2.Image">Image</h3>
-        <p>Image</p>
+        <h3 id="metalstack.api.v2.Disk">Disk</h3>
+        <p>Disk</p>
 
         
           <table class="field-table">
@@ -4173,59 +4390,17 @@ <h3 id="metalstack.api.v2.Image">Image</h3>
             <tbody>
               
                 <tr>
-                  <td>id</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Id of this imageLayout </p></td>
-                </tr>
-              
-                <tr>
-                  <td>meta</td>
-                  <td><a href="#metalstack.api.v2.Meta">Meta</a></td>
-                  <td></td>
-                  <td><p>Meta for this ip </p></td>
-                </tr>
-              
-                <tr>
-                  <td>url</td>
+                  <td>device</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>URL where this image is located </p></td>
-                </tr>
-              
-                <tr>
-                  <td>name</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Name of this imageLayout </p></td>
-                </tr>
-              
-                <tr>
-                  <td>description</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Description of this imageLayout </p></td>
+                  <td><p>Device the device to create the partitions </p></td>
                 </tr>
               
                 <tr>
-                  <td>features</td>
-                  <td><a href="#metalstack.api.v2.ImageFeature">ImageFeature</a></td>
+                  <td>partitions</td>
+                  <td><a href="#metalstack.api.v2.DiskPartition">DiskPartition</a></td>
                   <td>repeated</td>
-                  <td><p>Features of this image </p></td>
-                </tr>
-              
-                <tr>
-                  <td>classification</td>
-                  <td><a href="#metalstack.api.v2.ImageClassification">ImageClassification</a></td>
-                  <td></td>
-                  <td><p>Classification of this image </p></td>
-                </tr>
-              
-                <tr>
-                  <td>expires_at</td>
-                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
-                  <td></td>
-                  <td><p>ExpiresAt usage is not possible after this date </p></td>
+                  <td><p>Partitions list of partitions to create on this disk </p></td>
                 </tr>
               
             </tbody>
@@ -4235,8 +4410,8 @@ <h3 id="metalstack.api.v2.Image">Image</h3>
 
         
       
-        <h3 id="metalstack.api.v2.ImageQuery">ImageQuery</h3>
-        <p>ImageQuery is used to search images</p>
+        <h3 id="metalstack.api.v2.DiskPartition">DiskPartition</h3>
+        <p>DiskPartition</p>
 
         
           <table class="field-table">
@@ -4246,66 +4421,104 @@ <h3 id="metalstack.api.v2.ImageQuery">ImageQuery</h3>
             <tbody>
               
                 <tr>
-                  <td>id</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>ID of the image to get </p></td>
+                  <td>number</td>
+                  <td><a href="#uint32">uint32</a></td>
+                  <td></td>
+                  <td><p>Number partition number, will be appended to partitionprefix to create the final devicename </p></td>
                 </tr>
               
                 <tr>
-                  <td>os</td>
+                  <td>label</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>OS of the image </p></td>
+                  <td><p>optional label for this this partition </p></td>
                 </tr>
               
                 <tr>
-                  <td>version</td>
-                  <td><a href="#string">string</a></td>
+                  <td>size</td>
+                  <td><a href="#uint64">uint64</a></td>
+                  <td></td>
+                  <td><p>Size size in mebibytes (MiB) of this partition&#34; </p></td>
+                </tr>
+              
+                <tr>
+                  <td>gpt_type</td>
+                  <td><a href="#metalstack.api.v2.GPTType">GPTType</a></td>
                   <td>optional</td>
-                  <td><p>Version of the Image </p></td>
+                  <td><p>GPTType the gpt partition table type of this partition </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.api.v2.Filesystem">Filesystem</h3>
+        <p>Filesystem</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>device</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Device the underlying device where this filesystem should be created </p></td>
+                </tr>
+              
+                <tr>
+                  <td>format</td>
+                  <td><a href="#metalstack.api.v2.Format">Format</a></td>
+                  <td></td>
+                  <td><p>Format of the filesystem format </p></td>
                 </tr>
               
                 <tr>
                   <td>name</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Name of the image to query </p></td>
+                  <td><p>Name of this filesystem </p></td>
                 </tr>
               
                 <tr>
                   <td>description</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Description of the image to query </p></td>
+                  <td><p>Description of this filesystem </p></td>
                 </tr>
               
                 <tr>
-                  <td>url</td>
+                  <td>path</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Url of the image to query </p></td>
+                  <td><p>Path the mountpoint where this filesystem should be mounted on </p></td>
                 </tr>
               
                 <tr>
-                  <td>feature</td>
-                  <td><a href="#metalstack.api.v2.ImageFeature">ImageFeature</a></td>
+                  <td>label</td>
+                  <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Feature of the image to query </p></td>
+                  <td><p>Label optional label for this this filesystem </p></td>
                 </tr>
               
                 <tr>
-                  <td>classification</td>
-                  <td><a href="#metalstack.api.v2.ImageClassification">ImageClassification</a></td>
-                  <td>optional</td>
-                  <td><p>Classification of the image to query </p></td>
+                  <td>mount_options</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>MountOptions the options to use to mount this filesystem </p></td>
                 </tr>
               
                 <tr>
-                  <td>labels</td>
-                  <td><a href="#metalstack.api.v2.Labels">Labels</a></td>
-                  <td>optional</td>
-                  <td><p>Labels lists only images containing the given labels </p></td>
+                  <td>create_options</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>CreateOptions the options to use to create (mkfs) this filesystem </p></td>
                 </tr>
               
             </tbody>
@@ -4315,8 +4528,8 @@ <h3 id="metalstack.api.v2.ImageQuery">ImageQuery</h3>
 
         
       
-        <h3 id="metalstack.api.v2.ImageServiceGetRequest">ImageServiceGetRequest</h3>
-        <p>ImageServiceGetRequest is the request payload for a image get request</p>
+        <h3 id="metalstack.api.v2.FilesystemLayout">FilesystemLayout</h3>
+        <p>FilesystemLayout</p>
 
         
           <table class="field-table">
@@ -4329,7 +4542,70 @@ <h3 id="metalstack.api.v2.ImageServiceGetRequest">ImageServiceGetRequest</h3>
                   <td>id</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>ID of the image to get </p></td>
+                  <td><p>Id of this filesystemLayout </p></td>
+                </tr>
+              
+                <tr>
+                  <td>meta</td>
+                  <td><a href="#metalstack.api.v2.Meta">Meta</a></td>
+                  <td></td>
+                  <td><p>Meta for this filesystemLayout </p></td>
+                </tr>
+              
+                <tr>
+                  <td>name</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Name of this filesystemLayout </p></td>
+                </tr>
+              
+                <tr>
+                  <td>description</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Description of this filesystemLayout </p></td>
+                </tr>
+              
+                <tr>
+                  <td>filesystems</td>
+                  <td><a href="#metalstack.api.v2.Filesystem">Filesystem</a></td>
+                  <td>repeated</td>
+                  <td><p>Filesystems is a list of filesystems to create on a machine </p></td>
+                </tr>
+              
+                <tr>
+                  <td>disks</td>
+                  <td><a href="#metalstack.api.v2.Disk">Disk</a></td>
+                  <td>repeated</td>
+                  <td><p>Disks list of disks that belong to this layout </p></td>
+                </tr>
+              
+                <tr>
+                  <td>raid</td>
+                  <td><a href="#metalstack.api.v2.Raid">Raid</a></td>
+                  <td>repeated</td>
+                  <td><p>raid arrays to create </p></td>
+                </tr>
+              
+                <tr>
+                  <td>volume_groups</td>
+                  <td><a href="#metalstack.api.v2.VolumeGroup">VolumeGroup</a></td>
+                  <td>repeated</td>
+                  <td><p>VolumeGroups list of volumegroups to create </p></td>
+                </tr>
+              
+                <tr>
+                  <td>logical_volumes</td>
+                  <td><a href="#metalstack.api.v2.LogicalVolume">LogicalVolume</a></td>
+                  <td>repeated</td>
+                  <td><p>LogicalVolumes list of logicalvolumes to create </p></td>
+                </tr>
+              
+                <tr>
+                  <td>constraints</td>
+                  <td><a href="#metalstack.api.v2.FilesystemLayoutConstraints">FilesystemLayoutConstraints</a></td>
+                  <td></td>
+                  <td><p>Constraints which must match that this layout is taken, if sizes and images are empty these are develop layouts </p></td>
                 </tr>
               
             </tbody>
@@ -4339,8 +4615,8 @@ <h3 id="metalstack.api.v2.ImageServiceGetRequest">ImageServiceGetRequest</h3>
 
         
       
-        <h3 id="metalstack.api.v2.ImageServiceGetResponse">ImageServiceGetResponse</h3>
-        <p>ImageServiceGetResponse is the response payload for a image get request</p>
+        <h3 id="metalstack.api.v2.FilesystemLayoutConstraints">FilesystemLayoutConstraints</h3>
+        <p>FilesystemLayoutConstraints</p>
 
         
           <table class="field-table">
@@ -4350,10 +4626,17 @@ <h3 id="metalstack.api.v2.ImageServiceGetResponse">ImageServiceGetResponse</h3>
             <tbody>
               
                 <tr>
-                  <td>image</td>
-                  <td><a href="#metalstack.api.v2.Image">Image</a></td>
-                  <td></td>
-                  <td><p>Image the image </p></td>
+                  <td>sizes</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>Sizes list of sizes this layout applies to </p></td>
+                </tr>
+              
+                <tr>
+                  <td>images</td>
+                  <td><a href="#metalstack.api.v2.FilesystemLayoutConstraints.ImagesEntry">FilesystemLayoutConstraints.ImagesEntry</a></td>
+                  <td>repeated</td>
+                  <td><p>Images list of images this layout applies to </p></td>
                 </tr>
               
             </tbody>
@@ -4363,8 +4646,8 @@ <h3 id="metalstack.api.v2.ImageServiceGetResponse">ImageServiceGetResponse</h3>
 
         
       
-        <h3 id="metalstack.api.v2.ImageServiceLatestRequest">ImageServiceLatestRequest</h3>
-        <p>ImageServiceLatestRequest is the request payload for a image latest request</p>
+        <h3 id="metalstack.api.v2.FilesystemLayoutConstraints.ImagesEntry">FilesystemLayoutConstraints.ImagesEntry</h3>
+        <p></p>
 
         
           <table class="field-table">
@@ -4374,11 +4657,17 @@ <h3 id="metalstack.api.v2.ImageServiceLatestRequest">ImageServiceLatestRequest</
             <tbody>
               
                 <tr>
-                  <td>os</td>
+                  <td>key</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>OS for which the latest image should be fetched
-should contain os and major.minor then latest patch version of this os is returned </p></td>
+                  <td><p> </p></td>
+                </tr>
+              
+                <tr>
+                  <td>value</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p> </p></td>
                 </tr>
               
             </tbody>
@@ -4388,8 +4677,8 @@ <h3 id="metalstack.api.v2.ImageServiceLatestRequest">ImageServiceLatestRequest</
 
         
       
-        <h3 id="metalstack.api.v2.ImageServiceLatestResponse">ImageServiceLatestResponse</h3>
-        <p>ImageServiceLatestResponse is the response payload for a image latest request</p>
+        <h3 id="metalstack.api.v2.FilesystemServiceGetRequest">FilesystemServiceGetRequest</h3>
+        <p>FilesystemServiceGetRequest is the request payload for a filesystem get request</p>
 
         
           <table class="field-table">
@@ -4399,10 +4688,10 @@ <h3 id="metalstack.api.v2.ImageServiceLatestResponse">ImageServiceLatestResponse
             <tbody>
               
                 <tr>
-                  <td>image</td>
-                  <td><a href="#metalstack.api.v2.Image">Image</a></td>
+                  <td>id</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Image which is the latest for one os </p></td>
+                  <td><p>ID of the filesystem to get </p></td>
                 </tr>
               
             </tbody>
@@ -4412,8 +4701,8 @@ <h3 id="metalstack.api.v2.ImageServiceLatestResponse">ImageServiceLatestResponse
 
         
       
-        <h3 id="metalstack.api.v2.ImageServiceListRequest">ImageServiceListRequest</h3>
-        <p>ImageServiceListRequest is the request payload for a image list request</p>
+        <h3 id="metalstack.api.v2.FilesystemServiceGetResponse">FilesystemServiceGetResponse</h3>
+        <p>FilesystemServiceGetResponse is the response payload for a filesystem get request</p>
 
         
           <table class="field-table">
@@ -4423,10 +4712,10 @@ <h3 id="metalstack.api.v2.ImageServiceListRequest">ImageServiceListRequest</h3>
             <tbody>
               
                 <tr>
-                  <td>query</td>
-                  <td><a href="#metalstack.api.v2.ImageQuery">ImageQuery</a></td>
+                  <td>filesystem_layout</td>
+                  <td><a href="#metalstack.api.v2.FilesystemLayout">FilesystemLayout</a></td>
                   <td></td>
-                  <td><p>Query for images </p></td>
+                  <td><p>FilesystemLayout the filesystemlayout </p></td>
                 </tr>
               
             </tbody>
@@ -4436,8 +4725,8 @@ <h3 id="metalstack.api.v2.ImageServiceListRequest">ImageServiceListRequest</h3>
 
         
       
-        <h3 id="metalstack.api.v2.ImageServiceListResponse">ImageServiceListResponse</h3>
-        <p>ImageServiceListResponse is the response payload for a image list request</p>
+        <h3 id="metalstack.api.v2.FilesystemServiceListRequest">FilesystemServiceListRequest</h3>
+        <p>FilesystemServiceListRequest is the request payload for a filesystem list request</p>
 
         
           <table class="field-table">
@@ -4447,10 +4736,10 @@ <h3 id="metalstack.api.v2.ImageServiceListResponse">ImageServiceListResponse</h3
             <tbody>
               
                 <tr>
-                  <td>images</td>
-                  <td><a href="#metalstack.api.v2.Image">Image</a></td>
-                  <td>repeated</td>
-                  <td><p>Images the images </p></td>
+                  <td>id</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>ID of the filesystem to get </p></td>
                 </tr>
               
             </tbody>
@@ -4460,8 +4749,8 @@ <h3 id="metalstack.api.v2.ImageServiceListResponse">ImageServiceListResponse</h3
 
         
       
-        <h3 id="metalstack.api.v2.ImageUsage">ImageUsage</h3>
-        <p>ImageUsage reports which machines/firewalls actually use this image</p>
+        <h3 id="metalstack.api.v2.FilesystemServiceListResponse">FilesystemServiceListResponse</h3>
+        <p>FilesystemServiceListResponse is the response payload for a filesystem list request</p>
 
         
           <table class="field-table">
@@ -4471,17 +4760,10 @@ <h3 id="metalstack.api.v2.ImageUsage">ImageUsage</h3>
             <tbody>
               
                 <tr>
-                  <td>image</td>
-                  <td><a href="#metalstack.api.v2.Image">Image</a></td>
-                  <td></td>
-                  <td><p>Image with usage </p></td>
-                </tr>
-              
-                <tr>
-                  <td>used_by</td>
-                  <td><a href="#string">string</a></td>
+                  <td>filesystem_layouts</td>
+                  <td><a href="#metalstack.api.v2.FilesystemLayout">FilesystemLayout</a></td>
                   <td>repeated</td>
-                  <td><p>UsedBy the following machines/firewalls </p></td>
+                  <td><p>FilesystemLayouts the filesystemlayouts </p></td>
                 </tr>
               
             </tbody>
@@ -4491,119 +4773,8 @@ <h3 id="metalstack.api.v2.ImageUsage">ImageUsage</h3>
 
         
       
-
-      
-        <h3 id="metalstack.api.v2.ImageClassification">ImageClassification</h3>
-        <p>Image</p>
-        <table class="enum-table">
-          <thead>
-            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
-          </thead>
-          <tbody>
-            
-              <tr>
-                <td>IMAGE_CLASSIFICATION_UNSPECIFIED</td>
-                <td>0</td>
-                <td><p>IMAGE_CLASSIFICATION_UNSPECIFIED is not specified</p></td>
-              </tr>
-            
-              <tr>
-                <td>IMAGE_CLASSIFICATION_PREVIEW</td>
-                <td>1</td>
-                <td><p>IMAGE_CLASSIFICATION_PREVIEW indicates that this image is in preview</p></td>
-              </tr>
-            
-              <tr>
-                <td>IMAGE_CLASSIFICATION_SUPPORTED</td>
-                <td>2</td>
-                <td><p>IMAGE_CLASSIFICATION_SUPPORTED indicates that this image is supported</p></td>
-              </tr>
-            
-              <tr>
-                <td>IMAGE_CLASSIFICATION_DEPRECATED</td>
-                <td>3</td>
-                <td><p>IMAGE_CLASSIFICATION_DEPRECATED indicates that this image is deprecated</p></td>
-              </tr>
-            
-          </tbody>
-        </table>
-      
-        <h3 id="metalstack.api.v2.ImageFeature">ImageFeature</h3>
-        <p>ImageFeature</p>
-        <table class="enum-table">
-          <thead>
-            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
-          </thead>
-          <tbody>
-            
-              <tr>
-                <td>IMAGE_FEATURE_UNSPECIFIED</td>
-                <td>0</td>
-                <td><p>IMAGE_FEATURE_UNSPECIFIED is not specified</p></td>
-              </tr>
-            
-              <tr>
-                <td>IMAGE_FEATURE_MACHINE</td>
-                <td>1</td>
-                <td><p>IMAGE_FEATURE_MACHINE indicates this image is usable for a machine</p></td>
-              </tr>
-            
-              <tr>
-                <td>IMAGE_FEATURE_FIREWALL</td>
-                <td>2</td>
-                <td><p>IMAGE_FEATURE_FIREWALL indicates this image is usable for a firewall</p></td>
-              </tr>
-            
-          </tbody>
-        </table>
-      
-
-      
-
-      
-        <h3 id="metalstack.api.v2.ImageService">ImageService</h3>
-        <p>ImageService serves image related functions</p>
-        <table class="enum-table">
-          <thead>
-            <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
-          </thead>
-          <tbody>
-            
-              <tr>
-                <td>Get</td>
-                <td><a href="#metalstack.api.v2.ImageServiceGetRequest">ImageServiceGetRequest</a></td>
-                <td><a href="#metalstack.api.v2.ImageServiceGetResponse">ImageServiceGetResponse</a></td>
-                <td><p>Get a image</p></td>
-              </tr>
-            
-              <tr>
-                <td>List</td>
-                <td><a href="#metalstack.api.v2.ImageServiceListRequest">ImageServiceListRequest</a></td>
-                <td><a href="#metalstack.api.v2.ImageServiceListResponse">ImageServiceListResponse</a></td>
-                <td><p>List all images</p></td>
-              </tr>
-            
-              <tr>
-                <td>Latest</td>
-                <td><a href="#metalstack.api.v2.ImageServiceLatestRequest">ImageServiceLatestRequest</a></td>
-                <td><a href="#metalstack.api.v2.ImageServiceLatestResponse">ImageServiceLatestResponse</a></td>
-                <td><p>Latest image for a specific os</p></td>
-              </tr>
-            
-          </tbody>
-        </table>
-
-        
-    
-      
-      <div class="file-heading">
-        <h2 id="metalstack/admin/v2/image.proto">metalstack/admin/v2/image.proto</h2><a href="#title">Top</a>
-      </div>
-      <p></p>
-
-      
-        <h3 id="metalstack.admin.v2.ImageServiceCreateRequest">ImageServiceCreateRequest</h3>
-        <p>ImageServiceCreateRequest</p>
+        <h3 id="metalstack.api.v2.FilesystemServiceMatchRequest">FilesystemServiceMatchRequest</h3>
+        <p>FilesystemServiceMatchRequest</p>
 
         
           <table class="field-table">
@@ -4613,10 +4784,17 @@ <h3 id="metalstack.admin.v2.ImageServiceCreateRequest">ImageServiceCreateRequest
             <tbody>
               
                 <tr>
-                  <td>image</td>
-                  <td><a href="#metalstack.api.v2.Image">metalstack.api.v2.Image</a></td>
+                  <td>size_and_image</td>
+                  <td><a href="#metalstack.api.v2.MatchImageAndSize">MatchImageAndSize</a></td>
                   <td></td>
-                  <td><p>Image is the image </p></td>
+                  <td><p>SizeAndImage </p></td>
+                </tr>
+              
+                <tr>
+                  <td>machine_and_filesystemlayout</td>
+                  <td><a href="#metalstack.api.v2.MatchMachine">MatchMachine</a></td>
+                  <td></td>
+                  <td><p>MachineAndFilesystemlayout </p></td>
                 </tr>
               
             </tbody>
@@ -4626,8 +4804,8 @@ <h3 id="metalstack.admin.v2.ImageServiceCreateRequest">ImageServiceCreateRequest
 
         
       
-        <h3 id="metalstack.admin.v2.ImageServiceCreateResponse">ImageServiceCreateResponse</h3>
-        <p>ImageServiceCreateResponse</p>
+        <h3 id="metalstack.api.v2.FilesystemServiceMatchResponse">FilesystemServiceMatchResponse</h3>
+        <p>FilesystemServiceMatchResponse</p>
 
         
           <table class="field-table">
@@ -4637,10 +4815,10 @@ <h3 id="metalstack.admin.v2.ImageServiceCreateResponse">ImageServiceCreateRespon
             <tbody>
               
                 <tr>
-                  <td>image</td>
-                  <td><a href="#metalstack.api.v2.Image">metalstack.api.v2.Image</a></td>
+                  <td>filesystem_layout</td>
+                  <td><a href="#metalstack.api.v2.FilesystemLayout">FilesystemLayout</a></td>
                   <td></td>
-                  <td><p>Image is the image </p></td>
+                  <td><p>FilesystemLayout the filesystemlayout </p></td>
                 </tr>
               
             </tbody>
@@ -4650,8 +4828,8 @@ <h3 id="metalstack.admin.v2.ImageServiceCreateResponse">ImageServiceCreateRespon
 
         
       
-        <h3 id="metalstack.admin.v2.ImageServiceDeleteRequest">ImageServiceDeleteRequest</h3>
-        <p>ImageServiceDeleteRequest</p>
+        <h3 id="metalstack.api.v2.LogicalVolume">LogicalVolume</h3>
+        <p>LogicalVolume</p>
 
         
           <table class="field-table">
@@ -4661,10 +4839,31 @@ <h3 id="metalstack.admin.v2.ImageServiceDeleteRequest">ImageServiceDeleteRequest
             <tbody>
               
                 <tr>
-                  <td>id</td>
+                  <td>name</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>ID of the image to delete </p></td>
+                  <td><p>Name the name of the logical volume </p></td>
+                </tr>
+              
+                <tr>
+                  <td>volume_group</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>VolumeGroup the name of the volume group where to create the logical volume onto </p></td>
+                </tr>
+              
+                <tr>
+                  <td>size</td>
+                  <td><a href="#uint64">uint64</a></td>
+                  <td></td>
+                  <td><p>Size size in mebibytes (MiB) of this volume </p></td>
+                </tr>
+              
+                <tr>
+                  <td>lvm_type</td>
+                  <td><a href="#metalstack.api.v2.LVMType">LVMType</a></td>
+                  <td></td>
+                  <td><p>LVMType the type of this logical volume can be either linear|striped|raid1 </p></td>
                 </tr>
               
             </tbody>
@@ -4674,8 +4873,8 @@ <h3 id="metalstack.admin.v2.ImageServiceDeleteRequest">ImageServiceDeleteRequest
 
         
       
-        <h3 id="metalstack.admin.v2.ImageServiceDeleteResponse">ImageServiceDeleteResponse</h3>
-        <p>message ImageServiceDeleteResponse {</p>
+        <h3 id="metalstack.api.v2.MatchImageAndSize">MatchImageAndSize</h3>
+        <p>MatchImageAndSize</p>
 
         
           <table class="field-table">
@@ -4684,11 +4883,18 @@ <h3 id="metalstack.admin.v2.ImageServiceDeleteResponse">ImageServiceDeleteRespon
             </thead>
             <tbody>
               
+                <tr>
+                  <td>size</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Size, machine size to try </p></td>
+                </tr>
+              
                 <tr>
                   <td>image</td>
-                  <td><a href="#metalstack.api.v2.Image">metalstack.api.v2.Image</a></td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>ImageLayout the imagelayout </p></td>
+                  <td><p>Image machine image to try </p></td>
                 </tr>
               
             </tbody>
@@ -4698,8 +4904,8 @@ <h3 id="metalstack.admin.v2.ImageServiceDeleteResponse">ImageServiceDeleteRespon
 
         
       
-        <h3 id="metalstack.admin.v2.ImageServiceUpdateRequest">ImageServiceUpdateRequest</h3>
-        <p>ImageServiceUpdateRequest</p>
+        <h3 id="metalstack.api.v2.MatchMachine">MatchMachine</h3>
+        <p>MatchMachine</p>
 
         
           <table class="field-table">
@@ -4709,59 +4915,69 @@ <h3 id="metalstack.admin.v2.ImageServiceUpdateRequest">ImageServiceUpdateRequest
             <tbody>
               
                 <tr>
-                  <td>id</td>
+                  <td>machine</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Id of this image </p></td>
+                  <td><p>Machine to check </p></td>
                 </tr>
               
                 <tr>
-                  <td>update_meta</td>
-                  <td><a href="#metalstack.api.v2.UpdateMeta">metalstack.api.v2.UpdateMeta</a></td>
+                  <td>filesystem_layout</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>UpdateMeta contains the timestamp and strategy to be used in this update request </p></td>
+                  <td><p>FilesystemLayout to check </p></td>
                 </tr>
               
-                <tr>
-                  <td>url</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>URL where this image is located </p></td>
-                </tr>
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.api.v2.Raid">Raid</h3>
+        <p>Raid</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
               
                 <tr>
-                  <td>name</td>
+                  <td>array_name</td>
                   <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Name of this imageLayout </p></td>
+                  <td></td>
+                  <td><p>ArrayName the name of the resulting array device </p></td>
                 </tr>
               
                 <tr>
-                  <td>description</td>
+                  <td>devices</td>
                   <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Description of this imageLayout </p></td>
+                  <td>repeated</td>
+                  <td><p>Devices list of devices to form the raid array from </p></td>
                 </tr>
               
                 <tr>
-                  <td>features</td>
-                  <td><a href="#metalstack.api.v2.ImageFeature">metalstack.api.v2.ImageFeature</a></td>
-                  <td>repeated</td>
-                  <td><p>Features of this image </p></td>
+                  <td>level</td>
+                  <td><a href="#metalstack.api.v2.RaidLevel">RaidLevel</a></td>
+                  <td></td>
+                  <td><p>Level raid level to create, should be 0 or 1 </p></td>
                 </tr>
               
                 <tr>
-                  <td>classification</td>
-                  <td><a href="#metalstack.api.v2.ImageClassification">metalstack.api.v2.ImageClassification</a></td>
-                  <td></td>
-                  <td><p>Classification of this image </p></td>
+                  <td>create_options</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>CreateOptions the options to use to create the raid array </p></td>
                 </tr>
               
                 <tr>
-                  <td>expires_at</td>
-                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
+                  <td>spares</td>
+                  <td><a href="#int32">int32</a></td>
                   <td></td>
-                  <td><p>ExpiresAt usage is not possible after this date </p></td>
+                  <td><p>Spares number of spares for the raid array </p></td>
                 </tr>
               
             </tbody>
@@ -4771,8 +4987,8 @@ <h3 id="metalstack.admin.v2.ImageServiceUpdateRequest">ImageServiceUpdateRequest
 
         
       
-        <h3 id="metalstack.admin.v2.ImageServiceUpdateResponse">ImageServiceUpdateResponse</h3>
-        <p>ImageServiceUpdateResponse</p>
+        <h3 id="metalstack.api.v2.VolumeGroup">VolumeGroup</h3>
+        <p>VolumeGroup</p>
 
         
           <table class="field-table">
@@ -4782,10 +4998,24 @@ <h3 id="metalstack.admin.v2.ImageServiceUpdateResponse">ImageServiceUpdateRespon
             <tbody>
               
                 <tr>
-                  <td>image</td>
-                  <td><a href="#metalstack.api.v2.Image">metalstack.api.v2.Image</a></td>
+                  <td>name</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Image is the image </p></td>
+                  <td><p>Name the name of the resulting volume group </p></td>
+                </tr>
+              
+                <tr>
+                  <td>devices</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>Devices list of devices to form the volume group from </p></td>
+                </tr>
+              
+                <tr>
+                  <td>tags</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>Tags list of tags to add to the volume group </p></td>
                 </tr>
               
             </tbody>
@@ -4795,62 +5025,172 @@ <h3 id="metalstack.admin.v2.ImageServiceUpdateResponse">ImageServiceUpdateRespon
 
         
       
-        <h3 id="metalstack.admin.v2.ImageServiceUsageRequest">ImageServiceUsageRequest</h3>
-        <p>ImageServiceUsageRequest</p>
-
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
-              
-                <tr>
-                  <td>query</td>
-                  <td><a href="#metalstack.api.v2.ImageQuery">metalstack.api.v2.ImageQuery</a></td>
-                  <td></td>
-                  <td><p>Query for which images the usage should be reported </p></td>
-                </tr>
-              
-            </tbody>
-          </table>
-
-          
 
-        
       
-        <h3 id="metalstack.admin.v2.ImageServiceUsageResponse">ImageServiceUsageResponse</h3>
-        <p>ImageServiceUsageResponse</p>
-
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
-              
-                <tr>
-                  <td>image_usage</td>
-                  <td><a href="#metalstack.api.v2.ImageUsage">metalstack.api.v2.ImageUsage</a></td>
-                  <td>repeated</td>
-                  <td><p>Images with usage </p></td>
-                </tr>
-              
-            </tbody>
-          </table>
-
-          
-
-        
+        <h3 id="metalstack.api.v2.Format">Format</h3>
+        <p>Format specifies the filesystem to use on a volume</p>
+        <table class="enum-table">
+          <thead>
+            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>FORMAT_UNSPECIFIED</td>
+                <td>0</td>
+                <td><p>FORMAT_UNSPECIFIED</p></td>
+              </tr>
+            
+              <tr>
+                <td>FORMAT_VFAT</td>
+                <td>1</td>
+                <td><p>FORMAT_VFAT is used for the UEFI boot partition</p></td>
+              </tr>
+            
+              <tr>
+                <td>FORMAT_EXT3</td>
+                <td>2</td>
+                <td><p>FORMAT_EXT3 is usually only used for /boot</p></td>
+              </tr>
+            
+              <tr>
+                <td>FORMAT_EXT4</td>
+                <td>3</td>
+                <td><p>FORMAT_EXT4 is the default fs</p></td>
+              </tr>
+            
+              <tr>
+                <td>FORMAT_SWAP</td>
+                <td>4</td>
+                <td><p>FORMAT_SWAP is for the swap partition</p></td>
+              </tr>
+            
+              <tr>
+                <td>FORMAT_TMPFS</td>
+                <td>5</td>
+                <td><p>FORMAT_TMPFS is used for a memory filesystem typically /tmp</p></td>
+              </tr>
+            
+              <tr>
+                <td>FORMAT_NONE</td>
+                <td>6</td>
+                <td><p>FORMAT_NONE</p></td>
+              </tr>
+            
+          </tbody>
+        </table>
       
-
+        <h3 id="metalstack.api.v2.GPTType">GPTType</h3>
+        <p>GPTType specifies the partition type in uefi systems</p>
+        <table class="enum-table">
+          <thead>
+            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>GPT_TYPE_UNSPECIFIED</td>
+                <td>0</td>
+                <td><p>GPT_TYPE_UNSPECIFIED is no specified</p></td>
+              </tr>
+            
+              <tr>
+                <td>GPT_TYPE_BOOT</td>
+                <td>1</td>
+                <td><p>GPT_TYPE_BOOT EFI Boot Partition</p></td>
+              </tr>
+            
+              <tr>
+                <td>GPT_TYPE_LINUX</td>
+                <td>2</td>
+                <td><p>GPT_TYPE_LINUX Linux Partition</p></td>
+              </tr>
+            
+              <tr>
+                <td>GPT_TYPE_LINUX_RAID</td>
+                <td>3</td>
+                <td><p>GPT_TYPE_LINUX_RAID Linux Raid Partition</p></td>
+              </tr>
+            
+              <tr>
+                <td>GPT_TYPE_LINUX_LVM</td>
+                <td>4</td>
+                <td><p>GPT_TYPE_LINUX_LVM Linux LVM Partition</p></td>
+              </tr>
+            
+          </tbody>
+        </table>
+      
+        <h3 id="metalstack.api.v2.LVMType">LVMType</h3>
+        <p>LVMType</p>
+        <table class="enum-table">
+          <thead>
+            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>LVM_TYPE_UNSPECIFIED</td>
+                <td>0</td>
+                <td><p>LVM_TYPE_UNSPECIFIED is not specified</p></td>
+              </tr>
+            
+              <tr>
+                <td>LVM_TYPE_LINEAR</td>
+                <td>1</td>
+                <td><p>LVM_TYPE_LINEAR append across all physical volumes</p></td>
+              </tr>
+            
+              <tr>
+                <td>LVM_TYPE_STRIPED</td>
+                <td>2</td>
+                <td><p>LVM_TYPE_STRIPED stripe across all physical volumes</p></td>
+              </tr>
+            
+              <tr>
+                <td>LVM_TYPE_RAID1</td>
+                <td>3</td>
+                <td><p>LVM_TYPE_RAID1 mirror with raid across all physical volumes</p></td>
+              </tr>
+            
+          </tbody>
+        </table>
+      
+        <h3 id="metalstack.api.v2.RaidLevel">RaidLevel</h3>
+        <p>RaidLevel defines howto mirror two or more block devices</p>
+        <table class="enum-table">
+          <thead>
+            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>RAID_LEVEL_UNSPECIFIED</td>
+                <td>0</td>
+                <td><p>RAID_LEVEL_UNSPECIFIED is not specified</p></td>
+              </tr>
+            
+              <tr>
+                <td>RAID_LEVEL_0</td>
+                <td>1</td>
+                <td><p>RAID_LEVEL_0 is a stripe of two or more disks</p></td>
+              </tr>
+            
+              <tr>
+                <td>RAID_LEVEL_1</td>
+                <td>2</td>
+                <td><p>RAID_LEVEL_1 is a mirror of two disks</p></td>
+              </tr>
+            
+          </tbody>
+        </table>
       
 
       
 
       
-        <h3 id="metalstack.admin.v2.ImageService">ImageService</h3>
-        <p>ImageService serves image related functions</p>
+        <h3 id="metalstack.api.v2.FilesystemService">FilesystemService</h3>
+        <p>FilesystemService serves filesystem related functions</p>
         <table class="enum-table">
           <thead>
             <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
@@ -4858,31 +5198,24 @@ <h3 id="metalstack.admin.v2.ImageService">ImageService</h3>
           <tbody>
             
               <tr>
-                <td>Create</td>
-                <td><a href="#metalstack.admin.v2.ImageServiceCreateRequest">ImageServiceCreateRequest</a></td>
-                <td><a href="#metalstack.admin.v2.ImageServiceCreateResponse">ImageServiceCreateResponse</a></td>
-                <td><p>Create a image</p></td>
-              </tr>
-            
-              <tr>
-                <td>Update</td>
-                <td><a href="#metalstack.admin.v2.ImageServiceUpdateRequest">ImageServiceUpdateRequest</a></td>
-                <td><a href="#metalstack.admin.v2.ImageServiceUpdateResponse">ImageServiceUpdateResponse</a></td>
-                <td><p>Update a image</p></td>
+                <td>Get</td>
+                <td><a href="#metalstack.api.v2.FilesystemServiceGetRequest">FilesystemServiceGetRequest</a></td>
+                <td><a href="#metalstack.api.v2.FilesystemServiceGetResponse">FilesystemServiceGetResponse</a></td>
+                <td><p>Get a filesystem</p></td>
               </tr>
             
               <tr>
-                <td>Delete</td>
-                <td><a href="#metalstack.admin.v2.ImageServiceDeleteRequest">ImageServiceDeleteRequest</a></td>
-                <td><a href="#metalstack.admin.v2.ImageServiceDeleteResponse">ImageServiceDeleteResponse</a></td>
-                <td><p>Delete a image</p></td>
+                <td>List</td>
+                <td><a href="#metalstack.api.v2.FilesystemServiceListRequest">FilesystemServiceListRequest</a></td>
+                <td><a href="#metalstack.api.v2.FilesystemServiceListResponse">FilesystemServiceListResponse</a></td>
+                <td><p>List all filesystems</p></td>
               </tr>
             
               <tr>
-                <td>Usage</td>
-                <td><a href="#metalstack.admin.v2.ImageServiceUsageRequest">ImageServiceUsageRequest</a></td>
-                <td><a href="#metalstack.admin.v2.ImageServiceUsageResponse">ImageServiceUsageResponse</a></td>
-                <td><p>Usage of images</p></td>
+                <td>Match</td>
+                <td><a href="#metalstack.api.v2.FilesystemServiceMatchRequest">FilesystemServiceMatchRequest</a></td>
+                <td><a href="#metalstack.api.v2.FilesystemServiceMatchResponse">FilesystemServiceMatchResponse</a></td>
+                <td><p>Match a filesystems</p></td>
               </tr>
             
           </tbody>
@@ -4892,13 +5225,13 @@ <h3 id="metalstack.admin.v2.ImageService">ImageService</h3>
     
       
       <div class="file-heading">
-        <h2 id="metalstack/api/v2/ip.proto">metalstack/api/v2/ip.proto</h2><a href="#title">Top</a>
+        <h2 id="metalstack/admin/v2/filesystem.proto">metalstack/admin/v2/filesystem.proto</h2><a href="#title">Top</a>
       </div>
       <p></p>
 
       
-        <h3 id="metalstack.api.v2.IP">IP</h3>
-        <p>IP is a ip address which can be used as loadbalancer addresses</p>
+        <h3 id="metalstack.admin.v2.FilesystemServiceCreateRequest">FilesystemServiceCreateRequest</h3>
+        <p>FilesystemServiceCreateRequest</p>
 
         
           <table class="field-table">
@@ -4908,67 +5241,58 @@ <h3 id="metalstack.api.v2.IP">IP</h3>
             <tbody>
               
                 <tr>
-                  <td>uuid</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Uuid of this ip </p></td>
-                </tr>
-              
-                <tr>
-                  <td>meta</td>
-                  <td><a href="#metalstack.api.v2.Meta">Meta</a></td>
+                  <td>filesystem_layout</td>
+                  <td><a href="#metalstack.api.v2.FilesystemLayout">metalstack.api.v2.FilesystemLayout</a></td>
                   <td></td>
-                  <td><p>Meta for this ip </p></td>
+                  <td><p>FilesystemLayout the filesystemlayout </p></td>
                 </tr>
               
-                <tr>
-                  <td>ip</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Ip is either ipv4 or ipv6 address </p></td>
-                </tr>
-              
-                <tr>
-                  <td>name</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Name of this ip </p></td>
-                </tr>
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.admin.v2.FilesystemServiceCreateResponse">FilesystemServiceCreateResponse</h3>
+        <p>FilesystemServiceCreateResponse</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
               
                 <tr>
-                  <td>description</td>
-                  <td><a href="#string">string</a></td>
+                  <td>filesystem_layout</td>
+                  <td><a href="#metalstack.api.v2.FilesystemLayout">metalstack.api.v2.FilesystemLayout</a></td>
                   <td></td>
-                  <td><p>Description of this ip </p></td>
+                  <td><p>FilesystemLayout the filesystemlayout </p></td>
                 </tr>
               
-                <tr>
-                  <td>network</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Network is the network this ip belongs to </p></td>
-                </tr>
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.admin.v2.FilesystemServiceDeleteRequest">FilesystemServiceDeleteRequest</h3>
+        <p>FilesystemServiceDeleteRequest</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
               
                 <tr>
-                  <td>project</td>
+                  <td>id</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Project where this ip address belongs to </p></td>
-                </tr>
-              
-                <tr>
-                  <td>type</td>
-                  <td><a href="#metalstack.api.v2.IPType">IPType</a></td>
-                  <td></td>
-                  <td><p>Type of this ip </p></td>
-                </tr>
-              
-                <tr>
-                  <td>namespace</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Namespace if specified this ip is from a namespaced network and can therefore overlap with others
-Will be equal with project most of the time </p></td>
+                  <td><p>ID of the filesystem to delete </p></td>
                 </tr>
               
             </tbody>
@@ -4978,8 +5302,8 @@ <h3 id="metalstack.api.v2.IP">IP</h3>
 
         
       
-        <h3 id="metalstack.api.v2.IPQuery">IPQuery</h3>
-        <p>IPQuery can be used to query a IP or a list of IP</p>
+        <h3 id="metalstack.admin.v2.FilesystemServiceDeleteResponse">FilesystemServiceDeleteResponse</h3>
+        <p>message FilesystemServiceDeleteResponse {</p>
 
         
           <table class="field-table">
@@ -4989,80 +5313,10 @@ <h3 id="metalstack.api.v2.IPQuery">IPQuery</h3>
             <tbody>
               
                 <tr>
-                  <td>ip</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Ip the ip to list </p></td>
-                </tr>
-              
-                <tr>
-                  <td>network</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Network from where the ips to list </p></td>
-                </tr>
-              
-                <tr>
-                  <td>project</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Project of the ips to list </p></td>
-                </tr>
-              
-                <tr>
-                  <td>name</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Name of this ip </p></td>
-                </tr>
-              
-                <tr>
-                  <td>uuid</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Uuid for which this ips should get filtered </p></td>
-                </tr>
-              
-                <tr>
-                  <td>machine</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Machine for which this ips should get filtered </p></td>
-                </tr>
-              
-                <tr>
-                  <td>parent_prefix_cidr</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>ParentPrefixCidr for which this ips should get filtered </p></td>
-                </tr>
-              
-                <tr>
-                  <td>labels</td>
-                  <td><a href="#metalstack.api.v2.Labels">Labels</a></td>
-                  <td>optional</td>
-                  <td><p>Labels for which this ips should get filtered </p></td>
-                </tr>
-              
-                <tr>
-                  <td>type</td>
-                  <td><a href="#metalstack.api.v2.IPType">IPType</a></td>
-                  <td>optional</td>
-                  <td><p>Static if set to true, this will be a Static ip </p></td>
-                </tr>
-              
-                <tr>
-                  <td>address_family</td>
-                  <td><a href="#metalstack.api.v2.IPAddressFamily">IPAddressFamily</a></td>
-                  <td>optional</td>
-                  <td><p>Addressfamily of the IPs to list, defaults to all addressfamilies </p></td>
-                </tr>
-              
-                <tr>
-                  <td>namespace</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Namespace can be specified to get the ip of a namespace. </p></td>
+                  <td>filesystem_layout</td>
+                  <td><a href="#metalstack.api.v2.FilesystemLayout">metalstack.api.v2.FilesystemLayout</a></td>
+                  <td></td>
+                  <td><p>FilesystemLayout the filesystemlayout </p></td>
                 </tr>
               
             </tbody>
@@ -5072,8 +5326,8 @@ <h3 id="metalstack.api.v2.IPQuery">IPQuery</h3>
 
         
       
-        <h3 id="metalstack.api.v2.IPServiceCreateRequest">IPServiceCreateRequest</h3>
-        <p>IPServiceCreateRequest is the request payload for a ip create request</p>
+        <h3 id="metalstack.admin.v2.FilesystemServiceUpdateRequest">FilesystemServiceUpdateRequest</h3>
+        <p>FilesystemServiceUpdateRequest</p>
 
         
           <table class="field-table">
@@ -5083,90 +5337,73 @@ <h3 id="metalstack.api.v2.IPServiceCreateRequest">IPServiceCreateRequest</h3>
             <tbody>
               
                 <tr>
-                  <td>network</td>
+                  <td>id</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Network from which the IP should be created </p></td>
+                  <td><p>Id of this filesystemLayout </p></td>
                 </tr>
               
                 <tr>
-                  <td>project</td>
-                  <td><a href="#string">string</a></td>
+                  <td>update_meta</td>
+                  <td><a href="#metalstack.api.v2.UpdateMeta">metalstack.api.v2.UpdateMeta</a></td>
                   <td></td>
-                  <td><p>Project of the ip </p></td>
+                  <td><p>UpdateMeta contains the timestamp and strategy to be used in this update request </p></td>
                 </tr>
               
                 <tr>
                   <td>name</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Name of the ip </p></td>
+                  <td><p>Name of this filesystemLayout </p></td>
                 </tr>
               
                 <tr>
                   <td>description</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Description of the ip </p></td>
+                  <td><p>Description of this filesystemLayout </p></td>
                 </tr>
               
                 <tr>
-                  <td>ip</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>IP if given try to create this ip if still available </p></td>
+                  <td>filesystems</td>
+                  <td><a href="#metalstack.api.v2.Filesystem">metalstack.api.v2.Filesystem</a></td>
+                  <td>repeated</td>
+                  <td><p>Filesystems is a list of filesystems to create on a machine </p></td>
                 </tr>
               
                 <tr>
-                  <td>machine</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Machine for which this ip should get created </p></td>
+                  <td>disks</td>
+                  <td><a href="#metalstack.api.v2.Disk">metalstack.api.v2.Disk</a></td>
+                  <td>repeated</td>
+                  <td><p>Disks list of disks that belong to this layout </p></td>
                 </tr>
               
                 <tr>
-                  <td>labels</td>
-                  <td><a href="#metalstack.api.v2.Labels">Labels</a></td>
-                  <td>optional</td>
-                  <td><p>Labels to put onto the ip </p></td>
+                  <td>raid</td>
+                  <td><a href="#metalstack.api.v2.Raid">metalstack.api.v2.Raid</a></td>
+                  <td>repeated</td>
+                  <td><p>raid arrays to create </p></td>
                 </tr>
               
                 <tr>
-                  <td>type</td>
-                  <td><a href="#metalstack.api.v2.IPType">IPType</a></td>
-                  <td>optional</td>
-                  <td><p>Type of the IP, ether ephemeral (default), or static </p></td>
+                  <td>volume_groups</td>
+                  <td><a href="#metalstack.api.v2.VolumeGroup">metalstack.api.v2.VolumeGroup</a></td>
+                  <td>repeated</td>
+                  <td><p>VolumeGroups list of volumegroups to create </p></td>
                 </tr>
               
                 <tr>
-                  <td>address_family</td>
-                  <td><a href="#metalstack.api.v2.IPAddressFamily">IPAddressFamily</a></td>
-                  <td>optional</td>
-                  <td><p>Addressfamily of the IP to create, defaults to ipv4 </p></td>
+                  <td>logical_volumes</td>
+                  <td><a href="#metalstack.api.v2.LogicalVolume">metalstack.api.v2.LogicalVolume</a></td>
+                  <td>repeated</td>
+                  <td><p>LogicalVolumes list of logicalvolumes to create </p></td>
                 </tr>
               
-            </tbody>
-          </table>
-
-          
-
-        
-      
-        <h3 id="metalstack.api.v2.IPServiceCreateResponse">IPServiceCreateResponse</h3>
-        <p>IPServiceCreateResponse is the response payload for a ip create request</p>
-
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
-              
                 <tr>
-                  <td>ip</td>
-                  <td><a href="#metalstack.api.v2.IP">IP</a></td>
+                  <td>constraints</td>
+                  <td><a href="#metalstack.api.v2.FilesystemLayoutConstraints">metalstack.api.v2.FilesystemLayoutConstraints</a></td>
                   <td></td>
-                  <td><p>Ip the ip </p></td>
+                  <td><p>Constraints which must match that this layout is taken, if sizes and images are empty these are develop layouts </p></td>
                 </tr>
               
             </tbody>
@@ -5176,8 +5413,8 @@ <h3 id="metalstack.api.v2.IPServiceCreateResponse">IPServiceCreateResponse</h3>
 
         
       
-        <h3 id="metalstack.api.v2.IPServiceDeleteRequest">IPServiceDeleteRequest</h3>
-        <p>IPServiceDeleteRequest is the request payload for a ip delete request</p>
+        <h3 id="metalstack.admin.v2.FilesystemServiceUpdateResponse">FilesystemServiceUpdateResponse</h3>
+        <p>FilesystemServiceUpdateResponse</p>
 
         
           <table class="field-table">
@@ -5187,17 +5424,10 @@ <h3 id="metalstack.api.v2.IPServiceDeleteRequest">IPServiceDeleteRequest</h3>
             <tbody>
               
                 <tr>
-                  <td>ip</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>IP of the ip to delete </p></td>
-                </tr>
-              
-                <tr>
-                  <td>project</td>
-                  <td><a href="#string">string</a></td>
+                  <td>filesystem_layout</td>
+                  <td><a href="#metalstack.api.v2.FilesystemLayout">metalstack.api.v2.FilesystemLayout</a></td>
                   <td></td>
-                  <td><p>Project of the ip </p></td>
+                  <td><p>FilesystemLayout the filesystemlayout </p></td>
                 </tr>
               
             </tbody>
@@ -5207,8 +5437,55 @@ <h3 id="metalstack.api.v2.IPServiceDeleteRequest">IPServiceDeleteRequest</h3>
 
         
       
-        <h3 id="metalstack.api.v2.IPServiceDeleteResponse">IPServiceDeleteResponse</h3>
-        <p>IPServiceDeleteResponse is the response payload for a ip delete request</p>
+
+      
+
+      
+
+      
+        <h3 id="metalstack.admin.v2.FilesystemService">FilesystemService</h3>
+        <p>FilesystemService serves filesystem related functions</p>
+        <table class="enum-table">
+          <thead>
+            <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>Create</td>
+                <td><a href="#metalstack.admin.v2.FilesystemServiceCreateRequest">FilesystemServiceCreateRequest</a></td>
+                <td><a href="#metalstack.admin.v2.FilesystemServiceCreateResponse">FilesystemServiceCreateResponse</a></td>
+                <td><p>Create a filesystem</p></td>
+              </tr>
+            
+              <tr>
+                <td>Update</td>
+                <td><a href="#metalstack.admin.v2.FilesystemServiceUpdateRequest">FilesystemServiceUpdateRequest</a></td>
+                <td><a href="#metalstack.admin.v2.FilesystemServiceUpdateResponse">FilesystemServiceUpdateResponse</a></td>
+                <td><p>Update a filesystem</p></td>
+              </tr>
+            
+              <tr>
+                <td>Delete</td>
+                <td><a href="#metalstack.admin.v2.FilesystemServiceDeleteRequest">FilesystemServiceDeleteRequest</a></td>
+                <td><a href="#metalstack.admin.v2.FilesystemServiceDeleteResponse">FilesystemServiceDeleteResponse</a></td>
+                <td><p>Delete a filesystem</p></td>
+              </tr>
+            
+          </tbody>
+        </table>
+
+        
+    
+      
+      <div class="file-heading">
+        <h2 id="metalstack/api/v2/image.proto">metalstack/api/v2/image.proto</h2><a href="#title">Top</a>
+      </div>
+      <p></p>
+
+      
+        <h3 id="metalstack.api.v2.Image">Image</h3>
+        <p>Image</p>
 
         
           <table class="field-table">
@@ -5218,10 +5495,59 @@ <h3 id="metalstack.api.v2.IPServiceDeleteResponse">IPServiceDeleteResponse</h3>
             <tbody>
               
                 <tr>
-                  <td>ip</td>
-                  <td><a href="#metalstack.api.v2.IP">IP</a></td>
+                  <td>id</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Ip the ip </p></td>
+                  <td><p>Id of this imageLayout </p></td>
+                </tr>
+              
+                <tr>
+                  <td>meta</td>
+                  <td><a href="#metalstack.api.v2.Meta">Meta</a></td>
+                  <td></td>
+                  <td><p>Meta for this ip </p></td>
+                </tr>
+              
+                <tr>
+                  <td>url</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>URL where this image is located </p></td>
+                </tr>
+              
+                <tr>
+                  <td>name</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Name of this imageLayout </p></td>
+                </tr>
+              
+                <tr>
+                  <td>description</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Description of this imageLayout </p></td>
+                </tr>
+              
+                <tr>
+                  <td>features</td>
+                  <td><a href="#metalstack.api.v2.ImageFeature">ImageFeature</a></td>
+                  <td>repeated</td>
+                  <td><p>Features of this image </p></td>
+                </tr>
+              
+                <tr>
+                  <td>classification</td>
+                  <td><a href="#metalstack.api.v2.ImageClassification">ImageClassification</a></td>
+                  <td></td>
+                  <td><p>Classification of this image </p></td>
+                </tr>
+              
+                <tr>
+                  <td>expires_at</td>
+                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
+                  <td></td>
+                  <td><p>ExpiresAt usage is not possible after this date </p></td>
                 </tr>
               
             </tbody>
@@ -5231,8 +5557,8 @@ <h3 id="metalstack.api.v2.IPServiceDeleteResponse">IPServiceDeleteResponse</h3>
 
         
       
-        <h3 id="metalstack.api.v2.IPServiceGetRequest">IPServiceGetRequest</h3>
-        <p>IPServiceGetRequest is the request payload for a ip get request</p>
+        <h3 id="metalstack.api.v2.ImageQuery">ImageQuery</h3>
+        <p>ImageQuery is used to search images</p>
 
         
           <table class="field-table">
@@ -5242,24 +5568,66 @@ <h3 id="metalstack.api.v2.IPServiceGetRequest">IPServiceGetRequest</h3>
             <tbody>
               
                 <tr>
-                  <td>ip</td>
+                  <td>id</td>
                   <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>IP of the ip to get </p></td>
+                  <td>optional</td>
+                  <td><p>ID of the image to get </p></td>
                 </tr>
               
                 <tr>
-                  <td>project</td>
+                  <td>os</td>
                   <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Project of the ip </p></td>
+                  <td>optional</td>
+                  <td><p>OS of the image </p></td>
                 </tr>
               
                 <tr>
-                  <td>namespace</td>
+                  <td>version</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Namespace can be specified to get the ip of a namespace. </p></td>
+                  <td><p>Version of the Image </p></td>
+                </tr>
+              
+                <tr>
+                  <td>name</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Name of the image to query </p></td>
+                </tr>
+              
+                <tr>
+                  <td>description</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Description of the image to query </p></td>
+                </tr>
+              
+                <tr>
+                  <td>url</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Url of the image to query </p></td>
+                </tr>
+              
+                <tr>
+                  <td>feature</td>
+                  <td><a href="#metalstack.api.v2.ImageFeature">ImageFeature</a></td>
+                  <td>optional</td>
+                  <td><p>Feature of the image to query </p></td>
+                </tr>
+              
+                <tr>
+                  <td>classification</td>
+                  <td><a href="#metalstack.api.v2.ImageClassification">ImageClassification</a></td>
+                  <td>optional</td>
+                  <td><p>Classification of the image to query </p></td>
+                </tr>
+              
+                <tr>
+                  <td>labels</td>
+                  <td><a href="#metalstack.api.v2.Labels">Labels</a></td>
+                  <td>optional</td>
+                  <td><p>Labels lists only images containing the given labels </p></td>
                 </tr>
               
             </tbody>
@@ -5269,8 +5637,8 @@ <h3 id="metalstack.api.v2.IPServiceGetRequest">IPServiceGetRequest</h3>
 
         
       
-        <h3 id="metalstack.api.v2.IPServiceGetResponse">IPServiceGetResponse</h3>
-        <p>IPServiceGetResponse is the response payload for a ip get request</p>
+        <h3 id="metalstack.api.v2.ImageServiceGetRequest">ImageServiceGetRequest</h3>
+        <p>ImageServiceGetRequest is the request payload for a image get request</p>
 
         
           <table class="field-table">
@@ -5280,10 +5648,10 @@ <h3 id="metalstack.api.v2.IPServiceGetResponse">IPServiceGetResponse</h3>
             <tbody>
               
                 <tr>
-                  <td>ip</td>
-                  <td><a href="#metalstack.api.v2.IP">IP</a></td>
+                  <td>id</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Ip the ip </p></td>
+                  <td><p>ID of the image to get </p></td>
                 </tr>
               
             </tbody>
@@ -5293,8 +5661,8 @@ <h3 id="metalstack.api.v2.IPServiceGetResponse">IPServiceGetResponse</h3>
 
         
       
-        <h3 id="metalstack.api.v2.IPServiceListRequest">IPServiceListRequest</h3>
-        <p>IPServiceListRequest is the request payload for a ip list request</p>
+        <h3 id="metalstack.api.v2.ImageServiceGetResponse">ImageServiceGetResponse</h3>
+        <p>ImageServiceGetResponse is the response payload for a image get request</p>
 
         
           <table class="field-table">
@@ -5304,17 +5672,35 @@ <h3 id="metalstack.api.v2.IPServiceListRequest">IPServiceListRequest</h3>
             <tbody>
               
                 <tr>
-                  <td>project</td>
-                  <td><a href="#string">string</a></td>
+                  <td>image</td>
+                  <td><a href="#metalstack.api.v2.Image">Image</a></td>
                   <td></td>
-                  <td><p>Project of the ips to list </p></td>
+                  <td><p>Image the image </p></td>
                 </tr>
               
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.api.v2.ImageServiceLatestRequest">ImageServiceLatestRequest</h3>
+        <p>ImageServiceLatestRequest is the request payload for a image latest request</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
                 <tr>
-                  <td>query</td>
-                  <td><a href="#metalstack.api.v2.IPQuery">IPQuery</a></td>
+                  <td>os</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Query to list one ore more ips </p></td>
+                  <td><p>OS for which the latest image should be fetched
+should contain os and major.minor then latest patch version of this os is returned </p></td>
                 </tr>
               
             </tbody>
@@ -5324,8 +5710,8 @@ <h3 id="metalstack.api.v2.IPServiceListRequest">IPServiceListRequest</h3>
 
         
       
-        <h3 id="metalstack.api.v2.IPServiceListResponse">IPServiceListResponse</h3>
-        <p>IPServiceListResponse is the response payload for a ip list request</p>
+        <h3 id="metalstack.api.v2.ImageServiceLatestResponse">ImageServiceLatestResponse</h3>
+        <p>ImageServiceLatestResponse is the response payload for a image latest request</p>
 
         
           <table class="field-table">
@@ -5335,10 +5721,10 @@ <h3 id="metalstack.api.v2.IPServiceListResponse">IPServiceListResponse</h3>
             <tbody>
               
                 <tr>
-                  <td>ips</td>
-                  <td><a href="#metalstack.api.v2.IP">IP</a></td>
-                  <td>repeated</td>
-                  <td><p>Ips the ips </p></td>
+                  <td>image</td>
+                  <td><a href="#metalstack.api.v2.Image">Image</a></td>
+                  <td></td>
+                  <td><p>Image which is the latest for one os </p></td>
                 </tr>
               
             </tbody>
@@ -5348,8 +5734,8 @@ <h3 id="metalstack.api.v2.IPServiceListResponse">IPServiceListResponse</h3>
 
         
       
-        <h3 id="metalstack.api.v2.IPServiceUpdateRequest">IPServiceUpdateRequest</h3>
-        <p>IPServiceUpdateRequest is the request payload for a ip update request</p>
+        <h3 id="metalstack.api.v2.ImageServiceListRequest">ImageServiceListRequest</h3>
+        <p>ImageServiceListRequest is the request payload for a image list request</p>
 
         
           <table class="field-table">
@@ -5359,52 +5745,34 @@ <h3 id="metalstack.api.v2.IPServiceUpdateRequest">IPServiceUpdateRequest</h3>
             <tbody>
               
                 <tr>
-                  <td>ip</td>
-                  <td><a href="#string">string</a></td>
+                  <td>query</td>
+                  <td><a href="#metalstack.api.v2.ImageQuery">ImageQuery</a></td>
                   <td></td>
-                  <td><p>Ip the ip to update </p></td>
+                  <td><p>Query for images </p></td>
                 </tr>
               
-                <tr>
-                  <td>update_meta</td>
-                  <td><a href="#metalstack.api.v2.UpdateMeta">UpdateMeta</a></td>
-                  <td></td>
-                  <td><p>UpdateMeta contains the timestamp and strategy to be used in this update request </p></td>
-                </tr>
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.api.v2.ImageServiceListResponse">ImageServiceListResponse</h3>
+        <p>ImageServiceListResponse is the response payload for a image list request</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
               
                 <tr>
-                  <td>project</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Project id of the ip </p></td>
-                </tr>
-              
-                <tr>
-                  <td>name</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Name of this ip </p></td>
-                </tr>
-              
-                <tr>
-                  <td>description</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Description of this ip </p></td>
-                </tr>
-              
-                <tr>
-                  <td>type</td>
-                  <td><a href="#metalstack.api.v2.IPType">IPType</a></td>
-                  <td>optional</td>
-                  <td><p>Type of this ip </p></td>
-                </tr>
-              
-                <tr>
-                  <td>labels</td>
-                  <td><a href="#metalstack.api.v2.UpdateLabels">UpdateLabels</a></td>
-                  <td>optional</td>
-                  <td><p>Labels on this ip </p></td>
+                  <td>images</td>
+                  <td><a href="#metalstack.api.v2.Image">Image</a></td>
+                  <td>repeated</td>
+                  <td><p>Images the images </p></td>
                 </tr>
               
             </tbody>
@@ -5414,8 +5782,8 @@ <h3 id="metalstack.api.v2.IPServiceUpdateRequest">IPServiceUpdateRequest</h3>
 
         
       
-        <h3 id="metalstack.api.v2.IPServiceUpdateResponse">IPServiceUpdateResponse</h3>
-        <p>IPServiceUpdateResponse is the response payload for a ip update request</p>
+        <h3 id="metalstack.api.v2.ImageUsage">ImageUsage</h3>
+        <p>ImageUsage reports which machines/firewalls actually use this image</p>
 
         
           <table class="field-table">
@@ -5425,10 +5793,17 @@ <h3 id="metalstack.api.v2.IPServiceUpdateResponse">IPServiceUpdateResponse</h3>
             <tbody>
               
                 <tr>
-                  <td>ip</td>
-                  <td><a href="#metalstack.api.v2.IP">IP</a></td>
+                  <td>image</td>
+                  <td><a href="#metalstack.api.v2.Image">Image</a></td>
                   <td></td>
-                  <td><p>Ip the ip </p></td>
+                  <td><p>Image with usage </p></td>
+                </tr>
+              
+                <tr>
+                  <td>used_by</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>UsedBy the following machines/firewalls </p></td>
                 </tr>
               
             </tbody>
@@ -5440,8 +5815,8 @@ <h3 id="metalstack.api.v2.IPServiceUpdateResponse">IPServiceUpdateResponse</h3>
       
 
       
-        <h3 id="metalstack.api.v2.IPAddressFamily">IPAddressFamily</h3>
-        <p>IPAddressFamily defines either IPv4 or IPv6 Addressfamily</p>
+        <h3 id="metalstack.api.v2.ImageClassification">ImageClassification</h3>
+        <p>Image</p>
         <table class="enum-table">
           <thead>
             <tr><td>Name</td><td>Number</td><td>Description</td></tr>
@@ -5449,28 +5824,34 @@ <h3 id="metalstack.api.v2.IPAddressFamily">IPAddressFamily</h3>
           <tbody>
             
               <tr>
-                <td>IP_ADDRESS_FAMILY_UNSPECIFIED</td>
+                <td>IMAGE_CLASSIFICATION_UNSPECIFIED</td>
                 <td>0</td>
-                <td><p>IP_ADDRESS_FAMILY_UNSPECIFIED is not specified</p></td>
+                <td><p>IMAGE_CLASSIFICATION_UNSPECIFIED is not specified</p></td>
               </tr>
             
               <tr>
-                <td>IP_ADDRESS_FAMILY_V4</td>
+                <td>IMAGE_CLASSIFICATION_PREVIEW</td>
                 <td>1</td>
-                <td><p>IP_ADDRESS_FAMILY_V4 defines a IPv4 address</p></td>
+                <td><p>IMAGE_CLASSIFICATION_PREVIEW indicates that this image is in preview</p></td>
               </tr>
             
               <tr>
-                <td>IP_ADDRESS_FAMILY_V6</td>
+                <td>IMAGE_CLASSIFICATION_SUPPORTED</td>
                 <td>2</td>
-                <td><p>IP_ADDRESS_FAMILY_V6 defines a IPv6 address</p></td>
+                <td><p>IMAGE_CLASSIFICATION_SUPPORTED indicates that this image is supported</p></td>
+              </tr>
+            
+              <tr>
+                <td>IMAGE_CLASSIFICATION_DEPRECATED</td>
+                <td>3</td>
+                <td><p>IMAGE_CLASSIFICATION_DEPRECATED indicates that this image is deprecated</p></td>
               </tr>
             
           </tbody>
         </table>
       
-        <h3 id="metalstack.api.v2.IPType">IPType</h3>
-        <p>IPType specifies different ip address types</p>
+        <h3 id="metalstack.api.v2.ImageFeature">ImageFeature</h3>
+        <p>ImageFeature</p>
         <table class="enum-table">
           <thead>
             <tr><td>Name</td><td>Number</td><td>Description</td></tr>
@@ -5478,21 +5859,21 @@ <h3 id="metalstack.api.v2.IPType">IPType</h3>
           <tbody>
             
               <tr>
-                <td>IP_TYPE_UNSPECIFIED</td>
+                <td>IMAGE_FEATURE_UNSPECIFIED</td>
                 <td>0</td>
-                <td><p>IP_TYPE_UNSPECIFIED is not specified</p></td>
+                <td><p>IMAGE_FEATURE_UNSPECIFIED is not specified</p></td>
               </tr>
             
               <tr>
-                <td>IP_TYPE_EPHEMERAL</td>
+                <td>IMAGE_FEATURE_MACHINE</td>
                 <td>1</td>
-                <td><p>IP_TYPE_EPHEMERAL defines a ephemeral ip address which is freed/deleted after usage</p></td>
+                <td><p>IMAGE_FEATURE_MACHINE indicates this image is usable for a machine</p></td>
               </tr>
             
               <tr>
-                <td>IP_TYPE_STATIC</td>
+                <td>IMAGE_FEATURE_FIREWALL</td>
                 <td>2</td>
-                <td><p>IP_TYPE_STATIC defines a static ip address which must be freed/deleted explicitly</p></td>
+                <td><p>IMAGE_FEATURE_FIREWALL indicates this image is usable for a firewall</p></td>
               </tr>
             
           </tbody>
@@ -5502,8 +5883,8 @@ <h3 id="metalstack.api.v2.IPType">IPType</h3>
       
 
       
-        <h3 id="metalstack.api.v2.IPService">IPService</h3>
-        <p>IPService serves ip address related functions</p>
+        <h3 id="metalstack.api.v2.ImageService">ImageService</h3>
+        <p>ImageService serves image related functions</p>
         <table class="enum-table">
           <thead>
             <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
@@ -5512,37 +5893,23 @@ <h3 id="metalstack.api.v2.IPService">IPService</h3>
             
               <tr>
                 <td>Get</td>
-                <td><a href="#metalstack.api.v2.IPServiceGetRequest">IPServiceGetRequest</a></td>
-                <td><a href="#metalstack.api.v2.IPServiceGetResponse">IPServiceGetResponse</a></td>
-                <td><p>Get a ip</p></td>
-              </tr>
-            
-              <tr>
-                <td>Create</td>
-                <td><a href="#metalstack.api.v2.IPServiceCreateRequest">IPServiceCreateRequest</a></td>
-                <td><a href="#metalstack.api.v2.IPServiceCreateResponse">IPServiceCreateResponse</a></td>
-                <td><p>Create a ip</p></td>
-              </tr>
-            
-              <tr>
-                <td>Update</td>
-                <td><a href="#metalstack.api.v2.IPServiceUpdateRequest">IPServiceUpdateRequest</a></td>
-                <td><a href="#metalstack.api.v2.IPServiceUpdateResponse">IPServiceUpdateResponse</a></td>
-                <td><p>Update a ip</p></td>
+                <td><a href="#metalstack.api.v2.ImageServiceGetRequest">ImageServiceGetRequest</a></td>
+                <td><a href="#metalstack.api.v2.ImageServiceGetResponse">ImageServiceGetResponse</a></td>
+                <td><p>Get a image</p></td>
               </tr>
             
               <tr>
                 <td>List</td>
-                <td><a href="#metalstack.api.v2.IPServiceListRequest">IPServiceListRequest</a></td>
-                <td><a href="#metalstack.api.v2.IPServiceListResponse">IPServiceListResponse</a></td>
-                <td><p>List all ips</p></td>
+                <td><a href="#metalstack.api.v2.ImageServiceListRequest">ImageServiceListRequest</a></td>
+                <td><a href="#metalstack.api.v2.ImageServiceListResponse">ImageServiceListResponse</a></td>
+                <td><p>List all images</p></td>
               </tr>
             
               <tr>
-                <td>Delete</td>
-                <td><a href="#metalstack.api.v2.IPServiceDeleteRequest">IPServiceDeleteRequest</a></td>
-                <td><a href="#metalstack.api.v2.IPServiceDeleteResponse">IPServiceDeleteResponse</a></td>
-                <td><p>Delete a ip</p></td>
+                <td>Latest</td>
+                <td><a href="#metalstack.api.v2.ImageServiceLatestRequest">ImageServiceLatestRequest</a></td>
+                <td><a href="#metalstack.api.v2.ImageServiceLatestResponse">ImageServiceLatestResponse</a></td>
+                <td><p>Latest image for a specific os</p></td>
               </tr>
             
           </tbody>
@@ -5552,13 +5919,13 @@ <h3 id="metalstack.api.v2.IPService">IPService</h3>
     
       
       <div class="file-heading">
-        <h2 id="metalstack/admin/v2/ip.proto">metalstack/admin/v2/ip.proto</h2><a href="#title">Top</a>
+        <h2 id="metalstack/admin/v2/image.proto">metalstack/admin/v2/image.proto</h2><a href="#title">Top</a>
       </div>
       <p></p>
 
       
-        <h3 id="metalstack.admin.v2.IPServiceListRequest">IPServiceListRequest</h3>
-        <p>IPServiceListRequest</p>
+        <h3 id="metalstack.admin.v2.ImageServiceCreateRequest">ImageServiceCreateRequest</h3>
+        <p>ImageServiceCreateRequest</p>
 
         
           <table class="field-table">
@@ -5568,10 +5935,10 @@ <h3 id="metalstack.admin.v2.IPServiceListRequest">IPServiceListRequest</h3>
             <tbody>
               
                 <tr>
-                  <td>query</td>
-                  <td><a href="#metalstack.api.v2.IPQuery">metalstack.api.v2.IPQuery</a></td>
+                  <td>image</td>
+                  <td><a href="#metalstack.api.v2.Image">metalstack.api.v2.Image</a></td>
                   <td></td>
-                  <td><p>Query to search for one or more ips </p></td>
+                  <td><p>Image is the image </p></td>
                 </tr>
               
             </tbody>
@@ -5581,8 +5948,8 @@ <h3 id="metalstack.admin.v2.IPServiceListRequest">IPServiceListRequest</h3>
 
         
       
-        <h3 id="metalstack.admin.v2.IPServiceListResponse">IPServiceListResponse</h3>
-        <p>IPServiceListResponse</p>
+        <h3 id="metalstack.admin.v2.ImageServiceCreateResponse">ImageServiceCreateResponse</h3>
+        <p>ImageServiceCreateResponse</p>
 
         
           <table class="field-table">
@@ -5592,10 +5959,10 @@ <h3 id="metalstack.admin.v2.IPServiceListResponse">IPServiceListResponse</h3>
             <tbody>
               
                 <tr>
-                  <td>ips</td>
-                  <td><a href="#metalstack.api.v2.IP">metalstack.api.v2.IP</a></td>
-                  <td>repeated</td>
-                  <td><p>IPs are the list of ips </p></td>
+                  <td>image</td>
+                  <td><a href="#metalstack.api.v2.Image">metalstack.api.v2.Image</a></td>
+                  <td></td>
+                  <td><p>Image is the image </p></td>
                 </tr>
               
             </tbody>
@@ -5605,41 +5972,32 @@ <h3 id="metalstack.admin.v2.IPServiceListResponse">IPServiceListResponse</h3>
 
         
       
+        <h3 id="metalstack.admin.v2.ImageServiceDeleteRequest">ImageServiceDeleteRequest</h3>
+        <p>ImageServiceDeleteRequest</p>
 
-      
-
-      
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>id</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>ID of the image to delete </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
 
-      
-        <h3 id="metalstack.admin.v2.IPService">IPService</h3>
-        <p>IPService serves ip address related functions</p>
-        <table class="enum-table">
-          <thead>
-            <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
-          </thead>
-          <tbody>
-            
-              <tr>
-                <td>List</td>
-                <td><a href="#metalstack.admin.v2.IPServiceListRequest">IPServiceListRequest</a></td>
-                <td><a href="#metalstack.admin.v2.IPServiceListResponse">IPServiceListResponse</a></td>
-                <td><p>List all ips</p></td>
-              </tr>
-            
-          </tbody>
-        </table>
+          
 
         
-    
-      
-      <div class="file-heading">
-        <h2 id="metalstack/api/v2/network.proto">metalstack/api/v2/network.proto</h2><a href="#title">Top</a>
-      </div>
-      <p></p>
-
       
-        <h3 id="metalstack.api.v2.ChildPrefixLength">ChildPrefixLength</h3>
-        <p>ChildPrefixLength</p>
+        <h3 id="metalstack.admin.v2.ImageServiceDeleteResponse">ImageServiceDeleteResponse</h3>
+        <p>message ImageServiceDeleteResponse {</p>
 
         
           <table class="field-table">
@@ -5649,17 +6007,10 @@ <h3 id="metalstack.api.v2.ChildPrefixLength">ChildPrefixLength</h3>
             <tbody>
               
                 <tr>
-                  <td>ipv4</td>
-                  <td><a href="#uint32">uint32</a></td>
-                  <td>optional</td>
-                  <td><p>IPv4 bit length of this network in this addressfamily </p></td>
-                </tr>
-              
-                <tr>
-                  <td>ipv6</td>
-                  <td><a href="#uint32">uint32</a></td>
-                  <td>optional</td>
-                  <td><p>IPv6 bit length of this network in this addressfamily </p></td>
+                  <td>image</td>
+                  <td><a href="#metalstack.api.v2.Image">metalstack.api.v2.Image</a></td>
+                  <td></td>
+                  <td><p>ImageLayout the imagelayout </p></td>
                 </tr>
               
             </tbody>
@@ -5669,8 +6020,8 @@ <h3 id="metalstack.api.v2.ChildPrefixLength">ChildPrefixLength</h3>
 
         
       
-        <h3 id="metalstack.api.v2.Network">Network</h3>
-        <p>Network</p>
+        <h3 id="metalstack.admin.v2.ImageServiceUpdateRequest">ImageServiceUpdateRequest</h3>
+        <p>ImageServiceUpdateRequest</p>
 
         
           <table class="field-table">
@@ -5683,120 +6034,80 @@ <h3 id="metalstack.api.v2.Network">Network</h3>
                   <td>id</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Id of this network </p></td>
+                  <td><p>Id of this image </p></td>
                 </tr>
               
                 <tr>
-                  <td>meta</td>
-                  <td><a href="#metalstack.api.v2.Meta">Meta</a></td>
+                  <td>update_meta</td>
+                  <td><a href="#metalstack.api.v2.UpdateMeta">metalstack.api.v2.UpdateMeta</a></td>
                   <td></td>
-                  <td><p>Meta for this network </p></td>
+                  <td><p>UpdateMeta contains the timestamp and strategy to be used in this update request </p></td>
                 </tr>
               
                 <tr>
-                  <td>name</td>
+                  <td>url</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Name of this network </p></td>
+                  <td><p>URL where this image is located </p></td>
                 </tr>
               
                 <tr>
-                  <td>description</td>
+                  <td>name</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Description of this network </p></td>
+                  <td><p>Name of this imageLayout </p></td>
                 </tr>
               
                 <tr>
-                  <td>partition</td>
+                  <td>description</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Partition where this network will be created </p></td>
+                  <td><p>Description of this imageLayout </p></td>
                 </tr>
               
                 <tr>
-                  <td>project</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Project where this network belongs to </p></td>
+                  <td>features</td>
+                  <td><a href="#metalstack.api.v2.ImageFeature">metalstack.api.v2.ImageFeature</a></td>
+                  <td>repeated</td>
+                  <td><p>Features of this image </p></td>
                 </tr>
               
                 <tr>
-                  <td>namespace</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Namespace if specified, this network is namespaced and can therefore overlap with others
-Will be equal with project most of the time </p></td>
-                </tr>
-              
-                <tr>
-                  <td>prefixes</td>
-                  <td><a href="#string">string</a></td>
-                  <td>repeated</td>
-                  <td><p>Prefixes in this network </p></td>
-                </tr>
-              
-                <tr>
-                  <td>destination_prefixes</td>
-                  <td><a href="#string">string</a></td>
-                  <td>repeated</td>
-                  <td><p>Destination Prefixes in this network </p></td>
-                </tr>
-              
-                <tr>
-                  <td>default_child_prefix_length</td>
-                  <td><a href="#metalstack.api.v2.ChildPrefixLength">ChildPrefixLength</a></td>
+                  <td>classification</td>
+                  <td><a href="#metalstack.api.v2.ImageClassification">metalstack.api.v2.ImageClassification</a></td>
                   <td></td>
-                  <td><p>Default Child Prefix length defines the bitlength of a child network created per addressfamily, of not specified during the allocate request </p></td>
+                  <td><p>Classification of this image </p></td>
                 </tr>
               
                 <tr>
-                  <td>min_child_prefix_length</td>
-                  <td><a href="#metalstack.api.v2.ChildPrefixLength">ChildPrefixLength</a></td>
+                  <td>expires_at</td>
+                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
                   <td></td>
-                  <td><p>Min Child Prefix length asserts that during child network creation the requested bit length is greater or equal the min child prefix length </p></td>
-                </tr>
-              
-                <tr>
-                  <td>type</td>
-                  <td><a href="#metalstack.api.v2.NetworkType">NetworkType</a></td>
-                  <td>optional</td>
-                  <td><p>Type of the network </p></td>
-                </tr>
-              
-                <tr>
-                  <td>nat_type</td>
-                  <td><a href="#metalstack.api.v2.NATType">NATType</a></td>
-                  <td>optional</td>
-                  <td><p>NATType of this network </p></td>
-                </tr>
-              
-                <tr>
-                  <td>vrf</td>
-                  <td><a href="#uint32">uint32</a></td>
-                  <td>optional</td>
-                  <td><p>VRF of this network has this VNI. </p></td>
-                </tr>
-              
-                <tr>
-                  <td>parent_network</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Parent Network points to the id of the parent network if any </p></td>
+                  <td><p>ExpiresAt usage is not possible after this date </p></td>
                 </tr>
               
-                <tr>
-                  <td>additional_announcable_cidrs</td>
-                  <td><a href="#string">string</a></td>
-                  <td>repeated</td>
-                  <td><p>AdditionalAnnouncableCidrs will be added to the allow list on the switch which prefixes might be announced </p></td>
-                </tr>
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.admin.v2.ImageServiceUpdateResponse">ImageServiceUpdateResponse</h3>
+        <p>ImageServiceUpdateResponse</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
               
                 <tr>
-                  <td>consumption</td>
-                  <td><a href="#metalstack.api.v2.NetworkConsumption">NetworkConsumption</a></td>
+                  <td>image</td>
+                  <td><a href="#metalstack.api.v2.Image">metalstack.api.v2.Image</a></td>
                   <td></td>
-                  <td><p>Consumption of ips and prefixes in this networks </p></td>
+                  <td><p>Image is the image </p></td>
                 </tr>
               
             </tbody>
@@ -5806,8 +6117,8 @@ <h3 id="metalstack.api.v2.Network">Network</h3>
 
         
       
-        <h3 id="metalstack.api.v2.NetworkConsumption">NetworkConsumption</h3>
-        <p>NetworkConsumption contains ip and prefix usage by addressfamily</p>
+        <h3 id="metalstack.admin.v2.ImageServiceUsageRequest">ImageServiceUsageRequest</h3>
+        <p>ImageServiceUsageRequest</p>
 
         
           <table class="field-table">
@@ -5817,17 +6128,34 @@ <h3 id="metalstack.api.v2.NetworkConsumption">NetworkConsumption</h3>
             <tbody>
               
                 <tr>
-                  <td>ipv4</td>
-                  <td><a href="#metalstack.api.v2.NetworkUsage">NetworkUsage</a></td>
+                  <td>query</td>
+                  <td><a href="#metalstack.api.v2.ImageQuery">metalstack.api.v2.ImageQuery</a></td>
                   <td></td>
-                  <td><p>IPv4 network usage </p></td>
+                  <td><p>Query for which images the usage should be reported </p></td>
                 </tr>
               
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.admin.v2.ImageServiceUsageResponse">ImageServiceUsageResponse</h3>
+        <p>ImageServiceUsageResponse</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
                 <tr>
-                  <td>ipv6</td>
-                  <td><a href="#metalstack.api.v2.NetworkUsage">NetworkUsage</a></td>
-                  <td></td>
-                  <td><p>IPv6 network usage, this can be approximated for high numbers </p></td>
+                  <td>image_usage</td>
+                  <td><a href="#metalstack.api.v2.ImageUsage">metalstack.api.v2.ImageUsage</a></td>
+                  <td>repeated</td>
+                  <td><p>Images with usage </p></td>
                 </tr>
               
             </tbody>
@@ -5837,8 +6165,62 @@ <h3 id="metalstack.api.v2.NetworkConsumption">NetworkConsumption</h3>
 
         
       
-        <h3 id="metalstack.api.v2.NetworkQuery">NetworkQuery</h3>
-        <p>NetworkQuery defines which networks to query</p>
+
+      
+
+      
+
+      
+        <h3 id="metalstack.admin.v2.ImageService">ImageService</h3>
+        <p>ImageService serves image related functions</p>
+        <table class="enum-table">
+          <thead>
+            <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>Create</td>
+                <td><a href="#metalstack.admin.v2.ImageServiceCreateRequest">ImageServiceCreateRequest</a></td>
+                <td><a href="#metalstack.admin.v2.ImageServiceCreateResponse">ImageServiceCreateResponse</a></td>
+                <td><p>Create a image</p></td>
+              </tr>
+            
+              <tr>
+                <td>Update</td>
+                <td><a href="#metalstack.admin.v2.ImageServiceUpdateRequest">ImageServiceUpdateRequest</a></td>
+                <td><a href="#metalstack.admin.v2.ImageServiceUpdateResponse">ImageServiceUpdateResponse</a></td>
+                <td><p>Update a image</p></td>
+              </tr>
+            
+              <tr>
+                <td>Delete</td>
+                <td><a href="#metalstack.admin.v2.ImageServiceDeleteRequest">ImageServiceDeleteRequest</a></td>
+                <td><a href="#metalstack.admin.v2.ImageServiceDeleteResponse">ImageServiceDeleteResponse</a></td>
+                <td><p>Delete a image</p></td>
+              </tr>
+            
+              <tr>
+                <td>Usage</td>
+                <td><a href="#metalstack.admin.v2.ImageServiceUsageRequest">ImageServiceUsageRequest</a></td>
+                <td><a href="#metalstack.admin.v2.ImageServiceUsageResponse">ImageServiceUsageResponse</a></td>
+                <td><p>Usage of images</p></td>
+              </tr>
+            
+          </tbody>
+        </table>
+
+        
+    
+      
+      <div class="file-heading">
+        <h2 id="metalstack/api/v2/ip.proto">metalstack/api/v2/ip.proto</h2><a href="#title">Top</a>
+      </div>
+      <p></p>
+
+      
+        <h3 id="metalstack.api.v2.IP">IP</h3>
+        <p>IP is a ip address which can be used as loadbalancer addresses</p>
 
         
           <table class="field-table">
@@ -5848,101 +6230,161 @@ <h3 id="metalstack.api.v2.NetworkQuery">NetworkQuery</h3>
             <tbody>
               
                 <tr>
-                  <td>id</td>
+                  <td>uuid</td>
                   <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Id of the network to query </p></td>
+                  <td></td>
+                  <td><p>Uuid of this ip </p></td>
+                </tr>
+              
+                <tr>
+                  <td>meta</td>
+                  <td><a href="#metalstack.api.v2.Meta">Meta</a></td>
+                  <td></td>
+                  <td><p>Meta for this ip </p></td>
+                </tr>
+              
+                <tr>
+                  <td>ip</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Ip is either ipv4 or ipv6 address </p></td>
                 </tr>
               
                 <tr>
                   <td>name</td>
                   <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Name of this network </p></td>
+                  <td></td>
+                  <td><p>Name of this ip </p></td>
                 </tr>
               
                 <tr>
                   <td>description</td>
                   <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Description of this network </p></td>
+                  <td></td>
+                  <td><p>Description of this ip </p></td>
                 </tr>
               
                 <tr>
-                  <td>partition</td>
+                  <td>network</td>
                   <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Partition where this network will be created </p></td>
+                  <td></td>
+                  <td><p>Network is the network this ip belongs to </p></td>
                 </tr>
               
                 <tr>
                   <td>project</td>
                   <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Project where this network belongs to </p></td>
+                  <td></td>
+                  <td><p>Project where this ip address belongs to </p></td>
+                </tr>
+              
+                <tr>
+                  <td>type</td>
+                  <td><a href="#metalstack.api.v2.IPType">IPType</a></td>
+                  <td></td>
+                  <td><p>Type of this ip </p></td>
                 </tr>
               
                 <tr>
                   <td>namespace</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Namespace where this network belongs to </p></td>
+                  <td><p>Namespace if specified this ip is from a namespaced network and can therefore overlap with others
+Will be equal with project most of the time </p></td>
                 </tr>
               
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.api.v2.IPQuery">IPQuery</h3>
+        <p>IPQuery can be used to query a IP or a list of IP</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
                 <tr>
-                  <td>prefixes</td>
+                  <td>ip</td>
                   <td><a href="#string">string</a></td>
-                  <td>repeated</td>
-                  <td><p>Prefixes in this network </p></td>
+                  <td>optional</td>
+                  <td><p>Ip the ip to list </p></td>
                 </tr>
               
                 <tr>
-                  <td>destination_prefixes</td>
+                  <td>network</td>
                   <td><a href="#string">string</a></td>
-                  <td>repeated</td>
-                  <td><p>Destination Prefixes in this network </p></td>
+                  <td>optional</td>
+                  <td><p>Network from where the ips to list </p></td>
                 </tr>
               
                 <tr>
-                  <td>vrf</td>
-                  <td><a href="#uint32">uint32</a></td>
+                  <td>project</td>
+                  <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>VRF of this network has this VNI. </p></td>
+                  <td><p>Project of the ips to list </p></td>
                 </tr>
               
                 <tr>
-                  <td>parent_network</td>
+                  <td>name</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Parent Network points to the id of the parent network if any </p></td>
+                  <td><p>Name of this ip </p></td>
                 </tr>
               
                 <tr>
-                  <td>address_family</td>
-                  <td><a href="#metalstack.api.v2.NetworkAddressFamily">NetworkAddressFamily</a></td>
+                  <td>uuid</td>
+                  <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Addressfamily to query </p></td>
+                  <td><p>Uuid for which this ips should get filtered </p></td>
                 </tr>
               
                 <tr>
-                  <td>type</td>
-                  <td><a href="#metalstack.api.v2.NetworkType">NetworkType</a></td>
+                  <td>machine</td>
+                  <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Type of the network to query for </p></td>
+                  <td><p>Machine for which this ips should get filtered </p></td>
                 </tr>
               
                 <tr>
-                  <td>nat_type</td>
-                  <td><a href="#metalstack.api.v2.NATType">NATType</a></td>
+                  <td>parent_prefix_cidr</td>
+                  <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>NATType configured </p></td>
+                  <td><p>ParentPrefixCidr for which this ips should get filtered </p></td>
                 </tr>
               
                 <tr>
                   <td>labels</td>
                   <td><a href="#metalstack.api.v2.Labels">Labels</a></td>
                   <td>optional</td>
-                  <td><p>Labels on this network </p></td>
+                  <td><p>Labels for which this ips should get filtered </p></td>
+                </tr>
+              
+                <tr>
+                  <td>type</td>
+                  <td><a href="#metalstack.api.v2.IPType">IPType</a></td>
+                  <td>optional</td>
+                  <td><p>Static if set to true, this will be a Static ip </p></td>
+                </tr>
+              
+                <tr>
+                  <td>address_family</td>
+                  <td><a href="#metalstack.api.v2.IPAddressFamily">IPAddressFamily</a></td>
+                  <td>optional</td>
+                  <td><p>Addressfamily of the IPs to list, defaults to all addressfamilies </p></td>
+                </tr>
+              
+                <tr>
+                  <td>namespace</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Namespace can be specified to get the ip of a namespace. </p></td>
                 </tr>
               
             </tbody>
@@ -5952,8 +6394,8 @@ <h3 id="metalstack.api.v2.NetworkQuery">NetworkQuery</h3>
 
         
       
-        <h3 id="metalstack.api.v2.NetworkServiceCreateRequest">NetworkServiceCreateRequest</h3>
-        <p>NetworkServiceCreateRequest</p>
+        <h3 id="metalstack.api.v2.IPServiceCreateRequest">IPServiceCreateRequest</h3>
+        <p>IPServiceCreateRequest is the request payload for a ip create request</p>
 
         
           <table class="field-table">
@@ -5962,60 +6404,67 @@ <h3 id="metalstack.api.v2.NetworkServiceCreateRequest">NetworkServiceCreateReque
             </thead>
             <tbody>
               
+                <tr>
+                  <td>network</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Network from which the IP should be created </p></td>
+                </tr>
+              
                 <tr>
                   <td>project</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Project where this network belongs to </p></td>
+                  <td><p>Project of the ip </p></td>
                 </tr>
               
                 <tr>
                   <td>name</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Name of this network </p></td>
+                  <td><p>Name of the ip </p></td>
                 </tr>
               
                 <tr>
                   <td>description</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Description of this network </p></td>
+                  <td><p>Description of the ip </p></td>
                 </tr>
               
                 <tr>
-                  <td>partition</td>
+                  <td>ip</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Partition where this network will be created </p></td>
+                  <td><p>IP if given try to create this ip if still available </p></td>
                 </tr>
               
                 <tr>
-                  <td>labels</td>
-                  <td><a href="#metalstack.api.v2.Labels">Labels</a></td>
-                  <td></td>
-                  <td><p>Labels on this network </p></td>
+                  <td>machine</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Machine for which this ip should get created </p></td>
                 </tr>
               
                 <tr>
-                  <td>parent_network</td>
-                  <td><a href="#string">string</a></td>
+                  <td>labels</td>
+                  <td><a href="#metalstack.api.v2.Labels">Labels</a></td>
                   <td>optional</td>
-                  <td><p>Parent Network points to the id of the parent network if any </p></td>
+                  <td><p>Labels to put onto the ip </p></td>
                 </tr>
               
                 <tr>
-                  <td>length</td>
-                  <td><a href="#metalstack.api.v2.ChildPrefixLength">ChildPrefixLength</a></td>
+                  <td>type</td>
+                  <td><a href="#metalstack.api.v2.IPType">IPType</a></td>
                   <td>optional</td>
-                  <td><p>Length per addressfamily </p></td>
+                  <td><p>Type of the IP, ether ephemeral (default), or static </p></td>
                 </tr>
               
                 <tr>
                   <td>address_family</td>
-                  <td><a href="#metalstack.api.v2.NetworkAddressFamily">NetworkAddressFamily</a></td>
+                  <td><a href="#metalstack.api.v2.IPAddressFamily">IPAddressFamily</a></td>
                   <td>optional</td>
-                  <td><p>AddressFamily to create, defaults to the same as the parent </p></td>
+                  <td><p>Addressfamily of the IP to create, defaults to ipv4 </p></td>
                 </tr>
               
             </tbody>
@@ -6025,8 +6474,8 @@ <h3 id="metalstack.api.v2.NetworkServiceCreateRequest">NetworkServiceCreateReque
 
         
       
-        <h3 id="metalstack.api.v2.NetworkServiceCreateResponse">NetworkServiceCreateResponse</h3>
-        <p>NetworkServiceCreateResponse</p>
+        <h3 id="metalstack.api.v2.IPServiceCreateResponse">IPServiceCreateResponse</h3>
+        <p>IPServiceCreateResponse is the response payload for a ip create request</p>
 
         
           <table class="field-table">
@@ -6036,10 +6485,10 @@ <h3 id="metalstack.api.v2.NetworkServiceCreateResponse">NetworkServiceCreateResp
             <tbody>
               
                 <tr>
-                  <td>network</td>
-                  <td><a href="#metalstack.api.v2.Network">Network</a></td>
+                  <td>ip</td>
+                  <td><a href="#metalstack.api.v2.IP">IP</a></td>
                   <td></td>
-                  <td><p>Network is the created network </p></td>
+                  <td><p>Ip the ip </p></td>
                 </tr>
               
             </tbody>
@@ -6049,8 +6498,8 @@ <h3 id="metalstack.api.v2.NetworkServiceCreateResponse">NetworkServiceCreateResp
 
         
       
-        <h3 id="metalstack.api.v2.NetworkServiceDeleteRequest">NetworkServiceDeleteRequest</h3>
-        <p>NetworkServiceDeleteRequest</p>
+        <h3 id="metalstack.api.v2.IPServiceDeleteRequest">IPServiceDeleteRequest</h3>
+        <p>IPServiceDeleteRequest is the request payload for a ip delete request</p>
 
         
           <table class="field-table">
@@ -6060,17 +6509,17 @@ <h3 id="metalstack.api.v2.NetworkServiceDeleteRequest">NetworkServiceDeleteReque
             <tbody>
               
                 <tr>
-                  <td>id</td>
+                  <td>ip</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>ID of the network to get </p></td>
+                  <td><p>IP of the ip to delete </p></td>
                 </tr>
               
                 <tr>
                   <td>project</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Project of the network </p></td>
+                  <td><p>Project of the ip </p></td>
                 </tr>
               
             </tbody>
@@ -6080,8 +6529,8 @@ <h3 id="metalstack.api.v2.NetworkServiceDeleteRequest">NetworkServiceDeleteReque
 
         
       
-        <h3 id="metalstack.api.v2.NetworkServiceDeleteResponse">NetworkServiceDeleteResponse</h3>
-        <p>NetworkServiceDeleteResponse</p>
+        <h3 id="metalstack.api.v2.IPServiceDeleteResponse">IPServiceDeleteResponse</h3>
+        <p>IPServiceDeleteResponse is the response payload for a ip delete request</p>
 
         
           <table class="field-table">
@@ -6091,10 +6540,10 @@ <h3 id="metalstack.api.v2.NetworkServiceDeleteResponse">NetworkServiceDeleteResp
             <tbody>
               
                 <tr>
-                  <td>network</td>
-                  <td><a href="#metalstack.api.v2.Network">Network</a></td>
+                  <td>ip</td>
+                  <td><a href="#metalstack.api.v2.IP">IP</a></td>
                   <td></td>
-                  <td><p>Network is the deleted network </p></td>
+                  <td><p>Ip the ip </p></td>
                 </tr>
               
             </tbody>
@@ -6104,8 +6553,8 @@ <h3 id="metalstack.api.v2.NetworkServiceDeleteResponse">NetworkServiceDeleteResp
 
         
       
-        <h3 id="metalstack.api.v2.NetworkServiceGetRequest">NetworkServiceGetRequest</h3>
-        <p>NetworkServiceGetRequest</p>
+        <h3 id="metalstack.api.v2.IPServiceGetRequest">IPServiceGetRequest</h3>
+        <p>IPServiceGetRequest is the request payload for a ip get request</p>
 
         
           <table class="field-table">
@@ -6115,72 +6564,24 @@ <h3 id="metalstack.api.v2.NetworkServiceGetRequest">NetworkServiceGetRequest</h3
             <tbody>
               
                 <tr>
-                  <td>id</td>
+                  <td>ip</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>ID of the network to get </p></td>
+                  <td><p>IP of the ip to get </p></td>
                 </tr>
               
                 <tr>
                   <td>project</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Project of the network </p></td>
-                </tr>
-              
-            </tbody>
-          </table>
-
-          
-
-        
-      
-        <h3 id="metalstack.api.v2.NetworkServiceGetResponse">NetworkServiceGetResponse</h3>
-        <p>NetworkServiceGetResponse</p>
-
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
-              
-                <tr>
-                  <td>network</td>
-                  <td><a href="#metalstack.api.v2.Network">Network</a></td>
-                  <td></td>
-                  <td><p>Network which was requested to get </p></td>
+                  <td><p>Project of the ip </p></td>
                 </tr>
               
-            </tbody>
-          </table>
-
-          
-
-        
-      
-        <h3 id="metalstack.api.v2.NetworkServiceListBaseNetworksRequest">NetworkServiceListBaseNetworksRequest</h3>
-        <p>NetworkServiceListRequest</p>
-
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
-              
                 <tr>
-                  <td>project</td>
+                  <td>namespace</td>
                   <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Project of the base networks to list </p></td>
-                </tr>
-              
-                <tr>
-                  <td>query</td>
-                  <td><a href="#metalstack.api.v2.NetworkQuery">NetworkQuery</a></td>
-                  <td></td>
-                  <td><p>Query which specifies which networks to return </p></td>
+                  <td>optional</td>
+                  <td><p>Namespace can be specified to get the ip of a namespace. </p></td>
                 </tr>
               
             </tbody>
@@ -6190,8 +6591,8 @@ <h3 id="metalstack.api.v2.NetworkServiceListBaseNetworksRequest">NetworkServiceL
 
         
       
-        <h3 id="metalstack.api.v2.NetworkServiceListBaseNetworksResponse">NetworkServiceListBaseNetworksResponse</h3>
-        <p>NetworkServiceListResponse</p>
+        <h3 id="metalstack.api.v2.IPServiceGetResponse">IPServiceGetResponse</h3>
+        <p>IPServiceGetResponse is the response payload for a ip get request</p>
 
         
           <table class="field-table">
@@ -6201,10 +6602,10 @@ <h3 id="metalstack.api.v2.NetworkServiceListBaseNetworksResponse">NetworkService
             <tbody>
               
                 <tr>
-                  <td>networks</td>
-                  <td><a href="#metalstack.api.v2.Network">Network</a></td>
-                  <td>repeated</td>
-                  <td><p>Networks are the requested networks </p></td>
+                  <td>ip</td>
+                  <td><a href="#metalstack.api.v2.IP">IP</a></td>
+                  <td></td>
+                  <td><p>Ip the ip </p></td>
                 </tr>
               
             </tbody>
@@ -6214,8 +6615,8 @@ <h3 id="metalstack.api.v2.NetworkServiceListBaseNetworksResponse">NetworkService
 
         
       
-        <h3 id="metalstack.api.v2.NetworkServiceListRequest">NetworkServiceListRequest</h3>
-        <p>NetworkServiceListRequest</p>
+        <h3 id="metalstack.api.v2.IPServiceListRequest">IPServiceListRequest</h3>
+        <p>IPServiceListRequest is the request payload for a ip list request</p>
 
         
           <table class="field-table">
@@ -6228,14 +6629,14 @@ <h3 id="metalstack.api.v2.NetworkServiceListRequest">NetworkServiceListRequest</
                   <td>project</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Project of the networks to list </p></td>
+                  <td><p>Project of the ips to list </p></td>
                 </tr>
               
                 <tr>
                   <td>query</td>
-                  <td><a href="#metalstack.api.v2.NetworkQuery">NetworkQuery</a></td>
+                  <td><a href="#metalstack.api.v2.IPQuery">IPQuery</a></td>
                   <td></td>
-                  <td><p>Query which specifies which networks to return </p></td>
+                  <td><p>Query to list one ore more ips </p></td>
                 </tr>
               
             </tbody>
@@ -6245,8 +6646,8 @@ <h3 id="metalstack.api.v2.NetworkServiceListRequest">NetworkServiceListRequest</
 
         
       
-        <h3 id="metalstack.api.v2.NetworkServiceListResponse">NetworkServiceListResponse</h3>
-        <p>NetworkServiceListResponse</p>
+        <h3 id="metalstack.api.v2.IPServiceListResponse">IPServiceListResponse</h3>
+        <p>IPServiceListResponse is the response payload for a ip list request</p>
 
         
           <table class="field-table">
@@ -6256,10 +6657,10 @@ <h3 id="metalstack.api.v2.NetworkServiceListResponse">NetworkServiceListResponse
             <tbody>
               
                 <tr>
-                  <td>networks</td>
-                  <td><a href="#metalstack.api.v2.Network">Network</a></td>
+                  <td>ips</td>
+                  <td><a href="#metalstack.api.v2.IP">IP</a></td>
                   <td>repeated</td>
-                  <td><p>Networks are the requested networks </p></td>
+                  <td><p>Ips the ips </p></td>
                 </tr>
               
             </tbody>
@@ -6269,8 +6670,8 @@ <h3 id="metalstack.api.v2.NetworkServiceListResponse">NetworkServiceListResponse
 
         
       
-        <h3 id="metalstack.api.v2.NetworkServiceUpdateRequest">NetworkServiceUpdateRequest</h3>
-        <p>NetworkServiceUpdateRequest</p>
+        <h3 id="metalstack.api.v2.IPServiceUpdateRequest">IPServiceUpdateRequest</h3>
+        <p>IPServiceUpdateRequest is the request payload for a ip update request</p>
 
         
           <table class="field-table">
@@ -6280,10 +6681,10 @@ <h3 id="metalstack.api.v2.NetworkServiceUpdateRequest">NetworkServiceUpdateReque
             <tbody>
               
                 <tr>
-                  <td>id</td>
+                  <td>ip</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>ID of the network to get </p></td>
+                  <td><p>Ip the ip to update </p></td>
                 </tr>
               
                 <tr>
@@ -6297,28 +6698,35 @@ <h3 id="metalstack.api.v2.NetworkServiceUpdateRequest">NetworkServiceUpdateReque
                   <td>project</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Project of the network </p></td>
+                  <td><p>Project id of the ip </p></td>
                 </tr>
               
                 <tr>
                   <td>name</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Name of this network </p></td>
+                  <td><p>Name of this ip </p></td>
                 </tr>
               
                 <tr>
                   <td>description</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Description of this network </p></td>
+                  <td><p>Description of this ip </p></td>
+                </tr>
+              
+                <tr>
+                  <td>type</td>
+                  <td><a href="#metalstack.api.v2.IPType">IPType</a></td>
+                  <td>optional</td>
+                  <td><p>Type of this ip </p></td>
                 </tr>
               
                 <tr>
                   <td>labels</td>
                   <td><a href="#metalstack.api.v2.UpdateLabels">UpdateLabels</a></td>
                   <td>optional</td>
-                  <td><p>Labels on this network </p></td>
+                  <td><p>Labels on this ip </p></td>
                 </tr>
               
             </tbody>
@@ -6328,8 +6736,8 @@ <h3 id="metalstack.api.v2.NetworkServiceUpdateRequest">NetworkServiceUpdateReque
 
         
       
-        <h3 id="metalstack.api.v2.NetworkServiceUpdateResponse">NetworkServiceUpdateResponse</h3>
-        <p>NetworkServiceUpdateResponse</p>
+        <h3 id="metalstack.api.v2.IPServiceUpdateResponse">IPServiceUpdateResponse</h3>
+        <p>IPServiceUpdateResponse is the response payload for a ip update request</p>
 
         
           <table class="field-table">
@@ -6339,10 +6747,10 @@ <h3 id="metalstack.api.v2.NetworkServiceUpdateResponse">NetworkServiceUpdateResp
             <tbody>
               
                 <tr>
-                  <td>network</td>
-                  <td><a href="#metalstack.api.v2.Network">Network</a></td>
+                  <td>ip</td>
+                  <td><a href="#metalstack.api.v2.IP">IP</a></td>
                   <td></td>
-                  <td><p>Network is the updated network </p></td>
+                  <td><p>Ip the ip </p></td>
                 </tr>
               
             </tbody>
@@ -6352,84 +6760,10 @@ <h3 id="metalstack.api.v2.NetworkServiceUpdateResponse">NetworkServiceUpdateResp
 
         
       
-        <h3 id="metalstack.api.v2.NetworkUsage">NetworkUsage</h3>
-        <p>NetworkUsage reports core metrics about available and used IPs or Prefixes in a Network.</p>
 
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
-              
-                <tr>
-                  <td>available_ips</td>
-                  <td><a href="#uint64">uint64</a></td>
-                  <td></td>
-                  <td><p>the total available IPs </p></td>
-                </tr>
-              
-                <tr>
-                  <td>used_ips</td>
-                  <td><a href="#uint64">uint64</a></td>
-                  <td></td>
-                  <td><p>the total used IPs </p></td>
-                </tr>
-              
-                <tr>
-                  <td>available_prefixes</td>
-                  <td><a href="#uint64">uint64</a></td>
-                  <td></td>
-                  <td><p>the total available 2 bit Prefixes </p></td>
-                </tr>
-              
-                <tr>
-                  <td>used_prefixes</td>
-                  <td><a href="#uint64">uint64</a></td>
-                  <td></td>
-                  <td><p>the total used Prefixes </p></td>
-                </tr>
-              
-            </tbody>
-          </table>
-
-          
-
-        
-      
-
-      
-        <h3 id="metalstack.api.v2.NATType">NATType</h3>
-        <p>NATType defines how and if outgoing traffic is translated</p>
-        <table class="enum-table">
-          <thead>
-            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
-          </thead>
-          <tbody>
-            
-              <tr>
-                <td>NAT_TYPE_UNSPECIFIED</td>
-                <td>0</td>
-                <td><p>NAT_TYPE_UNSPECIFIED indicates a unspecified nat type</p></td>
-              </tr>
-            
-              <tr>
-                <td>NAT_TYPE_NONE</td>
-                <td>1</td>
-                <td><p>NAT_TYPE_NONE indicates that no nat is configured</p></td>
-              </tr>
-            
-              <tr>
-                <td>NAT_TYPE_IPV4_MASQUERADE</td>
-                <td>2</td>
-                <td><p>NAT_TYPE_IPV4_MASQUERADE masquerade ipv4 behind gateway ip when traffic enters this network</p></td>
-              </tr>
-            
-          </tbody>
-        </table>
       
-        <h3 id="metalstack.api.v2.NetworkAddressFamily">NetworkAddressFamily</h3>
-        <p>NetworkAddressFamily defines the address family of a network</p>
+        <h3 id="metalstack.api.v2.IPAddressFamily">IPAddressFamily</h3>
+        <p>IPAddressFamily defines either IPv4 or IPv6 Addressfamily</p>
         <table class="enum-table">
           <thead>
             <tr><td>Name</td><td>Number</td><td>Description</td></tr>
@@ -6437,34 +6771,28 @@ <h3 id="metalstack.api.v2.NetworkAddressFamily">NetworkAddressFamily</h3>
           <tbody>
             
               <tr>
-                <td>NETWORK_ADDRESS_FAMILY_UNSPECIFIED</td>
+                <td>IP_ADDRESS_FAMILY_UNSPECIFIED</td>
                 <td>0</td>
-                <td><p>NETWORK_ADDRESS_FAMILY_UNSPECIFIED is not specified</p></td>
+                <td><p>IP_ADDRESS_FAMILY_UNSPECIFIED is not specified</p></td>
               </tr>
             
               <tr>
-                <td>NETWORK_ADDRESS_FAMILY_V4</td>
+                <td>IP_ADDRESS_FAMILY_V4</td>
                 <td>1</td>
-                <td><p>NETWORK_ADDRESS_FAMILY_V4 defines a network with IPv4 address prefixes</p></td>
+                <td><p>IP_ADDRESS_FAMILY_V4 defines a IPv4 address</p></td>
               </tr>
             
               <tr>
-                <td>NETWORK_ADDRESS_FAMILY_V6</td>
+                <td>IP_ADDRESS_FAMILY_V6</td>
                 <td>2</td>
-                <td><p>NETWORK_ADDRESS_FAMILY_V6 defines a network with IPv6 address prefixes</p></td>
-              </tr>
-            
-              <tr>
-                <td>NETWORK_ADDRESS_FAMILY_DUAL_STACK</td>
-                <td>3</td>
-                <td><p>NETWORK_ADDRESS_FAMILY_DUAL_STACK defines a network with both IPv4 and IPv6 address prefixes</p></td>
+                <td><p>IP_ADDRESS_FAMILY_V6 defines a IPv6 address</p></td>
               </tr>
             
           </tbody>
         </table>
       
-        <h3 id="metalstack.api.v2.NetworkType">NetworkType</h3>
-        <p>NetworkType indicates the purpose of the network, it cannot be changed after creation</p>
+        <h3 id="metalstack.api.v2.IPType">IPType</h3>
+        <p>IPType specifies different ip address types</p>
         <table class="enum-table">
           <thead>
             <tr><td>Name</td><td>Number</td><td>Description</td></tr>
@@ -6472,67 +6800,21 @@ <h3 id="metalstack.api.v2.NetworkType">NetworkType</h3>
           <tbody>
             
               <tr>
-                <td>NETWORK_TYPE_UNSPECIFIED</td>
+                <td>IP_TYPE_UNSPECIFIED</td>
                 <td>0</td>
-                <td><p>NETWORK_TYPE_UNSPECIFIED indicates a unknown network type</p></td>
+                <td><p>IP_TYPE_UNSPECIFIED is not specified</p></td>
               </tr>
             
               <tr>
-                <td>NETWORK_TYPE_EXTERNAL</td>
+                <td>IP_TYPE_EPHEMERAL</td>
                 <td>1</td>
-                <td><p>NETWORK_TYPE_EXTERNAL indicates network where multiple projects can allocate ips, it offers connectivity to other external networks
-In most cases this is the internet network or a network which offers connectivity to legacy datacenter networks.
-If it is not project scoped everyone can allocate Ips in this network, otherwise only from the same project ip allocation is possible.</p></td>
+                <td><p>IP_TYPE_EPHEMERAL defines a ephemeral ip address which is freed/deleted after usage</p></td>
               </tr>
             
               <tr>
-                <td>NETWORK_TYPE_UNDERLAY</td>
+                <td>IP_TYPE_STATIC</td>
                 <td>2</td>
-                <td><p>NETWORK_TYPE_UNDERLAY indicates a underlay network
-The underlay network connects all switches and the firewalls to build a EVPN dataplane
-It is not project scoped. Is part of the dataplane and reserved for administrative purposes.</p></td>
-              </tr>
-            
-              <tr>
-                <td>NETWORK_TYPE_SUPER</td>
-                <td>3</td>
-                <td><p>NETWORK_TYPE_SUPER indicates a super network which is only used to create child networks
-If the vrf id is given, child networks will inherit this vrf.
-If the vrf id is nil in this network, child vrf is taken from the pool.
-If the partition is given, child networks inherit the partition.
-If the partition is nil, child networks also do not have a partition (i.e. requires vrf is distributed across all partitions).
-If the partition is given, only one super network in that partition can be created.
-If the partition is nil, multiple super networks can exist. Then, for child network creation the network id must be specified (base networks can be queried by label selector).
-For child creation destination prefixes will be inherited
-If this is project scoped, the child project must match, otherwise can be freely specified.</p></td>
-              </tr>
-            
-              <tr>
-                <td>NETWORK_TYPE_SUPER_NAMESPACED</td>
-                <td>4</td>
-                <td><p>NETWORK_TYPE_SUPER_NAMESPACED indicates a super network which is only used to create child networks.
-All rules from NETWORK_TYPE_SUPER apply for them as well.
-In addition, a network namespace will be created for every project. Child networks per project will have disjunct prefixes.
-Prefix allocation will start again with the same base cidr for every project / namespace.
-This will allow the creation of much more child networks from a given super network size.</p></td>
-              </tr>
-            
-              <tr>
-                <td>NETWORK_TYPE_CHILD</td>
-                <td>5</td>
-                <td><p>NETWORK_TYPE_CHILD indicates a child network of a project.
-This is the only network type that can be created by a user.
-Connectivity to external networks is not possible without going through an additional firewall in this network which creates connectivity to other networks.
-Such a network will be created either from a super, or super namespaced.</p></td>
-              </tr>
-            
-              <tr>
-                <td>NETWORK_TYPE_CHILD_SHARED</td>
-                <td>6</td>
-                <td><p>NETWORK_TYPE_CHILD_SHARED indicates a child network of a project which allows the allocation of ips from different projects.
-Connectivity to external networks is not possible, as for normal child networks.
-These networks are usually used to provide connectivity to shared services which are created in child networks, e.g. storage.
-With this approach the number of hops can be reduced to the bare minimum in order to increase availability and performance.</p></td>
+                <td><p>IP_TYPE_STATIC defines a static ip address which must be freed/deleted explicitly</p></td>
               </tr>
             
           </tbody>
@@ -6542,8 +6824,8 @@ <h3 id="metalstack.api.v2.NetworkType">NetworkType</h3>
       
 
       
-        <h3 id="metalstack.api.v2.NetworkService">NetworkService</h3>
-        <p>NetworkService serves network address related functions for end users, e.g. with project scope</p>
+        <h3 id="metalstack.api.v2.IPService">IPService</h3>
+        <p>IPService serves ip address related functions</p>
         <table class="enum-table">
           <thead>
             <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
@@ -6552,44 +6834,37 @@ <h3 id="metalstack.api.v2.NetworkService">NetworkService</h3>
             
               <tr>
                 <td>Get</td>
-                <td><a href="#metalstack.api.v2.NetworkServiceGetRequest">NetworkServiceGetRequest</a></td>
-                <td><a href="#metalstack.api.v2.NetworkServiceGetResponse">NetworkServiceGetResponse</a></td>
-                <td><p>Get a network</p></td>
+                <td><a href="#metalstack.api.v2.IPServiceGetRequest">IPServiceGetRequest</a></td>
+                <td><a href="#metalstack.api.v2.IPServiceGetResponse">IPServiceGetResponse</a></td>
+                <td><p>Get a ip</p></td>
               </tr>
             
               <tr>
                 <td>Create</td>
-                <td><a href="#metalstack.api.v2.NetworkServiceCreateRequest">NetworkServiceCreateRequest</a></td>
-                <td><a href="#metalstack.api.v2.NetworkServiceCreateResponse">NetworkServiceCreateResponse</a></td>
-                <td><p>Create a child network from a super network.</p></td>
+                <td><a href="#metalstack.api.v2.IPServiceCreateRequest">IPServiceCreateRequest</a></td>
+                <td><a href="#metalstack.api.v2.IPServiceCreateResponse">IPServiceCreateResponse</a></td>
+                <td><p>Create a ip</p></td>
               </tr>
             
               <tr>
                 <td>Update</td>
-                <td><a href="#metalstack.api.v2.NetworkServiceUpdateRequest">NetworkServiceUpdateRequest</a></td>
-                <td><a href="#metalstack.api.v2.NetworkServiceUpdateResponse">NetworkServiceUpdateResponse</a></td>
-                <td><p>Update a network</p></td>
+                <td><a href="#metalstack.api.v2.IPServiceUpdateRequest">IPServiceUpdateRequest</a></td>
+                <td><a href="#metalstack.api.v2.IPServiceUpdateResponse">IPServiceUpdateResponse</a></td>
+                <td><p>Update a ip</p></td>
               </tr>
             
               <tr>
                 <td>List</td>
-                <td><a href="#metalstack.api.v2.NetworkServiceListRequest">NetworkServiceListRequest</a></td>
-                <td><a href="#metalstack.api.v2.NetworkServiceListResponse">NetworkServiceListResponse</a></td>
-                <td><p>List all project networks</p></td>
-              </tr>
-            
-              <tr>
-                <td>ListBaseNetworks</td>
-                <td><a href="#metalstack.api.v2.NetworkServiceListBaseNetworksRequest">NetworkServiceListBaseNetworksRequest</a></td>
-                <td><a href="#metalstack.api.v2.NetworkServiceListBaseNetworksResponse">NetworkServiceListBaseNetworksResponse</a></td>
-                <td><p>ListBaseNetworks all base networks that can be used for either child network or ip allocation</p></td>
+                <td><a href="#metalstack.api.v2.IPServiceListRequest">IPServiceListRequest</a></td>
+                <td><a href="#metalstack.api.v2.IPServiceListResponse">IPServiceListResponse</a></td>
+                <td><p>List all ips</p></td>
               </tr>
             
               <tr>
                 <td>Delete</td>
-                <td><a href="#metalstack.api.v2.NetworkServiceDeleteRequest">NetworkServiceDeleteRequest</a></td>
-                <td><a href="#metalstack.api.v2.NetworkServiceDeleteResponse">NetworkServiceDeleteResponse</a></td>
-                <td><p>Delete a network</p></td>
+                <td><a href="#metalstack.api.v2.IPServiceDeleteRequest">IPServiceDeleteRequest</a></td>
+                <td><a href="#metalstack.api.v2.IPServiceDeleteResponse">IPServiceDeleteResponse</a></td>
+                <td><p>Delete a ip</p></td>
               </tr>
             
           </tbody>
@@ -6599,13 +6874,13 @@ <h3 id="metalstack.api.v2.NetworkService">NetworkService</h3>
     
       
       <div class="file-heading">
-        <h2 id="metalstack/api/v2/partition.proto">metalstack/api/v2/partition.proto</h2><a href="#title">Top</a>
+        <h2 id="metalstack/admin/v2/ip.proto">metalstack/admin/v2/ip.proto</h2><a href="#title">Top</a>
       </div>
       <p></p>
 
       
-        <h3 id="metalstack.api.v2.DNSServer">DNSServer</h3>
-        <p>DNSServer</p>
+        <h3 id="metalstack.admin.v2.IPServiceListRequest">IPServiceListRequest</h3>
+        <p>IPServiceListRequest</p>
 
         
           <table class="field-table">
@@ -6615,10 +6890,10 @@ <h3 id="metalstack.api.v2.DNSServer">DNSServer</h3>
             <tbody>
               
                 <tr>
-                  <td>ip</td>
-                  <td><a href="#string">string</a></td>
+                  <td>query</td>
+                  <td><a href="#metalstack.api.v2.IPQuery">metalstack.api.v2.IPQuery</a></td>
                   <td></td>
-                  <td><p>IP address of this dns server </p></td>
+                  <td><p>Query to search for one or more ips </p></td>
                 </tr>
               
             </tbody>
@@ -6628,8 +6903,8 @@ <h3 id="metalstack.api.v2.DNSServer">DNSServer</h3>
 
         
       
-        <h3 id="metalstack.api.v2.NTPServer">NTPServer</h3>
-        <p>NTPServer</p>
+        <h3 id="metalstack.admin.v2.IPServiceListResponse">IPServiceListResponse</h3>
+        <p>IPServiceListResponse</p>
 
         
           <table class="field-table">
@@ -6639,10 +6914,10 @@ <h3 id="metalstack.api.v2.NTPServer">NTPServer</h3>
             <tbody>
               
                 <tr>
-                  <td>address</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Address either as ip or hostname </p></td>
+                  <td>ips</td>
+                  <td><a href="#metalstack.api.v2.IP">metalstack.api.v2.IP</a></td>
+                  <td>repeated</td>
+                  <td><p>IPs are the list of ips </p></td>
                 </tr>
               
             </tbody>
@@ -6652,157 +6927,198 @@ <h3 id="metalstack.api.v2.NTPServer">NTPServer</h3>
 
         
       
-        <h3 id="metalstack.api.v2.Partition">Partition</h3>
-        <p>Partition is a failure domain with machines and switches</p>
+
+      
+
+      
+
+      
+        <h3 id="metalstack.admin.v2.IPService">IPService</h3>
+        <p>IPService serves ip address related functions</p>
+        <table class="enum-table">
+          <thead>
+            <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>List</td>
+                <td><a href="#metalstack.admin.v2.IPServiceListRequest">IPServiceListRequest</a></td>
+                <td><a href="#metalstack.admin.v2.IPServiceListResponse">IPServiceListResponse</a></td>
+                <td><p>List all ips</p></td>
+              </tr>
+            
+          </tbody>
+        </table>
 
         
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
-              
-                <tr>
-                  <td>id</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>ID of this partition </p></td>
+    
+      
+      <div class="file-heading">
+        <h2 id="metalstack/api/v2/network.proto">metalstack/api/v2/network.proto</h2><a href="#title">Top</a>
+      </div>
+      <p></p>
+
+      
+        <h3 id="metalstack.api.v2.ChildPrefixLength">ChildPrefixLength</h3>
+        <p>ChildPrefixLength</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>ipv4</td>
+                  <td><a href="#uint32">uint32</a></td>
+                  <td>optional</td>
+                  <td><p>IPv4 bit length of this network in this addressfamily </p></td>
+                </tr>
+              
+                <tr>
+                  <td>ipv6</td>
+                  <td><a href="#uint32">uint32</a></td>
+                  <td>optional</td>
+                  <td><p>IPv6 bit length of this network in this addressfamily </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.api.v2.Network">Network</h3>
+        <p>Network</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>id</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Id of this network </p></td>
                 </tr>
               
                 <tr>
                   <td>meta</td>
                   <td><a href="#metalstack.api.v2.Meta">Meta</a></td>
                   <td></td>
-                  <td><p>Meta for this ip </p></td>
+                  <td><p>Meta for this network </p></td>
+                </tr>
+              
+                <tr>
+                  <td>name</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Name of this network </p></td>
                 </tr>
               
                 <tr>
                   <td>description</td>
                   <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Description of this partition </p></td>
+                  <td>optional</td>
+                  <td><p>Description of this network </p></td>
                 </tr>
               
                 <tr>
-                  <td>boot_configuration</td>
-                  <td><a href="#metalstack.api.v2.PartitionBootConfiguration">PartitionBootConfiguration</a></td>
-                  <td></td>
-                  <td><p>PartitionBootConfiguration defines how metal-hammer boots </p></td>
+                  <td>partition</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Partition where this network will be created </p></td>
                 </tr>
               
                 <tr>
-                  <td>dns_server</td>
-                  <td><a href="#metalstack.api.v2.DNSServer">DNSServer</a></td>
-                  <td>repeated</td>
-                  <td><p>DNSServers for this partition </p></td>
+                  <td>project</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Project where this network belongs to </p></td>
                 </tr>
               
                 <tr>
-                  <td>ntp_server</td>
-                  <td><a href="#metalstack.api.v2.NTPServer">NTPServer</a></td>
-                  <td>repeated</td>
-                  <td><p>NTPServers for this partition </p></td>
+                  <td>namespace</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Namespace if specified, this network is namespaced and can therefore overlap with others
+Will be equal with project most of the time </p></td>
                 </tr>
               
                 <tr>
-                  <td>mgmt_service_addresses</td>
+                  <td>prefixes</td>
                   <td><a href="#string">string</a></td>
                   <td>repeated</td>
-                  <td><p>ManagementServiceAddresses defines where the management is reachable
-should be in the form &lt;ip|host&gt;:&lt;port&gt; </p></td>
+                  <td><p>Prefixes in this network </p></td>
                 </tr>
               
-            </tbody>
-          </table>
-
-          
-
-        
-      
-        <h3 id="metalstack.api.v2.PartitionBootConfiguration">PartitionBootConfiguration</h3>
-        <p>PartitionBootConfiguration defines how metal-hammer boots</p>
-
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
-              
                 <tr>
-                  <td>image_url</td>
+                  <td>destination_prefixes</td>
                   <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>ImageURL the url to download the initrd for the boot image </p></td>
+                  <td>repeated</td>
+                  <td><p>Destination Prefixes in this network </p></td>
                 </tr>
               
                 <tr>
-                  <td>kernel_url</td>
-                  <td><a href="#string">string</a></td>
+                  <td>default_child_prefix_length</td>
+                  <td><a href="#metalstack.api.v2.ChildPrefixLength">ChildPrefixLength</a></td>
                   <td></td>
-                  <td><p>KernelURL the url to download the kernel for the boot image </p></td>
+                  <td><p>Default Child Prefix length defines the bitlength of a child network created per addressfamily, of not specified during the allocate request </p></td>
                 </tr>
               
                 <tr>
-                  <td>commandline</td>
-                  <td><a href="#string">string</a></td>
+                  <td>min_child_prefix_length</td>
+                  <td><a href="#metalstack.api.v2.ChildPrefixLength">ChildPrefixLength</a></td>
                   <td></td>
-                  <td><p>Commandline the cmdline to the kernel for the boot image </p></td>
+                  <td><p>Min Child Prefix length asserts that during child network creation the requested bit length is greater or equal the min child prefix length </p></td>
                 </tr>
               
-            </tbody>
-          </table>
-
-          
-
-        
-      
-        <h3 id="metalstack.api.v2.PartitionQuery">PartitionQuery</h3>
-        <p>PartitionQuery is used to search partitions</p>
-
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
+                <tr>
+                  <td>type</td>
+                  <td><a href="#metalstack.api.v2.NetworkType">NetworkType</a></td>
+                  <td>optional</td>
+                  <td><p>Type of the network </p></td>
+                </tr>
               
                 <tr>
-                  <td>id</td>
-                  <td><a href="#string">string</a></td>
+                  <td>nat_type</td>
+                  <td><a href="#metalstack.api.v2.NATType">NATType</a></td>
                   <td>optional</td>
-                  <td><p>ID of the partition to get </p></td>
+                  <td><p>NATType of this network </p></td>
                 </tr>
               
                 <tr>
-                  <td>labels</td>
-                  <td><a href="#metalstack.api.v2.Labels">Labels</a></td>
+                  <td>vrf</td>
+                  <td><a href="#uint32">uint32</a></td>
                   <td>optional</td>
-                  <td><p>Labels lists only partitions containing the given labels </p></td>
+                  <td><p>VRF of this network has this VNI. </p></td>
                 </tr>
               
-            </tbody>
-          </table>
-
-          
-
-        
-      
-        <h3 id="metalstack.api.v2.PartitionServiceGetRequest">PartitionServiceGetRequest</h3>
-        <p>PartitionServiceGetRequest is the request payload for a partition get request</p>
-
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
+                <tr>
+                  <td>parent_network</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Parent Network points to the id of the parent network if any </p></td>
+                </tr>
               
                 <tr>
-                  <td>id</td>
+                  <td>additional_announcable_cidrs</td>
                   <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>AdditionalAnnouncableCidrs will be added to the allow list on the switch which prefixes might be announced </p></td>
+                </tr>
+              
+                <tr>
+                  <td>consumption</td>
+                  <td><a href="#metalstack.api.v2.NetworkConsumption">NetworkConsumption</a></td>
                   <td></td>
-                  <td><p>ID of the partition to get </p></td>
+                  <td><p>Consumption of ips and prefixes in this networks </p></td>
                 </tr>
               
             </tbody>
@@ -6812,8 +7128,8 @@ <h3 id="metalstack.api.v2.PartitionServiceGetRequest">PartitionServiceGetRequest
 
         
       
-        <h3 id="metalstack.api.v2.PartitionServiceGetResponse">PartitionServiceGetResponse</h3>
-        <p>PartitionServiceGetResponse is the response payload for a partition get request</p>
+        <h3 id="metalstack.api.v2.NetworkConsumption">NetworkConsumption</h3>
+        <p>NetworkConsumption contains ip and prefix usage by addressfamily</p>
 
         
           <table class="field-table">
@@ -6823,34 +7139,17 @@ <h3 id="metalstack.api.v2.PartitionServiceGetResponse">PartitionServiceGetRespon
             <tbody>
               
                 <tr>
-                  <td>partition</td>
-                  <td><a href="#metalstack.api.v2.Partition">Partition</a></td>
+                  <td>ipv4</td>
+                  <td><a href="#metalstack.api.v2.NetworkUsage">NetworkUsage</a></td>
                   <td></td>
-                  <td><p>Ip the partition </p></td>
+                  <td><p>IPv4 network usage </p></td>
                 </tr>
               
-            </tbody>
-          </table>
-
-          
-
-        
-      
-        <h3 id="metalstack.api.v2.PartitionServiceListRequest">PartitionServiceListRequest</h3>
-        <p>PartitionServiceListRequest is the request payload for a partition list request</p>
-
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
-              
                 <tr>
-                  <td>query</td>
-                  <td><a href="#metalstack.api.v2.PartitionQuery">PartitionQuery</a></td>
+                  <td>ipv6</td>
+                  <td><a href="#metalstack.api.v2.NetworkUsage">NetworkUsage</a></td>
                   <td></td>
-                  <td><p>Query for partitions </p></td>
+                  <td><p>IPv6 network usage, this can be approximated for high numbers </p></td>
                 </tr>
               
             </tbody>
@@ -6860,8 +7159,8 @@ <h3 id="metalstack.api.v2.PartitionServiceListRequest">PartitionServiceListReque
 
         
       
-        <h3 id="metalstack.api.v2.PartitionServiceListResponse">PartitionServiceListResponse</h3>
-        <p>PartitionServiceListResponse is the response payload for a partition list request</p>
+        <h3 id="metalstack.api.v2.NetworkQuery">NetworkQuery</h3>
+        <p>NetworkQuery defines which networks to query</p>
 
         
           <table class="field-table">
@@ -6871,147 +7170,101 @@ <h3 id="metalstack.api.v2.PartitionServiceListResponse">PartitionServiceListResp
             <tbody>
               
                 <tr>
-                  <td>partitions</td>
-                  <td><a href="#metalstack.api.v2.Partition">Partition</a></td>
-                  <td>repeated</td>
-                  <td><p>Ips the partitions </p></td>
+                  <td>id</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Id of the network to query </p></td>
                 </tr>
               
-            </tbody>
-          </table>
-
-          
-
-        
-      
-
-      
-
-      
-
-      
-        <h3 id="metalstack.api.v2.PartitionService">PartitionService</h3>
-        <p>PartitionService serves partition address related functions</p>
-        <table class="enum-table">
-          <thead>
-            <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
-          </thead>
-          <tbody>
-            
-              <tr>
-                <td>Get</td>
-                <td><a href="#metalstack.api.v2.PartitionServiceGetRequest">PartitionServiceGetRequest</a></td>
-                <td><a href="#metalstack.api.v2.PartitionServiceGetResponse">PartitionServiceGetResponse</a></td>
-                <td><p>Get a partition</p></td>
-              </tr>
-            
-              <tr>
-                <td>List</td>
-                <td><a href="#metalstack.api.v2.PartitionServiceListRequest">PartitionServiceListRequest</a></td>
-                <td><a href="#metalstack.api.v2.PartitionServiceListResponse">PartitionServiceListResponse</a></td>
-                <td><p>List all partitions</p></td>
-              </tr>
-            
-          </tbody>
-        </table>
-
-        
-    
-      
-      <div class="file-heading">
-        <h2 id="metalstack/api/v2/size.proto">metalstack/api/v2/size.proto</h2><a href="#title">Top</a>
-      </div>
-      <p></p>
-
-      
-        <h3 id="metalstack.api.v2.Size">Size</h3>
-        <p>Size</p>
-
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
+                <tr>
+                  <td>name</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Name of this network </p></td>
+                </tr>
               
                 <tr>
-                  <td>id</td>
+                  <td>description</td>
                   <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Id of this size </p></td>
+                  <td>optional</td>
+                  <td><p>Description of this network </p></td>
                 </tr>
               
                 <tr>
-                  <td>meta</td>
-                  <td><a href="#metalstack.api.v2.Meta">Meta</a></td>
-                  <td></td>
-                  <td><p>Meta for this size </p></td>
+                  <td>partition</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Partition where this network will be created </p></td>
                 </tr>
               
                 <tr>
-                  <td>name</td>
+                  <td>project</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Name of this size </p></td>
+                  <td><p>Project where this network belongs to </p></td>
                 </tr>
               
                 <tr>
-                  <td>description</td>
+                  <td>namespace</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Description of this size </p></td>
+                  <td><p>Namespace where this network belongs to </p></td>
                 </tr>
               
                 <tr>
-                  <td>constraints</td>
-                  <td><a href="#metalstack.api.v2.SizeConstraint">SizeConstraint</a></td>
+                  <td>prefixes</td>
+                  <td><a href="#string">string</a></td>
                   <td>repeated</td>
-                  <td><p>Constraints which must match that a specific machine is considered of this size </p></td>
+                  <td><p>Prefixes in this network </p></td>
                 </tr>
               
-            </tbody>
-          </table>
-
-          
-
-        
-      
-        <h3 id="metalstack.api.v2.SizeConstraint">SizeConstraint</h3>
-        <p>SizeConstraint defines the boundaries for certain type of machine property which must match to identify this machine as this size.</p>
-
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
+                <tr>
+                  <td>destination_prefixes</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>Destination Prefixes in this network </p></td>
+                </tr>
               
                 <tr>
-                  <td>type</td>
-                  <td><a href="#metalstack.api.v2.SizeConstraintType">SizeConstraintType</a></td>
-                  <td></td>
-                  <td><p>Type a machine matches to a size in order to make them easier to categorize </p></td>
+                  <td>vrf</td>
+                  <td><a href="#uint32">uint32</a></td>
+                  <td>optional</td>
+                  <td><p>VRF of this network has this VNI. </p></td>
                 </tr>
               
                 <tr>
-                  <td>min</td>
-                  <td><a href="#uint64">uint64</a></td>
-                  <td></td>
-                  <td><p>Min the minimum value of the constraint </p></td>
+                  <td>parent_network</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Parent Network points to the id of the parent network if any </p></td>
                 </tr>
               
                 <tr>
-                  <td>max</td>
-                  <td><a href="#uint64">uint64</a></td>
-                  <td></td>
-                  <td><p>Max the maximum value of the constraint </p></td>
+                  <td>address_family</td>
+                  <td><a href="#metalstack.api.v2.NetworkAddressFamily">NetworkAddressFamily</a></td>
+                  <td>optional</td>
+                  <td><p>Addressfamily to query </p></td>
                 </tr>
               
                 <tr>
-                  <td>identifier</td>
-                  <td><a href="#string">string</a></td>
+                  <td>type</td>
+                  <td><a href="#metalstack.api.v2.NetworkType">NetworkType</a></td>
                   <td>optional</td>
-                  <td><p>Identifier glob pattern which matches to the given type, for example gpu pci id </p></td>
+                  <td><p>Type of the network to query for </p></td>
+                </tr>
+              
+                <tr>
+                  <td>nat_type</td>
+                  <td><a href="#metalstack.api.v2.NATType">NATType</a></td>
+                  <td>optional</td>
+                  <td><p>NATType configured </p></td>
+                </tr>
+              
+                <tr>
+                  <td>labels</td>
+                  <td><a href="#metalstack.api.v2.Labels">Labels</a></td>
+                  <td>optional</td>
+                  <td><p>Labels on this network </p></td>
                 </tr>
               
             </tbody>
@@ -7021,8 +7274,8 @@ <h3 id="metalstack.api.v2.SizeConstraint">SizeConstraint</h3>
 
         
       
-        <h3 id="metalstack.api.v2.SizeQuery">SizeQuery</h3>
-        <p>SizeQuery is used to search sizes</p>
+        <h3 id="metalstack.api.v2.NetworkServiceCreateRequest">NetworkServiceCreateRequest</h3>
+        <p>NetworkServiceCreateRequest</p>
 
         
           <table class="field-table">
@@ -7032,31 +7285,59 @@ <h3 id="metalstack.api.v2.SizeQuery">SizeQuery</h3>
             <tbody>
               
                 <tr>
-                  <td>id</td>
+                  <td>project</td>
                   <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>ID of the size to get </p></td>
+                  <td></td>
+                  <td><p>Project where this network belongs to </p></td>
                 </tr>
               
                 <tr>
                   <td>name</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Name of the size to query </p></td>
+                  <td><p>Name of this network </p></td>
                 </tr>
               
                 <tr>
                   <td>description</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Description of the size to query </p></td>
+                  <td><p>Description of this network </p></td>
+                </tr>
+              
+                <tr>
+                  <td>partition</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Partition where this network will be created </p></td>
                 </tr>
               
                 <tr>
                   <td>labels</td>
                   <td><a href="#metalstack.api.v2.Labels">Labels</a></td>
+                  <td></td>
+                  <td><p>Labels on this network </p></td>
+                </tr>
+              
+                <tr>
+                  <td>parent_network</td>
+                  <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Labels lists only sizes containing the given labels </p></td>
+                  <td><p>Parent Network points to the id of the parent network if any </p></td>
+                </tr>
+              
+                <tr>
+                  <td>length</td>
+                  <td><a href="#metalstack.api.v2.ChildPrefixLength">ChildPrefixLength</a></td>
+                  <td>optional</td>
+                  <td><p>Length per addressfamily </p></td>
+                </tr>
+              
+                <tr>
+                  <td>address_family</td>
+                  <td><a href="#metalstack.api.v2.NetworkAddressFamily">NetworkAddressFamily</a></td>
+                  <td>optional</td>
+                  <td><p>AddressFamily to create, defaults to the same as the parent </p></td>
                 </tr>
               
             </tbody>
@@ -7066,8 +7347,8 @@ <h3 id="metalstack.api.v2.SizeQuery">SizeQuery</h3>
 
         
       
-        <h3 id="metalstack.api.v2.SizeServiceGetRequest">SizeServiceGetRequest</h3>
-        <p>SizeServiceGetRequest is the request payload for a size get request</p>
+        <h3 id="metalstack.api.v2.NetworkServiceCreateResponse">NetworkServiceCreateResponse</h3>
+        <p>NetworkServiceCreateResponse</p>
 
         
           <table class="field-table">
@@ -7077,10 +7358,10 @@ <h3 id="metalstack.api.v2.SizeServiceGetRequest">SizeServiceGetRequest</h3>
             <tbody>
               
                 <tr>
-                  <td>id</td>
-                  <td><a href="#string">string</a></td>
+                  <td>network</td>
+                  <td><a href="#metalstack.api.v2.Network">Network</a></td>
                   <td></td>
-                  <td><p>ID of the size to get </p></td>
+                  <td><p>Network is the created network </p></td>
                 </tr>
               
             </tbody>
@@ -7090,8 +7371,8 @@ <h3 id="metalstack.api.v2.SizeServiceGetRequest">SizeServiceGetRequest</h3>
 
         
       
-        <h3 id="metalstack.api.v2.SizeServiceGetResponse">SizeServiceGetResponse</h3>
-        <p>SizeServiceGetResponse is the response payload for a size get request</p>
+        <h3 id="metalstack.api.v2.NetworkServiceDeleteRequest">NetworkServiceDeleteRequest</h3>
+        <p>NetworkServiceDeleteRequest</p>
 
         
           <table class="field-table">
@@ -7101,10 +7382,17 @@ <h3 id="metalstack.api.v2.SizeServiceGetResponse">SizeServiceGetResponse</h3>
             <tbody>
               
                 <tr>
-                  <td>size</td>
-                  <td><a href="#metalstack.api.v2.Size">Size</a></td>
+                  <td>id</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Size the size </p></td>
+                  <td><p>ID of the network to get </p></td>
+                </tr>
+              
+                <tr>
+                  <td>project</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Project of the network </p></td>
                 </tr>
               
             </tbody>
@@ -7114,8 +7402,8 @@ <h3 id="metalstack.api.v2.SizeServiceGetResponse">SizeServiceGetResponse</h3>
 
         
       
-        <h3 id="metalstack.api.v2.SizeServiceListRequest">SizeServiceListRequest</h3>
-        <p>SizeServiceListRequest is the request payload for a size list request</p>
+        <h3 id="metalstack.api.v2.NetworkServiceDeleteResponse">NetworkServiceDeleteResponse</h3>
+        <p>NetworkServiceDeleteResponse</p>
 
         
           <table class="field-table">
@@ -7125,10 +7413,10 @@ <h3 id="metalstack.api.v2.SizeServiceListRequest">SizeServiceListRequest</h3>
             <tbody>
               
                 <tr>
-                  <td>query</td>
-                  <td><a href="#metalstack.api.v2.SizeQuery">SizeQuery</a></td>
+                  <td>network</td>
+                  <td><a href="#metalstack.api.v2.Network">Network</a></td>
                   <td></td>
-                  <td><p>Query for sizes </p></td>
+                  <td><p>Network is the deleted network </p></td>
                 </tr>
               
             </tbody>
@@ -7138,8 +7426,8 @@ <h3 id="metalstack.api.v2.SizeServiceListRequest">SizeServiceListRequest</h3>
 
         
       
-        <h3 id="metalstack.api.v2.SizeServiceListResponse">SizeServiceListResponse</h3>
-        <p>SizeServiceListResponse is the response payload for a size list request</p>
+        <h3 id="metalstack.api.v2.NetworkServiceGetRequest">NetworkServiceGetRequest</h3>
+        <p>NetworkServiceGetRequest</p>
 
         
           <table class="field-table">
@@ -7149,10 +7437,17 @@ <h3 id="metalstack.api.v2.SizeServiceListResponse">SizeServiceListResponse</h3>
             <tbody>
               
                 <tr>
-                  <td>sizes</td>
-                  <td><a href="#metalstack.api.v2.Size">Size</a></td>
-                  <td>repeated</td>
-                  <td><p>Sizes the sizes </p></td>
+                  <td>id</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>ID of the network to get </p></td>
+                </tr>
+              
+                <tr>
+                  <td>project</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Project of the network </p></td>
                 </tr>
               
             </tbody>
@@ -7162,89 +7457,8 @@ <h3 id="metalstack.api.v2.SizeServiceListResponse">SizeServiceListResponse</h3>
 
         
       
-
-      
-        <h3 id="metalstack.api.v2.SizeConstraintType">SizeConstraintType</h3>
-        <p>SizeConstraintType defines the property for which a constraint is defined</p>
-        <table class="enum-table">
-          <thead>
-            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
-          </thead>
-          <tbody>
-            
-              <tr>
-                <td>SIZE_CONSTRAINT_TYPE_UNSPECIFIED</td>
-                <td>0</td>
-                <td><p>SIZE_CONSTRAINT_TYPE_UNSPECIFIED type is not specified</p></td>
-              </tr>
-            
-              <tr>
-                <td>SIZE_CONSTRAINT_TYPE_CORES</td>
-                <td>1</td>
-                <td><p>SIZE_CONSTRAINT_TYPE_CORES defines the number of cores as property</p></td>
-              </tr>
-            
-              <tr>
-                <td>SIZE_CONSTRAINT_TYPE_MEMORY</td>
-                <td>2</td>
-                <td><p>SIZE_CONSTRAINT_TYPE_MEMORY defines the amount of memory as property</p></td>
-              </tr>
-            
-              <tr>
-                <td>SIZE_CONSTRAINT_TYPE_STORAGE</td>
-                <td>3</td>
-                <td><p>SIZE_CONSTRAINT_TYPE_STORAGE defines the amount of storage as property</p></td>
-              </tr>
-            
-              <tr>
-                <td>SIZE_CONSTRAINT_TYPE_GPU</td>
-                <td>4</td>
-                <td><p>SIZE_CONSTRAINT_TYPE_GPU defines the number of gpus as property</p></td>
-              </tr>
-            
-          </tbody>
-        </table>
-      
-
-      
-
-      
-        <h3 id="metalstack.api.v2.SizeService">SizeService</h3>
-        <p>SizeService serves size related functions</p>
-        <table class="enum-table">
-          <thead>
-            <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
-          </thead>
-          <tbody>
-            
-              <tr>
-                <td>Get</td>
-                <td><a href="#metalstack.api.v2.SizeServiceGetRequest">SizeServiceGetRequest</a></td>
-                <td><a href="#metalstack.api.v2.SizeServiceGetResponse">SizeServiceGetResponse</a></td>
-                <td><p>Get a size</p></td>
-              </tr>
-            
-              <tr>
-                <td>List</td>
-                <td><a href="#metalstack.api.v2.SizeServiceListRequest">SizeServiceListRequest</a></td>
-                <td><a href="#metalstack.api.v2.SizeServiceListResponse">SizeServiceListResponse</a></td>
-                <td><p>List all sizes</p></td>
-              </tr>
-            
-          </tbody>
-        </table>
-
-        
-    
-      
-      <div class="file-heading">
-        <h2 id="metalstack/api/v2/machine.proto">metalstack/api/v2/machine.proto</h2><a href="#title">Top</a>
-      </div>
-      <p></p>
-
-      
-        <h3 id="metalstack.api.v2.FirewallEgressRule">FirewallEgressRule</h3>
-        <p>FirewallEgressRule defines rules for outgoing traffic</p>
+        <h3 id="metalstack.api.v2.NetworkServiceGetResponse">NetworkServiceGetResponse</h3>
+        <p>NetworkServiceGetResponse</p>
 
         
           <table class="field-table">
@@ -7254,31 +7468,41 @@ <h3 id="metalstack.api.v2.FirewallEgressRule">FirewallEgressRule</h3>
             <tbody>
               
                 <tr>
-                  <td>protocol</td>
-                  <td><a href="#metalstack.api.v2.IPProtocol">IPProtocol</a></td>
+                  <td>network</td>
+                  <td><a href="#metalstack.api.v2.Network">Network</a></td>
                   <td></td>
-                  <td><p>Protocol the protocol for the rule, defaults to tcp </p></td>
+                  <td><p>Network which was requested to get </p></td>
                 </tr>
               
-                <tr>
-                  <td>ports</td>
-                  <td><a href="#uint32">uint32</a></td>
-                  <td>repeated</td>
-                  <td><p>Ports the ports affected by this rule </p></td>
-                </tr>
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.api.v2.NetworkServiceListBaseNetworksRequest">NetworkServiceListBaseNetworksRequest</h3>
+        <p>NetworkServiceListRequest</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
               
                 <tr>
-                  <td>to</td>
+                  <td>project</td>
                   <td><a href="#string">string</a></td>
-                  <td>repeated</td>
-                  <td><p>To the destination cidrs affected by this rule </p></td>
+                  <td></td>
+                  <td><p>Project of the base networks to list </p></td>
                 </tr>
               
                 <tr>
-                  <td>comment</td>
-                  <td><a href="#string">string</a></td>
+                  <td>query</td>
+                  <td><a href="#metalstack.api.v2.NetworkQuery">NetworkQuery</a></td>
                   <td></td>
-                  <td><p>Comment for this rule </p></td>
+                  <td><p>Query which specifies which networks to return </p></td>
                 </tr>
               
             </tbody>
@@ -7288,8 +7512,8 @@ <h3 id="metalstack.api.v2.FirewallEgressRule">FirewallEgressRule</h3>
 
         
       
-        <h3 id="metalstack.api.v2.FirewallIngressRule">FirewallIngressRule</h3>
-        <p>FirewallIngressRule defines rules for incoming traffic</p>
+        <h3 id="metalstack.api.v2.NetworkServiceListBaseNetworksResponse">NetworkServiceListBaseNetworksResponse</h3>
+        <p>NetworkServiceListResponse</p>
 
         
           <table class="field-table">
@@ -7299,38 +7523,10 @@ <h3 id="metalstack.api.v2.FirewallIngressRule">FirewallIngressRule</h3>
             <tbody>
               
                 <tr>
-                  <td>protocol</td>
-                  <td><a href="#metalstack.api.v2.IPProtocol">IPProtocol</a></td>
-                  <td></td>
-                  <td><p>Protocol the protocol for the rule, defaults to tcp </p></td>
-                </tr>
-              
-                <tr>
-                  <td>ports</td>
-                  <td><a href="#uint32">uint32</a></td>
-                  <td>repeated</td>
-                  <td><p>Ports the ports affected by this rule </p></td>
-                </tr>
-              
-                <tr>
-                  <td>to</td>
-                  <td><a href="#string">string</a></td>
-                  <td>repeated</td>
-                  <td><p>To the destination cidrs affected by this rule </p></td>
-                </tr>
-              
-                <tr>
-                  <td>from</td>
-                  <td><a href="#string">string</a></td>
+                  <td>networks</td>
+                  <td><a href="#metalstack.api.v2.Network">Network</a></td>
                   <td>repeated</td>
-                  <td><p>From the source cidrs affected by this rule </p></td>
-                </tr>
-              
-                <tr>
-                  <td>comment</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Comment for this rule </p></td>
+                  <td><p>Networks are the requested networks </p></td>
                 </tr>
               
             </tbody>
@@ -7340,8 +7536,8 @@ <h3 id="metalstack.api.v2.FirewallIngressRule">FirewallIngressRule</h3>
 
         
       
-        <h3 id="metalstack.api.v2.FirewallRules">FirewallRules</h3>
-        <p>FirewallRules can be defined during firewall allocation</p>
+        <h3 id="metalstack.api.v2.NetworkServiceListRequest">NetworkServiceListRequest</h3>
+        <p>NetworkServiceListRequest</p>
 
         
           <table class="field-table">
@@ -7351,17 +7547,17 @@ <h3 id="metalstack.api.v2.FirewallRules">FirewallRules</h3>
             <tbody>
               
                 <tr>
-                  <td>egress</td>
-                  <td><a href="#metalstack.api.v2.FirewallEgressRule">FirewallEgressRule</a></td>
-                  <td>repeated</td>
-                  <td><p>Egress list of egress rules to be deployed during firewall allocation </p></td>
+                  <td>project</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Project of the networks to list </p></td>
                 </tr>
               
                 <tr>
-                  <td>ingress</td>
-                  <td><a href="#metalstack.api.v2.FirewallIngressRule">FirewallIngressRule</a></td>
-                  <td>repeated</td>
-                  <td><p>Ingress list of ingress rules to be deployed during firewall allocation </p></td>
+                  <td>query</td>
+                  <td><a href="#metalstack.api.v2.NetworkQuery">NetworkQuery</a></td>
+                  <td></td>
+                  <td><p>Query which specifies which networks to return </p></td>
                 </tr>
               
             </tbody>
@@ -7371,8 +7567,8 @@ <h3 id="metalstack.api.v2.FirewallRules">FirewallRules</h3>
 
         
       
-        <h3 id="metalstack.api.v2.FirewallSpec">FirewallSpec</h3>
-        <p>FirewallSpec contains firewall specific firewall creation parameters</p>
+        <h3 id="metalstack.api.v2.NetworkServiceListResponse">NetworkServiceListResponse</h3>
+        <p>NetworkServiceListResponse</p>
 
         
           <table class="field-table">
@@ -7382,10 +7578,10 @@ <h3 id="metalstack.api.v2.FirewallSpec">FirewallSpec</h3>
             <tbody>
               
                 <tr>
-                  <td>firewall_rules</td>
-                  <td><a href="#metalstack.api.v2.FirewallRules">FirewallRules</a></td>
-                  <td></td>
-                  <td><p>FirewallRules to be applied if this is a firewall </p></td>
+                  <td>networks</td>
+                  <td><a href="#metalstack.api.v2.Network">Network</a></td>
+                  <td>repeated</td>
+                  <td><p>Networks are the requested networks </p></td>
                 </tr>
               
             </tbody>
@@ -7395,8 +7591,8 @@ <h3 id="metalstack.api.v2.FirewallSpec">FirewallSpec</h3>
 
         
       
-        <h3 id="metalstack.api.v2.Machine">Machine</h3>
-        <p>Machine represents a physical bare metal machine.</p>
+        <h3 id="metalstack.api.v2.NetworkServiceUpdateRequest">NetworkServiceUpdateRequest</h3>
+        <p>NetworkServiceUpdateRequest</p>
 
         
           <table class="field-table">
@@ -7406,66 +7602,45 @@ <h3 id="metalstack.api.v2.Machine">Machine</h3>
             <tbody>
               
                 <tr>
-                  <td>uuid</td>
+                  <td>id</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>UUID of this machine </p></td>
-                </tr>
-              
-                <tr>
-                  <td>meta</td>
-                  <td><a href="#metalstack.api.v2.Meta">Meta</a></td>
-                  <td></td>
-                  <td><p>Meta for this machine </p></td>
+                  <td><p>ID of the network to get </p></td>
                 </tr>
               
                 <tr>
-                  <td>partition</td>
-                  <td><a href="#metalstack.api.v2.Partition">Partition</a></td>
+                  <td>update_meta</td>
+                  <td><a href="#metalstack.api.v2.UpdateMeta">UpdateMeta</a></td>
                   <td></td>
-                  <td><p>Partition where this machine resides </p></td>
+                  <td><p>UpdateMeta contains the timestamp and strategy to be used in this update request </p></td>
                 </tr>
               
                 <tr>
-                  <td>rack</td>
+                  <td>project</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Rack where this machine is located </p></td>
-                </tr>
-              
-                <tr>
-                  <td>size</td>
-                  <td><a href="#metalstack.api.v2.Size">Size</a></td>
-                  <td></td>
-                  <td><p>Size of this machine </p></td>
-                </tr>
-              
-                <tr>
-                  <td>hardware</td>
-                  <td><a href="#metalstack.api.v2.MachineHardware">MachineHardware</a></td>
-                  <td></td>
-                  <td><p>Hardware specs of this machine </p></td>
+                  <td><p>Project of the network </p></td>
                 </tr>
               
                 <tr>
-                  <td>allocation</td>
-                  <td><a href="#metalstack.api.v2.MachineAllocation">MachineAllocation</a></td>
-                  <td></td>
-                  <td><p>Allocation details </p></td>
+                  <td>name</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Name of this network </p></td>
                 </tr>
               
                 <tr>
-                  <td>status</td>
-                  <td><a href="#metalstack.api.v2.MachineStatus">MachineStatus</a></td>
-                  <td></td>
-                  <td><p>Status contains several status details related to this machine </p></td>
+                  <td>description</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Description of this network </p></td>
                 </tr>
               
                 <tr>
-                  <td>recent_provisioning_events</td>
-                  <td><a href="#metalstack.api.v2.MachineRecentProvisioningEvents">MachineRecentProvisioningEvents</a></td>
-                  <td></td>
-                  <td><p>MachineRecentProvisioningEvents contains the recent provisioning events </p></td>
+                  <td>labels</td>
+                  <td><a href="#metalstack.api.v2.UpdateLabels">UpdateLabels</a></td>
+                  <td>optional</td>
+                  <td><p>Labels on this network </p></td>
                 </tr>
               
             </tbody>
@@ -7475,8 +7650,8 @@ <h3 id="metalstack.api.v2.Machine">Machine</h3>
 
         
       
-        <h3 id="metalstack.api.v2.MachineAllocation">MachineAllocation</h3>
-        <p>MachineAllocation contains properties if this machine is allocated</p>
+        <h3 id="metalstack.api.v2.NetworkServiceUpdateResponse">NetworkServiceUpdateResponse</h3>
+        <p>NetworkServiceUpdateResponse</p>
 
         
           <table class="field-table">
@@ -7486,123 +7661,10 @@ <h3 id="metalstack.api.v2.MachineAllocation">MachineAllocation</h3>
             <tbody>
               
                 <tr>
-                  <td>uuid</td>
-                  <td><a href="#string">string</a></td>
+                  <td>network</td>
+                  <td><a href="#metalstack.api.v2.Network">Network</a></td>
                   <td></td>
-                  <td><p>UUID of this machine allocation </p></td>
-                </tr>
-              
-                <tr>
-                  <td>meta</td>
-                  <td><a href="#metalstack.api.v2.Meta">Meta</a></td>
-                  <td></td>
-                  <td><p>Meta for this machine allocation </p></td>
-                </tr>
-              
-                <tr>
-                  <td>name</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Name of this allocation </p></td>
-                </tr>
-              
-                <tr>
-                  <td>description</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Description of this allocation </p></td>
-                </tr>
-              
-                <tr>
-                  <td>created_by</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Created By indicates who created this machine allocation </p></td>
-                </tr>
-              
-                <tr>
-                  <td>project</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Project of the allocation </p></td>
-                </tr>
-              
-                <tr>
-                  <td>image</td>
-                  <td><a href="#metalstack.api.v2.Image">Image</a></td>
-                  <td></td>
-                  <td><p>Image to be used to install on this machine </p></td>
-                </tr>
-              
-                <tr>
-                  <td>filesystem_layout</td>
-                  <td><a href="#metalstack.api.v2.FilesystemLayout">FilesystemLayout</a></td>
-                  <td></td>
-                  <td><p>FilesystemLayout to create on the disks </p></td>
-                </tr>
-              
-                <tr>
-                  <td>networks</td>
-                  <td><a href="#metalstack.api.v2.MachineNetwork">MachineNetwork</a></td>
-                  <td>repeated</td>
-                  <td><p>Networks this machine should be attached to </p></td>
-                </tr>
-              
-                <tr>
-                  <td>hostname</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Hostname of the allocated machine </p></td>
-                </tr>
-              
-                <tr>
-                  <td>ssh_public_keys</td>
-                  <td><a href="#string">string</a></td>
-                  <td>repeated</td>
-                  <td><p>SSHPublicKeys which should be installed on this machine </p></td>
-                </tr>
-              
-                <tr>
-                  <td>userdata</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Userdata contains instructions required to bootstrap the machine.
-AWS limits the max userdata size to 16k, lets allow twice as much </p></td>
-                </tr>
-              
-                <tr>
-                  <td>allocation_type</td>
-                  <td><a href="#metalstack.api.v2.MachineAllocationType">MachineAllocationType</a></td>
-                  <td></td>
-                  <td><p>AllocationType of this machine </p></td>
-                </tr>
-              
-                <tr>
-                  <td>firewall_rules</td>
-                  <td><a href="#metalstack.api.v2.FirewallRules">FirewallRules</a></td>
-                  <td></td>
-                  <td><p>FirewallRules to be applied if this is a firewall </p></td>
-                </tr>
-              
-                <tr>
-                  <td>dns_server</td>
-                  <td><a href="#metalstack.api.v2.DNSServer">DNSServer</a></td>
-                  <td>repeated</td>
-                  <td><p>DNSServers for this machine </p></td>
-                </tr>
-              
-                <tr>
-                  <td>ntp_server</td>
-                  <td><a href="#metalstack.api.v2.NTPServer">NTPServer</a></td>
-                  <td>repeated</td>
-                  <td><p>NTPServers for this machine </p></td>
-                </tr>
-              
-                <tr>
-                  <td>vpn</td>
-                  <td><a href="#metalstack.api.v2.MachineVPN">MachineVPN</a></td>
-                  <td></td>
-                  <td><p>VPN connection configuration </p></td>
+                  <td><p>Network is the updated network </p></td>
                 </tr>
               
             </tbody>
@@ -7612,8 +7674,8 @@ <h3 id="metalstack.api.v2.MachineAllocation">MachineAllocation</h3>
 
         
       
-        <h3 id="metalstack.api.v2.MachineAllocationNetwork">MachineAllocationNetwork</h3>
-        <p>MachineAllocationNetwork defines which network should be attached to a machine and if ips should be autoacquired</p>
+        <h3 id="metalstack.api.v2.NetworkUsage">NetworkUsage</h3>
+        <p>NetworkUsage reports core metrics about available and used IPs or Prefixes in a Network.</p>
 
         
           <table class="field-table">
@@ -7623,98 +7685,31 @@ <h3 id="metalstack.api.v2.MachineAllocationNetwork">MachineAllocationNetwork</h3
             <tbody>
               
                 <tr>
-                  <td>network</td>
-                  <td><a href="#string">string</a></td>
+                  <td>available_ips</td>
+                  <td><a href="#uint64">uint64</a></td>
                   <td></td>
-                  <td><p>Network the id of the network that this machine will be placed in </p></td>
-                </tr>
-              
-                <tr>
-                  <td>no_auto_acquire_ip</td>
-                  <td><a href="#bool">bool</a></td>
-                  <td>optional</td>
-                  <td><p>NoAutoAcquireIp will prevent automatic ip acquirement per network if set to true.
-By default one ip address is acquired per network for the machine </p></td>
-                </tr>
-              
-            </tbody>
-          </table>
-
-          
-
-        
-      
-        <h3 id="metalstack.api.v2.MachineAllocationQuery">MachineAllocationQuery</h3>
-        <p>MachineAllocationQuery allocation specific query parameters</p>
-
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
-              
-                <tr>
-                  <td>uuid</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>UUID of the allocation of the machine to get </p></td>
-                </tr>
-              
-                <tr>
-                  <td>name</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Name of the machine to get </p></td>
-                </tr>
-              
-                <tr>
-                  <td>project</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Project of the machine to get </p></td>
-                </tr>
-              
-                <tr>
-                  <td>image</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Image of the machine to get </p></td>
-                </tr>
-              
-                <tr>
-                  <td>filesystem_layout</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>FilesystemLayout of the machine to get </p></td>
-                </tr>
-              
-                <tr>
-                  <td>hostname</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Hostname of the machine to get </p></td>
+                  <td><p>the total available IPs </p></td>
                 </tr>
               
                 <tr>
-                  <td>allocation_type</td>
-                  <td><a href="#metalstack.api.v2.MachineAllocationType">MachineAllocationType</a></td>
-                  <td>optional</td>
-                  <td><p>AllocationType of this machine </p></td>
+                  <td>used_ips</td>
+                  <td><a href="#uint64">uint64</a></td>
+                  <td></td>
+                  <td><p>the total used IPs </p></td>
                 </tr>
               
                 <tr>
-                  <td>labels</td>
-                  <td><a href="#metalstack.api.v2.Labels">Labels</a></td>
-                  <td>optional</td>
-                  <td><p>Labels for which this machine allocation should get filtered </p></td>
+                  <td>available_prefixes</td>
+                  <td><a href="#uint64">uint64</a></td>
+                  <td></td>
+                  <td><p>the total available 2 bit Prefixes </p></td>
                 </tr>
               
                 <tr>
-                  <td>vpn</td>
-                  <td><a href="#metalstack.api.v2.MachineVPN">MachineVPN</a></td>
-                  <td>optional</td>
-                  <td><p>VPN query if this machine has a vpn configuration </p></td>
+                  <td>used_prefixes</td>
+                  <td><a href="#uint64">uint64</a></td>
+                  <td></td>
+                  <td><p>the total used Prefixes </p></td>
                 </tr>
               
             </tbody>
@@ -7724,63 +7719,228 @@ <h3 id="metalstack.api.v2.MachineAllocationQuery">MachineAllocationQuery</h3>
 
         
       
-        <h3 id="metalstack.api.v2.MachineBMC">MachineBMC</h3>
-        <p>MachineBMC describe details of the ipmi or out of band device</p>
 
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
-              
-                <tr>
-                  <td>address</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Address of this ipmi device from outside in the form of &lt;ip or hostname&gt;:&lt;port&gt; </p></td>
-                </tr>
-              
-                <tr>
-                  <td>mac</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Mac address of the network interface of this ipmi device </p></td>
-                </tr>
-              
-                <tr>
-                  <td>user</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>User of this ipmi device </p></td>
-                </tr>
-              
-                <tr>
-                  <td>password</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Password of this ipmi device </p></td>
-                </tr>
-              
-                <tr>
-                  <td>interface</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Interface of this ipmi device </p></td>
-                </tr>
-              
-                <tr>
-                  <td>version</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Version of this bmc device </p></td>
-                </tr>
+      
+        <h3 id="metalstack.api.v2.NATType">NATType</h3>
+        <p>NATType defines how and if outgoing traffic is translated</p>
+        <table class="enum-table">
+          <thead>
+            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>NAT_TYPE_UNSPECIFIED</td>
+                <td>0</td>
+                <td><p>NAT_TYPE_UNSPECIFIED indicates a unspecified nat type</p></td>
+              </tr>
+            
+              <tr>
+                <td>NAT_TYPE_NONE</td>
+                <td>1</td>
+                <td><p>NAT_TYPE_NONE indicates that no nat is configured</p></td>
+              </tr>
+            
+              <tr>
+                <td>NAT_TYPE_IPV4_MASQUERADE</td>
+                <td>2</td>
+                <td><p>NAT_TYPE_IPV4_MASQUERADE masquerade ipv4 behind gateway ip when traffic enters this network</p></td>
+              </tr>
+            
+          </tbody>
+        </table>
+      
+        <h3 id="metalstack.api.v2.NetworkAddressFamily">NetworkAddressFamily</h3>
+        <p>NetworkAddressFamily defines the address family of a network</p>
+        <table class="enum-table">
+          <thead>
+            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>NETWORK_ADDRESS_FAMILY_UNSPECIFIED</td>
+                <td>0</td>
+                <td><p>NETWORK_ADDRESS_FAMILY_UNSPECIFIED is not specified</p></td>
+              </tr>
+            
+              <tr>
+                <td>NETWORK_ADDRESS_FAMILY_V4</td>
+                <td>1</td>
+                <td><p>NETWORK_ADDRESS_FAMILY_V4 defines a network with IPv4 address prefixes</p></td>
+              </tr>
+            
+              <tr>
+                <td>NETWORK_ADDRESS_FAMILY_V6</td>
+                <td>2</td>
+                <td><p>NETWORK_ADDRESS_FAMILY_V6 defines a network with IPv6 address prefixes</p></td>
+              </tr>
+            
+              <tr>
+                <td>NETWORK_ADDRESS_FAMILY_DUAL_STACK</td>
+                <td>3</td>
+                <td><p>NETWORK_ADDRESS_FAMILY_DUAL_STACK defines a network with both IPv4 and IPv6 address prefixes</p></td>
+              </tr>
+            
+          </tbody>
+        </table>
+      
+        <h3 id="metalstack.api.v2.NetworkType">NetworkType</h3>
+        <p>NetworkType indicates the purpose of the network, it cannot be changed after creation</p>
+        <table class="enum-table">
+          <thead>
+            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>NETWORK_TYPE_UNSPECIFIED</td>
+                <td>0</td>
+                <td><p>NETWORK_TYPE_UNSPECIFIED indicates a unknown network type</p></td>
+              </tr>
+            
+              <tr>
+                <td>NETWORK_TYPE_EXTERNAL</td>
+                <td>1</td>
+                <td><p>NETWORK_TYPE_EXTERNAL indicates network where multiple projects can allocate ips, it offers connectivity to other external networks
+In most cases this is the internet network or a network which offers connectivity to legacy datacenter networks.
+If it is not project scoped everyone can allocate Ips in this network, otherwise only from the same project ip allocation is possible.</p></td>
+              </tr>
+            
+              <tr>
+                <td>NETWORK_TYPE_UNDERLAY</td>
+                <td>2</td>
+                <td><p>NETWORK_TYPE_UNDERLAY indicates a underlay network
+The underlay network connects all switches and the firewalls to build a EVPN dataplane
+It is not project scoped. Is part of the dataplane and reserved for administrative purposes.</p></td>
+              </tr>
+            
+              <tr>
+                <td>NETWORK_TYPE_SUPER</td>
+                <td>3</td>
+                <td><p>NETWORK_TYPE_SUPER indicates a super network which is only used to create child networks
+If the vrf id is given, child networks will inherit this vrf.
+If the vrf id is nil in this network, child vrf is taken from the pool.
+If the partition is given, child networks inherit the partition.
+If the partition is nil, child networks also do not have a partition (i.e. requires vrf is distributed across all partitions).
+If the partition is given, only one super network in that partition can be created.
+If the partition is nil, multiple super networks can exist. Then, for child network creation the network id must be specified (base networks can be queried by label selector).
+For child creation destination prefixes will be inherited
+If this is project scoped, the child project must match, otherwise can be freely specified.</p></td>
+              </tr>
+            
+              <tr>
+                <td>NETWORK_TYPE_SUPER_NAMESPACED</td>
+                <td>4</td>
+                <td><p>NETWORK_TYPE_SUPER_NAMESPACED indicates a super network which is only used to create child networks.
+All rules from NETWORK_TYPE_SUPER apply for them as well.
+In addition, a network namespace will be created for every project. Child networks per project will have disjunct prefixes.
+Prefix allocation will start again with the same base cidr for every project / namespace.
+This will allow the creation of much more child networks from a given super network size.</p></td>
+              </tr>
+            
+              <tr>
+                <td>NETWORK_TYPE_CHILD</td>
+                <td>5</td>
+                <td><p>NETWORK_TYPE_CHILD indicates a child network of a project.
+This is the only network type that can be created by a user.
+Connectivity to external networks is not possible without going through an additional firewall in this network which creates connectivity to other networks.
+Such a network will be created either from a super, or super namespaced.</p></td>
+              </tr>
+            
+              <tr>
+                <td>NETWORK_TYPE_CHILD_SHARED</td>
+                <td>6</td>
+                <td><p>NETWORK_TYPE_CHILD_SHARED indicates a child network of a project which allows the allocation of ips from different projects.
+Connectivity to external networks is not possible, as for normal child networks.
+These networks are usually used to provide connectivity to shared services which are created in child networks, e.g. storage.
+With this approach the number of hops can be reduced to the bare minimum in order to increase availability and performance.</p></td>
+              </tr>
+            
+          </tbody>
+        </table>
+      
+
+      
+
+      
+        <h3 id="metalstack.api.v2.NetworkService">NetworkService</h3>
+        <p>NetworkService serves network address related functions for end users, e.g. with project scope</p>
+        <table class="enum-table">
+          <thead>
+            <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>Get</td>
+                <td><a href="#metalstack.api.v2.NetworkServiceGetRequest">NetworkServiceGetRequest</a></td>
+                <td><a href="#metalstack.api.v2.NetworkServiceGetResponse">NetworkServiceGetResponse</a></td>
+                <td><p>Get a network</p></td>
+              </tr>
+            
+              <tr>
+                <td>Create</td>
+                <td><a href="#metalstack.api.v2.NetworkServiceCreateRequest">NetworkServiceCreateRequest</a></td>
+                <td><a href="#metalstack.api.v2.NetworkServiceCreateResponse">NetworkServiceCreateResponse</a></td>
+                <td><p>Create a child network from a super network.</p></td>
+              </tr>
+            
+              <tr>
+                <td>Update</td>
+                <td><a href="#metalstack.api.v2.NetworkServiceUpdateRequest">NetworkServiceUpdateRequest</a></td>
+                <td><a href="#metalstack.api.v2.NetworkServiceUpdateResponse">NetworkServiceUpdateResponse</a></td>
+                <td><p>Update a network</p></td>
+              </tr>
+            
+              <tr>
+                <td>List</td>
+                <td><a href="#metalstack.api.v2.NetworkServiceListRequest">NetworkServiceListRequest</a></td>
+                <td><a href="#metalstack.api.v2.NetworkServiceListResponse">NetworkServiceListResponse</a></td>
+                <td><p>List all project networks</p></td>
+              </tr>
+            
+              <tr>
+                <td>ListBaseNetworks</td>
+                <td><a href="#metalstack.api.v2.NetworkServiceListBaseNetworksRequest">NetworkServiceListBaseNetworksRequest</a></td>
+                <td><a href="#metalstack.api.v2.NetworkServiceListBaseNetworksResponse">NetworkServiceListBaseNetworksResponse</a></td>
+                <td><p>ListBaseNetworks all base networks that can be used for either child network or ip allocation</p></td>
+              </tr>
+            
+              <tr>
+                <td>Delete</td>
+                <td><a href="#metalstack.api.v2.NetworkServiceDeleteRequest">NetworkServiceDeleteRequest</a></td>
+                <td><a href="#metalstack.api.v2.NetworkServiceDeleteResponse">NetworkServiceDeleteResponse</a></td>
+                <td><p>Delete a network</p></td>
+              </tr>
+            
+          </tbody>
+        </table>
+
+        
+    
+      
+      <div class="file-heading">
+        <h2 id="metalstack/api/v2/partition.proto">metalstack/api/v2/partition.proto</h2><a href="#title">Top</a>
+      </div>
+      <p></p>
+
+      
+        <h3 id="metalstack.api.v2.DNSServer">DNSServer</h3>
+        <p>DNSServer</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
               
                 <tr>
-                  <td>power_state</td>
+                  <td>ip</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>PowerState of this machine </p></td>
+                  <td><p>IP address of this dns server </p></td>
                 </tr>
               
             </tbody>
@@ -7790,8 +7950,8 @@ <h3 id="metalstack.api.v2.MachineBMC">MachineBMC</h3>
 
         
       
-        <h3 id="metalstack.api.v2.MachineBMCQuery">MachineBMCQuery</h3>
-        <p>MachineBMCQuery machine ipmi or bmc specific machine queries</p>
+        <h3 id="metalstack.api.v2.NTPServer">NTPServer</h3>
+        <p>NTPServer</p>
 
         
           <table class="field-table">
@@ -7803,29 +7963,8 @@ <h3 id="metalstack.api.v2.MachineBMCQuery">MachineBMCQuery</h3>
                 <tr>
                   <td>address</td>
                   <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Address of the ipmi system of this machine </p></td>
-                </tr>
-              
-                <tr>
-                  <td>mac</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Mac of the ipmi system of this machine </p></td>
-                </tr>
-              
-                <tr>
-                  <td>user</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>User of the ipmi system of this machine </p></td>
-                </tr>
-              
-                <tr>
-                  <td>interface</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Interface of the ipmi system of this machine </p></td>
+                  <td></td>
+                  <td><p>Address either as ip or hostname </p></td>
                 </tr>
               
             </tbody>
@@ -7835,8 +7974,8 @@ <h3 id="metalstack.api.v2.MachineBMCQuery">MachineBMCQuery</h3>
 
         
       
-        <h3 id="metalstack.api.v2.MachineBMCReport">MachineBMCReport</h3>
-        <p>MachineBMCReport is sent from the metal-bmc to update bmc and power related details</p>
+        <h3 id="metalstack.api.v2.Partition">Partition</h3>
+        <p>Partition is a failure domain with machines and switches</p>
 
         
           <table class="field-table">
@@ -7846,52 +7985,53 @@ <h3 id="metalstack.api.v2.MachineBMCReport">MachineBMCReport</h3>
             <tbody>
               
                 <tr>
-                  <td>bmc</td>
-                  <td><a href="#metalstack.api.v2.MachineBMC">MachineBMC</a></td>
+                  <td>id</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Bmc contains bmc details </p></td>
+                  <td><p>ID of this partition </p></td>
                 </tr>
               
                 <tr>
-                  <td>bios</td>
-                  <td><a href="#metalstack.api.v2.MachineBios">MachineBios</a></td>
+                  <td>meta</td>
+                  <td><a href="#metalstack.api.v2.Meta">Meta</a></td>
                   <td></td>
-                  <td><p>Bios contains bios details </p></td>
+                  <td><p>Meta for this ip </p></td>
                 </tr>
               
                 <tr>
-                  <td>fru</td>
-                  <td><a href="#metalstack.api.v2.MachineFRU">MachineFRU</a></td>
+                  <td>description</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Fru containers field replaceable unit details </p></td>
+                  <td><p>Description of this partition </p></td>
                 </tr>
               
                 <tr>
-                  <td>power_metric</td>
-                  <td><a href="#metalstack.api.v2.MachinePowerMetric">MachinePowerMetric</a></td>
+                  <td>boot_configuration</td>
+                  <td><a href="#metalstack.api.v2.PartitionBootConfiguration">PartitionBootConfiguration</a></td>
                   <td></td>
-                  <td><p>PowerMetric contains the power statistics of the machine </p></td>
+                  <td><p>PartitionBootConfiguration defines how metal-hammer boots </p></td>
                 </tr>
               
                 <tr>
-                  <td>power_supplies</td>
-                  <td><a href="#metalstack.api.v2.MachinePowerSupply">MachinePowerSupply</a></td>
+                  <td>dns_server</td>
+                  <td><a href="#metalstack.api.v2.DNSServer">DNSServer</a></td>
                   <td>repeated</td>
-                  <td><p>PowerSupplies contains details about all power supplies and their state </p></td>
+                  <td><p>DNSServers for this partition </p></td>
                 </tr>
               
                 <tr>
-                  <td>led_state</td>
-                  <td><a href="#metalstack.api.v2.MachineChassisIdentifyLEDState">MachineChassisIdentifyLEDState</a></td>
-                  <td></td>
-                  <td><p>LedState indicates the state of the indicator LED on this machine </p></td>
+                  <td>ntp_server</td>
+                  <td><a href="#metalstack.api.v2.NTPServer">NTPServer</a></td>
+                  <td>repeated</td>
+                  <td><p>NTPServers for this partition </p></td>
                 </tr>
               
                 <tr>
-                  <td>updated_at</td>
-                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
-                  <td></td>
-                  <td><p>UpdatedAt contains the date when this data was last updated </p></td>
+                  <td>mgmt_service_addresses</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>ManagementServiceAddresses defines where the management is reachable
+should be in the form &lt;ip|host&gt;:&lt;port&gt; </p></td>
                 </tr>
               
             </tbody>
@@ -7901,8 +8041,8 @@ <h3 id="metalstack.api.v2.MachineBMCReport">MachineBMCReport</h3>
 
         
       
-        <h3 id="metalstack.api.v2.MachineBios">MachineBios</h3>
-        <p>MachineBios contains BIOS details of this machine</p>
+        <h3 id="metalstack.api.v2.PartitionBootConfiguration">PartitionBootConfiguration</h3>
+        <p>PartitionBootConfiguration defines how metal-hammer boots</p>
 
         
           <table class="field-table">
@@ -7912,24 +8052,24 @@ <h3 id="metalstack.api.v2.MachineBios">MachineBios</h3>
             <tbody>
               
                 <tr>
-                  <td>version</td>
+                  <td>image_url</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Version the bios version </p></td>
+                  <td><p>ImageURL the url to download the initrd for the boot image </p></td>
                 </tr>
               
                 <tr>
-                  <td>vendor</td>
+                  <td>kernel_url</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Vendor the bios vendor </p></td>
+                  <td><p>KernelURL the url to download the kernel for the boot image </p></td>
                 </tr>
               
                 <tr>
-                  <td>date</td>
+                  <td>commandline</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Date the bios date as string because every vendor has different ideas howto describe the date </p></td>
+                  <td><p>Commandline the cmdline to the kernel for the boot image </p></td>
                 </tr>
               
             </tbody>
@@ -7939,8 +8079,8 @@ <h3 id="metalstack.api.v2.MachineBios">MachineBios</h3>
 
         
       
-        <h3 id="metalstack.api.v2.MachineBlockDevice">MachineBlockDevice</h3>
-        <p>MachineBlockDevice contains details of a block device of this machine</p>
+        <h3 id="metalstack.api.v2.PartitionQuery">PartitionQuery</h3>
+        <p>PartitionQuery is used to search partitions</p>
 
         
           <table class="field-table">
@@ -7950,17 +8090,17 @@ <h3 id="metalstack.api.v2.MachineBlockDevice">MachineBlockDevice</h3>
             <tbody>
               
                 <tr>
-                  <td>name</td>
+                  <td>id</td>
                   <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Name of this block device </p></td>
+                  <td>optional</td>
+                  <td><p>ID of the partition to get </p></td>
                 </tr>
               
                 <tr>
-                  <td>size</td>
-                  <td><a href="#uint64">uint64</a></td>
-                  <td></td>
-                  <td><p>Size of this block device in bytes </p></td>
+                  <td>labels</td>
+                  <td><a href="#metalstack.api.v2.Labels">Labels</a></td>
+                  <td>optional</td>
+                  <td><p>Labels lists only partitions containing the given labels </p></td>
                 </tr>
               
             </tbody>
@@ -7970,8 +8110,8 @@ <h3 id="metalstack.api.v2.MachineBlockDevice">MachineBlockDevice</h3>
 
         
       
-        <h3 id="metalstack.api.v2.MachineChassisIdentifyLEDState">MachineChassisIdentifyLEDState</h3>
-        <p>MachineChassisIdentifyLEDState describes the identifier led state</p>
+        <h3 id="metalstack.api.v2.PartitionServiceGetRequest">PartitionServiceGetRequest</h3>
+        <p>PartitionServiceGetRequest is the request payload for a partition get request</p>
 
         
           <table class="field-table">
@@ -7981,17 +8121,10 @@ <h3 id="metalstack.api.v2.MachineChassisIdentifyLEDState">MachineChassisIdentify
             <tbody>
               
                 <tr>
-                  <td>value</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Value the state of this chassis identify LED. empty means LED-OFF </p></td>
-                </tr>
-              
-                <tr>
-                  <td>description</td>
+                  <td>id</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Description a description why this chassis identify LED is in the given state </p></td>
+                  <td><p>ID of the partition to get </p></td>
                 </tr>
               
             </tbody>
@@ -8001,8 +8134,8 @@ <h3 id="metalstack.api.v2.MachineChassisIdentifyLEDState">MachineChassisIdentify
 
         
       
-        <h3 id="metalstack.api.v2.MachineCondition">MachineCondition</h3>
-        <p>MachineCondition describes the availability of this machine</p>
+        <h3 id="metalstack.api.v2.PartitionServiceGetResponse">PartitionServiceGetResponse</h3>
+        <p>PartitionServiceGetResponse is the response payload for a partition get request</p>
 
         
           <table class="field-table">
@@ -8012,24 +8145,34 @@ <h3 id="metalstack.api.v2.MachineCondition">MachineCondition</h3>
             <tbody>
               
                 <tr>
-                  <td>state</td>
-                  <td><a href="#metalstack.api.v2.MachineState">MachineState</a></td>
+                  <td>partition</td>
+                  <td><a href="#metalstack.api.v2.Partition">Partition</a></td>
                   <td></td>
-                  <td><p>State the state of this machine. empty means available for all </p></td>
+                  <td><p>Ip the partition </p></td>
                 </tr>
               
-                <tr>
-                  <td>description</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Description a description why this machine is in the given state </p></td>
-                </tr>
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.api.v2.PartitionServiceListRequest">PartitionServiceListRequest</h3>
+        <p>PartitionServiceListRequest is the request payload for a partition list request</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
               
                 <tr>
-                  <td>issuer</td>
-                  <td><a href="#string">string</a></td>
+                  <td>query</td>
+                  <td><a href="#metalstack.api.v2.PartitionQuery">PartitionQuery</a></td>
                   <td></td>
-                  <td><p>Issuer the user that changed the state </p></td>
+                  <td><p>Query for partitions </p></td>
                 </tr>
               
             </tbody>
@@ -8039,8 +8182,8 @@ <h3 id="metalstack.api.v2.MachineCondition">MachineCondition</h3>
 
         
       
-        <h3 id="metalstack.api.v2.MachineDiskQuery">MachineDiskQuery</h3>
-        <p>MachineDiskQuery disk specific machine queries</p>
+        <h3 id="metalstack.api.v2.PartitionServiceListResponse">PartitionServiceListResponse</h3>
+        <p>PartitionServiceListResponse is the response payload for a partition list request</p>
 
         
           <table class="field-table">
@@ -8050,17 +8193,10 @@ <h3 id="metalstack.api.v2.MachineDiskQuery">MachineDiskQuery</h3>
             <tbody>
               
                 <tr>
-                  <td>names</td>
-                  <td><a href="#string">string</a></td>
-                  <td>repeated</td>
-                  <td><p>Names of disks in this machine </p></td>
-                </tr>
-              
-                <tr>
-                  <td>sizes</td>
-                  <td><a href="#uint64">uint64</a></td>
+                  <td>partitions</td>
+                  <td><a href="#metalstack.api.v2.Partition">Partition</a></td>
                   <td>repeated</td>
-                  <td><p>Sizes of disks in this machine </p></td>
+                  <td><p>Ips the partitions </p></td>
                 </tr>
               
             </tbody>
@@ -8070,8 +8206,48 @@ <h3 id="metalstack.api.v2.MachineDiskQuery">MachineDiskQuery</h3>
 
         
       
-        <h3 id="metalstack.api.v2.MachineFRU">MachineFRU</h3>
-        <p>MachineFRU describes details to the machine which are required in case of a necessary replacement</p>
+
+      
+
+      
+
+      
+        <h3 id="metalstack.api.v2.PartitionService">PartitionService</h3>
+        <p>PartitionService serves partition address related functions</p>
+        <table class="enum-table">
+          <thead>
+            <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>Get</td>
+                <td><a href="#metalstack.api.v2.PartitionServiceGetRequest">PartitionServiceGetRequest</a></td>
+                <td><a href="#metalstack.api.v2.PartitionServiceGetResponse">PartitionServiceGetResponse</a></td>
+                <td><p>Get a partition</p></td>
+              </tr>
+            
+              <tr>
+                <td>List</td>
+                <td><a href="#metalstack.api.v2.PartitionServiceListRequest">PartitionServiceListRequest</a></td>
+                <td><a href="#metalstack.api.v2.PartitionServiceListResponse">PartitionServiceListResponse</a></td>
+                <td><p>List all partitions</p></td>
+              </tr>
+            
+          </tbody>
+        </table>
+
+        
+    
+      
+      <div class="file-heading">
+        <h2 id="metalstack/api/v2/size.proto">metalstack/api/v2/size.proto</h2><a href="#title">Top</a>
+      </div>
+      <p></p>
+
+      
+        <h3 id="metalstack.api.v2.Size">Size</h3>
+        <p>Size</p>
 
         
           <table class="field-table">
@@ -8081,59 +8257,38 @@ <h3 id="metalstack.api.v2.MachineFRU">MachineFRU</h3>
             <tbody>
               
                 <tr>
-                  <td>chassis_part_number</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>ChassisPartNumber is the part number of the machine chassis </p></td>
-                </tr>
-              
-                <tr>
-                  <td>chassis_part_serial</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>ChassisPartSerial is the serial number of the machine chassis </p></td>
-                </tr>
-              
-                <tr>
-                  <td>board_mfg</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>BoardMfg is the short description of the mainboard </p></td>
-                </tr>
-              
-                <tr>
-                  <td>board_mfg_serial</td>
+                  <td>id</td>
                   <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>BoardMfgSerial is the serial number of the mainboard </p></td>
+                  <td></td>
+                  <td><p>Id of this size </p></td>
                 </tr>
               
                 <tr>
-                  <td>board_part_number</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>BoardPartNumber is the part number of the mainboard </p></td>
+                  <td>meta</td>
+                  <td><a href="#metalstack.api.v2.Meta">Meta</a></td>
+                  <td></td>
+                  <td><p>Meta for this size </p></td>
                 </tr>
               
                 <tr>
-                  <td>product_manufacturer</td>
+                  <td>name</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>ProductManufacturer is the manufacturer of the machine </p></td>
+                  <td><p>Name of this size </p></td>
                 </tr>
               
                 <tr>
-                  <td>product_part_number</td>
+                  <td>description</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>ProductPartNumber is the part number of the machine </p></td>
+                  <td><p>Description of this size </p></td>
                 </tr>
               
                 <tr>
-                  <td>product_serial</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>ProductSerial is the serial number of the machine </p></td>
+                  <td>constraints</td>
+                  <td><a href="#metalstack.api.v2.SizeConstraint">SizeConstraint</a></td>
+                  <td>repeated</td>
+                  <td><p>Constraints which must match that a specific machine is considered of this size </p></td>
                 </tr>
               
             </tbody>
@@ -8143,8 +8298,8 @@ <h3 id="metalstack.api.v2.MachineFRU">MachineFRU</h3>
 
         
       
-        <h3 id="metalstack.api.v2.MachineFRUQuery">MachineFRUQuery</h3>
-        <p>MachineFRUQuery machine fru specific machine queries</p>
+        <h3 id="metalstack.api.v2.SizeConstraint">SizeConstraint</h3>
+        <p>SizeConstraint defines the boundaries for certain type of machine property which must match to identify this machine as this size.</p>
 
         
           <table class="field-table">
@@ -8154,59 +8309,76 @@ <h3 id="metalstack.api.v2.MachineFRUQuery">MachineFRUQuery</h3>
             <tbody>
               
                 <tr>
-                  <td>chassis_part_number</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>ChassisPartNumber of this machine </p></td>
+                  <td>type</td>
+                  <td><a href="#metalstack.api.v2.SizeConstraintType">SizeConstraintType</a></td>
+                  <td></td>
+                  <td><p>Type a machine matches to a size in order to make them easier to categorize </p></td>
                 </tr>
               
                 <tr>
-                  <td>chassis_part_serial</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>ChassisPartSerial of this machine </p></td>
+                  <td>min</td>
+                  <td><a href="#uint64">uint64</a></td>
+                  <td></td>
+                  <td><p>Min the minimum value of the constraint </p></td>
                 </tr>
               
                 <tr>
-                  <td>board_mfg</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>BoardMFG of this machine </p></td>
+                  <td>max</td>
+                  <td><a href="#uint64">uint64</a></td>
+                  <td></td>
+                  <td><p>Max the maximum value of the constraint </p></td>
                 </tr>
               
                 <tr>
-                  <td>board_serial</td>
+                  <td>identifier</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>BoardSerial of this machine </p></td>
+                  <td><p>Identifier glob pattern which matches to the given type, for example gpu pci id </p></td>
                 </tr>
               
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.api.v2.SizeQuery">SizeQuery</h3>
+        <p>SizeQuery is used to search sizes</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
                 <tr>
-                  <td>board_part_number</td>
+                  <td>id</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>BoardPartNumber of this machine </p></td>
+                  <td><p>ID of the size to get </p></td>
                 </tr>
               
                 <tr>
-                  <td>product_manufacturer</td>
+                  <td>name</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>ProductManufacturer of this machine </p></td>
+                  <td><p>Name of the size to query </p></td>
                 </tr>
               
                 <tr>
-                  <td>product_part_number</td>
+                  <td>description</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>ProductPartNumber of this machine </p></td>
+                  <td><p>Description of the size to query </p></td>
                 </tr>
               
                 <tr>
-                  <td>product_serial</td>
-                  <td><a href="#string">string</a></td>
+                  <td>labels</td>
+                  <td><a href="#metalstack.api.v2.Labels">Labels</a></td>
                   <td>optional</td>
-                  <td><p>ProductSerial of this machine </p></td>
+                  <td><p>Labels lists only sizes containing the given labels </p></td>
                 </tr>
               
             </tbody>
@@ -8216,8 +8388,8 @@ <h3 id="metalstack.api.v2.MachineFRUQuery">MachineFRUQuery</h3>
 
         
       
-        <h3 id="metalstack.api.v2.MachineHardware">MachineHardware</h3>
-        <p>MachineHardware contains hardware details</p>
+        <h3 id="metalstack.api.v2.SizeServiceGetRequest">SizeServiceGetRequest</h3>
+        <p>SizeServiceGetRequest is the request payload for a size get request</p>
 
         
           <table class="field-table">
@@ -8227,38 +8399,10 @@ <h3 id="metalstack.api.v2.MachineHardware">MachineHardware</h3>
             <tbody>
               
                 <tr>
-                  <td>memory</td>
-                  <td><a href="#uint64">uint64</a></td>
+                  <td>id</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Memory the total memory of the machine in bytes </p></td>
-                </tr>
-              
-                <tr>
-                  <td>disks</td>
-                  <td><a href="#metalstack.api.v2.MachineBlockDevice">MachineBlockDevice</a></td>
-                  <td>repeated</td>
-                  <td><p>Disks the list of block devices of this machine </p></td>
-                </tr>
-              
-                <tr>
-                  <td>cpus</td>
-                  <td><a href="#metalstack.api.v2.MetalCPU">MetalCPU</a></td>
-                  <td>repeated</td>
-                  <td><p>CPUs the cpu details </p></td>
-                </tr>
-              
-                <tr>
-                  <td>gpus</td>
-                  <td><a href="#metalstack.api.v2.MetalGPU">MetalGPU</a></td>
-                  <td>repeated</td>
-                  <td><p>GPUs the gpu details </p></td>
-                </tr>
-              
-                <tr>
-                  <td>nics</td>
-                  <td><a href="#metalstack.api.v2.MachineNic">MachineNic</a></td>
-                  <td>repeated</td>
-                  <td><p>Nics the list of network interfaces of this machine </p></td>
+                  <td><p>ID of the size to get </p></td>
                 </tr>
               
             </tbody>
@@ -8268,8 +8412,8 @@ <h3 id="metalstack.api.v2.MachineHardware">MachineHardware</h3>
 
         
       
-        <h3 id="metalstack.api.v2.MachineHardwareQuery">MachineHardwareQuery</h3>
-        <p>MachineHardwareQuery machine hardware specific machine queries</p>
+        <h3 id="metalstack.api.v2.SizeServiceGetResponse">SizeServiceGetResponse</h3>
+        <p>SizeServiceGetResponse is the response payload for a size get request</p>
 
         
           <table class="field-table">
@@ -8279,17 +8423,10 @@ <h3 id="metalstack.api.v2.MachineHardwareQuery">MachineHardwareQuery</h3>
             <tbody>
               
                 <tr>
-                  <td>memory</td>
-                  <td><a href="#uint64">uint64</a></td>
-                  <td>optional</td>
-                  <td><p>Memory the total memory of the machine in bytes </p></td>
-                </tr>
-              
-                <tr>
-                  <td>cpu_cores</td>
-                  <td><a href="#uint32">uint32</a></td>
-                  <td>optional</td>
-                  <td><p>CPUCores the number of cpu cores </p></td>
+                  <td>size</td>
+                  <td><a href="#metalstack.api.v2.Size">Size</a></td>
+                  <td></td>
+                  <td><p>Size the size </p></td>
                 </tr>
               
             </tbody>
@@ -8299,8 +8436,8 @@ <h3 id="metalstack.api.v2.MachineHardwareQuery">MachineHardwareQuery</h3>
 
         
       
-        <h3 id="metalstack.api.v2.MachineNetwork">MachineNetwork</h3>
-        <p>MachineNetwork contains details which network should be created on a allocated machine</p>
+        <h3 id="metalstack.api.v2.SizeServiceListRequest">SizeServiceListRequest</h3>
+        <p>SizeServiceListRequest is the request payload for a size list request</p>
 
         
           <table class="field-table">
@@ -8310,59 +8447,10 @@ <h3 id="metalstack.api.v2.MachineNetwork">MachineNetwork</h3>
             <tbody>
               
                 <tr>
-                  <td>network</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Network the networkID of the allocated machine in this vrf </p></td>
-                </tr>
-              
-                <tr>
-                  <td>prefixes</td>
-                  <td><a href="#string">string</a></td>
-                  <td>repeated</td>
-                  <td><p>Prefixes the prefixes of this network </p></td>
-                </tr>
-              
-                <tr>
-                  <td>destination_prefixes</td>
-                  <td><a href="#string">string</a></td>
-                  <td>repeated</td>
-                  <td><p>DestinationPrefixes prefixes that are reachable within this network </p></td>
-                </tr>
-              
-                <tr>
-                  <td>ips</td>
-                  <td><a href="#string">string</a></td>
-                  <td>repeated</td>
-                  <td><p>IPs the ip addresses of the allocated machine in this vrf </p></td>
-                </tr>
-              
-                <tr>
-                  <td>network_type</td>
-                  <td><a href="#metalstack.api.v2.NetworkType">NetworkType</a></td>
-                  <td></td>
-                  <td><p>NetworkType the type of network of this vrf </p></td>
-                </tr>
-              
-                <tr>
-                  <td>nat_type</td>
-                  <td><a href="#metalstack.api.v2.NATType">NATType</a></td>
-                  <td></td>
-                  <td><p>NatType what type of nat if any should be used </p></td>
-                </tr>
-              
-                <tr>
-                  <td>vrf</td>
-                  <td><a href="#uint64">uint64</a></td>
-                  <td></td>
-                  <td><p>VRF the vrf id </p></td>
-                </tr>
-              
-                <tr>
-                  <td>asn</td>
-                  <td><a href="#uint32">uint32</a></td>
+                  <td>query</td>
+                  <td><a href="#metalstack.api.v2.SizeQuery">SizeQuery</a></td>
                   <td></td>
-                  <td><p>ASN the autonomous system number for this network </p></td>
+                  <td><p>Query for sizes </p></td>
                 </tr>
               
             </tbody>
@@ -8372,8 +8460,8 @@ <h3 id="metalstack.api.v2.MachineNetwork">MachineNetwork</h3>
 
         
       
-        <h3 id="metalstack.api.v2.MachineNetworkQuery">MachineNetworkQuery</h3>
-        <p>MachineNetworkQuery network specific machine queries</p>
+        <h3 id="metalstack.api.v2.SizeServiceListResponse">SizeServiceListResponse</h3>
+        <p>SizeServiceListResponse is the response payload for a size list request</p>
 
         
           <table class="field-table">
@@ -8383,45 +8471,10 @@ <h3 id="metalstack.api.v2.MachineNetworkQuery">MachineNetworkQuery</h3>
             <tbody>
               
                 <tr>
-                  <td>networks</td>
-                  <td><a href="#string">string</a></td>
-                  <td>repeated</td>
-                  <td><p>Networks this machine is connected to </p></td>
-                </tr>
-              
-                <tr>
-                  <td>prefixes</td>
-                  <td><a href="#string">string</a></td>
-                  <td>repeated</td>
-                  <td><p>Prefixes this machine is connected to </p></td>
-                </tr>
-              
-                <tr>
-                  <td>destination_prefixes</td>
-                  <td><a href="#string">string</a></td>
-                  <td>repeated</td>
-                  <td><p>DestinationPrefixes this machine is connected to </p></td>
-                </tr>
-              
-                <tr>
-                  <td>ips</td>
-                  <td><a href="#string">string</a></td>
-                  <td>repeated</td>
-                  <td><p>IPs this machine has </p></td>
-                </tr>
-              
-                <tr>
-                  <td>vrfs</td>
-                  <td><a href="#uint64">uint64</a></td>
-                  <td>repeated</td>
-                  <td><p>VRFs this machine is connected to </p></td>
-                </tr>
-              
-                <tr>
-                  <td>asns</td>
-                  <td><a href="#uint32">uint32</a></td>
+                  <td>sizes</td>
+                  <td><a href="#metalstack.api.v2.Size">Size</a></td>
                   <td>repeated</td>
-                  <td><p>ASNs this machine is connected to </p></td>
+                  <td><p>Sizes the sizes </p></td>
                 </tr>
               
             </tbody>
@@ -8431,81 +8484,89 @@ <h3 id="metalstack.api.v2.MachineNetworkQuery">MachineNetworkQuery</h3>
 
         
       
-        <h3 id="metalstack.api.v2.MachineNic">MachineNic</h3>
-        <p>MachineNic contains details of a network interface of this machine</p>
 
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
-              
-                <tr>
-                  <td>mac</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Mac the macaddress of this interface </p></td>
-                </tr>
-              
-                <tr>
-                  <td>name</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Name of this interface </p></td>
-                </tr>
-              
-                <tr>
-                  <td>identifier</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Identifier the unique identifier of this network interface </p></td>
-                </tr>
-              
-                <tr>
-                  <td>vendor</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Vendor of this network card </p></td>
-                </tr>
-              
-                <tr>
-                  <td>model</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Model of this network card </p></td>
-                </tr>
-              
-                <tr>
-                  <td>speed</td>
-                  <td><a href="#uint64">uint64</a></td>
-                  <td></td>
-                  <td><p>Speed in bits/second of this network card </p></td>
-                </tr>
-              
-                <tr>
-                  <td>neighbors</td>
-                  <td><a href="#metalstack.api.v2.MachineNic">MachineNic</a></td>
-                  <td>repeated</td>
-                  <td><p>Neighbors the neighbors visible to this network interface </p></td>
-                </tr>
-              
-                <tr>
-                  <td>hostname</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Hostname the nic belongs to </p></td>
-                </tr>
-              
-            </tbody>
-          </table>
+      
+        <h3 id="metalstack.api.v2.SizeConstraintType">SizeConstraintType</h3>
+        <p>SizeConstraintType defines the property for which a constraint is defined</p>
+        <table class="enum-table">
+          <thead>
+            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>SIZE_CONSTRAINT_TYPE_UNSPECIFIED</td>
+                <td>0</td>
+                <td><p>SIZE_CONSTRAINT_TYPE_UNSPECIFIED type is not specified</p></td>
+              </tr>
+            
+              <tr>
+                <td>SIZE_CONSTRAINT_TYPE_CORES</td>
+                <td>1</td>
+                <td><p>SIZE_CONSTRAINT_TYPE_CORES defines the number of cores as property</p></td>
+              </tr>
+            
+              <tr>
+                <td>SIZE_CONSTRAINT_TYPE_MEMORY</td>
+                <td>2</td>
+                <td><p>SIZE_CONSTRAINT_TYPE_MEMORY defines the amount of memory as property</p></td>
+              </tr>
+            
+              <tr>
+                <td>SIZE_CONSTRAINT_TYPE_STORAGE</td>
+                <td>3</td>
+                <td><p>SIZE_CONSTRAINT_TYPE_STORAGE defines the amount of storage as property</p></td>
+              </tr>
+            
+              <tr>
+                <td>SIZE_CONSTRAINT_TYPE_GPU</td>
+                <td>4</td>
+                <td><p>SIZE_CONSTRAINT_TYPE_GPU defines the number of gpus as property</p></td>
+              </tr>
+            
+          </tbody>
+        </table>
+      
 
-          
+      
+
+      
+        <h3 id="metalstack.api.v2.SizeService">SizeService</h3>
+        <p>SizeService serves size related functions</p>
+        <table class="enum-table">
+          <thead>
+            <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>Get</td>
+                <td><a href="#metalstack.api.v2.SizeServiceGetRequest">SizeServiceGetRequest</a></td>
+                <td><a href="#metalstack.api.v2.SizeServiceGetResponse">SizeServiceGetResponse</a></td>
+                <td><p>Get a size</p></td>
+              </tr>
+            
+              <tr>
+                <td>List</td>
+                <td><a href="#metalstack.api.v2.SizeServiceListRequest">SizeServiceListRequest</a></td>
+                <td><a href="#metalstack.api.v2.SizeServiceListResponse">SizeServiceListResponse</a></td>
+                <td><p>List all sizes</p></td>
+              </tr>
+            
+          </tbody>
+        </table>
 
         
+    
       
-        <h3 id="metalstack.api.v2.MachineNicQuery">MachineNicQuery</h3>
-        <p>MachineNicQuery nic specific machine queries</p>
+      <div class="file-heading">
+        <h2 id="metalstack/api/v2/machine.proto">metalstack/api/v2/machine.proto</h2><a href="#title">Top</a>
+      </div>
+      <p></p>
+
+      
+        <h3 id="metalstack.api.v2.FirewallEgressRule">FirewallEgressRule</h3>
+        <p>FirewallEgressRule defines rules for outgoing traffic</p>
 
         
           <table class="field-table">
@@ -8515,31 +8576,31 @@ <h3 id="metalstack.api.v2.MachineNicQuery">MachineNicQuery</h3>
             <tbody>
               
                 <tr>
-                  <td>macs</td>
-                  <td><a href="#string">string</a></td>
-                  <td>repeated</td>
-                  <td><p>Macs this machine nic has </p></td>
+                  <td>protocol</td>
+                  <td><a href="#metalstack.api.v2.IPProtocol">IPProtocol</a></td>
+                  <td></td>
+                  <td><p>Protocol the protocol for the rule, defaults to tcp </p></td>
                 </tr>
               
                 <tr>
-                  <td>names</td>
-                  <td><a href="#string">string</a></td>
+                  <td>ports</td>
+                  <td><a href="#uint32">uint32</a></td>
                   <td>repeated</td>
-                  <td><p>Names this machine nic has </p></td>
+                  <td><p>Ports the ports affected by this rule </p></td>
                 </tr>
               
                 <tr>
-                  <td>neighbor_macs</td>
+                  <td>to</td>
                   <td><a href="#string">string</a></td>
                   <td>repeated</td>
-                  <td><p>NeighborMacs this machine nic has </p></td>
+                  <td><p>To the destination cidrs affected by this rule </p></td>
                 </tr>
               
                 <tr>
-                  <td>neighbor_names</td>
+                  <td>comment</td>
                   <td><a href="#string">string</a></td>
-                  <td>repeated</td>
-                  <td><p>NeighborNames this machine nic has </p></td>
+                  <td></td>
+                  <td><p>Comment for this rule </p></td>
                 </tr>
               
             </tbody>
@@ -8549,8 +8610,8 @@ <h3 id="metalstack.api.v2.MachineNicQuery">MachineNicQuery</h3>
 
         
       
-        <h3 id="metalstack.api.v2.MachinePowerMetric">MachinePowerMetric</h3>
-        <p>MachinePowerMetric contains metrics of the power consumption of a machine</p>
+        <h3 id="metalstack.api.v2.FirewallIngressRule">FirewallIngressRule</h3>
+        <p>FirewallIngressRule defines rules for incoming traffic</p>
 
         
           <table class="field-table">
@@ -8560,40 +8621,38 @@ <h3 id="metalstack.api.v2.MachinePowerMetric">MachinePowerMetric</h3>
             <tbody>
               
                 <tr>
-                  <td>average_consumed_watts</td>
-                  <td><a href="#float">float</a></td>
+                  <td>protocol</td>
+                  <td><a href="#metalstack.api.v2.IPProtocol">IPProtocol</a></td>
                   <td></td>
-                  <td><p>AverageConsumedWatts shall represent the
-average power level that occurred averaged over the last IntervalInMin
-minutes. </p></td>
+                  <td><p>Protocol the protocol for the rule, defaults to tcp </p></td>
                 </tr>
               
                 <tr>
-                  <td>interval_in_min</td>
-                  <td><a href="#float">float</a></td>
-                  <td></td>
-                  <td><p>IntervalInMin shall represent the time
-interval (or window), in minutes, in which the PowerMetrics properties
-are measured over.
-Should be an integer, but some Dell implementations return as a float. </p></td>
+                  <td>ports</td>
+                  <td><a href="#uint32">uint32</a></td>
+                  <td>repeated</td>
+                  <td><p>Ports the ports affected by this rule </p></td>
                 </tr>
               
                 <tr>
-                  <td>max_consumed_watts</td>
-                  <td><a href="#float">float</a></td>
-                  <td></td>
-                  <td><p>MaxConsumedWatts shall represent the
-maximum power level in watts that occurred within the last
-IntervalInMin minutes. </p></td>
+                  <td>to</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>To the destination cidrs affected by this rule </p></td>
                 </tr>
               
                 <tr>
-                  <td>min_consumed_watts</td>
-                  <td><a href="#float">float</a></td>
+                  <td>from</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>From the source cidrs affected by this rule </p></td>
+                </tr>
+              
+                <tr>
+                  <td>comment</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>MinConsumedWatts shall represent the
-minimum power level in watts that occurred within the last
-IntervalInMin minutes. </p></td>
+                  <td><p>Comment for this rule </p></td>
                 </tr>
               
             </tbody>
@@ -8603,8 +8662,8 @@ <h3 id="metalstack.api.v2.MachinePowerMetric">MachinePowerMetric</h3>
 
         
       
-        <h3 id="metalstack.api.v2.MachinePowerSupply">MachinePowerSupply</h3>
-        <p>MachinePowerSupply contains details of the power supply of a machine</p>
+        <h3 id="metalstack.api.v2.FirewallRules">FirewallRules</h3>
+        <p>FirewallRules can be defined during firewall allocation</p>
 
         
           <table class="field-table">
@@ -8614,17 +8673,17 @@ <h3 id="metalstack.api.v2.MachinePowerSupply">MachinePowerSupply</h3>
             <tbody>
               
                 <tr>
-                  <td>health</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Health of the powersupply </p></td>
+                  <td>egress</td>
+                  <td><a href="#metalstack.api.v2.FirewallEgressRule">FirewallEgressRule</a></td>
+                  <td>repeated</td>
+                  <td><p>Egress list of egress rules to be deployed during firewall allocation </p></td>
                 </tr>
               
                 <tr>
-                  <td>state</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>State of the powersupply </p></td>
+                  <td>ingress</td>
+                  <td><a href="#metalstack.api.v2.FirewallIngressRule">FirewallIngressRule</a></td>
+                  <td>repeated</td>
+                  <td><p>Ingress list of ingress rules to be deployed during firewall allocation </p></td>
                 </tr>
               
             </tbody>
@@ -8634,8 +8693,8 @@ <h3 id="metalstack.api.v2.MachinePowerSupply">MachinePowerSupply</h3>
 
         
       
-        <h3 id="metalstack.api.v2.MachineProvisioningEvent">MachineProvisioningEvent</h3>
-        <p>MachineProvisioningEvent is a event which has occurred during provisioning</p>
+        <h3 id="metalstack.api.v2.FirewallSpec">FirewallSpec</h3>
+        <p>FirewallSpec contains firewall specific firewall creation parameters</p>
 
         
           <table class="field-table">
@@ -8645,24 +8704,10 @@ <h3 id="metalstack.api.v2.MachineProvisioningEvent">MachineProvisioningEvent</h3
             <tbody>
               
                 <tr>
-                  <td>time</td>
-                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
-                  <td></td>
-                  <td><p>Time the time that this event was received </p></td>
-                </tr>
-              
-                <tr>
-                  <td>event</td>
-                  <td><a href="#metalstack.api.v2.MachineProvisioningEventType">MachineProvisioningEventType</a></td>
-                  <td></td>
-                  <td><p>Event the event emitted by the machine </p></td>
-                </tr>
-              
-                <tr>
-                  <td>message</td>
-                  <td><a href="#string">string</a></td>
+                  <td>firewall_rules</td>
+                  <td><a href="#metalstack.api.v2.FirewallRules">FirewallRules</a></td>
                   <td></td>
-                  <td><p>Message an additional message to add to the event </p></td>
+                  <td><p>FirewallRules to be applied if this is a firewall </p></td>
                 </tr>
               
             </tbody>
@@ -8672,8 +8717,8 @@ <h3 id="metalstack.api.v2.MachineProvisioningEvent">MachineProvisioningEvent</h3
 
         
       
-        <h3 id="metalstack.api.v2.MachineQuery">MachineQuery</h3>
-        <p>MachineQuery contains fields which can be specified to list specific machines.</p>
+        <h3 id="metalstack.api.v2.Machine">Machine</h3>
+        <p>Machine represents a physical bare metal machine.</p>
 
         
           <table class="field-table">
@@ -8685,144 +8730,201 @@ <h3 id="metalstack.api.v2.MachineQuery">MachineQuery</h3>
                 <tr>
                   <td>uuid</td>
                   <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>UUID of the machine to get </p></td>
+                  <td></td>
+                  <td><p>UUID of this machine </p></td>
                 </tr>
               
                 <tr>
-                  <td>name</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Name of the machine to get </p></td>
+                  <td>meta</td>
+                  <td><a href="#metalstack.api.v2.Meta">Meta</a></td>
+                  <td></td>
+                  <td><p>Meta for this machine </p></td>
                 </tr>
               
                 <tr>
                   <td>partition</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Partition of the machine to get </p></td>
+                  <td><a href="#metalstack.api.v2.Partition">Partition</a></td>
+                  <td></td>
+                  <td><p>Partition where this machine resides </p></td>
                 </tr>
               
                 <tr>
-                  <td>size</td>
+                  <td>rack</td>
                   <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Size of the machine to get </p></td>
+                  <td></td>
+                  <td><p>Rack where this machine is located </p></td>
                 </tr>
               
                 <tr>
-                  <td>rack</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Rack of the machine to get </p></td>
+                  <td>size</td>
+                  <td><a href="#metalstack.api.v2.Size">Size</a></td>
+                  <td></td>
+                  <td><p>Size of this machine </p></td>
                 </tr>
               
                 <tr>
-                  <td>labels</td>
-                  <td><a href="#metalstack.api.v2.Labels">Labels</a></td>
-                  <td>optional</td>
-                  <td><p>Labels for which this machine should get filtered </p></td>
+                  <td>hardware</td>
+                  <td><a href="#metalstack.api.v2.MachineHardware">MachineHardware</a></td>
+                  <td></td>
+                  <td><p>Hardware specs of this machine </p></td>
                 </tr>
               
                 <tr>
                   <td>allocation</td>
-                  <td><a href="#metalstack.api.v2.MachineAllocationQuery">MachineAllocationQuery</a></td>
-                  <td>optional</td>
-                  <td><p>Allocation specific machine queries </p></td>
+                  <td><a href="#metalstack.api.v2.MachineAllocation">MachineAllocation</a></td>
+                  <td></td>
+                  <td><p>Allocation details </p></td>
                 </tr>
               
                 <tr>
-                  <td>network</td>
-                  <td><a href="#metalstack.api.v2.MachineNetworkQuery">MachineNetworkQuery</a></td>
-                  <td>optional</td>
-                  <td><p>Network specific machine queries </p></td>
+                  <td>status</td>
+                  <td><a href="#metalstack.api.v2.MachineStatus">MachineStatus</a></td>
+                  <td></td>
+                  <td><p>Status contains several status details related to this machine </p></td>
                 </tr>
               
                 <tr>
-                  <td>nic</td>
-                  <td><a href="#metalstack.api.v2.MachineNicQuery">MachineNicQuery</a></td>
-                  <td>optional</td>
-                  <td><p>Nic specific machine queries </p></td>
+                  <td>recent_provisioning_events</td>
+                  <td><a href="#metalstack.api.v2.MachineRecentProvisioningEvents">MachineRecentProvisioningEvents</a></td>
+                  <td></td>
+                  <td><p>MachineRecentProvisioningEvents contains the recent provisioning events </p></td>
                 </tr>
               
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.api.v2.MachineAllocation">MachineAllocation</h3>
+        <p>MachineAllocation contains properties if this machine is allocated</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
                 <tr>
-                  <td>disk</td>
-                  <td><a href="#metalstack.api.v2.MachineDiskQuery">MachineDiskQuery</a></td>
-                  <td>optional</td>
-                  <td><p>Disk specific machine queries </p></td>
+                  <td>uuid</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>UUID of this machine allocation </p></td>
                 </tr>
               
                 <tr>
-                  <td>bmc</td>
-                  <td><a href="#metalstack.api.v2.MachineBMCQuery">MachineBMCQuery</a></td>
-                  <td>optional</td>
-                  <td><p>Bmc specific machine queries </p></td>
+                  <td>meta</td>
+                  <td><a href="#metalstack.api.v2.Meta">Meta</a></td>
+                  <td></td>
+                  <td><p>Meta for this machine allocation </p></td>
                 </tr>
               
                 <tr>
-                  <td>fru</td>
-                  <td><a href="#metalstack.api.v2.MachineFRUQuery">MachineFRUQuery</a></td>
-                  <td>optional</td>
-                  <td><p>Fru specific machine queries </p></td>
+                  <td>name</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Name of this allocation </p></td>
                 </tr>
               
                 <tr>
-                  <td>hardware</td>
-                  <td><a href="#metalstack.api.v2.MachineHardwareQuery">MachineHardwareQuery</a></td>
-                  <td>optional</td>
-                  <td><p>Hardware specific machine query </p></td>
+                  <td>description</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Description of this allocation </p></td>
                 </tr>
               
                 <tr>
-                  <td>state</td>
-                  <td><a href="#metalstack.api.v2.MachineState">MachineState</a></td>
-                  <td>optional</td>
-                  <td><p>State this machine has </p></td>
+                  <td>created_by</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Created By indicates who created this machine allocation </p></td>
                 </tr>
               
-            </tbody>
-          </table>
-
-          
-
-        
-      
-        <h3 id="metalstack.api.v2.MachineRecentProvisioningEvents">MachineRecentProvisioningEvents</h3>
-        <p>MachineRecentProvisioningEvents the recent provisioning events for this machine</p>
-
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
+                <tr>
+                  <td>project</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Project of the allocation </p></td>
+                </tr>
               
                 <tr>
-                  <td>events</td>
-                  <td><a href="#metalstack.api.v2.MachineProvisioningEvent">MachineProvisioningEvent</a></td>
+                  <td>image</td>
+                  <td><a href="#metalstack.api.v2.Image">Image</a></td>
+                  <td></td>
+                  <td><p>Image to be used to install on this machine </p></td>
+                </tr>
+              
+                <tr>
+                  <td>filesystem_layout</td>
+                  <td><a href="#metalstack.api.v2.FilesystemLayout">FilesystemLayout</a></td>
+                  <td></td>
+                  <td><p>FilesystemLayout to create on the disks </p></td>
+                </tr>
+              
+                <tr>
+                  <td>networks</td>
+                  <td><a href="#metalstack.api.v2.MachineNetwork">MachineNetwork</a></td>
                   <td>repeated</td>
-                  <td><p>Events the log of recent machine provisioning events </p></td>
+                  <td><p>Networks this machine should be attached to </p></td>
                 </tr>
               
                 <tr>
-                  <td>last_event_time</td>
-                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
+                  <td>hostname</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>LastEventTime the time where the last event was received </p></td>
+                  <td><p>Hostname of the allocated machine </p></td>
                 </tr>
               
                 <tr>
-                  <td>last_error_event</td>
-                  <td><a href="#metalstack.api.v2.MachineProvisioningEvent">MachineProvisioningEvent</a></td>
+                  <td>ssh_public_keys</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>SSHPublicKeys which should be installed on this machine </p></td>
+                </tr>
+              
+                <tr>
+                  <td>userdata</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>LastErrorEvent the last erroneous event received </p></td>
+                  <td><p>Userdata contains instructions required to bootstrap the machine.
+AWS limits the max userdata size to 16k, lets allow twice as much </p></td>
                 </tr>
               
                 <tr>
-                  <td>state</td>
-                  <td><a href="#metalstack.api.v2.MachineProvisioningEventState">MachineProvisioningEventState</a></td>
+                  <td>allocation_type</td>
+                  <td><a href="#metalstack.api.v2.MachineAllocationType">MachineAllocationType</a></td>
                   <td></td>
-                  <td><p>State can be either CrashLoop, FailedReclaim or something else </p></td>
+                  <td><p>AllocationType of this machine </p></td>
+                </tr>
+              
+                <tr>
+                  <td>firewall_rules</td>
+                  <td><a href="#metalstack.api.v2.FirewallRules">FirewallRules</a></td>
+                  <td></td>
+                  <td><p>FirewallRules to be applied if this is a firewall </p></td>
+                </tr>
+              
+                <tr>
+                  <td>dns_server</td>
+                  <td><a href="#metalstack.api.v2.DNSServer">DNSServer</a></td>
+                  <td>repeated</td>
+                  <td><p>DNSServers for this machine </p></td>
+                </tr>
+              
+                <tr>
+                  <td>ntp_server</td>
+                  <td><a href="#metalstack.api.v2.NTPServer">NTPServer</a></td>
+                  <td>repeated</td>
+                  <td><p>NTPServers for this machine </p></td>
+                </tr>
+              
+                <tr>
+                  <td>vpn</td>
+                  <td><a href="#metalstack.api.v2.MachineVPN">MachineVPN</a></td>
+                  <td></td>
+                  <td><p>VPN connection configuration </p></td>
                 </tr>
               
             </tbody>
@@ -8832,8 +8934,8 @@ <h3 id="metalstack.api.v2.MachineRecentProvisioningEvents">MachineRecentProvisio
 
         
       
-        <h3 id="metalstack.api.v2.MachineServiceBMCCommandRequest">MachineServiceBMCCommandRequest</h3>
-        <p>MachineServiceBMCCommandRequest is the request payload for a machine bmc command</p>
+        <h3 id="metalstack.api.v2.MachineAllocationNetwork">MachineAllocationNetwork</h3>
+        <p>MachineAllocationNetwork defines which network should be attached to a machine and if ips should be autoacquired</p>
 
         
           <table class="field-table">
@@ -8843,24 +8945,18 @@ <h3 id="metalstack.api.v2.MachineServiceBMCCommandRequest">MachineServiceBMCComm
             <tbody>
               
                 <tr>
-                  <td>uuid</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>UUID of the machine to send the command to </p></td>
-                </tr>
-              
-                <tr>
-                  <td>project</td>
+                  <td>network</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Project of the machine </p></td>
+                  <td><p>Network the id of the network that this machine will be placed in </p></td>
                 </tr>
               
                 <tr>
-                  <td>command</td>
-                  <td><a href="#metalstack.api.v2.MachineBMCCommand">MachineBMCCommand</a></td>
-                  <td></td>
-                  <td><p>Command to send to the bmc of the machine </p></td>
+                  <td>no_auto_acquire_ip</td>
+                  <td><a href="#bool">bool</a></td>
+                  <td>optional</td>
+                  <td><p>NoAutoAcquireIp will prevent automatic ip acquirement per network if set to true.
+By default one ip address is acquired per network for the machine </p></td>
                 </tr>
               
             </tbody>
@@ -8870,15 +8966,8 @@ <h3 id="metalstack.api.v2.MachineServiceBMCCommandRequest">MachineServiceBMCComm
 
         
       
-        <h3 id="metalstack.api.v2.MachineServiceBMCCommandResponse">MachineServiceBMCCommandResponse</h3>
-        <p>MachineServiceBMCCommandResponse is the response payload for a machine bmc command</p>
-
-        
-
-        
-      
-        <h3 id="metalstack.api.v2.MachineServiceCreateRequest">MachineServiceCreateRequest</h3>
-        <p>MachineServiceCreateRequest is the request payload for a machine create request</p>
+        <h3 id="metalstack.api.v2.MachineAllocationQuery">MachineAllocationQuery</h3>
+        <p>MachineAllocationQuery allocation specific query parameters</p>
 
         
           <table class="field-table">
@@ -8887,142 +8976,133 @@ <h3 id="metalstack.api.v2.MachineServiceCreateRequest">MachineServiceCreateReque
             </thead>
             <tbody>
               
-                <tr>
-                  <td>project</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Project of the machine </p></td>
-                </tr>
-              
                 <tr>
                   <td>uuid</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>UUID if this field is set, this specific machine will be allocated if it is not in available state and not currently allocated.
-this field overrules size and partition </p></td>
+                  <td><p>UUID of the allocation of the machine to get </p></td>
                 </tr>
               
                 <tr>
                   <td>name</td>
                   <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Name of this machine </p></td>
+                  <td>optional</td>
+                  <td><p>Name of the machine to get </p></td>
                 </tr>
               
                 <tr>
-                  <td>description</td>
+                  <td>project</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Description for this machine </p></td>
+                  <td><p>Project of the machine to get </p></td>
                 </tr>
               
                 <tr>
-                  <td>hostname</td>
+                  <td>image</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Hostname the hostname for the allocated machine (defaults to metal) </p></td>
+                  <td><p>Image of the machine to get </p></td>
                 </tr>
               
                 <tr>
-                  <td>partition</td>
+                  <td>filesystem_layout</td>
                   <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Partition the partition id to assign this machine to </p></td>
+                  <td>optional</td>
+                  <td><p>FilesystemLayout of the machine to get </p></td>
                 </tr>
               
                 <tr>
-                  <td>size</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Size of the machine to create </p></td>
-                </tr>
-              
-                <tr>
-                  <td>image</td>
+                  <td>hostname</td>
                   <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Image which should be installed on this machine </p></td>
+                  <td>optional</td>
+                  <td><p>Hostname of the machine to get </p></td>
                 </tr>
               
                 <tr>
-                  <td>filesystem_layout</td>
-                  <td><a href="#string">string</a></td>
+                  <td>allocation_type</td>
+                  <td><a href="#metalstack.api.v2.MachineAllocationType">MachineAllocationType</a></td>
                   <td>optional</td>
-                  <td><p>FilesystemLayout which should be applied for the operating system installation
-Is defaulted by a lookup at the available fsls for this size and image.
-Can be specified to test new fsls during development of fsls </p></td>
+                  <td><p>AllocationType of this machine </p></td>
                 </tr>
               
                 <tr>
-                  <td>ssh_public_keys</td>
-                  <td><a href="#string">string</a></td>
-                  <td>repeated</td>
-                  <td><p>SSHPublicKeys defines the ssh public key to be installed on the machine to access it via ssh </p></td>
+                  <td>labels</td>
+                  <td><a href="#metalstack.api.v2.Labels">Labels</a></td>
+                  <td>optional</td>
+                  <td><p>Labels for which this machine allocation should get filtered </p></td>
                 </tr>
               
                 <tr>
-                  <td>userdata</td>
-                  <td><a href="#string">string</a></td>
+                  <td>vpn</td>
+                  <td><a href="#metalstack.api.v2.MachineVPN">MachineVPN</a></td>
                   <td>optional</td>
-                  <td><p>Userdata contains instructions required to bootstrap the machine
-AWS limits the max userdata size to 16k, lets allow twice as much </p></td>
+                  <td><p>VPN query if this machine has a vpn configuration </p></td>
                 </tr>
               
-                <tr>
-                  <td>labels</td>
-                  <td><a href="#metalstack.api.v2.Labels">Labels</a></td>
-                  <td></td>
-                  <td><p>Labels to be attached to this machine allocation </p></td>
-                </tr>
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.api.v2.MachineBMC">MachineBMC</h3>
+        <p>MachineBMC describe details of the ipmi or out of band device</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
               
                 <tr>
-                  <td>networks</td>
-                  <td><a href="#metalstack.api.v2.MachineAllocationNetwork">MachineAllocationNetwork</a></td>
-                  <td>repeated</td>
-                  <td><p>Networks the networks that this machine will be placed in. </p></td>
+                  <td>address</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Address of this ipmi device from outside in the form of &lt;ip or hostname&gt;:&lt;port&gt; </p></td>
                 </tr>
               
                 <tr>
-                  <td>ips</td>
+                  <td>mac</td>
                   <td><a href="#string">string</a></td>
-                  <td>repeated</td>
-                  <td><p>IPs to to attach to this machine additionally </p></td>
+                  <td></td>
+                  <td><p>Mac address of the network interface of this ipmi device </p></td>
                 </tr>
               
                 <tr>
-                  <td>placement_tags</td>
+                  <td>user</td>
                   <td><a href="#string">string</a></td>
-                  <td>repeated</td>
-                  <td><p>PlacementTags by default machines are spread across the racks inside a partition for every project.
-if placement tags are provided, the machine candidate has an additional anti-affinity to other machines having the same tags </p></td>
+                  <td></td>
+                  <td><p>User of this ipmi device </p></td>
                 </tr>
               
                 <tr>
-                  <td>dns_server</td>
-                  <td><a href="#metalstack.api.v2.DNSServer">DNSServer</a></td>
-                  <td>repeated</td>
-                  <td><p>DNSServer the dns servers used for the machine </p></td>
+                  <td>password</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Password of this ipmi device </p></td>
                 </tr>
               
                 <tr>
-                  <td>ntp_server</td>
-                  <td><a href="#metalstack.api.v2.NTPServer">NTPServer</a></td>
-                  <td>repeated</td>
-                  <td><p>NTPServer the ntp servers used for the machine </p></td>
+                  <td>interface</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Interface of this ipmi device </p></td>
                 </tr>
               
                 <tr>
-                  <td>allocation_type</td>
-                  <td><a href="#metalstack.api.v2.MachineAllocationType">MachineAllocationType</a></td>
+                  <td>version</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>AllocationType of this machine </p></td>
+                  <td><p>Version of this bmc device </p></td>
                 </tr>
               
                 <tr>
-                  <td>firewall_spec</td>
-                  <td><a href="#metalstack.api.v2.FirewallSpec">FirewallSpec</a></td>
+                  <td>power_state</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>FirewallSpec provides firewall specific parameters if allocationType is firewall </p></td>
+                  <td><p>PowerState of this machine </p></td>
                 </tr>
               
             </tbody>
@@ -9032,8 +9112,8 @@ <h3 id="metalstack.api.v2.MachineServiceCreateRequest">MachineServiceCreateReque
 
         
       
-        <h3 id="metalstack.api.v2.MachineServiceCreateResponse">MachineServiceCreateResponse</h3>
-        <p>MachineServiceCreateResponse is the request payload for a machine create response</p>
+        <h3 id="metalstack.api.v2.MachineBMCQuery">MachineBMCQuery</h3>
+        <p>MachineBMCQuery machine ipmi or bmc specific machine queries</p>
 
         
           <table class="field-table">
@@ -9043,41 +9123,31 @@ <h3 id="metalstack.api.v2.MachineServiceCreateResponse">MachineServiceCreateResp
             <tbody>
               
                 <tr>
-                  <td>machine</td>
-                  <td><a href="#metalstack.api.v2.Machine">Machine</a></td>
-                  <td></td>
-                  <td><p>Machine which was created </p></td>
+                  <td>address</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Address of the ipmi system of this machine </p></td>
                 </tr>
               
-            </tbody>
-          </table>
-
-          
-
-        
-      
-        <h3 id="metalstack.api.v2.MachineServiceDeleteRequest">MachineServiceDeleteRequest</h3>
-        <p>MachineServiceDeleteRequest is the request payload for a machine delete request</p>
-
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
+                <tr>
+                  <td>mac</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Mac of the ipmi system of this machine </p></td>
+                </tr>
               
                 <tr>
-                  <td>uuid</td>
+                  <td>user</td>
                   <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>UUID of the machine to delete </p></td>
+                  <td>optional</td>
+                  <td><p>User of the ipmi system of this machine </p></td>
                 </tr>
               
                 <tr>
-                  <td>project</td>
+                  <td>interface</td>
                   <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Project of the machine </p></td>
+                  <td>optional</td>
+                  <td><p>Interface of the ipmi system of this machine </p></td>
                 </tr>
               
             </tbody>
@@ -9087,8 +9157,8 @@ <h3 id="metalstack.api.v2.MachineServiceDeleteRequest">MachineServiceDeleteReque
 
         
       
-        <h3 id="metalstack.api.v2.MachineServiceDeleteResponse">MachineServiceDeleteResponse</h3>
-        <p>MachineServiceDeleteResponse is the request payload for a machine delete response</p>
+        <h3 id="metalstack.api.v2.MachineBMCReport">MachineBMCReport</h3>
+        <p>MachineBMCReport is sent from the metal-bmc to update bmc and power related details</p>
 
         
           <table class="field-table">
@@ -9098,10 +9168,52 @@ <h3 id="metalstack.api.v2.MachineServiceDeleteResponse">MachineServiceDeleteResp
             <tbody>
               
                 <tr>
-                  <td>machine</td>
-                  <td><a href="#metalstack.api.v2.Machine">Machine</a></td>
+                  <td>bmc</td>
+                  <td><a href="#metalstack.api.v2.MachineBMC">MachineBMC</a></td>
                   <td></td>
-                  <td><p>Machine which was deleteds </p></td>
+                  <td><p>Bmc contains bmc details </p></td>
+                </tr>
+              
+                <tr>
+                  <td>bios</td>
+                  <td><a href="#metalstack.api.v2.MachineBios">MachineBios</a></td>
+                  <td></td>
+                  <td><p>Bios contains bios details </p></td>
+                </tr>
+              
+                <tr>
+                  <td>fru</td>
+                  <td><a href="#metalstack.api.v2.MachineFRU">MachineFRU</a></td>
+                  <td></td>
+                  <td><p>Fru containers field replaceable unit details </p></td>
+                </tr>
+              
+                <tr>
+                  <td>power_metric</td>
+                  <td><a href="#metalstack.api.v2.MachinePowerMetric">MachinePowerMetric</a></td>
+                  <td></td>
+                  <td><p>PowerMetric contains the power statistics of the machine </p></td>
+                </tr>
+              
+                <tr>
+                  <td>power_supplies</td>
+                  <td><a href="#metalstack.api.v2.MachinePowerSupply">MachinePowerSupply</a></td>
+                  <td>repeated</td>
+                  <td><p>PowerSupplies contains details about all power supplies and their state </p></td>
+                </tr>
+              
+                <tr>
+                  <td>led_state</td>
+                  <td><a href="#metalstack.api.v2.MachineChassisIdentifyLEDState">MachineChassisIdentifyLEDState</a></td>
+                  <td></td>
+                  <td><p>LedState indicates the state of the indicator LED on this machine </p></td>
+                </tr>
+              
+                <tr>
+                  <td>updated_at</td>
+                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
+                  <td></td>
+                  <td><p>UpdatedAt contains the date when this data was last updated </p></td>
                 </tr>
               
             </tbody>
@@ -9111,8 +9223,8 @@ <h3 id="metalstack.api.v2.MachineServiceDeleteResponse">MachineServiceDeleteResp
 
         
       
-        <h3 id="metalstack.api.v2.MachineServiceGetBMCRequest">MachineServiceGetBMCRequest</h3>
-        <p>MachineServiceGetBMCRequest is the request payload for a machine getbmc request</p>
+        <h3 id="metalstack.api.v2.MachineBios">MachineBios</h3>
+        <p>MachineBios contains BIOS details of this machine</p>
 
         
           <table class="field-table">
@@ -9122,17 +9234,24 @@ <h3 id="metalstack.api.v2.MachineServiceGetBMCRequest">MachineServiceGetBMCReque
             <tbody>
               
                 <tr>
-                  <td>uuid</td>
+                  <td>version</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>UUID of the machine to get </p></td>
+                  <td><p>Version the bios version </p></td>
                 </tr>
               
                 <tr>
-                  <td>project</td>
+                  <td>vendor</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Project of the machine </p></td>
+                  <td><p>Vendor the bios vendor </p></td>
+                </tr>
+              
+                <tr>
+                  <td>date</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Date the bios date as string because every vendor has different ideas howto describe the date </p></td>
                 </tr>
               
             </tbody>
@@ -9142,8 +9261,8 @@ <h3 id="metalstack.api.v2.MachineServiceGetBMCRequest">MachineServiceGetBMCReque
 
         
       
-        <h3 id="metalstack.api.v2.MachineServiceGetBMCResponse">MachineServiceGetBMCResponse</h3>
-        <p>MachineServiceGetBMCResponse is the response payload for a machine getbmc request</p>
+        <h3 id="metalstack.api.v2.MachineBlockDevice">MachineBlockDevice</h3>
+        <p>MachineBlockDevice contains details of a block device of this machine</p>
 
         
           <table class="field-table">
@@ -9153,17 +9272,17 @@ <h3 id="metalstack.api.v2.MachineServiceGetBMCResponse">MachineServiceGetBMCResp
             <tbody>
               
                 <tr>
-                  <td>uuid</td>
+                  <td>name</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>UUID of the machine </p></td>
+                  <td><p>Name of this block device </p></td>
                 </tr>
               
                 <tr>
-                  <td>bmc</td>
-                  <td><a href="#metalstack.api.v2.MachineBMCReport">MachineBMCReport</a></td>
+                  <td>size</td>
+                  <td><a href="#uint64">uint64</a></td>
                   <td></td>
-                  <td><p>BMC contains the BMC details of this machine </p></td>
+                  <td><p>Size of this block device in bytes </p></td>
                 </tr>
               
             </tbody>
@@ -9173,8 +9292,8 @@ <h3 id="metalstack.api.v2.MachineServiceGetBMCResponse">MachineServiceGetBMCResp
 
         
       
-        <h3 id="metalstack.api.v2.MachineServiceGetRequest">MachineServiceGetRequest</h3>
-        <p>MachineServiceGetRequest is the request payload for a machine get request</p>
+        <h3 id="metalstack.api.v2.MachineChassisIdentifyLEDState">MachineChassisIdentifyLEDState</h3>
+        <p>MachineChassisIdentifyLEDState describes the identifier led state</p>
 
         
           <table class="field-table">
@@ -9184,17 +9303,17 @@ <h3 id="metalstack.api.v2.MachineServiceGetRequest">MachineServiceGetRequest</h3
             <tbody>
               
                 <tr>
-                  <td>uuid</td>
+                  <td>value</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>UUID of the machine to get </p></td>
+                  <td><p>Value the state of this chassis identify LED. empty means LED-OFF </p></td>
                 </tr>
               
                 <tr>
-                  <td>project</td>
+                  <td>description</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Project of the machine </p></td>
+                  <td><p>Description a description why this chassis identify LED is in the given state </p></td>
                 </tr>
               
             </tbody>
@@ -9204,8 +9323,8 @@ <h3 id="metalstack.api.v2.MachineServiceGetRequest">MachineServiceGetRequest</h3
 
         
       
-        <h3 id="metalstack.api.v2.MachineServiceGetResponse">MachineServiceGetResponse</h3>
-        <p>MachineServiceGetResponse is the request payload for a machine get response</p>
+        <h3 id="metalstack.api.v2.MachineCondition">MachineCondition</h3>
+        <p>MachineCondition describes the availability of this machine</p>
 
         
           <table class="field-table">
@@ -9215,41 +9334,24 @@ <h3 id="metalstack.api.v2.MachineServiceGetResponse">MachineServiceGetResponse</
             <tbody>
               
                 <tr>
-                  <td>machine</td>
-                  <td><a href="#metalstack.api.v2.Machine">Machine</a></td>
+                  <td>state</td>
+                  <td><a href="#metalstack.api.v2.MachineState">MachineState</a></td>
                   <td></td>
-                  <td><p>Machine is the machine requested </p></td>
+                  <td><p>State the state of this machine. empty means available for all </p></td>
                 </tr>
               
-            </tbody>
-          </table>
-
-          
-
-        
-      
-        <h3 id="metalstack.api.v2.MachineServiceListRequest">MachineServiceListRequest</h3>
-        <p>MachineServiceListRequest is the request payload for a machine list request</p>
-
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
-              
                 <tr>
-                  <td>project</td>
+                  <td>description</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Project of the machines to list </p></td>
+                  <td><p>Description a description why this machine is in the given state </p></td>
                 </tr>
               
                 <tr>
-                  <td>query</td>
-                  <td><a href="#metalstack.api.v2.MachineQuery">MachineQuery</a></td>
+                  <td>issuer</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Query to list one ore more machines </p></td>
+                  <td><p>Issuer the user that changed the state </p></td>
                 </tr>
               
             </tbody>
@@ -9259,8 +9361,8 @@ <h3 id="metalstack.api.v2.MachineServiceListRequest">MachineServiceListRequest</
 
         
       
-        <h3 id="metalstack.api.v2.MachineServiceListResponse">MachineServiceListResponse</h3>
-        <p>MachineServiceListResponse is the request payload for a machine list response</p>
+        <h3 id="metalstack.api.v2.MachineDiskQuery">MachineDiskQuery</h3>
+        <p>MachineDiskQuery disk specific machine queries</p>
 
         
           <table class="field-table">
@@ -9270,10 +9372,17 @@ <h3 id="metalstack.api.v2.MachineServiceListResponse">MachineServiceListResponse
             <tbody>
               
                 <tr>
-                  <td>machines</td>
-                  <td><a href="#metalstack.api.v2.Machine">Machine</a></td>
+                  <td>names</td>
+                  <td><a href="#string">string</a></td>
                   <td>repeated</td>
-                  <td><p>Machines are the machines requested by a list request </p></td>
+                  <td><p>Names of disks in this machine </p></td>
+                </tr>
+              
+                <tr>
+                  <td>sizes</td>
+                  <td><a href="#uint64">uint64</a></td>
+                  <td>repeated</td>
+                  <td><p>Sizes of disks in this machine </p></td>
                 </tr>
               
             </tbody>
@@ -9283,8 +9392,8 @@ <h3 id="metalstack.api.v2.MachineServiceListResponse">MachineServiceListResponse
 
         
       
-        <h3 id="metalstack.api.v2.MachineServiceUpdateRequest">MachineServiceUpdateRequest</h3>
-        <p>MachineServiceUpdateRequest is the request payload for a machine update request</p>
+        <h3 id="metalstack.api.v2.MachineFRU">MachineFRU</h3>
+        <p>MachineFRU describes details to the machine which are required in case of a necessary replacement</p>
 
         
           <table class="field-table">
@@ -9294,114 +9403,59 @@ <h3 id="metalstack.api.v2.MachineServiceUpdateRequest">MachineServiceUpdateReque
             <tbody>
               
                 <tr>
-                  <td>uuid</td>
+                  <td>chassis_part_number</td>
                   <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>UUID of the machine to modify </p></td>
-                </tr>
-              
-                <tr>
-                  <td>update_meta</td>
-                  <td><a href="#metalstack.api.v2.UpdateMeta">UpdateMeta</a></td>
-                  <td></td>
-                  <td><p>UpdateMeta contains the timestamp and strategy to be used in this update request </p></td>
+                  <td>optional</td>
+                  <td><p>ChassisPartNumber is the part number of the machine chassis </p></td>
                 </tr>
               
                 <tr>
-                  <td>project</td>
+                  <td>chassis_part_serial</td>
                   <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Project of the machine </p></td>
+                  <td>optional</td>
+                  <td><p>ChassisPartSerial is the serial number of the machine chassis </p></td>
                 </tr>
               
                 <tr>
-                  <td>description</td>
+                  <td>board_mfg</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Description of this machine allocation </p></td>
+                  <td><p>BoardMfg is the short description of the mainboard </p></td>
                 </tr>
               
                 <tr>
-                  <td>labels</td>
-                  <td><a href="#metalstack.api.v2.UpdateLabels">UpdateLabels</a></td>
+                  <td>board_mfg_serial</td>
+                  <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Labels to update on this machine allocation </p></td>
+                  <td><p>BoardMfgSerial is the serial number of the mainboard </p></td>
                 </tr>
               
                 <tr>
-                  <td>ssh_public_keys</td>
+                  <td>board_part_number</td>
                   <td><a href="#string">string</a></td>
-                  <td>repeated</td>
-                  <td><p>SSHPublicKeys which should be update of this machine allocation </p></td>
-                </tr>
-              
-            </tbody>
-          </table>
-
-          
-
-        
-      
-        <h3 id="metalstack.api.v2.MachineServiceUpdateResponse">MachineServiceUpdateResponse</h3>
-        <p>MachineServiceUpdateResponse is the request payload for a machine update response</p>
-
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
-              
-                <tr>
-                  <td>machine</td>
-                  <td><a href="#metalstack.api.v2.Machine">Machine</a></td>
-                  <td></td>
-                  <td><p>Machine which was updated </p></td>
-                </tr>
-              
-            </tbody>
-          </table>
-
-          
-
-        
-      
-        <h3 id="metalstack.api.v2.MachineStatus">MachineStatus</h3>
-        <p>MachineStatus contains several status details related to this machine</p>
-
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
-              
-                <tr>
-                  <td>condition</td>
-                  <td><a href="#metalstack.api.v2.MachineCondition">MachineCondition</a></td>
-                  <td></td>
-                  <td><p>Condition describes the availability </p></td>
+                  <td>optional</td>
+                  <td><p>BoardPartNumber is the part number of the mainboard </p></td>
                 </tr>
               
                 <tr>
-                  <td>led_state</td>
-                  <td><a href="#metalstack.api.v2.MachineChassisIdentifyLEDState">MachineChassisIdentifyLEDState</a></td>
-                  <td></td>
-                  <td><p>LEDState indicates the state of the indicator LED on this machine </p></td>
+                  <td>product_manufacturer</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>ProductManufacturer is the manufacturer of the machine </p></td>
                 </tr>
               
                 <tr>
-                  <td>liveliness</td>
-                  <td><a href="#metalstack.api.v2.MachineLiveliness">MachineLiveliness</a></td>
-                  <td></td>
-                  <td><p>Liveliness of this machine </p></td>
+                  <td>product_part_number</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>ProductPartNumber is the part number of the machine </p></td>
                 </tr>
               
                 <tr>
-                  <td>metal_hammer_version</td>
+                  <td>product_serial</td>
                   <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>MetalHammerVersion the version of metal hammer which put the machine in waiting state </p></td>
+                  <td>optional</td>
+                  <td><p>ProductSerial is the serial number of the machine </p></td>
                 </tr>
               
             </tbody>
@@ -9411,8 +9465,8 @@ <h3 id="metalstack.api.v2.MachineStatus">MachineStatus</h3>
 
         
       
-        <h3 id="metalstack.api.v2.MachineVPN">MachineVPN</h3>
-        <p>MachineVPN contains configuration data for the VPN connection</p>
+        <h3 id="metalstack.api.v2.MachineFRUQuery">MachineFRUQuery</h3>
+        <p>MachineFRUQuery machine fru specific machine queries</p>
 
         
           <table class="field-table">
@@ -9422,76 +9476,59 @@ <h3 id="metalstack.api.v2.MachineVPN">MachineVPN</h3>
             <tbody>
               
                 <tr>
-                  <td>control_plane_address</td>
+                  <td>chassis_part_number</td>
                   <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Address of VPN control plane </p></td>
+                  <td>optional</td>
+                  <td><p>ChassisPartNumber of this machine </p></td>
                 </tr>
               
                 <tr>
-                  <td>auth_key</td>
+                  <td>chassis_part_serial</td>
                   <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Auth key used to connect to VPN </p></td>
+                  <td>optional</td>
+                  <td><p>ChassisPartSerial of this machine </p></td>
                 </tr>
               
                 <tr>
-                  <td>connected</td>
-                  <td><a href="#bool">bool</a></td>
-                  <td></td>
-                  <td><p>Connected indicate if this machine is connected to the VPN </p></td>
+                  <td>board_mfg</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>BoardMFG of this machine </p></td>
                 </tr>
               
                 <tr>
-                  <td>ips</td>
+                  <td>board_serial</td>
                   <td><a href="#string">string</a></td>
-                  <td>repeated</td>
-                  <td><p>IPs of the machine connected to the vpn </p></td>
+                  <td>optional</td>
+                  <td><p>BoardSerial of this machine </p></td>
                 </tr>
               
-            </tbody>
-          </table>
-
-          
-
-        
-      
-        <h3 id="metalstack.api.v2.MetalCPU">MetalCPU</h3>
-        <p>MetalCPU contains details of a cpu in this machine</p>
-
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
-              
                 <tr>
-                  <td>vendor</td>
+                  <td>board_part_number</td>
                   <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Vendor of this cpu </p></td>
+                  <td>optional</td>
+                  <td><p>BoardPartNumber of this machine </p></td>
                 </tr>
               
                 <tr>
-                  <td>model</td>
+                  <td>product_manufacturer</td>
                   <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Model of this cpu </p></td>
+                  <td>optional</td>
+                  <td><p>ProductManufacturer of this machine </p></td>
                 </tr>
               
                 <tr>
-                  <td>cores</td>
-                  <td><a href="#uint32">uint32</a></td>
-                  <td></td>
-                  <td><p>Cores of this cpu </p></td>
+                  <td>product_part_number</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>ProductPartNumber of this machine </p></td>
                 </tr>
               
                 <tr>
-                  <td>threads</td>
-                  <td><a href="#uint32">uint32</a></td>
-                  <td></td>
-                  <td><p>Threads of this cpu </p></td>
+                  <td>product_serial</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>ProductSerial of this machine </p></td>
                 </tr>
               
             </tbody>
@@ -9501,8 +9538,8 @@ <h3 id="metalstack.api.v2.MetalCPU">MetalCPU</h3>
 
         
       
-        <h3 id="metalstack.api.v2.MetalGPU">MetalGPU</h3>
-        <p>MetalGPU contains details of a gpu in this machine</p>
+        <h3 id="metalstack.api.v2.MachineHardware">MachineHardware</h3>
+        <p>MachineHardware contains hardware details</p>
 
         
           <table class="field-table">
@@ -9512,426 +9549,49 @@ <h3 id="metalstack.api.v2.MetalGPU">MetalGPU</h3>
             <tbody>
               
                 <tr>
-                  <td>vendor</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Vendor of this gpu </p></td>
-                </tr>
-              
-                <tr>
-                  <td>model</td>
-                  <td><a href="#string">string</a></td>
+                  <td>memory</td>
+                  <td><a href="#uint64">uint64</a></td>
                   <td></td>
-                  <td><p>Model of this gpu </p></td>
-                </tr>
-              
-            </tbody>
-          </table>
-
-          
-
-        
-      
-
-      
-        <h3 id="metalstack.api.v2.IPProtocol">IPProtocol</h3>
-        <p>IPProtocol defines tcp|udp</p>
-        <table class="enum-table">
-          <thead>
-            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
-          </thead>
-          <tbody>
-            
-              <tr>
-                <td>IP_PROTOCOL_UNSPECIFIED</td>
-                <td>0</td>
-                <td><p>IP_PROTOCOL_UNSPECIFIED is not specified</p></td>
-              </tr>
-            
-              <tr>
-                <td>IP_PROTOCOL_TCP</td>
-                <td>1</td>
-                <td><p>IP_PROTOCOL_TCP is tcp</p></td>
-              </tr>
-            
-              <tr>
-                <td>IP_PROTOCOL_UDP</td>
-                <td>2</td>
-                <td><p>IP_PROTOCOL_UDP is udp</p></td>
-              </tr>
-            
-          </tbody>
-        </table>
-      
-        <h3 id="metalstack.api.v2.MachineAllocationType">MachineAllocationType</h3>
-        <p>MachineAllocationType defines if this is a machine or a firewall</p>
-        <table class="enum-table">
-          <thead>
-            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
-          </thead>
-          <tbody>
-            
-              <tr>
-                <td>MACHINE_ALLOCATION_TYPE_UNSPECIFIED</td>
-                <td>0</td>
-                <td><p>MACHINE_ALLOCATION_TYPE_UNSPECIFIED is unspecified</p></td>
-              </tr>
-            
-              <tr>
-                <td>MACHINE_ALLOCATION_TYPE_MACHINE</td>
-                <td>1</td>
-                <td><p>MACHINE_ALLOCATION_TYPE_MACHINE is a machine</p></td>
-              </tr>
-            
-              <tr>
-                <td>MACHINE_ALLOCATION_TYPE_FIREWALL</td>
-                <td>2</td>
-                <td><p>MACHINE_ALLOCATION_TYPE_FIREWALL is a firewall</p></td>
-              </tr>
-            
-          </tbody>
-        </table>
-      
-        <h3 id="metalstack.api.v2.MachineBMCCommand">MachineBMCCommand</h3>
-        <p>MachineBMCCommand defines commands send to the BMC of the machine</p>
-        <table class="enum-table">
-          <thead>
-            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
-          </thead>
-          <tbody>
-            
-              <tr>
-                <td>MACHINE_BMC_COMMAND_UNSPECIFIED</td>
-                <td>0</td>
-                <td><p>MACHINE_BMC_COMMAND_UNSPECIFIED is not defined</p></td>
-              </tr>
-            
-              <tr>
-                <td>MACHINE_BMC_COMMAND_ON</td>
-                <td>1</td>
-                <td><p>MACHINE_BMC_COMMAND_ON Power on the machine</p></td>
-              </tr>
-            
-              <tr>
-                <td>MACHINE_BMC_COMMAND_OFF</td>
-                <td>2</td>
-                <td><p>MACHINE_BMC_COMMAND_OFF Power off the machine</p></td>
-              </tr>
-            
-              <tr>
-                <td>MACHINE_BMC_COMMAND_RESET</td>
-                <td>3</td>
-                <td><p>MACHINE_BMC_COMMAND_RESET Power reset the machine</p></td>
-              </tr>
-            
-              <tr>
-                <td>MACHINE_BMC_COMMAND_CYCLE</td>
-                <td>4</td>
-                <td><p>MACHINE_BMC_COMMAND_CYCLE Power cycle the machine</p></td>
-              </tr>
-            
-              <tr>
-                <td>MACHINE_BMC_COMMAND_BOOT_TO_BIOS</td>
-                <td>5</td>
-                <td><p>MACHINE_BMC_COMMAND_BOOT_TO_BIOS boot the machine into bios</p></td>
-              </tr>
-            
-              <tr>
-                <td>MACHINE_BMC_COMMAND_BOOT_FROM_DISK</td>
-                <td>6</td>
-                <td><p>MACHINE_BMC_COMMAND_BOOT_FROM_DISK boot the machine from hard disk</p></td>
-              </tr>
-            
-              <tr>
-                <td>MACHINE_BMC_COMMAND_BOOT_FROM_PXE</td>
-                <td>7</td>
-                <td><p>MACHINE_BMC_COMMAND_BOOT_FROM_PXE boot the machine from pxe</p></td>
-              </tr>
-            
-              <tr>
-                <td>MACHINE_BMC_COMMAND_IDENTIFY_LED_ON</td>
-                <td>8</td>
-                <td><p>MACHINE_BMC_COMMAND_IDENTIFY_LED_ON set identify led of the machine chassis to on</p></td>
-              </tr>
-            
-              <tr>
-                <td>MACHINE_BMC_COMMAND_IDENTIFY_LED_OFF</td>
-                <td>9</td>
-                <td><p>MACHINE_BMC_COMMAND_IDENTIFY_LED_OFF set identify led of the machine chassis to off</p></td>
-              </tr>
-            
-              <tr>
-                <td>MACHINE_BMC_COMMAND_MACHINE_DELETED</td>
-                <td>10</td>
-                <td><p>MACHINE_BMC_COMMAND_MACHINE_DELETED should be called if the machine was deleted to power cycle and boot into pxe</p></td>
-              </tr>
-            
-              <tr>
-                <td>MACHINE_BMC_COMMAND_MACHINE_CREATED</td>
-                <td>11</td>
-                <td><p>MACHINE_BMC_COMMAND_MACHINE_CREATED should be called if the machine was created to set the boot order to boot from disk</p></td>
-              </tr>
-            
-          </tbody>
-        </table>
-      
-        <h3 id="metalstack.api.v2.MachineLiveliness">MachineLiveliness</h3>
-        <p>MachineLiveliness specifies the liveliness of a machine</p>
-        <table class="enum-table">
-          <thead>
-            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
-          </thead>
-          <tbody>
-            
-              <tr>
-                <td>MACHINE_LIVELINESS_UNSPECIFIED</td>
-                <td>0</td>
-                <td><p>MACHINE_LIVELINESS_UNSPECIFIED is not defined</p></td>
-              </tr>
-            
-              <tr>
-                <td>MACHINE_LIVELINESS_ALIVE</td>
-                <td>1</td>
-                <td><p>MACHINE_LIVELINESS_ALIVE liveliness is alive</p></td>
-              </tr>
-            
-              <tr>
-                <td>MACHINE_LIVELINESS_DEAD</td>
-                <td>2</td>
-                <td><p>MACHINE_LIVELINESS_DEAD liveliness is dead</p></td>
-              </tr>
-            
-              <tr>
-                <td>MACHINE_LIVELINESS_UNKNOWN</td>
-                <td>3</td>
-                <td><p>MACHINE_LIVELINESS_UNKNOWN liveliness is unknown</p></td>
-              </tr>
-            
-          </tbody>
-        </table>
-      
-        <h3 id="metalstack.api.v2.MachineProvisioningEventState">MachineProvisioningEventState</h3>
-        <p>MachineProvisioningEventState possible event states</p>
-        <table class="enum-table">
-          <thead>
-            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
-          </thead>
-          <tbody>
-            
-              <tr>
-                <td>MACHINE_PROVISIONING_EVENT_STATE_UNSPECIFIED</td>
-                <td>0</td>
-                <td><p>MACHINE_PROVISIONING_EVENT_STATE_UNSPECIFIED is not specified</p></td>
-              </tr>
-            
-              <tr>
-                <td>MACHINE_PROVISIONING_EVENT_STATE_CRASHLOOP</td>
-                <td>1</td>
-                <td><p>MACHINE_PROVISIONING_EVENT_STATE_CRASHLOOP machine is in crash loop</p></td>
-              </tr>
-            
-              <tr>
-                <td>MACHINE_PROVISIONING_EVENT_STATE_FAILED_RECLAIM</td>
-                <td>2</td>
-                <td><p>MACHINE_PROVISIONING_EVENT_STATE_FAILED_RECLAIM machine is in failed reclaim</p></td>
-              </tr>
-            
-          </tbody>
-        </table>
-      
-        <h3 id="metalstack.api.v2.MachineProvisioningEventType">MachineProvisioningEventType</h3>
-        <p>MachineProvisioningEventType defines in which phase the machine actually is</p>
-        <table class="enum-table">
-          <thead>
-            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
-          </thead>
-          <tbody>
-            
-              <tr>
-                <td>MACHINE_PROVISIONING_EVENT_TYPE_UNSPECIFIED</td>
-                <td>0</td>
-                <td><p>MACHINE_PROVISIONING_EVENT_TYPE_UNSPECIFIED is not specified</p></td>
-              </tr>
-            
-              <tr>
-                <td>MACHINE_PROVISIONING_EVENT_TYPE_ALIVE</td>
-                <td>1</td>
-                <td><p>MACHINE_PROVISIONING_EVENT_TYPE_ALIVE machine is alive</p></td>
-              </tr>
-            
-              <tr>
-                <td>MACHINE_PROVISIONING_EVENT_TYPE_CRASHED</td>
-                <td>2</td>
-                <td><p>MACHINE_PROVISIONING_EVENT_TYPE_CRASHED machine crashed</p></td>
-              </tr>
-            
-              <tr>
-                <td>MACHINE_PROVISIONING_EVENT_TYPE_PXE_BOOTING</td>
-                <td>3</td>
-                <td><p>MACHINE_PROVISIONING_EVENT_TYPE_PXE_BOOTING machine is pxe booting into metal-hammer</p></td>
-              </tr>
-            
-              <tr>
-                <td>MACHINE_PROVISIONING_EVENT_TYPE_PLANNED_REBOOT</td>
-                <td>4</td>
-                <td><p>MACHINE_PROVISIONING_EVENT_TYPE_PLANNED_REBOOT machine got a reboot instruction</p></td>
-              </tr>
-            
-              <tr>
-                <td>MACHINE_PROVISIONING_EVENT_TYPE_PREPARING</td>
-                <td>5</td>
-                <td><p>MACHINE_PROVISIONING_EVENT_TYPE_PREPARING metal-hammer is preparing the machine</p></td>
-              </tr>
-            
-              <tr>
-                <td>MACHINE_PROVISIONING_EVENT_TYPE_REGISTERING</td>
-                <td>6</td>
-                <td><p>MACHINE_PROVISIONING_EVENT_TYPE_REGISTERING metal-hammer registers machine at the apiserver</p></td>
-              </tr>
-            
-              <tr>
-                <td>MACHINE_PROVISIONING_EVENT_TYPE_WAITING</td>
-                <td>7</td>
-                <td><p>MACHINE_PROVISIONING_EVENT_TYPE_WAITING machine is waiting for installation</p></td>
-              </tr>
-            
-              <tr>
-                <td>MACHINE_PROVISIONING_EVENT_TYPE_INSTALLING</td>
-                <td>8</td>
-                <td><p>MACHINE_PROVISIONING_EVENT_TYPE_INSTALLING metal-hammer is installing the desired os</p></td>
-              </tr>
-            
-              <tr>
-                <td>MACHINE_PROVISIONING_EVENT_TYPE_BOOTING_NEW_KERNEL</td>
-                <td>9</td>
-                <td><p>MACHINE_PROVISIONING_EVENT_TYPE_BOOTING_NEW_KERNEL metal-hammer completed installation and boots into target os</p></td>
-              </tr>
-            
-              <tr>
-                <td>MACHINE_PROVISIONING_EVENT_TYPE_PHONED_HOME</td>
-                <td>10</td>
-                <td><p>MACHINE_PROVISIONING_EVENT_TYPE_PHONED_HOME machine is installed and phones home</p></td>
-              </tr>
-            
-              <tr>
-                <td>MACHINE_PROVISIONING_EVENT_TYPE_MACHINE_RECLAIM</td>
-                <td>11</td>
-                <td><p>MACHINE_PROVISIONING_EVENT_TYPE_MACHINE_RECLAIM machine is not allocated, but phones home</p></td>
-              </tr>
-            
-          </tbody>
-        </table>
-      
-        <h3 id="metalstack.api.v2.MachineState">MachineState</h3>
-        <p>MachineState defines if the machine was locked or reserved from a operator</p>
-        <table class="enum-table">
-          <thead>
-            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
-          </thead>
-          <tbody>
-            
-              <tr>
-                <td>MACHINE_STATE_UNSPECIFIED</td>
-                <td>0</td>
-                <td><p>MACHINE_STATE_UNSPECIFIED is not specified</p></td>
-              </tr>
-            
-              <tr>
-                <td>MACHINE_STATE_RESERVED</td>
-                <td>1</td>
-                <td><p>MACHINE_STATE_RESERVED this machine is reserved</p></td>
-              </tr>
-            
-              <tr>
-                <td>MACHINE_STATE_LOCKED</td>
-                <td>2</td>
-                <td><p>MACHINE_STATE_LOCKED this machine is locked</p></td>
-              </tr>
-            
-              <tr>
-                <td>MACHINE_STATE_AVAILABLE</td>
-                <td>3</td>
-                <td><p>MACHINE_STATE_LOCKED this machine is available for all</p></td>
-              </tr>
-            
-          </tbody>
-        </table>
-      
-
-      
-
-      
-        <h3 id="metalstack.api.v2.MachineService">MachineService</h3>
-        <p>MachineService serves machine related functions</p>
-        <table class="enum-table">
-          <thead>
-            <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
-          </thead>
-          <tbody>
-            
-              <tr>
-                <td>Get</td>
-                <td><a href="#metalstack.api.v2.MachineServiceGetRequest">MachineServiceGetRequest</a></td>
-                <td><a href="#metalstack.api.v2.MachineServiceGetResponse">MachineServiceGetResponse</a></td>
-                <td><p>Get a machine</p></td>
-              </tr>
-            
-              <tr>
-                <td>Create</td>
-                <td><a href="#metalstack.api.v2.MachineServiceCreateRequest">MachineServiceCreateRequest</a></td>
-                <td><a href="#metalstack.api.v2.MachineServiceCreateResponse">MachineServiceCreateResponse</a></td>
-                <td><p>Create a machine</p></td>
-              </tr>
-            
-              <tr>
-                <td>Update</td>
-                <td><a href="#metalstack.api.v2.MachineServiceUpdateRequest">MachineServiceUpdateRequest</a></td>
-                <td><a href="#metalstack.api.v2.MachineServiceUpdateResponse">MachineServiceUpdateResponse</a></td>
-                <td><p>Update a machine</p></td>
-              </tr>
-            
-              <tr>
-                <td>List</td>
-                <td><a href="#metalstack.api.v2.MachineServiceListRequest">MachineServiceListRequest</a></td>
-                <td><a href="#metalstack.api.v2.MachineServiceListResponse">MachineServiceListResponse</a></td>
-                <td><p>List all machines</p></td>
-              </tr>
-            
-              <tr>
-                <td>Delete</td>
-                <td><a href="#metalstack.api.v2.MachineServiceDeleteRequest">MachineServiceDeleteRequest</a></td>
-                <td><a href="#metalstack.api.v2.MachineServiceDeleteResponse">MachineServiceDeleteResponse</a></td>
-                <td><p>Delete a machine</p></td>
-              </tr>
-            
-              <tr>
-                <td>BMCCommand</td>
-                <td><a href="#metalstack.api.v2.MachineServiceBMCCommandRequest">MachineServiceBMCCommandRequest</a></td>
-                <td><a href="#metalstack.api.v2.MachineServiceBMCCommandResponse">MachineServiceBMCCommandResponse</a></td>
-                <td><p>BMCCommand send a command to the bmc of a machine</p></td>
-              </tr>
-            
-              <tr>
-                <td>GetBMC</td>
-                <td><a href="#metalstack.api.v2.MachineServiceGetBMCRequest">MachineServiceGetBMCRequest</a></td>
-                <td><a href="#metalstack.api.v2.MachineServiceGetBMCResponse">MachineServiceGetBMCResponse</a></td>
-                <td><p>GetBMC returns the BMC details of a machine</p></td>
-              </tr>
-            
-          </tbody>
-        </table>
+                  <td><p>Memory the total memory of the machine in bytes </p></td>
+                </tr>
+              
+                <tr>
+                  <td>disks</td>
+                  <td><a href="#metalstack.api.v2.MachineBlockDevice">MachineBlockDevice</a></td>
+                  <td>repeated</td>
+                  <td><p>Disks the list of block devices of this machine </p></td>
+                </tr>
+              
+                <tr>
+                  <td>cpus</td>
+                  <td><a href="#metalstack.api.v2.MetalCPU">MetalCPU</a></td>
+                  <td>repeated</td>
+                  <td><p>CPUs the cpu details </p></td>
+                </tr>
+              
+                <tr>
+                  <td>gpus</td>
+                  <td><a href="#metalstack.api.v2.MetalGPU">MetalGPU</a></td>
+                  <td>repeated</td>
+                  <td><p>GPUs the gpu details </p></td>
+                </tr>
+              
+                <tr>
+                  <td>nics</td>
+                  <td><a href="#metalstack.api.v2.MachineNic">MachineNic</a></td>
+                  <td>repeated</td>
+                  <td><p>Nics the list of network interfaces of this machine </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
 
-        
-    
-      
-      <div class="file-heading">
-        <h2 id="metalstack/admin/v2/machine.proto">metalstack/admin/v2/machine.proto</h2><a href="#title">Top</a>
-      </div>
-      <p></p>
+          
 
+        
       
-        <h3 id="metalstack.admin.v2.MachineServiceBMCCommandRequest">MachineServiceBMCCommandRequest</h3>
-        <p>MachineServiceBMCCommandRequest is the request payload for a machine bmc command</p>
+        <h3 id="metalstack.api.v2.MachineHardwareQuery">MachineHardwareQuery</h3>
+        <p>MachineHardwareQuery machine hardware specific machine queries</p>
 
         
           <table class="field-table">
@@ -9941,17 +9601,17 @@ <h3 id="metalstack.admin.v2.MachineServiceBMCCommandRequest">MachineServiceBMCCo
             <tbody>
               
                 <tr>
-                  <td>uuid</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>UUID of the machine to send the command to </p></td>
+                  <td>memory</td>
+                  <td><a href="#uint64">uint64</a></td>
+                  <td>optional</td>
+                  <td><p>Memory the total memory of the machine in bytes </p></td>
                 </tr>
               
                 <tr>
-                  <td>command</td>
-                  <td><a href="#metalstack.api.v2.MachineBMCCommand">metalstack.api.v2.MachineBMCCommand</a></td>
-                  <td></td>
-                  <td><p>Command to send to the bmc of the machine </p></td>
+                  <td>cpu_cores</td>
+                  <td><a href="#uint32">uint32</a></td>
+                  <td>optional</td>
+                  <td><p>CPUCores the number of cpu cores </p></td>
                 </tr>
               
             </tbody>
@@ -9961,15 +9621,81 @@ <h3 id="metalstack.admin.v2.MachineServiceBMCCommandRequest">MachineServiceBMCCo
 
         
       
-        <h3 id="metalstack.admin.v2.MachineServiceBMCCommandResponse">MachineServiceBMCCommandResponse</h3>
-        <p>MachineServiceBMCCommandResponse is the response payload for a machine bmc command</p>
+        <h3 id="metalstack.api.v2.MachineNetwork">MachineNetwork</h3>
+        <p>MachineNetwork contains details which network should be created on a allocated machine</p>
 
         
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>network</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Network the networkID of the allocated machine in this vrf </p></td>
+                </tr>
+              
+                <tr>
+                  <td>prefixes</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>Prefixes the prefixes of this network </p></td>
+                </tr>
+              
+                <tr>
+                  <td>destination_prefixes</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>DestinationPrefixes prefixes that are reachable within this network </p></td>
+                </tr>
+              
+                <tr>
+                  <td>ips</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>IPs the ip addresses of the allocated machine in this vrf </p></td>
+                </tr>
+              
+                <tr>
+                  <td>network_type</td>
+                  <td><a href="#metalstack.api.v2.NetworkType">NetworkType</a></td>
+                  <td></td>
+                  <td><p>NetworkType the type of network of this vrf </p></td>
+                </tr>
+              
+                <tr>
+                  <td>nat_type</td>
+                  <td><a href="#metalstack.api.v2.NATType">NATType</a></td>
+                  <td></td>
+                  <td><p>NatType what type of nat if any should be used </p></td>
+                </tr>
+              
+                <tr>
+                  <td>vrf</td>
+                  <td><a href="#uint64">uint64</a></td>
+                  <td></td>
+                  <td><p>VRF the vrf id </p></td>
+                </tr>
+              
+                <tr>
+                  <td>asn</td>
+                  <td><a href="#uint32">uint32</a></td>
+                  <td></td>
+                  <td><p>ASN the autonomous system number for this network </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+
+          
 
         
       
-        <h3 id="metalstack.admin.v2.MachineServiceConsolePasswordRequest">MachineServiceConsolePasswordRequest</h3>
-        <p>MachineServiceConsolePasswordRequest is the request to get the console password</p>
+        <h3 id="metalstack.api.v2.MachineNetworkQuery">MachineNetworkQuery</h3>
+        <p>MachineNetworkQuery network specific machine queries</p>
 
         
           <table class="field-table">
@@ -9979,18 +9705,45 @@ <h3 id="metalstack.admin.v2.MachineServiceConsolePasswordRequest">MachineService
             <tbody>
               
                 <tr>
-                  <td>uuid</td>
+                  <td>networks</td>
                   <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>UUID of the machine to get </p></td>
+                  <td>repeated</td>
+                  <td><p>Networks this machine is connected to </p></td>
                 </tr>
               
                 <tr>
-                  <td>reason</td>
+                  <td>prefixes</td>
                   <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Reason must be provided why access to the console is requested.
-Reason is only forwarded to an audit sink </p></td>
+                  <td>repeated</td>
+                  <td><p>Prefixes this machine is connected to </p></td>
+                </tr>
+              
+                <tr>
+                  <td>destination_prefixes</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>DestinationPrefixes this machine is connected to </p></td>
+                </tr>
+              
+                <tr>
+                  <td>ips</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>IPs this machine has </p></td>
+                </tr>
+              
+                <tr>
+                  <td>vrfs</td>
+                  <td><a href="#uint64">uint64</a></td>
+                  <td>repeated</td>
+                  <td><p>VRFs this machine is connected to </p></td>
+                </tr>
+              
+                <tr>
+                  <td>asns</td>
+                  <td><a href="#uint32">uint32</a></td>
+                  <td>repeated</td>
+                  <td><p>ASNs this machine is connected to </p></td>
                 </tr>
               
             </tbody>
@@ -10000,8 +9753,8 @@ <h3 id="metalstack.admin.v2.MachineServiceConsolePasswordRequest">MachineService
 
         
       
-        <h3 id="metalstack.admin.v2.MachineServiceConsolePasswordResponse">MachineServiceConsolePasswordResponse</h3>
-        <p>MachineServiceConsolePasswordResponse is the response to the console password request</p>
+        <h3 id="metalstack.api.v2.MachineNic">MachineNic</h3>
+        <p>MachineNic contains details of a network interface of this machine</p>
 
         
           <table class="field-table">
@@ -10011,17 +9764,59 @@ <h3 id="metalstack.admin.v2.MachineServiceConsolePasswordResponse">MachineServic
             <tbody>
               
                 <tr>
-                  <td>uuid</td>
+                  <td>mac</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>UUID of the machine to get </p></td>
+                  <td><p>Mac the macaddress of this interface </p></td>
                 </tr>
               
                 <tr>
-                  <td>password</td>
+                  <td>name</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Password to access the console </p></td>
+                  <td><p>Name of this interface </p></td>
+                </tr>
+              
+                <tr>
+                  <td>identifier</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Identifier the unique identifier of this network interface </p></td>
+                </tr>
+              
+                <tr>
+                  <td>vendor</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Vendor of this network card </p></td>
+                </tr>
+              
+                <tr>
+                  <td>model</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Model of this network card </p></td>
+                </tr>
+              
+                <tr>
+                  <td>speed</td>
+                  <td><a href="#uint64">uint64</a></td>
+                  <td></td>
+                  <td><p>Speed in bits/second of this network card </p></td>
+                </tr>
+              
+                <tr>
+                  <td>neighbors</td>
+                  <td><a href="#metalstack.api.v2.MachineNic">MachineNic</a></td>
+                  <td>repeated</td>
+                  <td><p>Neighbors the neighbors visible to this network interface </p></td>
+                </tr>
+              
+                <tr>
+                  <td>hostname</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Hostname the nic belongs to </p></td>
                 </tr>
               
             </tbody>
@@ -10031,8 +9826,8 @@ <h3 id="metalstack.admin.v2.MachineServiceConsolePasswordResponse">MachineServic
 
         
       
-        <h3 id="metalstack.admin.v2.MachineServiceGetBMCRequest">MachineServiceGetBMCRequest</h3>
-        <p>MachineServiceGetBMCRequest is the request payload for a machine getbmc request</p>
+        <h3 id="metalstack.api.v2.MachineNicQuery">MachineNicQuery</h3>
+        <p>MachineNicQuery nic specific machine queries</p>
 
         
           <table class="field-table">
@@ -10042,10 +9837,31 @@ <h3 id="metalstack.admin.v2.MachineServiceGetBMCRequest">MachineServiceGetBMCReq
             <tbody>
               
                 <tr>
-                  <td>uuid</td>
+                  <td>macs</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>Macs this machine nic has </p></td>
+                </tr>
+              
+                <tr>
+                  <td>names</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>Names this machine nic has </p></td>
+                </tr>
+              
+                <tr>
+                  <td>neighbor_macs</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>NeighborMacs this machine nic has </p></td>
+                </tr>
+              
+                <tr>
+                  <td>neighbor_names</td>
                   <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>UUID of the machine to get </p></td>
+                  <td>repeated</td>
+                  <td><p>NeighborNames this machine nic has </p></td>
                 </tr>
               
             </tbody>
@@ -10055,8 +9871,8 @@ <h3 id="metalstack.admin.v2.MachineServiceGetBMCRequest">MachineServiceGetBMCReq
 
         
       
-        <h3 id="metalstack.admin.v2.MachineServiceGetBMCResponse">MachineServiceGetBMCResponse</h3>
-        <p>MachineServiceGetBMCResponse is the response payload for a machine getbmc request</p>
+        <h3 id="metalstack.api.v2.MachinePowerMetric">MachinePowerMetric</h3>
+        <p>MachinePowerMetric contains metrics of the power consumption of a machine</p>
 
         
           <table class="field-table">
@@ -10066,17 +9882,40 @@ <h3 id="metalstack.admin.v2.MachineServiceGetBMCResponse">MachineServiceGetBMCRe
             <tbody>
               
                 <tr>
-                  <td>uuid</td>
-                  <td><a href="#string">string</a></td>
+                  <td>average_consumed_watts</td>
+                  <td><a href="#float">float</a></td>
                   <td></td>
-                  <td><p>UUID of the machine </p></td>
+                  <td><p>AverageConsumedWatts shall represent the
+average power level that occurred averaged over the last IntervalInMin
+minutes. </p></td>
                 </tr>
               
                 <tr>
-                  <td>bmc</td>
-                  <td><a href="#metalstack.api.v2.MachineBMCReport">metalstack.api.v2.MachineBMCReport</a></td>
+                  <td>interval_in_min</td>
+                  <td><a href="#float">float</a></td>
                   <td></td>
-                  <td><p>BMC contains the BMC details of this machine </p></td>
+                  <td><p>IntervalInMin shall represent the time
+interval (or window), in minutes, in which the PowerMetrics properties
+are measured over.
+Should be an integer, but some Dell implementations return as a float. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>max_consumed_watts</td>
+                  <td><a href="#float">float</a></td>
+                  <td></td>
+                  <td><p>MaxConsumedWatts shall represent the
+maximum power level in watts that occurred within the last
+IntervalInMin minutes. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>min_consumed_watts</td>
+                  <td><a href="#float">float</a></td>
+                  <td></td>
+                  <td><p>MinConsumedWatts shall represent the
+minimum power level in watts that occurred within the last
+IntervalInMin minutes. </p></td>
                 </tr>
               
             </tbody>
@@ -10086,8 +9925,8 @@ <h3 id="metalstack.admin.v2.MachineServiceGetBMCResponse">MachineServiceGetBMCRe
 
         
       
-        <h3 id="metalstack.admin.v2.MachineServiceGetRequest">MachineServiceGetRequest</h3>
-        <p>MachineServiceGetRequest is the request payload for a machine get request</p>
+        <h3 id="metalstack.api.v2.MachinePowerSupply">MachinePowerSupply</h3>
+        <p>MachinePowerSupply contains details of the power supply of a machine</p>
 
         
           <table class="field-table">
@@ -10097,10 +9936,17 @@ <h3 id="metalstack.admin.v2.MachineServiceGetRequest">MachineServiceGetRequest</
             <tbody>
               
                 <tr>
-                  <td>uuid</td>
+                  <td>health</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>UUID of the machine to get </p></td>
+                  <td><p>Health of the powersupply </p></td>
+                </tr>
+              
+                <tr>
+                  <td>state</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>State of the powersupply </p></td>
                 </tr>
               
             </tbody>
@@ -10110,8 +9956,8 @@ <h3 id="metalstack.admin.v2.MachineServiceGetRequest">MachineServiceGetRequest</
 
         
       
-        <h3 id="metalstack.admin.v2.MachineServiceGetResponse">MachineServiceGetResponse</h3>
-        <p>MachineServiceGetResponse is the request payload for a machine get response</p>
+        <h3 id="metalstack.api.v2.MachineProvisioningEvent">MachineProvisioningEvent</h3>
+        <p>MachineProvisioningEvent is a event which has occurred during provisioning</p>
 
         
           <table class="field-table">
@@ -10121,34 +9967,24 @@ <h3 id="metalstack.admin.v2.MachineServiceGetResponse">MachineServiceGetResponse
             <tbody>
               
                 <tr>
-                  <td>machine</td>
-                  <td><a href="#metalstack.api.v2.Machine">metalstack.api.v2.Machine</a></td>
+                  <td>time</td>
+                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
                   <td></td>
-                  <td><p>Machine is the machine requested </p></td>
+                  <td><p>Time the time that this event was received </p></td>
                 </tr>
               
-            </tbody>
-          </table>
-
-          
-
-        
-      
-        <h3 id="metalstack.admin.v2.MachineServiceListBMCRequest">MachineServiceListBMCRequest</h3>
-        <p>MachineServiceListBMCRequest is the request payload for a machine listbmc request</p>
-
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
+                <tr>
+                  <td>event</td>
+                  <td><a href="#metalstack.api.v2.MachineProvisioningEventType">MachineProvisioningEventType</a></td>
+                  <td></td>
+                  <td><p>Event the event emitted by the machine </p></td>
+                </tr>
               
                 <tr>
-                  <td>query</td>
-                  <td><a href="#metalstack.api.v2.MachineBMCQuery">metalstack.api.v2.MachineBMCQuery</a></td>
+                  <td>message</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Query to list one ore more bmcs of more machines </p></td>
+                  <td><p>Message an additional message to add to the event </p></td>
                 </tr>
               
             </tbody>
@@ -10158,8 +9994,8 @@ <h3 id="metalstack.admin.v2.MachineServiceListBMCRequest">MachineServiceListBMCR
 
         
       
-        <h3 id="metalstack.admin.v2.MachineServiceListBMCResponse">MachineServiceListBMCResponse</h3>
-        <p>MachineServiceListBMCResponse is the response payload for a machine listbmc request</p>
+        <h3 id="metalstack.api.v2.MachineQuery">MachineQuery</h3>
+        <p>MachineQuery contains fields which can be specified to list specific machines.</p>
 
         
           <table class="field-table">
@@ -10169,41 +10005,101 @@ <h3 id="metalstack.admin.v2.MachineServiceListBMCResponse">MachineServiceListBMC
             <tbody>
               
                 <tr>
-                  <td>bmc_reports</td>
-                  <td><a href="#metalstack.admin.v2.MachineServiceListBMCResponse.BmcReportsEntry">MachineServiceListBMCResponse.BmcReportsEntry</a></td>
-                  <td>repeated</td>
-                  <td><p>BMCReports maps the bmc report per machine uuid </p></td>
+                  <td>uuid</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>UUID of the machine to get </p></td>
                 </tr>
               
-            </tbody>
-          </table>
-
-          
-
-        
-      
-        <h3 id="metalstack.admin.v2.MachineServiceListBMCResponse.BmcReportsEntry">MachineServiceListBMCResponse.BmcReportsEntry</h3>
-        <p></p>
-
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
+                <tr>
+                  <td>name</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Name of the machine to get </p></td>
+                </tr>
               
                 <tr>
-                  <td>key</td>
+                  <td>partition</td>
                   <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p> </p></td>
+                  <td>optional</td>
+                  <td><p>Partition of the machine to get </p></td>
                 </tr>
               
                 <tr>
-                  <td>value</td>
-                  <td><a href="#metalstack.api.v2.MachineBMCReport">metalstack.api.v2.MachineBMCReport</a></td>
-                  <td></td>
-                  <td><p> </p></td>
+                  <td>size</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Size of the machine to get </p></td>
+                </tr>
+              
+                <tr>
+                  <td>rack</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Rack of the machine to get </p></td>
+                </tr>
+              
+                <tr>
+                  <td>labels</td>
+                  <td><a href="#metalstack.api.v2.Labels">Labels</a></td>
+                  <td>optional</td>
+                  <td><p>Labels for which this machine should get filtered </p></td>
+                </tr>
+              
+                <tr>
+                  <td>allocation</td>
+                  <td><a href="#metalstack.api.v2.MachineAllocationQuery">MachineAllocationQuery</a></td>
+                  <td>optional</td>
+                  <td><p>Allocation specific machine queries </p></td>
+                </tr>
+              
+                <tr>
+                  <td>network</td>
+                  <td><a href="#metalstack.api.v2.MachineNetworkQuery">MachineNetworkQuery</a></td>
+                  <td>optional</td>
+                  <td><p>Network specific machine queries </p></td>
+                </tr>
+              
+                <tr>
+                  <td>nic</td>
+                  <td><a href="#metalstack.api.v2.MachineNicQuery">MachineNicQuery</a></td>
+                  <td>optional</td>
+                  <td><p>Nic specific machine queries </p></td>
+                </tr>
+              
+                <tr>
+                  <td>disk</td>
+                  <td><a href="#metalstack.api.v2.MachineDiskQuery">MachineDiskQuery</a></td>
+                  <td>optional</td>
+                  <td><p>Disk specific machine queries </p></td>
+                </tr>
+              
+                <tr>
+                  <td>bmc</td>
+                  <td><a href="#metalstack.api.v2.MachineBMCQuery">MachineBMCQuery</a></td>
+                  <td>optional</td>
+                  <td><p>Bmc specific machine queries </p></td>
+                </tr>
+              
+                <tr>
+                  <td>fru</td>
+                  <td><a href="#metalstack.api.v2.MachineFRUQuery">MachineFRUQuery</a></td>
+                  <td>optional</td>
+                  <td><p>Fru specific machine queries </p></td>
+                </tr>
+              
+                <tr>
+                  <td>hardware</td>
+                  <td><a href="#metalstack.api.v2.MachineHardwareQuery">MachineHardwareQuery</a></td>
+                  <td>optional</td>
+                  <td><p>Hardware specific machine query </p></td>
+                </tr>
+              
+                <tr>
+                  <td>state</td>
+                  <td><a href="#metalstack.api.v2.MachineState">MachineState</a></td>
+                  <td>optional</td>
+                  <td><p>State this machine has </p></td>
                 </tr>
               
             </tbody>
@@ -10213,8 +10109,8 @@ <h3 id="metalstack.admin.v2.MachineServiceListBMCResponse.BmcReportsEntry">Machi
 
         
       
-        <h3 id="metalstack.admin.v2.MachineServiceListRequest">MachineServiceListRequest</h3>
-        <p>MachineServiceListRequest is the request payload for a machine list request</p>
+        <h3 id="metalstack.api.v2.MachineRecentProvisioningEvents">MachineRecentProvisioningEvents</h3>
+        <p>MachineRecentProvisioningEvents the recent provisioning events for this machine</p>
 
         
           <table class="field-table">
@@ -10224,18 +10120,31 @@ <h3 id="metalstack.admin.v2.MachineServiceListRequest">MachineServiceListRequest
             <tbody>
               
                 <tr>
-                  <td>query</td>
-                  <td><a href="#metalstack.api.v2.MachineQuery">metalstack.api.v2.MachineQuery</a></td>
+                  <td>events</td>
+                  <td><a href="#metalstack.api.v2.MachineProvisioningEvent">MachineProvisioningEvent</a></td>
+                  <td>repeated</td>
+                  <td><p>Events the log of recent machine provisioning events </p></td>
+                </tr>
+              
+                <tr>
+                  <td>last_event_time</td>
+                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
                   <td></td>
-                  <td><p>Query to list one ore more machines </p></td>
+                  <td><p>LastEventTime the time where the last event was received </p></td>
                 </tr>
               
                 <tr>
-                  <td>partition</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Partition for which machines should be listed, could be left empty if only one partition is present
-otherwise an error is thrown that the partition must be specified </p></td>
+                  <td>last_error_event</td>
+                  <td><a href="#metalstack.api.v2.MachineProvisioningEvent">MachineProvisioningEvent</a></td>
+                  <td></td>
+                  <td><p>LastErrorEvent the last erroneous event received </p></td>
+                </tr>
+              
+                <tr>
+                  <td>state</td>
+                  <td><a href="#metalstack.api.v2.MachineProvisioningEventState">MachineProvisioningEventState</a></td>
+                  <td></td>
+                  <td><p>State can be either CrashLoop, FailedReclaim or something else </p></td>
                 </tr>
               
             </tbody>
@@ -10245,8 +10154,8 @@ <h3 id="metalstack.admin.v2.MachineServiceListRequest">MachineServiceListRequest
 
         
       
-        <h3 id="metalstack.admin.v2.MachineServiceListResponse">MachineServiceListResponse</h3>
-        <p>MachineServiceListResponse is the request payload for a machine list response</p>
+        <h3 id="metalstack.api.v2.MachineServiceBMCCommandRequest">MachineServiceBMCCommandRequest</h3>
+        <p>MachineServiceBMCCommandRequest is the request payload for a machine bmc command</p>
 
         
           <table class="field-table">
@@ -10256,10 +10165,24 @@ <h3 id="metalstack.admin.v2.MachineServiceListResponse">MachineServiceListRespon
             <tbody>
               
                 <tr>
-                  <td>machines</td>
-                  <td><a href="#metalstack.api.v2.Machine">metalstack.api.v2.Machine</a></td>
-                  <td>repeated</td>
-                  <td><p>Machines are the machines requested by a list request </p></td>
+                  <td>uuid</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>UUID of the machine to send the command to </p></td>
+                </tr>
+              
+                <tr>
+                  <td>project</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Project of the machine </p></td>
+                </tr>
+              
+                <tr>
+                  <td>command</td>
+                  <td><a href="#metalstack.api.v2.MachineBMCCommand">MachineBMCCommand</a></td>
+                  <td></td>
+                  <td><p>Command to send to the bmc of the machine </p></td>
                 </tr>
               
             </tbody>
@@ -10269,76 +10192,15 @@ <h3 id="metalstack.admin.v2.MachineServiceListResponse">MachineServiceListRespon
 
         
       
-
-      
-
-      
-
-      
-        <h3 id="metalstack.admin.v2.MachineService">MachineService</h3>
-        <p>MachineService serves machine related functions</p>
-        <table class="enum-table">
-          <thead>
-            <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
-          </thead>
-          <tbody>
-            
-              <tr>
-                <td>Get</td>
-                <td><a href="#metalstack.admin.v2.MachineServiceGetRequest">MachineServiceGetRequest</a></td>
-                <td><a href="#metalstack.admin.v2.MachineServiceGetResponse">MachineServiceGetResponse</a></td>
-                <td><p>Get a machine</p></td>
-              </tr>
-            
-              <tr>
-                <td>List</td>
-                <td><a href="#metalstack.admin.v2.MachineServiceListRequest">MachineServiceListRequest</a></td>
-                <td><a href="#metalstack.admin.v2.MachineServiceListResponse">MachineServiceListResponse</a></td>
-                <td><p>List all machines</p></td>
-              </tr>
-            
-              <tr>
-                <td>BMCCommand</td>
-                <td><a href="#metalstack.admin.v2.MachineServiceBMCCommandRequest">MachineServiceBMCCommandRequest</a></td>
-                <td><a href="#metalstack.admin.v2.MachineServiceBMCCommandResponse">MachineServiceBMCCommandResponse</a></td>
-                <td><p>BMCCommand send a command to the bmc of a machine</p></td>
-              </tr>
-            
-              <tr>
-                <td>GetBMC</td>
-                <td><a href="#metalstack.admin.v2.MachineServiceGetBMCRequest">MachineServiceGetBMCRequest</a></td>
-                <td><a href="#metalstack.admin.v2.MachineServiceGetBMCResponse">MachineServiceGetBMCResponse</a></td>
-                <td><p>GetBMC returns the BMC details of a machine</p></td>
-              </tr>
-            
-              <tr>
-                <td>ListBMC</td>
-                <td><a href="#metalstack.admin.v2.MachineServiceListBMCRequest">MachineServiceListBMCRequest</a></td>
-                <td><a href="#metalstack.admin.v2.MachineServiceListBMCResponse">MachineServiceListBMCResponse</a></td>
-                <td><p>ListBMC returns the BMC details of many machines</p></td>
-              </tr>
-            
-              <tr>
-                <td>ConsolePassword</td>
-                <td><a href="#metalstack.admin.v2.MachineServiceConsolePasswordRequest">MachineServiceConsolePasswordRequest</a></td>
-                <td><a href="#metalstack.admin.v2.MachineServiceConsolePasswordResponse">MachineServiceConsolePasswordResponse</a></td>
-                <td><p>ConsolePassword returns the password to access the serial console of the machine</p></td>
-              </tr>
-            
-          </tbody>
-        </table>
+        <h3 id="metalstack.api.v2.MachineServiceBMCCommandResponse">MachineServiceBMCCommandResponse</h3>
+        <p>MachineServiceBMCCommandResponse is the response payload for a machine bmc command</p>
 
         
-    
-      
-      <div class="file-heading">
-        <h2 id="metalstack/admin/v2/network.proto">metalstack/admin/v2/network.proto</h2><a href="#title">Top</a>
-      </div>
-      <p></p>
 
+        
       
-        <h3 id="metalstack.admin.v2.NetworkServiceCreateRequest">NetworkServiceCreateRequest</h3>
-        <p>NetworkServiceCreateRequest</p>
+        <h3 id="metalstack.api.v2.MachineServiceCreateRequest">MachineServiceCreateRequest</h3>
+        <p>MachineServiceCreateRequest is the request payload for a machine create request</p>
 
         
           <table class="field-table">
@@ -10348,122 +10210,196 @@ <h3 id="metalstack.admin.v2.NetworkServiceCreateRequest">NetworkServiceCreateReq
             <tbody>
               
                 <tr>
-                  <td>id</td>
+                  <td>project</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Project of the machine </p></td>
+                </tr>
+              
+                <tr>
+                  <td>uuid</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Id of this network </p></td>
+                  <td><p>UUID if this field is set, this specific machine will be allocated if it is not in available state and not currently allocated.
+this field overrules size and partition </p></td>
                 </tr>
               
                 <tr>
                   <td>name</td>
                   <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Name of this network </p></td>
+                  <td></td>
+                  <td><p>Name of this machine </p></td>
                 </tr>
               
                 <tr>
                   <td>description</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Description of this network </p></td>
+                  <td><p>Description for this machine </p></td>
                 </tr>
               
                 <tr>
-                  <td>partition</td>
+                  <td>hostname</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Partition where this network will be created </p></td>
+                  <td><p>Hostname the hostname for the allocated machine (defaults to metal) </p></td>
                 </tr>
               
                 <tr>
-                  <td>project</td>
+                  <td>partition</td>
                   <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Project where this network belongs to </p></td>
+                  <td></td>
+                  <td><p>Partition the partition id to assign this machine to </p></td>
                 </tr>
               
                 <tr>
-                  <td>type</td>
-                  <td><a href="#metalstack.api.v2.NetworkType">metalstack.api.v2.NetworkType</a></td>
+                  <td>size</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Type of the network to create </p></td>
+                  <td><p>Size of the machine to create </p></td>
                 </tr>
               
                 <tr>
-                  <td>labels</td>
-                  <td><a href="#metalstack.api.v2.Labels">metalstack.api.v2.Labels</a></td>
-                  <td>optional</td>
-                  <td><p>Labels on this network </p></td>
+                  <td>image</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Image which should be installed on this machine </p></td>
                 </tr>
               
                 <tr>
-                  <td>prefixes</td>
+                  <td>filesystem_layout</td>
                   <td><a href="#string">string</a></td>
-                  <td>repeated</td>
-                  <td><p>Prefixes in this network </p></td>
+                  <td>optional</td>
+                  <td><p>FilesystemLayout which should be applied for the operating system installation
+Is defaulted by a lookup at the available fsls for this size and image.
+Can be specified to test new fsls during development of fsls </p></td>
                 </tr>
               
                 <tr>
-                  <td>destination_prefixes</td>
+                  <td>ssh_public_keys</td>
                   <td><a href="#string">string</a></td>
                   <td>repeated</td>
-                  <td><p>Destination Prefixes in this network </p></td>
+                  <td><p>SSHPublicKeys defines the ssh public key to be installed on the machine to access it via ssh </p></td>
                 </tr>
               
                 <tr>
-                  <td>default_child_prefix_length</td>
-                  <td><a href="#metalstack.api.v2.ChildPrefixLength">metalstack.api.v2.ChildPrefixLength</a></td>
-                  <td></td>
-                  <td><p>Default Child Prefix length defines the bitlength of a child network created per addressfamily, if not specified during the allocate request </p></td>
+                  <td>userdata</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Userdata contains instructions required to bootstrap the machine
+AWS limits the max userdata size to 16k, lets allow twice as much </p></td>
                 </tr>
               
                 <tr>
-                  <td>min_child_prefix_length</td>
-                  <td><a href="#metalstack.api.v2.ChildPrefixLength">metalstack.api.v2.ChildPrefixLength</a></td>
+                  <td>labels</td>
+                  <td><a href="#metalstack.api.v2.Labels">Labels</a></td>
                   <td></td>
-                  <td><p>Min Child Prefix length asserts that during child network creation the requested bit length is greater or equal the min child prefix length </p></td>
+                  <td><p>Labels to be attached to this machine allocation </p></td>
                 </tr>
               
                 <tr>
-                  <td>nat_type</td>
-                  <td><a href="#metalstack.api.v2.NATType">metalstack.api.v2.NATType</a></td>
-                  <td>optional</td>
-                  <td><p>NATType of this network </p></td>
+                  <td>networks</td>
+                  <td><a href="#metalstack.api.v2.MachineAllocationNetwork">MachineAllocationNetwork</a></td>
+                  <td>repeated</td>
+                  <td><p>Networks the networks that this machine will be placed in. </p></td>
                 </tr>
               
                 <tr>
-                  <td>vrf</td>
-                  <td><a href="#uint32">uint32</a></td>
-                  <td>optional</td>
-                  <td><p>VRF of this network has this VNI. </p></td>
+                  <td>ips</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>IPs to to attach to this machine additionally </p></td>
                 </tr>
               
                 <tr>
-                  <td>parent_network</td>
+                  <td>placement_tags</td>
                   <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Parent Network points to the id of the parent network if any </p></td>
+                  <td>repeated</td>
+                  <td><p>PlacementTags by default machines are spread across the racks inside a partition for every project.
+if placement tags are provided, the machine candidate has an additional anti-affinity to other machines having the same tags </p></td>
                 </tr>
               
                 <tr>
-                  <td>additional_announcable_cidrs</td>
-                  <td><a href="#string">string</a></td>
+                  <td>dns_server</td>
+                  <td><a href="#metalstack.api.v2.DNSServer">DNSServer</a></td>
                   <td>repeated</td>
-                  <td><p>AdditionalAnnouncableCidrs will be added to the allow list on the switch which prefixes might be announced </p></td>
+                  <td><p>DNSServer the dns servers used for the machine </p></td>
                 </tr>
               
                 <tr>
-                  <td>length</td>
-                  <td><a href="#metalstack.api.v2.ChildPrefixLength">metalstack.api.v2.ChildPrefixLength</a></td>
-                  <td>optional</td>
-                  <td><p>Length per addressfamily </p></td>
+                  <td>ntp_server</td>
+                  <td><a href="#metalstack.api.v2.NTPServer">NTPServer</a></td>
+                  <td>repeated</td>
+                  <td><p>NTPServer the ntp servers used for the machine </p></td>
+                </tr>
+              
+                <tr>
+                  <td>allocation_type</td>
+                  <td><a href="#metalstack.api.v2.MachineAllocationType">MachineAllocationType</a></td>
+                  <td></td>
+                  <td><p>AllocationType of this machine </p></td>
+                </tr>
+              
+                <tr>
+                  <td>firewall_spec</td>
+                  <td><a href="#metalstack.api.v2.FirewallSpec">FirewallSpec</a></td>
+                  <td></td>
+                  <td><p>FirewallSpec provides firewall specific parameters if allocationType is firewall </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.api.v2.MachineServiceCreateResponse">MachineServiceCreateResponse</h3>
+        <p>MachineServiceCreateResponse is the request payload for a machine create response</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>machine</td>
+                  <td><a href="#metalstack.api.v2.Machine">Machine</a></td>
+                  <td></td>
+                  <td><p>Machine which was created </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.api.v2.MachineServiceDeleteRequest">MachineServiceDeleteRequest</h3>
+        <p>MachineServiceDeleteRequest is the request payload for a machine delete request</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>uuid</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>UUID of the machine to delete </p></td>
                 </tr>
               
                 <tr>
-                  <td>address_family</td>
-                  <td><a href="#metalstack.api.v2.NetworkAddressFamily">metalstack.api.v2.NetworkAddressFamily</a></td>
-                  <td>optional</td>
-                  <td><p>AddressFamily to create, defaults to the same as the parent </p></td>
+                  <td>project</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Project of the machine </p></td>
                 </tr>
               
             </tbody>
@@ -10473,8 +10409,8 @@ <h3 id="metalstack.admin.v2.NetworkServiceCreateRequest">NetworkServiceCreateReq
 
         
       
-        <h3 id="metalstack.admin.v2.NetworkServiceCreateResponse">NetworkServiceCreateResponse</h3>
-        <p>NetworkServiceCreateResponse is the response payload for a network create request</p>
+        <h3 id="metalstack.api.v2.MachineServiceDeleteResponse">MachineServiceDeleteResponse</h3>
+        <p>MachineServiceDeleteResponse is the request payload for a machine delete response</p>
 
         
           <table class="field-table">
@@ -10484,10 +10420,10 @@ <h3 id="metalstack.admin.v2.NetworkServiceCreateResponse">NetworkServiceCreateRe
             <tbody>
               
                 <tr>
-                  <td>network</td>
-                  <td><a href="#metalstack.api.v2.Network">metalstack.api.v2.Network</a></td>
+                  <td>machine</td>
+                  <td><a href="#metalstack.api.v2.Machine">Machine</a></td>
                   <td></td>
-                  <td><p>Network the network </p></td>
+                  <td><p>Machine which was deleteds </p></td>
                 </tr>
               
             </tbody>
@@ -10497,8 +10433,8 @@ <h3 id="metalstack.admin.v2.NetworkServiceCreateResponse">NetworkServiceCreateRe
 
         
       
-        <h3 id="metalstack.admin.v2.NetworkServiceDeleteRequest">NetworkServiceDeleteRequest</h3>
-        <p>NetworkServiceDeleteRequest is the request payload for a network delete request</p>
+        <h3 id="metalstack.api.v2.MachineServiceGetBMCRequest">MachineServiceGetBMCRequest</h3>
+        <p>MachineServiceGetBMCRequest is the request payload for a machine getbmc request</p>
 
         
           <table class="field-table">
@@ -10508,10 +10444,17 @@ <h3 id="metalstack.admin.v2.NetworkServiceDeleteRequest">NetworkServiceDeleteReq
             <tbody>
               
                 <tr>
-                  <td>id</td>
+                  <td>uuid</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>ID of the network to get </p></td>
+                  <td><p>UUID of the machine to get </p></td>
+                </tr>
+              
+                <tr>
+                  <td>project</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Project of the machine </p></td>
                 </tr>
               
             </tbody>
@@ -10521,8 +10464,8 @@ <h3 id="metalstack.admin.v2.NetworkServiceDeleteRequest">NetworkServiceDeleteReq
 
         
       
-        <h3 id="metalstack.admin.v2.NetworkServiceDeleteResponse">NetworkServiceDeleteResponse</h3>
-        <p>NetworkServiceCapacityResponse is the response payload for a network delete request</p>
+        <h3 id="metalstack.api.v2.MachineServiceGetBMCResponse">MachineServiceGetBMCResponse</h3>
+        <p>MachineServiceGetBMCResponse is the response payload for a machine getbmc request</p>
 
         
           <table class="field-table">
@@ -10532,10 +10475,17 @@ <h3 id="metalstack.admin.v2.NetworkServiceDeleteResponse">NetworkServiceDeleteRe
             <tbody>
               
                 <tr>
-                  <td>network</td>
-                  <td><a href="#metalstack.api.v2.Network">metalstack.api.v2.Network</a></td>
+                  <td>uuid</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Network the network </p></td>
+                  <td><p>UUID of the machine </p></td>
+                </tr>
+              
+                <tr>
+                  <td>bmc</td>
+                  <td><a href="#metalstack.api.v2.MachineBMCReport">MachineBMCReport</a></td>
+                  <td></td>
+                  <td><p>BMC contains the BMC details of this machine </p></td>
                 </tr>
               
             </tbody>
@@ -10545,8 +10495,8 @@ <h3 id="metalstack.admin.v2.NetworkServiceDeleteResponse">NetworkServiceDeleteRe
 
         
       
-        <h3 id="metalstack.admin.v2.NetworkServiceGetRequest">NetworkServiceGetRequest</h3>
-        <p>NetworkServiceGetRequest</p>
+        <h3 id="metalstack.api.v2.MachineServiceGetRequest">MachineServiceGetRequest</h3>
+        <p>MachineServiceGetRequest is the request payload for a machine get request</p>
 
         
           <table class="field-table">
@@ -10556,10 +10506,17 @@ <h3 id="metalstack.admin.v2.NetworkServiceGetRequest">NetworkServiceGetRequest</
             <tbody>
               
                 <tr>
-                  <td>id</td>
+                  <td>uuid</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>ID of the network to get </p></td>
+                  <td><p>UUID of the machine to get </p></td>
+                </tr>
+              
+                <tr>
+                  <td>project</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Project of the machine </p></td>
                 </tr>
               
             </tbody>
@@ -10569,8 +10526,8 @@ <h3 id="metalstack.admin.v2.NetworkServiceGetRequest">NetworkServiceGetRequest</
 
         
       
-        <h3 id="metalstack.admin.v2.NetworkServiceGetResponse">NetworkServiceGetResponse</h3>
-        <p>NetworkServiceGetResponse</p>
+        <h3 id="metalstack.api.v2.MachineServiceGetResponse">MachineServiceGetResponse</h3>
+        <p>MachineServiceGetResponse is the request payload for a machine get response</p>
 
         
           <table class="field-table">
@@ -10580,10 +10537,10 @@ <h3 id="metalstack.admin.v2.NetworkServiceGetResponse">NetworkServiceGetResponse
             <tbody>
               
                 <tr>
-                  <td>network</td>
-                  <td><a href="#metalstack.api.v2.Network">metalstack.api.v2.Network</a></td>
+                  <td>machine</td>
+                  <td><a href="#metalstack.api.v2.Machine">Machine</a></td>
                   <td></td>
-                  <td><p>Network which was requested to get </p></td>
+                  <td><p>Machine is the machine requested </p></td>
                 </tr>
               
             </tbody>
@@ -10593,8 +10550,8 @@ <h3 id="metalstack.admin.v2.NetworkServiceGetResponse">NetworkServiceGetResponse
 
         
       
-        <h3 id="metalstack.admin.v2.NetworkServiceListRequest">NetworkServiceListRequest</h3>
-        <p>NetworkServiceListRequest</p>
+        <h3 id="metalstack.api.v2.MachineServiceListRequest">MachineServiceListRequest</h3>
+        <p>MachineServiceListRequest is the request payload for a machine list request</p>
 
         
           <table class="field-table">
@@ -10603,11 +10560,18 @@ <h3 id="metalstack.admin.v2.NetworkServiceListRequest">NetworkServiceListRequest
             </thead>
             <tbody>
               
+                <tr>
+                  <td>project</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Project of the machines to list </p></td>
+                </tr>
+              
                 <tr>
                   <td>query</td>
-                  <td><a href="#metalstack.api.v2.NetworkQuery">metalstack.api.v2.NetworkQuery</a></td>
+                  <td><a href="#metalstack.api.v2.MachineQuery">MachineQuery</a></td>
                   <td></td>
-                  <td><p>Query which specifies which networks to return </p></td>
+                  <td><p>Query to list one ore more machines </p></td>
                 </tr>
               
             </tbody>
@@ -10617,8 +10581,8 @@ <h3 id="metalstack.admin.v2.NetworkServiceListRequest">NetworkServiceListRequest
 
         
       
-        <h3 id="metalstack.admin.v2.NetworkServiceListResponse">NetworkServiceListResponse</h3>
-        <p>NetworkServiceListResponse</p>
+        <h3 id="metalstack.api.v2.MachineServiceListResponse">MachineServiceListResponse</h3>
+        <p>MachineServiceListResponse is the request payload for a machine list response</p>
 
         
           <table class="field-table">
@@ -10628,10 +10592,10 @@ <h3 id="metalstack.admin.v2.NetworkServiceListResponse">NetworkServiceListRespon
             <tbody>
               
                 <tr>
-                  <td>networks</td>
-                  <td><a href="#metalstack.api.v2.Network">metalstack.api.v2.Network</a></td>
+                  <td>machines</td>
+                  <td><a href="#metalstack.api.v2.Machine">Machine</a></td>
                   <td>repeated</td>
-                  <td><p>Networks are the requested networks </p></td>
+                  <td><p>Machines are the machines requested by a list request </p></td>
                 </tr>
               
             </tbody>
@@ -10641,8 +10605,8 @@ <h3 id="metalstack.admin.v2.NetworkServiceListResponse">NetworkServiceListRespon
 
         
       
-        <h3 id="metalstack.admin.v2.NetworkServiceUpdateRequest">NetworkServiceUpdateRequest</h3>
-        <p>NetworkServiceUpdateRequest is the request payload for a network update request</p>
+        <h3 id="metalstack.api.v2.MachineServiceUpdateRequest">MachineServiceUpdateRequest</h3>
+        <p>MachineServiceUpdateRequest is the request payload for a machine update request</p>
 
         
           <table class="field-table">
@@ -10652,87 +10616,204 @@ <h3 id="metalstack.admin.v2.NetworkServiceUpdateRequest">NetworkServiceUpdateReq
             <tbody>
               
                 <tr>
-                  <td>id</td>
+                  <td>uuid</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Id of this network </p></td>
+                  <td><p>UUID of the machine to modify </p></td>
                 </tr>
               
                 <tr>
                   <td>update_meta</td>
-                  <td><a href="#metalstack.api.v2.UpdateMeta">metalstack.api.v2.UpdateMeta</a></td>
+                  <td><a href="#metalstack.api.v2.UpdateMeta">UpdateMeta</a></td>
                   <td></td>
                   <td><p>UpdateMeta contains the timestamp and strategy to be used in this update request </p></td>
                 </tr>
               
                 <tr>
-                  <td>name</td>
+                  <td>project</td>
                   <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Name of this network </p></td>
+                  <td></td>
+                  <td><p>Project of the machine </p></td>
                 </tr>
               
                 <tr>
                   <td>description</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Description of this network </p></td>
+                  <td><p>Description of this machine allocation </p></td>
                 </tr>
               
                 <tr>
                   <td>labels</td>
-                  <td><a href="#metalstack.api.v2.UpdateLabels">metalstack.api.v2.UpdateLabels</a></td>
+                  <td><a href="#metalstack.api.v2.UpdateLabels">UpdateLabels</a></td>
                   <td>optional</td>
-                  <td><p>Labels to update on this network </p></td>
+                  <td><p>Labels to update on this machine allocation </p></td>
                 </tr>
               
                 <tr>
-                  <td>prefixes</td>
+                  <td>ssh_public_keys</td>
                   <td><a href="#string">string</a></td>
                   <td>repeated</td>
-                  <td><p>Prefixes in this network </p></td>
+                  <td><p>SSHPublicKeys which should be update of this machine allocation </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.api.v2.MachineServiceUpdateResponse">MachineServiceUpdateResponse</h3>
+        <p>MachineServiceUpdateResponse is the request payload for a machine update response</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>machine</td>
+                  <td><a href="#metalstack.api.v2.Machine">Machine</a></td>
+                  <td></td>
+                  <td><p>Machine which was updated </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.api.v2.MachineStatus">MachineStatus</h3>
+        <p>MachineStatus contains several status details related to this machine</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>condition</td>
+                  <td><a href="#metalstack.api.v2.MachineCondition">MachineCondition</a></td>
+                  <td></td>
+                  <td><p>Condition describes the availability </p></td>
+                </tr>
+              
+                <tr>
+                  <td>led_state</td>
+                  <td><a href="#metalstack.api.v2.MachineChassisIdentifyLEDState">MachineChassisIdentifyLEDState</a></td>
+                  <td></td>
+                  <td><p>LEDState indicates the state of the indicator LED on this machine </p></td>
+                </tr>
+              
+                <tr>
+                  <td>liveliness</td>
+                  <td><a href="#metalstack.api.v2.MachineLiveliness">MachineLiveliness</a></td>
+                  <td></td>
+                  <td><p>Liveliness of this machine </p></td>
+                </tr>
+              
+                <tr>
+                  <td>metal_hammer_version</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>MetalHammerVersion the version of metal hammer which put the machine in waiting state </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.api.v2.MachineVPN">MachineVPN</h3>
+        <p>MachineVPN contains configuration data for the VPN connection</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>control_plane_address</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Address of VPN control plane </p></td>
+                </tr>
+              
+                <tr>
+                  <td>auth_key</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Auth key used to connect to VPN </p></td>
+                </tr>
+              
+                <tr>
+                  <td>connected</td>
+                  <td><a href="#bool">bool</a></td>
+                  <td></td>
+                  <td><p>Connected indicate if this machine is connected to the VPN </p></td>
+                </tr>
+              
+                <tr>
+                  <td>ips</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>IPs of the machine connected to the vpn </p></td>
                 </tr>
               
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.api.v2.MetalCPU">MetalCPU</h3>
+        <p>MetalCPU contains details of a cpu in this machine</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
                 <tr>
-                  <td>destination_prefixes</td>
+                  <td>vendor</td>
                   <td><a href="#string">string</a></td>
-                  <td>repeated</td>
-                  <td><p>Destination Prefixes in this network </p></td>
-                </tr>
-              
-                <tr>
-                  <td>default_child_prefix_length</td>
-                  <td><a href="#metalstack.api.v2.ChildPrefixLength">metalstack.api.v2.ChildPrefixLength</a></td>
-                  <td>optional</td>
-                  <td><p>Default Child Prefix length defines the bit length of a child network created per addressfamily, of not specified during the allocate request </p></td>
-                </tr>
-              
-                <tr>
-                  <td>min_child_prefix_length</td>
-                  <td><a href="#metalstack.api.v2.ChildPrefixLength">metalstack.api.v2.ChildPrefixLength</a></td>
-                  <td>optional</td>
-                  <td><p>Min Child Prefix length asserts that during child network creation the requested bit length is greater or equal the min child prefix length </p></td>
+                  <td></td>
+                  <td><p>Vendor of this cpu </p></td>
                 </tr>
               
                 <tr>
-                  <td>nat_type</td>
-                  <td><a href="#metalstack.api.v2.NATType">metalstack.api.v2.NATType</a></td>
-                  <td>optional</td>
-                  <td><p>NATType of this network </p></td>
+                  <td>model</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Model of this cpu </p></td>
                 </tr>
               
                 <tr>
-                  <td>additional_announcable_cidrs</td>
-                  <td><a href="#string">string</a></td>
-                  <td>repeated</td>
-                  <td><p>AdditionalAnnouncableCidrs will be added to the allow list on the switch which prefixes might be announced </p></td>
+                  <td>cores</td>
+                  <td><a href="#uint32">uint32</a></td>
+                  <td></td>
+                  <td><p>Cores of this cpu </p></td>
                 </tr>
               
                 <tr>
-                  <td>force</td>
-                  <td><a href="#bool">bool</a></td>
+                  <td>threads</td>
+                  <td><a href="#uint32">uint32</a></td>
                   <td></td>
-                  <td><p>Force update, actually only prevents accidental removal of additional_announcable_cidrs which will destroy your dataplane in fact. </p></td>
+                  <td><p>Threads of this cpu </p></td>
                 </tr>
               
             </tbody>
@@ -10742,8 +10823,8 @@ <h3 id="metalstack.admin.v2.NetworkServiceUpdateRequest">NetworkServiceUpdateReq
 
         
       
-        <h3 id="metalstack.admin.v2.NetworkServiceUpdateResponse">NetworkServiceUpdateResponse</h3>
-        <p>NetworkServiceUpdateResponse is the response payload for a network update request</p>
+        <h3 id="metalstack.api.v2.MetalGPU">MetalGPU</h3>
+        <p>MetalGPU contains details of a gpu in this machine</p>
 
         
           <table class="field-table">
@@ -10753,10 +10834,17 @@ <h3 id="metalstack.admin.v2.NetworkServiceUpdateResponse">NetworkServiceUpdateRe
             <tbody>
               
                 <tr>
-                  <td>network</td>
-                  <td><a href="#metalstack.api.v2.Network">metalstack.api.v2.Network</a></td>
+                  <td>vendor</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Network the network </p></td>
+                  <td><p>Vendor of this gpu </p></td>
+                </tr>
+              
+                <tr>
+                  <td>model</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Model of this gpu </p></td>
                 </tr>
               
             </tbody>
@@ -10766,14 +10854,337 @@ <h3 id="metalstack.admin.v2.NetworkServiceUpdateResponse">NetworkServiceUpdateRe
 
         
       
-
+
+      
+        <h3 id="metalstack.api.v2.IPProtocol">IPProtocol</h3>
+        <p>IPProtocol defines tcp|udp</p>
+        <table class="enum-table">
+          <thead>
+            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>IP_PROTOCOL_UNSPECIFIED</td>
+                <td>0</td>
+                <td><p>IP_PROTOCOL_UNSPECIFIED is not specified</p></td>
+              </tr>
+            
+              <tr>
+                <td>IP_PROTOCOL_TCP</td>
+                <td>1</td>
+                <td><p>IP_PROTOCOL_TCP is tcp</p></td>
+              </tr>
+            
+              <tr>
+                <td>IP_PROTOCOL_UDP</td>
+                <td>2</td>
+                <td><p>IP_PROTOCOL_UDP is udp</p></td>
+              </tr>
+            
+          </tbody>
+        </table>
+      
+        <h3 id="metalstack.api.v2.MachineAllocationType">MachineAllocationType</h3>
+        <p>MachineAllocationType defines if this is a machine or a firewall</p>
+        <table class="enum-table">
+          <thead>
+            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>MACHINE_ALLOCATION_TYPE_UNSPECIFIED</td>
+                <td>0</td>
+                <td><p>MACHINE_ALLOCATION_TYPE_UNSPECIFIED is unspecified</p></td>
+              </tr>
+            
+              <tr>
+                <td>MACHINE_ALLOCATION_TYPE_MACHINE</td>
+                <td>1</td>
+                <td><p>MACHINE_ALLOCATION_TYPE_MACHINE is a machine</p></td>
+              </tr>
+            
+              <tr>
+                <td>MACHINE_ALLOCATION_TYPE_FIREWALL</td>
+                <td>2</td>
+                <td><p>MACHINE_ALLOCATION_TYPE_FIREWALL is a firewall</p></td>
+              </tr>
+            
+          </tbody>
+        </table>
+      
+        <h3 id="metalstack.api.v2.MachineBMCCommand">MachineBMCCommand</h3>
+        <p>MachineBMCCommand defines commands send to the BMC of the machine</p>
+        <table class="enum-table">
+          <thead>
+            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>MACHINE_BMC_COMMAND_UNSPECIFIED</td>
+                <td>0</td>
+                <td><p>MACHINE_BMC_COMMAND_UNSPECIFIED is not defined</p></td>
+              </tr>
+            
+              <tr>
+                <td>MACHINE_BMC_COMMAND_ON</td>
+                <td>1</td>
+                <td><p>MACHINE_BMC_COMMAND_ON Power on the machine</p></td>
+              </tr>
+            
+              <tr>
+                <td>MACHINE_BMC_COMMAND_OFF</td>
+                <td>2</td>
+                <td><p>MACHINE_BMC_COMMAND_OFF Power off the machine</p></td>
+              </tr>
+            
+              <tr>
+                <td>MACHINE_BMC_COMMAND_RESET</td>
+                <td>3</td>
+                <td><p>MACHINE_BMC_COMMAND_RESET Power reset the machine</p></td>
+              </tr>
+            
+              <tr>
+                <td>MACHINE_BMC_COMMAND_CYCLE</td>
+                <td>4</td>
+                <td><p>MACHINE_BMC_COMMAND_CYCLE Power cycle the machine</p></td>
+              </tr>
+            
+              <tr>
+                <td>MACHINE_BMC_COMMAND_BOOT_TO_BIOS</td>
+                <td>5</td>
+                <td><p>MACHINE_BMC_COMMAND_BOOT_TO_BIOS boot the machine into bios</p></td>
+              </tr>
+            
+              <tr>
+                <td>MACHINE_BMC_COMMAND_BOOT_FROM_DISK</td>
+                <td>6</td>
+                <td><p>MACHINE_BMC_COMMAND_BOOT_FROM_DISK boot the machine from hard disk</p></td>
+              </tr>
+            
+              <tr>
+                <td>MACHINE_BMC_COMMAND_BOOT_FROM_PXE</td>
+                <td>7</td>
+                <td><p>MACHINE_BMC_COMMAND_BOOT_FROM_PXE boot the machine from pxe</p></td>
+              </tr>
+            
+              <tr>
+                <td>MACHINE_BMC_COMMAND_IDENTIFY_LED_ON</td>
+                <td>8</td>
+                <td><p>MACHINE_BMC_COMMAND_IDENTIFY_LED_ON set identify led of the machine chassis to on</p></td>
+              </tr>
+            
+              <tr>
+                <td>MACHINE_BMC_COMMAND_IDENTIFY_LED_OFF</td>
+                <td>9</td>
+                <td><p>MACHINE_BMC_COMMAND_IDENTIFY_LED_OFF set identify led of the machine chassis to off</p></td>
+              </tr>
+            
+              <tr>
+                <td>MACHINE_BMC_COMMAND_MACHINE_DELETED</td>
+                <td>10</td>
+                <td><p>MACHINE_BMC_COMMAND_MACHINE_DELETED should be called if the machine was deleted to power cycle and boot into pxe</p></td>
+              </tr>
+            
+              <tr>
+                <td>MACHINE_BMC_COMMAND_MACHINE_CREATED</td>
+                <td>11</td>
+                <td><p>MACHINE_BMC_COMMAND_MACHINE_CREATED should be called if the machine was created to set the boot order to boot from disk</p></td>
+              </tr>
+            
+          </tbody>
+        </table>
+      
+        <h3 id="metalstack.api.v2.MachineLiveliness">MachineLiveliness</h3>
+        <p>MachineLiveliness specifies the liveliness of a machine</p>
+        <table class="enum-table">
+          <thead>
+            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>MACHINE_LIVELINESS_UNSPECIFIED</td>
+                <td>0</td>
+                <td><p>MACHINE_LIVELINESS_UNSPECIFIED is not defined</p></td>
+              </tr>
+            
+              <tr>
+                <td>MACHINE_LIVELINESS_ALIVE</td>
+                <td>1</td>
+                <td><p>MACHINE_LIVELINESS_ALIVE liveliness is alive</p></td>
+              </tr>
+            
+              <tr>
+                <td>MACHINE_LIVELINESS_DEAD</td>
+                <td>2</td>
+                <td><p>MACHINE_LIVELINESS_DEAD liveliness is dead</p></td>
+              </tr>
+            
+              <tr>
+                <td>MACHINE_LIVELINESS_UNKNOWN</td>
+                <td>3</td>
+                <td><p>MACHINE_LIVELINESS_UNKNOWN liveliness is unknown</p></td>
+              </tr>
+            
+          </tbody>
+        </table>
+      
+        <h3 id="metalstack.api.v2.MachineProvisioningEventState">MachineProvisioningEventState</h3>
+        <p>MachineProvisioningEventState possible event states</p>
+        <table class="enum-table">
+          <thead>
+            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>MACHINE_PROVISIONING_EVENT_STATE_UNSPECIFIED</td>
+                <td>0</td>
+                <td><p>MACHINE_PROVISIONING_EVENT_STATE_UNSPECIFIED is not specified</p></td>
+              </tr>
+            
+              <tr>
+                <td>MACHINE_PROVISIONING_EVENT_STATE_CRASHLOOP</td>
+                <td>1</td>
+                <td><p>MACHINE_PROVISIONING_EVENT_STATE_CRASHLOOP machine is in crash loop</p></td>
+              </tr>
+            
+              <tr>
+                <td>MACHINE_PROVISIONING_EVENT_STATE_FAILED_RECLAIM</td>
+                <td>2</td>
+                <td><p>MACHINE_PROVISIONING_EVENT_STATE_FAILED_RECLAIM machine is in failed reclaim</p></td>
+              </tr>
+            
+          </tbody>
+        </table>
+      
+        <h3 id="metalstack.api.v2.MachineProvisioningEventType">MachineProvisioningEventType</h3>
+        <p>MachineProvisioningEventType defines in which phase the machine actually is</p>
+        <table class="enum-table">
+          <thead>
+            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>MACHINE_PROVISIONING_EVENT_TYPE_UNSPECIFIED</td>
+                <td>0</td>
+                <td><p>MACHINE_PROVISIONING_EVENT_TYPE_UNSPECIFIED is not specified</p></td>
+              </tr>
+            
+              <tr>
+                <td>MACHINE_PROVISIONING_EVENT_TYPE_ALIVE</td>
+                <td>1</td>
+                <td><p>MACHINE_PROVISIONING_EVENT_TYPE_ALIVE machine is alive</p></td>
+              </tr>
+            
+              <tr>
+                <td>MACHINE_PROVISIONING_EVENT_TYPE_CRASHED</td>
+                <td>2</td>
+                <td><p>MACHINE_PROVISIONING_EVENT_TYPE_CRASHED machine crashed</p></td>
+              </tr>
+            
+              <tr>
+                <td>MACHINE_PROVISIONING_EVENT_TYPE_PXE_BOOTING</td>
+                <td>3</td>
+                <td><p>MACHINE_PROVISIONING_EVENT_TYPE_PXE_BOOTING machine is pxe booting into metal-hammer</p></td>
+              </tr>
+            
+              <tr>
+                <td>MACHINE_PROVISIONING_EVENT_TYPE_PLANNED_REBOOT</td>
+                <td>4</td>
+                <td><p>MACHINE_PROVISIONING_EVENT_TYPE_PLANNED_REBOOT machine got a reboot instruction</p></td>
+              </tr>
+            
+              <tr>
+                <td>MACHINE_PROVISIONING_EVENT_TYPE_PREPARING</td>
+                <td>5</td>
+                <td><p>MACHINE_PROVISIONING_EVENT_TYPE_PREPARING metal-hammer is preparing the machine</p></td>
+              </tr>
+            
+              <tr>
+                <td>MACHINE_PROVISIONING_EVENT_TYPE_REGISTERING</td>
+                <td>6</td>
+                <td><p>MACHINE_PROVISIONING_EVENT_TYPE_REGISTERING metal-hammer registers machine at the apiserver</p></td>
+              </tr>
+            
+              <tr>
+                <td>MACHINE_PROVISIONING_EVENT_TYPE_WAITING</td>
+                <td>7</td>
+                <td><p>MACHINE_PROVISIONING_EVENT_TYPE_WAITING machine is waiting for installation</p></td>
+              </tr>
+            
+              <tr>
+                <td>MACHINE_PROVISIONING_EVENT_TYPE_INSTALLING</td>
+                <td>8</td>
+                <td><p>MACHINE_PROVISIONING_EVENT_TYPE_INSTALLING metal-hammer is installing the desired os</p></td>
+              </tr>
+            
+              <tr>
+                <td>MACHINE_PROVISIONING_EVENT_TYPE_BOOTING_NEW_KERNEL</td>
+                <td>9</td>
+                <td><p>MACHINE_PROVISIONING_EVENT_TYPE_BOOTING_NEW_KERNEL metal-hammer completed installation and boots into target os</p></td>
+              </tr>
+            
+              <tr>
+                <td>MACHINE_PROVISIONING_EVENT_TYPE_PHONED_HOME</td>
+                <td>10</td>
+                <td><p>MACHINE_PROVISIONING_EVENT_TYPE_PHONED_HOME machine is installed and phones home</p></td>
+              </tr>
+            
+              <tr>
+                <td>MACHINE_PROVISIONING_EVENT_TYPE_MACHINE_RECLAIM</td>
+                <td>11</td>
+                <td><p>MACHINE_PROVISIONING_EVENT_TYPE_MACHINE_RECLAIM machine is not allocated, but phones home</p></td>
+              </tr>
+            
+          </tbody>
+        </table>
+      
+        <h3 id="metalstack.api.v2.MachineState">MachineState</h3>
+        <p>MachineState defines if the machine was locked or reserved from a operator</p>
+        <table class="enum-table">
+          <thead>
+            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>MACHINE_STATE_UNSPECIFIED</td>
+                <td>0</td>
+                <td><p>MACHINE_STATE_UNSPECIFIED is not specified</p></td>
+              </tr>
+            
+              <tr>
+                <td>MACHINE_STATE_RESERVED</td>
+                <td>1</td>
+                <td><p>MACHINE_STATE_RESERVED this machine is reserved</p></td>
+              </tr>
+            
+              <tr>
+                <td>MACHINE_STATE_LOCKED</td>
+                <td>2</td>
+                <td><p>MACHINE_STATE_LOCKED this machine is locked</p></td>
+              </tr>
+            
+              <tr>
+                <td>MACHINE_STATE_AVAILABLE</td>
+                <td>3</td>
+                <td><p>MACHINE_STATE_LOCKED this machine is available for all</p></td>
+              </tr>
+            
+          </tbody>
+        </table>
       
 
       
 
       
-        <h3 id="metalstack.admin.v2.NetworkService">NetworkService</h3>
-        <p>NetworkService serves network address related functions</p>
+        <h3 id="metalstack.api.v2.MachineService">MachineService</h3>
+        <p>MachineService serves machine related functions</p>
         <table class="enum-table">
           <thead>
             <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
@@ -10782,167 +11193,126 @@ <h3 id="metalstack.admin.v2.NetworkService">NetworkService</h3>
             
               <tr>
                 <td>Get</td>
-                <td><a href="#metalstack.admin.v2.NetworkServiceGetRequest">NetworkServiceGetRequest</a></td>
-                <td><a href="#metalstack.admin.v2.NetworkServiceGetResponse">NetworkServiceGetResponse</a></td>
-                <td><p>Get a network</p></td>
+                <td><a href="#metalstack.api.v2.MachineServiceGetRequest">MachineServiceGetRequest</a></td>
+                <td><a href="#metalstack.api.v2.MachineServiceGetResponse">MachineServiceGetResponse</a></td>
+                <td><p>Get a machine</p></td>
               </tr>
             
               <tr>
                 <td>Create</td>
-                <td><a href="#metalstack.admin.v2.NetworkServiceCreateRequest">NetworkServiceCreateRequest</a></td>
-                <td><a href="#metalstack.admin.v2.NetworkServiceCreateResponse">NetworkServiceCreateResponse</a></td>
-                <td><p>Create a network</p></td>
+                <td><a href="#metalstack.api.v2.MachineServiceCreateRequest">MachineServiceCreateRequest</a></td>
+                <td><a href="#metalstack.api.v2.MachineServiceCreateResponse">MachineServiceCreateResponse</a></td>
+                <td><p>Create a machine</p></td>
               </tr>
             
               <tr>
                 <td>Update</td>
-                <td><a href="#metalstack.admin.v2.NetworkServiceUpdateRequest">NetworkServiceUpdateRequest</a></td>
-                <td><a href="#metalstack.admin.v2.NetworkServiceUpdateResponse">NetworkServiceUpdateResponse</a></td>
-                <td><p>Update a network</p></td>
+                <td><a href="#metalstack.api.v2.MachineServiceUpdateRequest">MachineServiceUpdateRequest</a></td>
+                <td><a href="#metalstack.api.v2.MachineServiceUpdateResponse">MachineServiceUpdateResponse</a></td>
+                <td><p>Update a machine</p></td>
+              </tr>
+            
+              <tr>
+                <td>List</td>
+                <td><a href="#metalstack.api.v2.MachineServiceListRequest">MachineServiceListRequest</a></td>
+                <td><a href="#metalstack.api.v2.MachineServiceListResponse">MachineServiceListResponse</a></td>
+                <td><p>List all machines</p></td>
               </tr>
             
               <tr>
                 <td>Delete</td>
-                <td><a href="#metalstack.admin.v2.NetworkServiceDeleteRequest">NetworkServiceDeleteRequest</a></td>
-                <td><a href="#metalstack.admin.v2.NetworkServiceDeleteResponse">NetworkServiceDeleteResponse</a></td>
-                <td><p>Delete a network</p></td>
+                <td><a href="#metalstack.api.v2.MachineServiceDeleteRequest">MachineServiceDeleteRequest</a></td>
+                <td><a href="#metalstack.api.v2.MachineServiceDeleteResponse">MachineServiceDeleteResponse</a></td>
+                <td><p>Delete a machine</p></td>
               </tr>
             
               <tr>
-                <td>List</td>
-                <td><a href="#metalstack.admin.v2.NetworkServiceListRequest">NetworkServiceListRequest</a></td>
-                <td><a href="#metalstack.admin.v2.NetworkServiceListResponse">NetworkServiceListResponse</a></td>
-                <td><p>List all networks</p></td>
+                <td>BMCCommand</td>
+                <td><a href="#metalstack.api.v2.MachineServiceBMCCommandRequest">MachineServiceBMCCommandRequest</a></td>
+                <td><a href="#metalstack.api.v2.MachineServiceBMCCommandResponse">MachineServiceBMCCommandResponse</a></td>
+                <td><p>BMCCommand send a command to the bmc of a machine</p></td>
+              </tr>
+            
+              <tr>
+                <td>GetBMC</td>
+                <td><a href="#metalstack.api.v2.MachineServiceGetBMCRequest">MachineServiceGetBMCRequest</a></td>
+                <td><a href="#metalstack.api.v2.MachineServiceGetBMCResponse">MachineServiceGetBMCResponse</a></td>
+                <td><p>GetBMC returns the BMC details of a machine</p></td>
               </tr>
             
           </tbody>
         </table>
-
-        
-    
-      
-      <div class="file-heading">
-        <h2 id="metalstack/admin/v2/partition.proto">metalstack/admin/v2/partition.proto</h2><a href="#title">Top</a>
-      </div>
-      <p></p>
-
-      
-        <h3 id="metalstack.admin.v2.MachineSizeCapacity">MachineSizeCapacity</h3>
-        <p>ServerCapacity is the capacity of one server type, eg machine size</p>
-
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
-              
-                <tr>
-                  <td>size</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Size is the size id correlating to all counts in this server capacity. </p></td>
-                </tr>
-              
-                <tr>
-                  <td>total</td>
-                  <td><a href="#int64">int64</a></td>
-                  <td></td>
-                  <td><p>Total is the total amount of machines for this size. </p></td>
-                </tr>
-              
-                <tr>
-                  <td>phoned_home</td>
-                  <td><a href="#int64">int64</a></td>
-                  <td></td>
-                  <td><p>PhonedHome is the amount of machines that are currently in the provisioning state &#34;phoned home&#34;. </p></td>
-                </tr>
-              
-                <tr>
-                  <td>waiting</td>
-                  <td><a href="#int64">int64</a></td>
-                  <td></td>
-                  <td><p>Waiting is the amount of machines that are currently in the provisioning state &#34;waiting&#34;. </p></td>
-                </tr>
-              
-                <tr>
-                  <td>other</td>
-                  <td><a href="#int64">int64</a></td>
-                  <td></td>
-                  <td><p>Other is the amount of machines that are neither in the provisioning state waiting nor in phoned home but in another provisioning state. </p></td>
-                </tr>
-              
-                <tr>
-                  <td>other_machines</td>
-                  <td><a href="#string">string</a></td>
-                  <td>repeated</td>
-                  <td><p>OtherMachines contains the machine IDs for machines that were classified into &#34;Other&#34;. </p></td>
-                </tr>
-              
-                <tr>
-                  <td>allocated</td>
-                  <td><a href="#int64">int64</a></td>
-                  <td></td>
-                  <td><p>Allocated is the amount of machines that are currently allocated. </p></td>
-                </tr>
-              
-                <tr>
-                  <td>allocatable</td>
-                  <td><a href="#int64">int64</a></td>
-                  <td></td>
-                  <td><p>Allocatable is the amount of machines in a partition is the amount of machines that can be allocated.
-Effectively this is the amount of waiting machines minus the machines that are unavailable due to machine state or un-allocatable. Size reservations are not considered in this count. </p></td>
-                </tr>
+
+        
+    
+      
+      <div class="file-heading">
+        <h2 id="metalstack/admin/v2/machine.proto">metalstack/admin/v2/machine.proto</h2><a href="#title">Top</a>
+      </div>
+      <p></p>
+
+      
+        <h3 id="metalstack.admin.v2.MachineServiceBMCCommandRequest">MachineServiceBMCCommandRequest</h3>
+        <p>MachineServiceBMCCommandRequest is the request payload for a machine bmc command</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
               
                 <tr>
-                  <td>free</td>
-                  <td><a href="#int64">int64</a></td>
+                  <td>uuid</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Free is the amount of machines in a partition that can be freely allocated at any given moment by a project.
-Effectively this is the amount of waiting machines minus the machines that are unavailable due to machine state or un-allocatable due to size reservations. </p></td>
+                  <td><p>UUID of the machine to send the command to </p></td>
                 </tr>
               
                 <tr>
-                  <td>unavailable</td>
-                  <td><a href="#int64">int64</a></td>
+                  <td>command</td>
+                  <td><a href="#metalstack.api.v2.MachineBMCCommand">metalstack.api.v2.MachineBMCCommand</a></td>
                   <td></td>
-                  <td><p>Unavailable is the amount of machine in a partition that are currently not allocatable because they are not waiting or
-not in the machine state &#34;available&#34;, e.g. locked or reserved. </p></td>
+                  <td><p>Command to send to the bmc of the machine </p></td>
                 </tr>
               
-                <tr>
-                  <td>faulty</td>
-                  <td><a href="#int64">int64</a></td>
-                  <td></td>
-                  <td><p>Faulty is the amount of machines that are neither allocated nor in the pool of available machines because they report an error. </p></td>
-                </tr>
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.admin.v2.MachineServiceBMCCommandResponse">MachineServiceBMCCommandResponse</h3>
+        <p>MachineServiceBMCCommandResponse is the response payload for a machine bmc command</p>
+
+        
+
+        
+      
+        <h3 id="metalstack.admin.v2.MachineServiceConsolePasswordRequest">MachineServiceConsolePasswordRequest</h3>
+        <p>MachineServiceConsolePasswordRequest is the request to get the console password</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
               
                 <tr>
-                  <td>faulty_machines</td>
+                  <td>uuid</td>
                   <td><a href="#string">string</a></td>
-                  <td>repeated</td>
-                  <td><p>FaultyMachines contains the machine IDs for machines that were classified into &#34;Faulty&#34;. </p></td>
-                </tr>
-              
-                <tr>
-                  <td>reservations</td>
-                  <td><a href="#int64">int64</a></td>
-                  <td></td>
-                  <td><p>Reservations is the amount of reservations made for this size. </p></td>
-                </tr>
-              
-                <tr>
-                  <td>used_reservations</td>
-                  <td><a href="#int64">int64</a></td>
                   <td></td>
-                  <td><p>UsedReservations is the amount of reservations already used up for this size. </p></td>
+                  <td><p>UUID of the machine to get </p></td>
                 </tr>
               
                 <tr>
-                  <td>remaining_reservations</td>
-                  <td><a href="#int64">int64</a></td>
+                  <td>reason</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>RemainingReservations is the amount of reservations remaining for this size. </p></td>
+                  <td><p>Reason must be provided why access to the console is requested.
+Reason is only forwarded to an audit sink </p></td>
                 </tr>
               
             </tbody>
@@ -10952,8 +11322,8 @@ <h3 id="metalstack.admin.v2.MachineSizeCapacity">MachineSizeCapacity</h3>
 
         
       
-        <h3 id="metalstack.admin.v2.PartitionCapacity">PartitionCapacity</h3>
-        <p>PartitionCapacity is the capacity of one partition</p>
+        <h3 id="metalstack.admin.v2.MachineServiceConsolePasswordResponse">MachineServiceConsolePasswordResponse</h3>
+        <p>MachineServiceConsolePasswordResponse is the response to the console password request</p>
 
         
           <table class="field-table">
@@ -10963,17 +11333,17 @@ <h3 id="metalstack.admin.v2.PartitionCapacity">PartitionCapacity</h3>
             <tbody>
               
                 <tr>
-                  <td>partition</td>
+                  <td>uuid</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Partition of which this capacity is reported. </p></td>
+                  <td><p>UUID of the machine to get </p></td>
                 </tr>
               
                 <tr>
-                  <td>machine_size_capacities</td>
-                  <td><a href="#metalstack.admin.v2.MachineSizeCapacity">MachineSizeCapacity</a></td>
-                  <td>repeated</td>
-                  <td><p>MachineSizeCapacities is the capacity per machine size. </p></td>
+                  <td>password</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Password to access the console </p></td>
                 </tr>
               
             </tbody>
@@ -10983,8 +11353,8 @@ <h3 id="metalstack.admin.v2.PartitionCapacity">PartitionCapacity</h3>
 
         
       
-        <h3 id="metalstack.admin.v2.PartitionServiceCapacityRequest">PartitionServiceCapacityRequest</h3>
-        <p>PartitionServiceListRequest is the request payload for a partition capacity request</p>
+        <h3 id="metalstack.admin.v2.MachineServiceGetBMCRequest">MachineServiceGetBMCRequest</h3>
+        <p>MachineServiceGetBMCRequest is the request payload for a machine getbmc request</p>
 
         
           <table class="field-table">
@@ -10994,24 +11364,10 @@ <h3 id="metalstack.admin.v2.PartitionServiceCapacityRequest">PartitionServiceCap
             <tbody>
               
                 <tr>
-                  <td>id</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>ID of the partition to get </p></td>
-                </tr>
-              
-                <tr>
-                  <td>size</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Size of machines to show the capacity </p></td>
-                </tr>
-              
-                <tr>
-                  <td>project</td>
+                  <td>uuid</td>
                   <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Project of machines to show the capacity </p></td>
+                  <td></td>
+                  <td><p>UUID of the machine to get </p></td>
                 </tr>
               
             </tbody>
@@ -11021,8 +11377,8 @@ <h3 id="metalstack.admin.v2.PartitionServiceCapacityRequest">PartitionServiceCap
 
         
       
-        <h3 id="metalstack.admin.v2.PartitionServiceCapacityResponse">PartitionServiceCapacityResponse</h3>
-        <p>PartitionServiceCapacityResponse is the response payload for a partition capacity request</p>
+        <h3 id="metalstack.admin.v2.MachineServiceGetBMCResponse">MachineServiceGetBMCResponse</h3>
+        <p>MachineServiceGetBMCResponse is the response payload for a machine getbmc request</p>
 
         
           <table class="field-table">
@@ -11032,10 +11388,17 @@ <h3 id="metalstack.admin.v2.PartitionServiceCapacityResponse">PartitionServiceCa
             <tbody>
               
                 <tr>
-                  <td>partition_capacity</td>
-                  <td><a href="#metalstack.admin.v2.PartitionCapacity">PartitionCapacity</a></td>
-                  <td>repeated</td>
-                  <td><p>PartitionCapacity is a capacity report per partition </p></td>
+                  <td>uuid</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>UUID of the machine </p></td>
+                </tr>
+              
+                <tr>
+                  <td>bmc</td>
+                  <td><a href="#metalstack.api.v2.MachineBMCReport">metalstack.api.v2.MachineBMCReport</a></td>
+                  <td></td>
+                  <td><p>BMC contains the BMC details of this machine </p></td>
                 </tr>
               
             </tbody>
@@ -11045,8 +11408,8 @@ <h3 id="metalstack.admin.v2.PartitionServiceCapacityResponse">PartitionServiceCa
 
         
       
-        <h3 id="metalstack.admin.v2.PartitionServiceCreateRequest">PartitionServiceCreateRequest</h3>
-        <p>PartitionServiceCreateRequest is the request payload for a partition create request</p>
+        <h3 id="metalstack.admin.v2.MachineServiceGetRequest">MachineServiceGetRequest</h3>
+        <p>MachineServiceGetRequest is the request payload for a machine get request</p>
 
         
           <table class="field-table">
@@ -11056,10 +11419,10 @@ <h3 id="metalstack.admin.v2.PartitionServiceCreateRequest">PartitionServiceCreat
             <tbody>
               
                 <tr>
-                  <td>partition</td>
-                  <td><a href="#metalstack.api.v2.Partition">metalstack.api.v2.Partition</a></td>
+                  <td>uuid</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Partition the partition </p></td>
+                  <td><p>UUID of the machine to get </p></td>
                 </tr>
               
             </tbody>
@@ -11069,8 +11432,8 @@ <h3 id="metalstack.admin.v2.PartitionServiceCreateRequest">PartitionServiceCreat
 
         
       
-        <h3 id="metalstack.admin.v2.PartitionServiceCreateResponse">PartitionServiceCreateResponse</h3>
-        <p>PartitionServiceCreateResponse is the response payload for a partition create request</p>
+        <h3 id="metalstack.admin.v2.MachineServiceGetResponse">MachineServiceGetResponse</h3>
+        <p>MachineServiceGetResponse is the request payload for a machine get response</p>
 
         
           <table class="field-table">
@@ -11080,10 +11443,10 @@ <h3 id="metalstack.admin.v2.PartitionServiceCreateResponse">PartitionServiceCrea
             <tbody>
               
                 <tr>
-                  <td>partition</td>
-                  <td><a href="#metalstack.api.v2.Partition">metalstack.api.v2.Partition</a></td>
+                  <td>machine</td>
+                  <td><a href="#metalstack.api.v2.Machine">metalstack.api.v2.Machine</a></td>
                   <td></td>
-                  <td><p>Partition the partition </p></td>
+                  <td><p>Machine is the machine requested </p></td>
                 </tr>
               
             </tbody>
@@ -11093,8 +11456,8 @@ <h3 id="metalstack.admin.v2.PartitionServiceCreateResponse">PartitionServiceCrea
 
         
       
-        <h3 id="metalstack.admin.v2.PartitionServiceDeleteRequest">PartitionServiceDeleteRequest</h3>
-        <p>PartitionServiceDeleteRequest is the request payload for a partition delete request</p>
+        <h3 id="metalstack.admin.v2.MachineServiceListBMCRequest">MachineServiceListBMCRequest</h3>
+        <p>MachineServiceListBMCRequest is the request payload for a machine listbmc request</p>
 
         
           <table class="field-table">
@@ -11104,10 +11467,10 @@ <h3 id="metalstack.admin.v2.PartitionServiceDeleteRequest">PartitionServiceDelet
             <tbody>
               
                 <tr>
-                  <td>id</td>
-                  <td><a href="#string">string</a></td>
+                  <td>query</td>
+                  <td><a href="#metalstack.api.v2.MachineBMCQuery">metalstack.api.v2.MachineBMCQuery</a></td>
                   <td></td>
-                  <td><p>ID of the partition to get </p></td>
+                  <td><p>Query to list one ore more bmcs of more machines </p></td>
                 </tr>
               
             </tbody>
@@ -11117,8 +11480,8 @@ <h3 id="metalstack.admin.v2.PartitionServiceDeleteRequest">PartitionServiceDelet
 
         
       
-        <h3 id="metalstack.admin.v2.PartitionServiceDeleteResponse">PartitionServiceDeleteResponse</h3>
-        <p>PartitionServiceCapacityResponse is the response payload for a partition delete request</p>
+        <h3 id="metalstack.admin.v2.MachineServiceListBMCResponse">MachineServiceListBMCResponse</h3>
+        <p>MachineServiceListBMCResponse is the response payload for a machine listbmc request</p>
 
         
           <table class="field-table">
@@ -11128,10 +11491,10 @@ <h3 id="metalstack.admin.v2.PartitionServiceDeleteResponse">PartitionServiceDele
             <tbody>
               
                 <tr>
-                  <td>partition</td>
-                  <td><a href="#metalstack.api.v2.Partition">metalstack.api.v2.Partition</a></td>
-                  <td></td>
-                  <td><p>Partition the partition </p></td>
+                  <td>bmc_reports</td>
+                  <td><a href="#metalstack.admin.v2.MachineServiceListBMCResponse.BmcReportsEntry">MachineServiceListBMCResponse.BmcReportsEntry</a></td>
+                  <td>repeated</td>
+                  <td><p>BMCReports maps the bmc report per machine uuid </p></td>
                 </tr>
               
             </tbody>
@@ -11141,8 +11504,8 @@ <h3 id="metalstack.admin.v2.PartitionServiceDeleteResponse">PartitionServiceDele
 
         
       
-        <h3 id="metalstack.admin.v2.PartitionServiceUpdateRequest">PartitionServiceUpdateRequest</h3>
-        <p>PartitionServiceUpdateRequest is the request payload for a partition update request</p>
+        <h3 id="metalstack.admin.v2.MachineServiceListBMCResponse.BmcReportsEntry">MachineServiceListBMCResponse.BmcReportsEntry</h3>
+        <p></p>
 
         
           <table class="field-table">
@@ -11152,61 +11515,49 @@ <h3 id="metalstack.admin.v2.PartitionServiceUpdateRequest">PartitionServiceUpdat
             <tbody>
               
                 <tr>
-                  <td>id</td>
+                  <td>key</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>ID of this partition </p></td>
+                  <td><p> </p></td>
                 </tr>
               
                 <tr>
-                  <td>update_meta</td>
-                  <td><a href="#metalstack.api.v2.UpdateMeta">metalstack.api.v2.UpdateMeta</a></td>
+                  <td>value</td>
+                  <td><a href="#metalstack.api.v2.MachineBMCReport">metalstack.api.v2.MachineBMCReport</a></td>
                   <td></td>
-                  <td><p>UpdateMeta contains the timestamp and strategy to be used in this update request </p></td>
+                  <td><p> </p></td>
                 </tr>
               
-                <tr>
-                  <td>description</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Description of this partition </p></td>
-                </tr>
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.admin.v2.MachineServiceListRequest">MachineServiceListRequest</h3>
+        <p>MachineServiceListRequest is the request payload for a machine list request</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
               
                 <tr>
-                  <td>boot_configuration</td>
-                  <td><a href="#metalstack.api.v2.PartitionBootConfiguration">metalstack.api.v2.PartitionBootConfiguration</a></td>
+                  <td>query</td>
+                  <td><a href="#metalstack.api.v2.MachineQuery">metalstack.api.v2.MachineQuery</a></td>
                   <td></td>
-                  <td><p>PartitionBootConfiguration defines how metal-hammer boots </p></td>
-                </tr>
-              
-                <tr>
-                  <td>dns_server</td>
-                  <td><a href="#metalstack.api.v2.DNSServer">metalstack.api.v2.DNSServer</a></td>
-                  <td>repeated</td>
-                  <td><p>DNSServers for this partition </p></td>
-                </tr>
-              
-                <tr>
-                  <td>ntp_server</td>
-                  <td><a href="#metalstack.api.v2.NTPServer">metalstack.api.v2.NTPServer</a></td>
-                  <td>repeated</td>
-                  <td><p>NTPServers for this partition </p></td>
-                </tr>
-              
-                <tr>
-                  <td>mgmt_service_addresses</td>
-                  <td><a href="#string">string</a></td>
-                  <td>repeated</td>
-                  <td><p>ManagementServiceAddresses defines where the management is reachable
-should be in the form &lt;ip|host&gt;:&lt;port&gt;
-FIXME validation </p></td>
+                  <td><p>Query to list one ore more machines </p></td>
                 </tr>
               
                 <tr>
-                  <td>labels</td>
-                  <td><a href="#metalstack.api.v2.UpdateLabels">metalstack.api.v2.UpdateLabels</a></td>
+                  <td>partition</td>
+                  <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Labels to update on this network </p></td>
+                  <td><p>Partition for which machines should be listed, could be left empty if only one partition is present
+otherwise an error is thrown that the partition must be specified </p></td>
                 </tr>
               
             </tbody>
@@ -11216,8 +11567,8 @@ <h3 id="metalstack.admin.v2.PartitionServiceUpdateRequest">PartitionServiceUpdat
 
         
       
-        <h3 id="metalstack.admin.v2.PartitionServiceUpdateResponse">PartitionServiceUpdateResponse</h3>
-        <p>PartitionServiceUpdateResponse is the response payload for a partition update request</p>
+        <h3 id="metalstack.admin.v2.MachineServiceListResponse">MachineServiceListResponse</h3>
+        <p>MachineServiceListResponse is the request payload for a machine list response</p>
 
         
           <table class="field-table">
@@ -11227,10 +11578,10 @@ <h3 id="metalstack.admin.v2.PartitionServiceUpdateResponse">PartitionServiceUpda
             <tbody>
               
                 <tr>
-                  <td>partition</td>
-                  <td><a href="#metalstack.api.v2.Partition">metalstack.api.v2.Partition</a></td>
-                  <td></td>
-                  <td><p>Partition the partition </p></td>
+                  <td>machines</td>
+                  <td><a href="#metalstack.api.v2.Machine">metalstack.api.v2.Machine</a></td>
+                  <td>repeated</td>
+                  <td><p>Machines are the machines requested by a list request </p></td>
                 </tr>
               
             </tbody>
@@ -11246,8 +11597,8 @@ <h3 id="metalstack.admin.v2.PartitionServiceUpdateResponse">PartitionServiceUpda
       
 
       
-        <h3 id="metalstack.admin.v2.PartitionService">PartitionService</h3>
-        <p>PartitionService serves partition address related functions</p>
+        <h3 id="metalstack.admin.v2.MachineService">MachineService</h3>
+        <p>MachineService serves machine related functions</p>
         <table class="enum-table">
           <thead>
             <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
@@ -11255,31 +11606,45 @@ <h3 id="metalstack.admin.v2.PartitionService">PartitionService</h3>
           <tbody>
             
               <tr>
-                <td>Create</td>
-                <td><a href="#metalstack.admin.v2.PartitionServiceCreateRequest">PartitionServiceCreateRequest</a></td>
-                <td><a href="#metalstack.admin.v2.PartitionServiceCreateResponse">PartitionServiceCreateResponse</a></td>
-                <td><p>Create a partition</p></td>
+                <td>Get</td>
+                <td><a href="#metalstack.admin.v2.MachineServiceGetRequest">MachineServiceGetRequest</a></td>
+                <td><a href="#metalstack.admin.v2.MachineServiceGetResponse">MachineServiceGetResponse</a></td>
+                <td><p>Get a machine</p></td>
               </tr>
             
               <tr>
-                <td>Update</td>
-                <td><a href="#metalstack.admin.v2.PartitionServiceUpdateRequest">PartitionServiceUpdateRequest</a></td>
-                <td><a href="#metalstack.admin.v2.PartitionServiceUpdateResponse">PartitionServiceUpdateResponse</a></td>
-                <td><p>Update a partition</p></td>
+                <td>List</td>
+                <td><a href="#metalstack.admin.v2.MachineServiceListRequest">MachineServiceListRequest</a></td>
+                <td><a href="#metalstack.admin.v2.MachineServiceListResponse">MachineServiceListResponse</a></td>
+                <td><p>List all machines</p></td>
               </tr>
             
               <tr>
-                <td>Delete</td>
-                <td><a href="#metalstack.admin.v2.PartitionServiceDeleteRequest">PartitionServiceDeleteRequest</a></td>
-                <td><a href="#metalstack.admin.v2.PartitionServiceDeleteResponse">PartitionServiceDeleteResponse</a></td>
-                <td><p>Delete a partition</p></td>
+                <td>BMCCommand</td>
+                <td><a href="#metalstack.admin.v2.MachineServiceBMCCommandRequest">MachineServiceBMCCommandRequest</a></td>
+                <td><a href="#metalstack.admin.v2.MachineServiceBMCCommandResponse">MachineServiceBMCCommandResponse</a></td>
+                <td><p>BMCCommand send a command to the bmc of a machine</p></td>
               </tr>
             
               <tr>
-                <td>Capacity</td>
-                <td><a href="#metalstack.admin.v2.PartitionServiceCapacityRequest">PartitionServiceCapacityRequest</a></td>
-                <td><a href="#metalstack.admin.v2.PartitionServiceCapacityResponse">PartitionServiceCapacityResponse</a></td>
-                <td><p>Capacity of a partitions</p></td>
+                <td>GetBMC</td>
+                <td><a href="#metalstack.admin.v2.MachineServiceGetBMCRequest">MachineServiceGetBMCRequest</a></td>
+                <td><a href="#metalstack.admin.v2.MachineServiceGetBMCResponse">MachineServiceGetBMCResponse</a></td>
+                <td><p>GetBMC returns the BMC details of a machine</p></td>
+              </tr>
+            
+              <tr>
+                <td>ListBMC</td>
+                <td><a href="#metalstack.admin.v2.MachineServiceListBMCRequest">MachineServiceListBMCRequest</a></td>
+                <td><a href="#metalstack.admin.v2.MachineServiceListBMCResponse">MachineServiceListBMCResponse</a></td>
+                <td><p>ListBMC returns the BMC details of many machines</p></td>
+              </tr>
+            
+              <tr>
+                <td>ConsolePassword</td>
+                <td><a href="#metalstack.admin.v2.MachineServiceConsolePasswordRequest">MachineServiceConsolePasswordRequest</a></td>
+                <td><a href="#metalstack.admin.v2.MachineServiceConsolePasswordResponse">MachineServiceConsolePasswordResponse</a></td>
+                <td><p>ConsolePassword returns the password to access the serial console of the machine</p></td>
               </tr>
             
           </tbody>
@@ -11289,13 +11654,13 @@ <h3 id="metalstack.admin.v2.PartitionService">PartitionService</h3>
     
       
       <div class="file-heading">
-        <h2 id="metalstack/api/v2/project.proto">metalstack/api/v2/project.proto</h2><a href="#title">Top</a>
+        <h2 id="metalstack/admin/v2/network.proto">metalstack/admin/v2/network.proto</h2><a href="#title">Top</a>
       </div>
       <p></p>
 
       
-        <h3 id="metalstack.api.v2.Project">Project</h3>
-        <p>Project defines a group of resources belonging to a tenant</p><p>a tenant can have multiple projects</p>
+        <h3 id="metalstack.admin.v2.NetworkServiceCreateRequest">NetworkServiceCreateRequest</h3>
+        <p>NetworkServiceCreateRequest</p>
 
         
           <table class="field-table">
@@ -11305,225 +11670,122 @@ <h3 id="metalstack.api.v2.Project">Project</h3>
             <tbody>
               
                 <tr>
-                  <td>uuid</td>
+                  <td>id</td>
                   <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Uuid of this project </p></td>
-                </tr>
-              
-                <tr>
-                  <td>meta</td>
-                  <td><a href="#metalstack.api.v2.Meta">Meta</a></td>
-                  <td></td>
-                  <td><p>Meta for this project </p></td>
+                  <td>optional</td>
+                  <td><p>Id of this network </p></td>
                 </tr>
               
                 <tr>
                   <td>name</td>
                   <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Name of this project must be unique per tenant </p></td>
+                  <td>optional</td>
+                  <td><p>Name of this network </p></td>
                 </tr>
               
                 <tr>
                   <td>description</td>
                   <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Description of this project </p></td>
-                </tr>
-              
-                <tr>
-                  <td>tenant</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Tenant this project belongs to </p></td>
-                </tr>
-              
-                <tr>
-                  <td>avatar_url</td>
-                  <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>AvatarUrl of the Project </p></td>
+                  <td><p>Description of this network </p></td>
                 </tr>
               
-            </tbody>
-          </table>
-
-          
-
-        
-      
-        <h3 id="metalstack.api.v2.ProjectInvite">ProjectInvite</h3>
-        <p>ProjectInvite defines invite to project</p>
-
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
-              
                 <tr>
-                  <td>secret</td>
+                  <td>partition</td>
                   <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Secret is the secret part of the invite, typically part of the url </p></td>
+                  <td>optional</td>
+                  <td><p>Partition where this network will be created </p></td>
                 </tr>
               
                 <tr>
                   <td>project</td>
                   <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Project is the project id for which this invite was created </p></td>
-                </tr>
-              
-                <tr>
-                  <td>role</td>
-                  <td><a href="#metalstack.api.v2.ProjectRole">ProjectRole</a></td>
-                  <td></td>
-                  <td><p>Role is the role in this project the user will get after accepting the invitation </p></td>
-                </tr>
-              
-                <tr>
-                  <td>joined</td>
-                  <td><a href="#bool">bool</a></td>
-                  <td></td>
-                  <td><p>Joined is false as long as a user has not accepted the invite </p></td>
+                  <td>optional</td>
+                  <td><p>Project where this network belongs to </p></td>
                 </tr>
               
                 <tr>
-                  <td>project_name</td>
-                  <td><a href="#string">string</a></td>
+                  <td>type</td>
+                  <td><a href="#metalstack.api.v2.NetworkType">metalstack.api.v2.NetworkType</a></td>
                   <td></td>
-                  <td><p>ProjectName is the project name for which this invite was created </p></td>
+                  <td><p>Type of the network to create </p></td>
                 </tr>
               
                 <tr>
-                  <td>tenant</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Tenant is the login of tenant who invites to join this project </p></td>
+                  <td>labels</td>
+                  <td><a href="#metalstack.api.v2.Labels">metalstack.api.v2.Labels</a></td>
+                  <td>optional</td>
+                  <td><p>Labels on this network </p></td>
                 </tr>
               
                 <tr>
-                  <td>tenant_name</td>
+                  <td>prefixes</td>
                   <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>TenantName is the name of tenant who invites to join this project </p></td>
-                </tr>
-              
-                <tr>
-                  <td>expires_at</td>
-                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
-                  <td></td>
-                  <td><p>ExpiresAt the date when this invite expires </p></td>
-                </tr>
-              
-                <tr>
-                  <td>joined_at</td>
-                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
-                  <td></td>
-                  <td><p>JoinedAt the date when the member accepted this invite </p></td>
+                  <td>repeated</td>
+                  <td><p>Prefixes in this network </p></td>
                 </tr>
               
-            </tbody>
-          </table>
-
-          
-
-        
-      
-        <h3 id="metalstack.api.v2.ProjectMember">ProjectMember</h3>
-        <p>ProjectMember defines a user that participates at a project</p>
-
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
-              
                 <tr>
-                  <td>id</td>
+                  <td>destination_prefixes</td>
                   <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Id is the user id of the member </p></td>
+                  <td>repeated</td>
+                  <td><p>Destination Prefixes in this network </p></td>
                 </tr>
               
                 <tr>
-                  <td>role</td>
-                  <td><a href="#metalstack.api.v2.ProjectRole">ProjectRole</a></td>
+                  <td>default_child_prefix_length</td>
+                  <td><a href="#metalstack.api.v2.ChildPrefixLength">metalstack.api.v2.ChildPrefixLength</a></td>
                   <td></td>
-                  <td><p>Role is the role of the member </p></td>
+                  <td><p>Default Child Prefix length defines the bitlength of a child network created per addressfamily, if not specified during the allocate request </p></td>
                 </tr>
               
                 <tr>
-                  <td>inherited_membership</td>
-                  <td><a href="#bool">bool</a></td>
+                  <td>min_child_prefix_length</td>
+                  <td><a href="#metalstack.api.v2.ChildPrefixLength">metalstack.api.v2.ChildPrefixLength</a></td>
                   <td></td>
-                  <td><p>InheritedMembership indicates that this member has implicit permissions on the project through his membership within the tenant.
-This member does not have direct project membership but gains permissions on this project from the role he has in the tenant.
-Inherited memberships are not included in member lists for users with guest permission but only for direct tenant members. </p></td>
+                  <td><p>Min Child Prefix length asserts that during child network creation the requested bit length is greater or equal the min child prefix length </p></td>
                 </tr>
               
                 <tr>
-                  <td>created_at</td>
-                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
-                  <td></td>
-                  <td><p>CreatedAt the date when the member was added to the project </p></td>
+                  <td>nat_type</td>
+                  <td><a href="#metalstack.api.v2.NATType">metalstack.api.v2.NATType</a></td>
+                  <td>optional</td>
+                  <td><p>NATType of this network </p></td>
                 </tr>
               
-            </tbody>
-          </table>
-
-          
-
-        
-      
-        <h3 id="metalstack.api.v2.ProjectServiceCreateRequest">ProjectServiceCreateRequest</h3>
-        <p>ProjectServiceCreateRequest is the request payload to Create a project</p>
-
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
-              
                 <tr>
-                  <td>login</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Login is the tenant of this project
-TODO: is login really a good name? </p></td>
+                  <td>vrf</td>
+                  <td><a href="#uint32">uint32</a></td>
+                  <td>optional</td>
+                  <td><p>VRF of this network has this VNI. </p></td>
                 </tr>
               
                 <tr>
-                  <td>name</td>
+                  <td>parent_network</td>
                   <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Name of this project, unique per tenant </p></td>
+                  <td>optional</td>
+                  <td><p>Parent Network points to the id of the parent network if any </p></td>
                 </tr>
               
                 <tr>
-                  <td>description</td>
+                  <td>additional_announcable_cidrs</td>
                   <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Description of this project </p></td>
+                  <td>repeated</td>
+                  <td><p>AdditionalAnnouncableCidrs will be added to the allow list on the switch which prefixes might be announced </p></td>
                 </tr>
               
                 <tr>
-                  <td>avatar_url</td>
-                  <td><a href="#string">string</a></td>
+                  <td>length</td>
+                  <td><a href="#metalstack.api.v2.ChildPrefixLength">metalstack.api.v2.ChildPrefixLength</a></td>
                   <td>optional</td>
-                  <td><p>Avatar URL of the project </p></td>
+                  <td><p>Length per addressfamily </p></td>
                 </tr>
               
                 <tr>
-                  <td>labels</td>
-                  <td><a href="#metalstack.api.v2.Labels">Labels</a></td>
-                  <td></td>
-                  <td><p>Labels on the project </p></td>
+                  <td>address_family</td>
+                  <td><a href="#metalstack.api.v2.NetworkAddressFamily">metalstack.api.v2.NetworkAddressFamily</a></td>
+                  <td>optional</td>
+                  <td><p>AddressFamily to create, defaults to the same as the parent </p></td>
                 </tr>
               
             </tbody>
@@ -11533,8 +11795,8 @@ <h3 id="metalstack.api.v2.ProjectServiceCreateRequest">ProjectServiceCreateReque
 
         
       
-        <h3 id="metalstack.api.v2.ProjectServiceCreateResponse">ProjectServiceCreateResponse</h3>
-        <p>ProjectServiceCreateResponse is the response payload of creation of a project</p>
+        <h3 id="metalstack.admin.v2.NetworkServiceCreateResponse">NetworkServiceCreateResponse</h3>
+        <p>NetworkServiceCreateResponse is the response payload for a network create request</p>
 
         
           <table class="field-table">
@@ -11544,10 +11806,10 @@ <h3 id="metalstack.api.v2.ProjectServiceCreateResponse">ProjectServiceCreateResp
             <tbody>
               
                 <tr>
-                  <td>project</td>
-                  <td><a href="#metalstack.api.v2.Project">Project</a></td>
+                  <td>network</td>
+                  <td><a href="#metalstack.api.v2.Network">metalstack.api.v2.Network</a></td>
                   <td></td>
-                  <td><p>Project is the project </p></td>
+                  <td><p>Network the network </p></td>
                 </tr>
               
             </tbody>
@@ -11557,8 +11819,8 @@ <h3 id="metalstack.api.v2.ProjectServiceCreateResponse">ProjectServiceCreateResp
 
         
       
-        <h3 id="metalstack.api.v2.ProjectServiceDeleteRequest">ProjectServiceDeleteRequest</h3>
-        <p>ProjectServiceDeleteRequest is the request payload to delete a project</p>
+        <h3 id="metalstack.admin.v2.NetworkServiceDeleteRequest">NetworkServiceDeleteRequest</h3>
+        <p>NetworkServiceDeleteRequest is the request payload for a network delete request</p>
 
         
           <table class="field-table">
@@ -11568,10 +11830,10 @@ <h3 id="metalstack.api.v2.ProjectServiceDeleteRequest">ProjectServiceDeleteReque
             <tbody>
               
                 <tr>
-                  <td>project</td>
+                  <td>id</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Project is the uuid of the project to get </p></td>
+                  <td><p>ID of the network to get </p></td>
                 </tr>
               
             </tbody>
@@ -11581,8 +11843,8 @@ <h3 id="metalstack.api.v2.ProjectServiceDeleteRequest">ProjectServiceDeleteReque
 
         
       
-        <h3 id="metalstack.api.v2.ProjectServiceDeleteResponse">ProjectServiceDeleteResponse</h3>
-        <p>ProjectServiceDeleteResponse is the response payload to delete a project</p>
+        <h3 id="metalstack.admin.v2.NetworkServiceDeleteResponse">NetworkServiceDeleteResponse</h3>
+        <p>NetworkServiceCapacityResponse is the response payload for a network delete request</p>
 
         
           <table class="field-table">
@@ -11592,10 +11854,10 @@ <h3 id="metalstack.api.v2.ProjectServiceDeleteResponse">ProjectServiceDeleteResp
             <tbody>
               
                 <tr>
-                  <td>project</td>
-                  <td><a href="#metalstack.api.v2.Project">Project</a></td>
+                  <td>network</td>
+                  <td><a href="#metalstack.api.v2.Network">metalstack.api.v2.Network</a></td>
                   <td></td>
-                  <td><p>Project is the project </p></td>
+                  <td><p>Network the network </p></td>
                 </tr>
               
             </tbody>
@@ -11605,8 +11867,8 @@ <h3 id="metalstack.api.v2.ProjectServiceDeleteResponse">ProjectServiceDeleteResp
 
         
       
-        <h3 id="metalstack.api.v2.ProjectServiceGetRequest">ProjectServiceGetRequest</h3>
-        <p>ProjectServiceGetRequest is the request payload to get a project</p>
+        <h3 id="metalstack.admin.v2.NetworkServiceGetRequest">NetworkServiceGetRequest</h3>
+        <p>NetworkServiceGetRequest</p>
 
         
           <table class="field-table">
@@ -11616,10 +11878,10 @@ <h3 id="metalstack.api.v2.ProjectServiceGetRequest">ProjectServiceGetRequest</h3
             <tbody>
               
                 <tr>
-                  <td>project</td>
+                  <td>id</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Project is the uuid of the project to get </p></td>
+                  <td><p>ID of the network to get </p></td>
                 </tr>
               
             </tbody>
@@ -11629,8 +11891,8 @@ <h3 id="metalstack.api.v2.ProjectServiceGetRequest">ProjectServiceGetRequest</h3
 
         
       
-        <h3 id="metalstack.api.v2.ProjectServiceGetResponse">ProjectServiceGetResponse</h3>
-        <p>ProjectServiceGetResponse is the response payload to get a projects</p>
+        <h3 id="metalstack.admin.v2.NetworkServiceGetResponse">NetworkServiceGetResponse</h3>
+        <p>NetworkServiceGetResponse</p>
 
         
           <table class="field-table">
@@ -11640,17 +11902,34 @@ <h3 id="metalstack.api.v2.ProjectServiceGetResponse">ProjectServiceGetResponse</
             <tbody>
               
                 <tr>
-                  <td>project</td>
-                  <td><a href="#metalstack.api.v2.Project">Project</a></td>
+                  <td>network</td>
+                  <td><a href="#metalstack.api.v2.Network">metalstack.api.v2.Network</a></td>
                   <td></td>
-                  <td><p>Project is the project </p></td>
+                  <td><p>Network which was requested to get </p></td>
                 </tr>
               
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.admin.v2.NetworkServiceListRequest">NetworkServiceListRequest</h3>
+        <p>NetworkServiceListRequest</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
                 <tr>
-                  <td>project_members</td>
-                  <td><a href="#metalstack.api.v2.ProjectMember">ProjectMember</a></td>
-                  <td>repeated</td>
-                  <td><p>ProjectMembers in this project, projects guests will only see direct project members and not implicit memberships from tenant permissions </p></td>
+                  <td>query</td>
+                  <td><a href="#metalstack.api.v2.NetworkQuery">metalstack.api.v2.NetworkQuery</a></td>
+                  <td></td>
+                  <td><p>Query which specifies which networks to return </p></td>
                 </tr>
               
             </tbody>
@@ -11660,8 +11939,8 @@ <h3 id="metalstack.api.v2.ProjectServiceGetResponse">ProjectServiceGetResponse</
 
         
       
-        <h3 id="metalstack.api.v2.ProjectServiceInviteAcceptRequest">ProjectServiceInviteAcceptRequest</h3>
-        <p>ProjectServiceInviteAcceptRequest is the request payload to a accept invite request</p>
+        <h3 id="metalstack.admin.v2.NetworkServiceListResponse">NetworkServiceListResponse</h3>
+        <p>NetworkServiceListResponse</p>
 
         
           <table class="field-table">
@@ -11671,10 +11950,10 @@ <h3 id="metalstack.api.v2.ProjectServiceInviteAcceptRequest">ProjectServiceInvit
             <tbody>
               
                 <tr>
-                  <td>secret</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Secret is the invitation secret part of the invitation url </p></td>
+                  <td>networks</td>
+                  <td><a href="#metalstack.api.v2.Network">metalstack.api.v2.Network</a></td>
+                  <td>repeated</td>
+                  <td><p>Networks are the requested networks </p></td>
                 </tr>
               
             </tbody>
@@ -11684,8 +11963,8 @@ <h3 id="metalstack.api.v2.ProjectServiceInviteAcceptRequest">ProjectServiceInvit
 
         
       
-        <h3 id="metalstack.api.v2.ProjectServiceInviteAcceptResponse">ProjectServiceInviteAcceptResponse</h3>
-        <p>ProjectServiceInvitesListResponse is the response payload to a accept invite request</p>
+        <h3 id="metalstack.admin.v2.NetworkServiceUpdateRequest">NetworkServiceUpdateRequest</h3>
+        <p>NetworkServiceUpdateRequest is the request payload for a network update request</p>
 
         
           <table class="field-table">
@@ -11695,17 +11974,87 @@ <h3 id="metalstack.api.v2.ProjectServiceInviteAcceptResponse">ProjectServiceInvi
             <tbody>
               
                 <tr>
-                  <td>project</td>
+                  <td>id</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Project ID of the project joined </p></td>
+                  <td><p>Id of this network </p></td>
                 </tr>
               
                 <tr>
-                  <td>project_name</td>
+                  <td>update_meta</td>
+                  <td><a href="#metalstack.api.v2.UpdateMeta">metalstack.api.v2.UpdateMeta</a></td>
+                  <td></td>
+                  <td><p>UpdateMeta contains the timestamp and strategy to be used in this update request </p></td>
+                </tr>
+              
+                <tr>
+                  <td>name</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Name of this network </p></td>
+                </tr>
+              
+                <tr>
+                  <td>description</td>
                   <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Description of this network </p></td>
+                </tr>
+              
+                <tr>
+                  <td>labels</td>
+                  <td><a href="#metalstack.api.v2.UpdateLabels">metalstack.api.v2.UpdateLabels</a></td>
+                  <td>optional</td>
+                  <td><p>Labels to update on this network </p></td>
+                </tr>
+              
+                <tr>
+                  <td>prefixes</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>Prefixes in this network </p></td>
+                </tr>
+              
+                <tr>
+                  <td>destination_prefixes</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>Destination Prefixes in this network </p></td>
+                </tr>
+              
+                <tr>
+                  <td>default_child_prefix_length</td>
+                  <td><a href="#metalstack.api.v2.ChildPrefixLength">metalstack.api.v2.ChildPrefixLength</a></td>
+                  <td>optional</td>
+                  <td><p>Default Child Prefix length defines the bit length of a child network created per addressfamily, of not specified during the allocate request </p></td>
+                </tr>
+              
+                <tr>
+                  <td>min_child_prefix_length</td>
+                  <td><a href="#metalstack.api.v2.ChildPrefixLength">metalstack.api.v2.ChildPrefixLength</a></td>
+                  <td>optional</td>
+                  <td><p>Min Child Prefix length asserts that during child network creation the requested bit length is greater or equal the min child prefix length </p></td>
+                </tr>
+              
+                <tr>
+                  <td>nat_type</td>
+                  <td><a href="#metalstack.api.v2.NATType">metalstack.api.v2.NATType</a></td>
+                  <td>optional</td>
+                  <td><p>NATType of this network </p></td>
+                </tr>
+              
+                <tr>
+                  <td>additional_announcable_cidrs</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>AdditionalAnnouncableCidrs will be added to the allow list on the switch which prefixes might be announced </p></td>
+                </tr>
+              
+                <tr>
+                  <td>force</td>
+                  <td><a href="#bool">bool</a></td>
                   <td></td>
-                  <td><p>ProjectName if the project joined </p></td>
+                  <td><p>Force update, actually only prevents accidental removal of additional_announcable_cidrs which will destroy your dataplane in fact. </p></td>
                 </tr>
               
             </tbody>
@@ -11715,8 +12064,8 @@ <h3 id="metalstack.api.v2.ProjectServiceInviteAcceptResponse">ProjectServiceInvi
 
         
       
-        <h3 id="metalstack.api.v2.ProjectServiceInviteDeleteRequest">ProjectServiceInviteDeleteRequest</h3>
-        <p>ProjectServiceInviteDeleteRequest is the request payload to a delete invite</p>
+        <h3 id="metalstack.admin.v2.NetworkServiceUpdateResponse">NetworkServiceUpdateResponse</h3>
+        <p>NetworkServiceUpdateResponse is the response payload for a network update request</p>
 
         
           <table class="field-table">
@@ -11726,17 +12075,10 @@ <h3 id="metalstack.api.v2.ProjectServiceInviteDeleteRequest">ProjectServiceInvit
             <tbody>
               
                 <tr>
-                  <td>project</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Project is the uuid of the project </p></td>
-                </tr>
-              
-                <tr>
-                  <td>secret</td>
-                  <td><a href="#string">string</a></td>
+                  <td>network</td>
+                  <td><a href="#metalstack.api.v2.Network">metalstack.api.v2.Network</a></td>
                   <td></td>
-                  <td><p>Secret of the invite to delete </p></td>
+                  <td><p>Network the network </p></td>
                 </tr>
               
             </tbody>
@@ -11746,15 +12088,69 @@ <h3 id="metalstack.api.v2.ProjectServiceInviteDeleteRequest">ProjectServiceInvit
 
         
       
-        <h3 id="metalstack.api.v2.ProjectServiceInviteDeleteResponse">ProjectServiceInviteDeleteResponse</h3>
-        <p>ProjectServiceInviteDeleteResponse is the response payload of a delete invite request</p>
-
-        
 
-        
       
-        <h3 id="metalstack.api.v2.ProjectServiceInviteGetRequest">ProjectServiceInviteGetRequest</h3>
-        <p>ProjectServiceInviteGetRequest is the request payload to get a invite</p>
+
+      
+
+      
+        <h3 id="metalstack.admin.v2.NetworkService">NetworkService</h3>
+        <p>NetworkService serves network address related functions</p>
+        <table class="enum-table">
+          <thead>
+            <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>Get</td>
+                <td><a href="#metalstack.admin.v2.NetworkServiceGetRequest">NetworkServiceGetRequest</a></td>
+                <td><a href="#metalstack.admin.v2.NetworkServiceGetResponse">NetworkServiceGetResponse</a></td>
+                <td><p>Get a network</p></td>
+              </tr>
+            
+              <tr>
+                <td>Create</td>
+                <td><a href="#metalstack.admin.v2.NetworkServiceCreateRequest">NetworkServiceCreateRequest</a></td>
+                <td><a href="#metalstack.admin.v2.NetworkServiceCreateResponse">NetworkServiceCreateResponse</a></td>
+                <td><p>Create a network</p></td>
+              </tr>
+            
+              <tr>
+                <td>Update</td>
+                <td><a href="#metalstack.admin.v2.NetworkServiceUpdateRequest">NetworkServiceUpdateRequest</a></td>
+                <td><a href="#metalstack.admin.v2.NetworkServiceUpdateResponse">NetworkServiceUpdateResponse</a></td>
+                <td><p>Update a network</p></td>
+              </tr>
+            
+              <tr>
+                <td>Delete</td>
+                <td><a href="#metalstack.admin.v2.NetworkServiceDeleteRequest">NetworkServiceDeleteRequest</a></td>
+                <td><a href="#metalstack.admin.v2.NetworkServiceDeleteResponse">NetworkServiceDeleteResponse</a></td>
+                <td><p>Delete a network</p></td>
+              </tr>
+            
+              <tr>
+                <td>List</td>
+                <td><a href="#metalstack.admin.v2.NetworkServiceListRequest">NetworkServiceListRequest</a></td>
+                <td><a href="#metalstack.admin.v2.NetworkServiceListResponse">NetworkServiceListResponse</a></td>
+                <td><p>List all networks</p></td>
+              </tr>
+            
+          </tbody>
+        </table>
+
+        
+    
+      
+      <div class="file-heading">
+        <h2 id="metalstack/admin/v2/partition.proto">metalstack/admin/v2/partition.proto</h2><a href="#title">Top</a>
+      </div>
+      <p></p>
+
+      
+        <h3 id="metalstack.admin.v2.MachineSizeCapacity">MachineSizeCapacity</h3>
+        <p>ServerCapacity is the capacity of one server type, eg machine size</p>
 
         
           <table class="field-table">
@@ -11764,139 +12160,111 @@ <h3 id="metalstack.api.v2.ProjectServiceInviteGetRequest">ProjectServiceInviteGe
             <tbody>
               
                 <tr>
-                  <td>secret</td>
+                  <td>size</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Secret of the invite to list </p></td>
+                  <td><p>Size is the size id correlating to all counts in this server capacity. </p></td>
                 </tr>
               
-            </tbody>
-          </table>
-
-          
-
-        
-      
-        <h3 id="metalstack.api.v2.ProjectServiceInviteGetResponse">ProjectServiceInviteGetResponse</h3>
-        <p>ProjectServiceInviteGetResponse is the response payload to a get invite request</p>
-
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
+                <tr>
+                  <td>total</td>
+                  <td><a href="#int64">int64</a></td>
+                  <td></td>
+                  <td><p>Total is the total amount of machines for this size. </p></td>
+                </tr>
               
                 <tr>
-                  <td>invite</td>
-                  <td><a href="#metalstack.api.v2.ProjectInvite">ProjectInvite</a></td>
+                  <td>phoned_home</td>
+                  <td><a href="#int64">int64</a></td>
                   <td></td>
-                  <td><p>Invite is the invite </p></td>
+                  <td><p>PhonedHome is the amount of machines that are currently in the provisioning state &#34;phoned home&#34;. </p></td>
                 </tr>
               
-            </tbody>
-          </table>
-
-          
-
-        
-      
-        <h3 id="metalstack.api.v2.ProjectServiceInviteRequest">ProjectServiceInviteRequest</h3>
-        <p>ProjectServiceInviteRequest is used to invite a member to a project</p>
-
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
+                <tr>
+                  <td>waiting</td>
+                  <td><a href="#int64">int64</a></td>
+                  <td></td>
+                  <td><p>Waiting is the amount of machines that are currently in the provisioning state &#34;waiting&#34;. </p></td>
+                </tr>
               
                 <tr>
-                  <td>project</td>
+                  <td>other</td>
+                  <td><a href="#int64">int64</a></td>
+                  <td></td>
+                  <td><p>Other is the amount of machines that are neither in the provisioning state waiting nor in phoned home but in another provisioning state. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>other_machines</td>
                   <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>OtherMachines contains the machine IDs for machines that were classified into &#34;Other&#34;. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>allocated</td>
+                  <td><a href="#int64">int64</a></td>
                   <td></td>
-                  <td><p>Project is the uuid of the project </p></td>
+                  <td><p>Allocated is the amount of machines that are currently allocated. </p></td>
                 </tr>
               
                 <tr>
-                  <td>role</td>
-                  <td><a href="#metalstack.api.v2.ProjectRole">ProjectRole</a></td>
+                  <td>allocatable</td>
+                  <td><a href="#int64">int64</a></td>
                   <td></td>
-                  <td><p>Role of this user in this project </p></td>
+                  <td><p>Allocatable is the amount of machines in a partition is the amount of machines that can be allocated.
+Effectively this is the amount of waiting machines minus the machines that are unavailable due to machine state or un-allocatable. Size reservations are not considered in this count. </p></td>
                 </tr>
               
-            </tbody>
-          </table>
-
-          
-
-        
-      
-        <h3 id="metalstack.api.v2.ProjectServiceInviteResponse">ProjectServiceInviteResponse</h3>
-        <p>ProjectServiceInviteRequest is the response payload to a invite member request</p>
-
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
+                <tr>
+                  <td>free</td>
+                  <td><a href="#int64">int64</a></td>
+                  <td></td>
+                  <td><p>Free is the amount of machines in a partition that can be freely allocated at any given moment by a project.
+Effectively this is the amount of waiting machines minus the machines that are unavailable due to machine state or un-allocatable due to size reservations. </p></td>
+                </tr>
               
                 <tr>
-                  <td>invite</td>
-                  <td><a href="#metalstack.api.v2.ProjectInvite">ProjectInvite</a></td>
+                  <td>unavailable</td>
+                  <td><a href="#int64">int64</a></td>
                   <td></td>
-                  <td><p>Inviter contains a secret which can be sent to a potential user
-can be appended to the invitation endpoint at our cloud console like
-console.metalstack.cloud/invite/&lt;secret&gt; </p></td>
+                  <td><p>Unavailable is the amount of machine in a partition that are currently not allocatable because they are not waiting or
+not in the machine state &#34;available&#34;, e.g. locked or reserved. </p></td>
                 </tr>
               
-            </tbody>
-          </table>
-
-          
-
-        
-      
-        <h3 id="metalstack.api.v2.ProjectServiceInvitesListRequest">ProjectServiceInvitesListRequest</h3>
-        <p>ProjectServiceInvitesListRequest is the request payload to a list invites request</p>
-
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
+                <tr>
+                  <td>faulty</td>
+                  <td><a href="#int64">int64</a></td>
+                  <td></td>
+                  <td><p>Faulty is the amount of machines that are neither allocated nor in the pool of available machines because they report an error. </p></td>
+                </tr>
               
                 <tr>
-                  <td>project</td>
+                  <td>faulty_machines</td>
                   <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>FaultyMachines contains the machine IDs for machines that were classified into &#34;Faulty&#34;. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>reservations</td>
+                  <td><a href="#int64">int64</a></td>
                   <td></td>
-                  <td><p>Project is the uuid of the project </p></td>
+                  <td><p>Reservations is the amount of reservations made for this size. </p></td>
                 </tr>
               
-            </tbody>
-          </table>
-
-          
-
-        
-      
-        <h3 id="metalstack.api.v2.ProjectServiceInvitesListResponse">ProjectServiceInvitesListResponse</h3>
-        <p>ProjectServiceInvitesListResponse is the response payload to a list invites request</p>
-
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
+                <tr>
+                  <td>used_reservations</td>
+                  <td><a href="#int64">int64</a></td>
+                  <td></td>
+                  <td><p>UsedReservations is the amount of reservations already used up for this size. </p></td>
+                </tr>
               
                 <tr>
-                  <td>invites</td>
-                  <td><a href="#metalstack.api.v2.ProjectInvite">ProjectInvite</a></td>
-                  <td>repeated</td>
-                  <td><p>Invites not already accepted the invitation to this project </p></td>
+                  <td>remaining_reservations</td>
+                  <td><a href="#int64">int64</a></td>
+                  <td></td>
+                  <td><p>RemainingReservations is the amount of reservations remaining for this size. </p></td>
                 </tr>
               
             </tbody>
@@ -11906,8 +12274,8 @@ <h3 id="metalstack.api.v2.ProjectServiceInvitesListResponse">ProjectServiceInvit
 
         
       
-        <h3 id="metalstack.api.v2.ProjectServiceLeaveRequest">ProjectServiceLeaveRequest</h3>
-        <p>ProjectServiceLeaveRequest is used to leave a project</p>
+        <h3 id="metalstack.admin.v2.PartitionCapacity">PartitionCapacity</h3>
+        <p>PartitionCapacity is the capacity of one partition</p>
 
         
           <table class="field-table">
@@ -11917,10 +12285,17 @@ <h3 id="metalstack.api.v2.ProjectServiceLeaveRequest">ProjectServiceLeaveRequest
             <tbody>
               
                 <tr>
-                  <td>project</td>
+                  <td>partition</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Project is the uuid of the project </p></td>
+                  <td><p>Partition of which this capacity is reported. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>machine_size_capacities</td>
+                  <td><a href="#metalstack.admin.v2.MachineSizeCapacity">MachineSizeCapacity</a></td>
+                  <td>repeated</td>
+                  <td><p>MachineSizeCapacities is the capacity per machine size. </p></td>
                 </tr>
               
             </tbody>
@@ -11930,15 +12305,8 @@ <h3 id="metalstack.api.v2.ProjectServiceLeaveRequest">ProjectServiceLeaveRequest
 
         
       
-        <h3 id="metalstack.api.v2.ProjectServiceLeaveResponse">ProjectServiceLeaveResponse</h3>
-        <p>ProjectServiceLeaveResponse is the response payload to a leave project request</p>
-
-        
-
-        
-      
-        <h3 id="metalstack.api.v2.ProjectServiceListRequest">ProjectServiceListRequest</h3>
-        <p>ProjectServiceListRequest is the request payload to list all projects</p>
+        <h3 id="metalstack.admin.v2.PartitionServiceCapacityRequest">PartitionServiceCapacityRequest</h3>
+        <p>PartitionServiceListRequest is the request payload for a partition capacity request</p>
 
         
           <table class="field-table">
@@ -11951,52 +12319,21 @@ <h3 id="metalstack.api.v2.ProjectServiceListRequest">ProjectServiceListRequest</
                   <td>id</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Id lists only projects with this id </p></td>
-                </tr>
-              
-                <tr>
-                  <td>name</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Name lists only projects with this name </p></td>
+                  <td><p>ID of the partition to get </p></td>
                 </tr>
               
                 <tr>
-                  <td>tenant</td>
+                  <td>size</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Tenant lists only projects of this tenant </p></td>
-                </tr>
-              
-                <tr>
-                  <td>labels</td>
-                  <td><a href="#metalstack.api.v2.Labels">Labels</a></td>
-                  <td>optional</td>
-                  <td><p>Labels lists only projects containing the given labels </p></td>
+                  <td><p>Size of machines to show the capacity </p></td>
                 </tr>
               
-            </tbody>
-          </table>
-
-          
-
-        
-      
-        <h3 id="metalstack.api.v2.ProjectServiceListResponse">ProjectServiceListResponse</h3>
-        <p>ProjectServiceListResponse is the response payload to list all projects</p>
-
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
-              
                 <tr>
-                  <td>projects</td>
-                  <td><a href="#metalstack.api.v2.Project">Project</a></td>
-                  <td>repeated</td>
-                  <td><p>Projects is a list of all your projects </p></td>
+                  <td>project</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Project of machines to show the capacity </p></td>
                 </tr>
               
             </tbody>
@@ -12006,8 +12343,8 @@ <h3 id="metalstack.api.v2.ProjectServiceListResponse">ProjectServiceListResponse
 
         
       
-        <h3 id="metalstack.api.v2.ProjectServiceRemoveMemberRequest">ProjectServiceRemoveMemberRequest</h3>
-        <p>ProjectServiceRemoveMemberRequest is used to remove a member from a project</p>
+        <h3 id="metalstack.admin.v2.PartitionServiceCapacityResponse">PartitionServiceCapacityResponse</h3>
+        <p>PartitionServiceCapacityResponse is the response payload for a partition capacity request</p>
 
         
           <table class="field-table">
@@ -12017,17 +12354,10 @@ <h3 id="metalstack.api.v2.ProjectServiceRemoveMemberRequest">ProjectServiceRemov
             <tbody>
               
                 <tr>
-                  <td>project</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Project is the uuid of the project </p></td>
-                </tr>
-              
-                <tr>
-                  <td>member</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Member is the id of the member to remove from this project </p></td>
+                  <td>partition_capacity</td>
+                  <td><a href="#metalstack.admin.v2.PartitionCapacity">PartitionCapacity</a></td>
+                  <td>repeated</td>
+                  <td><p>PartitionCapacity is a capacity report per partition </p></td>
                 </tr>
               
             </tbody>
@@ -12037,15 +12367,8 @@ <h3 id="metalstack.api.v2.ProjectServiceRemoveMemberRequest">ProjectServiceRemov
 
         
       
-        <h3 id="metalstack.api.v2.ProjectServiceRemoveMemberResponse">ProjectServiceRemoveMemberResponse</h3>
-        <p>ProjectServiceRemoveMemberResponse is the response payload to a remove member request</p>
-
-        
-
-        
-      
-        <h3 id="metalstack.api.v2.ProjectServiceUpdateMemberRequest">ProjectServiceUpdateMemberRequest</h3>
-        <p>ProjectServiceUpdateMemberRequest is used to update a member of a project</p>
+        <h3 id="metalstack.admin.v2.PartitionServiceCreateRequest">PartitionServiceCreateRequest</h3>
+        <p>PartitionServiceCreateRequest is the request payload for a partition create request</p>
 
         
           <table class="field-table">
@@ -12055,24 +12378,10 @@ <h3 id="metalstack.api.v2.ProjectServiceUpdateMemberRequest">ProjectServiceUpdat
             <tbody>
               
                 <tr>
-                  <td>project</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Project is the uuid of the project </p></td>
-                </tr>
-              
-                <tr>
-                  <td>member</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Member is the id of the member to remove from this project </p></td>
-                </tr>
-              
-                <tr>
-                  <td>role</td>
-                  <td><a href="#metalstack.api.v2.ProjectRole">ProjectRole</a></td>
+                  <td>partition</td>
+                  <td><a href="#metalstack.api.v2.Partition">metalstack.api.v2.Partition</a></td>
                   <td></td>
-                  <td><p>Role is the role in this project the user will get after the update </p></td>
+                  <td><p>Partition the partition </p></td>
                 </tr>
               
             </tbody>
@@ -12082,8 +12391,8 @@ <h3 id="metalstack.api.v2.ProjectServiceUpdateMemberRequest">ProjectServiceUpdat
 
         
       
-        <h3 id="metalstack.api.v2.ProjectServiceUpdateMemberResponse">ProjectServiceUpdateMemberResponse</h3>
-        <p>ProjectServiceUpdateMemberResponse is the response payload to a update member request</p>
+        <h3 id="metalstack.admin.v2.PartitionServiceCreateResponse">PartitionServiceCreateResponse</h3>
+        <p>PartitionServiceCreateResponse is the response payload for a partition create request</p>
 
         
           <table class="field-table">
@@ -12093,10 +12402,10 @@ <h3 id="metalstack.api.v2.ProjectServiceUpdateMemberResponse">ProjectServiceUpda
             <tbody>
               
                 <tr>
-                  <td>project_member</td>
-                  <td><a href="#metalstack.api.v2.ProjectMember">ProjectMember</a></td>
+                  <td>partition</td>
+                  <td><a href="#metalstack.api.v2.Partition">metalstack.api.v2.Partition</a></td>
                   <td></td>
-                  <td><p>ProjectMember is the updated project member </p></td>
+                  <td><p>Partition the partition </p></td>
                 </tr>
               
             </tbody>
@@ -12106,8 +12415,8 @@ <h3 id="metalstack.api.v2.ProjectServiceUpdateMemberResponse">ProjectServiceUpda
 
         
       
-        <h3 id="metalstack.api.v2.ProjectServiceUpdateRequest">ProjectServiceUpdateRequest</h3>
-        <p>ProjectServiceUpdateRequest is the request payload to update a project</p>
+        <h3 id="metalstack.admin.v2.PartitionServiceDeleteRequest">PartitionServiceDeleteRequest</h3>
+        <p>PartitionServiceDeleteRequest is the request payload for a partition delete request</p>
 
         
           <table class="field-table">
@@ -12117,45 +12426,10 @@ <h3 id="metalstack.api.v2.ProjectServiceUpdateRequest">ProjectServiceUpdateReque
             <tbody>
               
                 <tr>
-                  <td>project</td>
+                  <td>id</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Project is the uuid of the project to get </p></td>
-                </tr>
-              
-                <tr>
-                  <td>update_meta</td>
-                  <td><a href="#metalstack.api.v2.UpdateMeta">UpdateMeta</a></td>
-                  <td></td>
-                  <td><p>UpdateMeta contains the timestamp and strategy to be used in this update request </p></td>
-                </tr>
-              
-                <tr>
-                  <td>name</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Name of this project unique per tenant </p></td>
-                </tr>
-              
-                <tr>
-                  <td>description</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Description of this project </p></td>
-                </tr>
-              
-                <tr>
-                  <td>avatar_url</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Avatar URL of the project </p></td>
-                </tr>
-              
-                <tr>
-                  <td>labels</td>
-                  <td><a href="#metalstack.api.v2.UpdateLabels">UpdateLabels</a></td>
-                  <td>optional</td>
-                  <td><p>Labels on this project </p></td>
+                  <td><p>ID of the partition to get </p></td>
                 </tr>
               
             </tbody>
@@ -12165,8 +12439,8 @@ <h3 id="metalstack.api.v2.ProjectServiceUpdateRequest">ProjectServiceUpdateReque
 
         
       
-        <h3 id="metalstack.api.v2.ProjectServiceUpdateResponse">ProjectServiceUpdateResponse</h3>
-        <p>ProjectServiceUpdateResponse is the response payload to update a project</p>
+        <h3 id="metalstack.admin.v2.PartitionServiceDeleteResponse">PartitionServiceDeleteResponse</h3>
+        <p>PartitionServiceCapacityResponse is the response payload for a partition delete request</p>
 
         
           <table class="field-table">
@@ -12176,10 +12450,10 @@ <h3 id="metalstack.api.v2.ProjectServiceUpdateResponse">ProjectServiceUpdateResp
             <tbody>
               
                 <tr>
-                  <td>project</td>
-                  <td><a href="#metalstack.api.v2.Project">Project</a></td>
+                  <td>partition</td>
+                  <td><a href="#metalstack.api.v2.Partition">metalstack.api.v2.Partition</a></td>
                   <td></td>
-                  <td><p>Project is the project </p></td>
+                  <td><p>Partition the partition </p></td>
                 </tr>
               
             </tbody>
@@ -12189,125 +12463,8 @@ <h3 id="metalstack.api.v2.ProjectServiceUpdateResponse">ProjectServiceUpdateResp
 
         
       
-
-      
-
-      
-
-      
-        <h3 id="metalstack.api.v2.ProjectService">ProjectService</h3>
-        <p>ProjectService serves project related functions</p>
-        <table class="enum-table">
-          <thead>
-            <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
-          </thead>
-          <tbody>
-            
-              <tr>
-                <td>List</td>
-                <td><a href="#metalstack.api.v2.ProjectServiceListRequest">ProjectServiceListRequest</a></td>
-                <td><a href="#metalstack.api.v2.ProjectServiceListResponse">ProjectServiceListResponse</a></td>
-                <td><p>List all accessible projects</p></td>
-              </tr>
-            
-              <tr>
-                <td>Get</td>
-                <td><a href="#metalstack.api.v2.ProjectServiceGetRequest">ProjectServiceGetRequest</a></td>
-                <td><a href="#metalstack.api.v2.ProjectServiceGetResponse">ProjectServiceGetResponse</a></td>
-                <td><p>Get a project</p></td>
-              </tr>
-            
-              <tr>
-                <td>Create</td>
-                <td><a href="#metalstack.api.v2.ProjectServiceCreateRequest">ProjectServiceCreateRequest</a></td>
-                <td><a href="#metalstack.api.v2.ProjectServiceCreateResponse">ProjectServiceCreateResponse</a></td>
-                <td><p>Create a project</p></td>
-              </tr>
-            
-              <tr>
-                <td>Delete</td>
-                <td><a href="#metalstack.api.v2.ProjectServiceDeleteRequest">ProjectServiceDeleteRequest</a></td>
-                <td><a href="#metalstack.api.v2.ProjectServiceDeleteResponse">ProjectServiceDeleteResponse</a></td>
-                <td><p>Delete a project</p></td>
-              </tr>
-            
-              <tr>
-                <td>Update</td>
-                <td><a href="#metalstack.api.v2.ProjectServiceUpdateRequest">ProjectServiceUpdateRequest</a></td>
-                <td><a href="#metalstack.api.v2.ProjectServiceUpdateResponse">ProjectServiceUpdateResponse</a></td>
-                <td><p>Update a project</p></td>
-              </tr>
-            
-              <tr>
-                <td>Leave</td>
-                <td><a href="#metalstack.api.v2.ProjectServiceLeaveRequest">ProjectServiceLeaveRequest</a></td>
-                <td><a href="#metalstack.api.v2.ProjectServiceLeaveResponse">ProjectServiceLeaveResponse</a></td>
-                <td><p>Leave project</p></td>
-              </tr>
-            
-              <tr>
-                <td>RemoveMember</td>
-                <td><a href="#metalstack.api.v2.ProjectServiceRemoveMemberRequest">ProjectServiceRemoveMemberRequest</a></td>
-                <td><a href="#metalstack.api.v2.ProjectServiceRemoveMemberResponse">ProjectServiceRemoveMemberResponse</a></td>
-                <td><p>RemoveMember remove a user from a project</p></td>
-              </tr>
-            
-              <tr>
-                <td>UpdateMember</td>
-                <td><a href="#metalstack.api.v2.ProjectServiceUpdateMemberRequest">ProjectServiceUpdateMemberRequest</a></td>
-                <td><a href="#metalstack.api.v2.ProjectServiceUpdateMemberResponse">ProjectServiceUpdateMemberResponse</a></td>
-                <td><p>UpdateMember update a user for a project</p></td>
-              </tr>
-            
-              <tr>
-                <td>Invite</td>
-                <td><a href="#metalstack.api.v2.ProjectServiceInviteRequest">ProjectServiceInviteRequest</a></td>
-                <td><a href="#metalstack.api.v2.ProjectServiceInviteResponse">ProjectServiceInviteResponse</a></td>
-                <td><p>Invite a user to a project</p></td>
-              </tr>
-            
-              <tr>
-                <td>InviteAccept</td>
-                <td><a href="#metalstack.api.v2.ProjectServiceInviteAcceptRequest">ProjectServiceInviteAcceptRequest</a></td>
-                <td><a href="#metalstack.api.v2.ProjectServiceInviteAcceptResponse">ProjectServiceInviteAcceptResponse</a></td>
-                <td><p>InviteAccept is called from a user to accept a invitation</p></td>
-              </tr>
-            
-              <tr>
-                <td>InviteDelete</td>
-                <td><a href="#metalstack.api.v2.ProjectServiceInviteDeleteRequest">ProjectServiceInviteDeleteRequest</a></td>
-                <td><a href="#metalstack.api.v2.ProjectServiceInviteDeleteResponse">ProjectServiceInviteDeleteResponse</a></td>
-                <td><p>InviteDelete deletes a pending invitation</p></td>
-              </tr>
-            
-              <tr>
-                <td>InvitesList</td>
-                <td><a href="#metalstack.api.v2.ProjectServiceInvitesListRequest">ProjectServiceInvitesListRequest</a></td>
-                <td><a href="#metalstack.api.v2.ProjectServiceInvitesListResponse">ProjectServiceInvitesListResponse</a></td>
-                <td><p>InvitesList list all invites to a project</p></td>
-              </tr>
-            
-              <tr>
-                <td>InviteGet</td>
-                <td><a href="#metalstack.api.v2.ProjectServiceInviteGetRequest">ProjectServiceInviteGetRequest</a></td>
-                <td><a href="#metalstack.api.v2.ProjectServiceInviteGetResponse">ProjectServiceInviteGetResponse</a></td>
-                <td><p>InviteGet get an invite</p></td>
-              </tr>
-            
-          </tbody>
-        </table>
-
-        
-    
-      
-      <div class="file-heading">
-        <h2 id="metalstack/admin/v2/project.proto">metalstack/admin/v2/project.proto</h2><a href="#title">Top</a>
-      </div>
-      <p></p>
-
-      
-        <h3 id="metalstack.admin.v2.ProjectServiceListRequest">ProjectServiceListRequest</h3>
-        <p>ProjectServiceListRequest is the request payload for the project list request</p>
+        <h3 id="metalstack.admin.v2.PartitionServiceUpdateRequest">PartitionServiceUpdateRequest</h3>
+        <p>PartitionServiceUpdateRequest is the request payload for a partition update request</p>
 
         
           <table class="field-table">
@@ -12317,17 +12474,61 @@ <h3 id="metalstack.admin.v2.ProjectServiceListRequest">ProjectServiceListRequest
             <tbody>
               
                 <tr>
-                  <td>tenant</td>
+                  <td>id</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>ID of this partition </p></td>
+                </tr>
+              
+                <tr>
+                  <td>update_meta</td>
+                  <td><a href="#metalstack.api.v2.UpdateMeta">metalstack.api.v2.UpdateMeta</a></td>
+                  <td></td>
+                  <td><p>UpdateMeta contains the timestamp and strategy to be used in this update request </p></td>
+                </tr>
+              
+                <tr>
+                  <td>description</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Description of this partition </p></td>
+                </tr>
+              
+                <tr>
+                  <td>boot_configuration</td>
+                  <td><a href="#metalstack.api.v2.PartitionBootConfiguration">metalstack.api.v2.PartitionBootConfiguration</a></td>
+                  <td></td>
+                  <td><p>PartitionBootConfiguration defines how metal-hammer boots </p></td>
+                </tr>
+              
+                <tr>
+                  <td>dns_server</td>
+                  <td><a href="#metalstack.api.v2.DNSServer">metalstack.api.v2.DNSServer</a></td>
+                  <td>repeated</td>
+                  <td><p>DNSServers for this partition </p></td>
+                </tr>
+              
+                <tr>
+                  <td>ntp_server</td>
+                  <td><a href="#metalstack.api.v2.NTPServer">metalstack.api.v2.NTPServer</a></td>
+                  <td>repeated</td>
+                  <td><p>NTPServers for this partition </p></td>
+                </tr>
+              
+                <tr>
+                  <td>mgmt_service_addresses</td>
                   <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Tenant lists only projects of this tenant </p></td>
+                  <td>repeated</td>
+                  <td><p>ManagementServiceAddresses defines where the management is reachable
+should be in the form &lt;ip|host&gt;:&lt;port&gt;
+FIXME validation </p></td>
                 </tr>
               
                 <tr>
                   <td>labels</td>
-                  <td><a href="#metalstack.api.v2.Labels">metalstack.api.v2.Labels</a></td>
+                  <td><a href="#metalstack.api.v2.UpdateLabels">metalstack.api.v2.UpdateLabels</a></td>
                   <td>optional</td>
-                  <td><p>Labels lists only projects containing the given labels </p></td>
+                  <td><p>Labels to update on this network </p></td>
                 </tr>
               
             </tbody>
@@ -12337,8 +12538,8 @@ <h3 id="metalstack.admin.v2.ProjectServiceListRequest">ProjectServiceListRequest
 
         
       
-        <h3 id="metalstack.admin.v2.ProjectServiceListResponse">ProjectServiceListResponse</h3>
-        <p>ProjectServiceListResponse is the response payload for the project list request</p>
+        <h3 id="metalstack.admin.v2.PartitionServiceUpdateResponse">PartitionServiceUpdateResponse</h3>
+        <p>PartitionServiceUpdateResponse is the response payload for a partition update request</p>
 
         
           <table class="field-table">
@@ -12348,10 +12549,10 @@ <h3 id="metalstack.admin.v2.ProjectServiceListResponse">ProjectServiceListRespon
             <tbody>
               
                 <tr>
-                  <td>projects</td>
-                  <td><a href="#metalstack.api.v2.Project">metalstack.api.v2.Project</a></td>
-                  <td>repeated</td>
-                  <td><p>Projects is a list of all projects </p></td>
+                  <td>partition</td>
+                  <td><a href="#metalstack.api.v2.Partition">metalstack.api.v2.Partition</a></td>
+                  <td></td>
+                  <td><p>Partition the partition </p></td>
                 </tr>
               
             </tbody>
@@ -12367,8 +12568,8 @@ <h3 id="metalstack.admin.v2.ProjectServiceListResponse">ProjectServiceListRespon
       
 
       
-        <h3 id="metalstack.admin.v2.ProjectService">ProjectService</h3>
-        <p>ProjectService serves project related functions</p>
+        <h3 id="metalstack.admin.v2.PartitionService">PartitionService</h3>
+        <p>PartitionService serves partition address related functions</p>
         <table class="enum-table">
           <thead>
             <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
@@ -12376,10 +12577,31 @@ <h3 id="metalstack.admin.v2.ProjectService">ProjectService</h3>
           <tbody>
             
               <tr>
-                <td>List</td>
-                <td><a href="#metalstack.admin.v2.ProjectServiceListRequest">ProjectServiceListRequest</a></td>
-                <td><a href="#metalstack.admin.v2.ProjectServiceListResponse">ProjectServiceListResponse</a></td>
-                <td><p>List projects based on various filter criteria</p></td>
+                <td>Create</td>
+                <td><a href="#metalstack.admin.v2.PartitionServiceCreateRequest">PartitionServiceCreateRequest</a></td>
+                <td><a href="#metalstack.admin.v2.PartitionServiceCreateResponse">PartitionServiceCreateResponse</a></td>
+                <td><p>Create a partition</p></td>
+              </tr>
+            
+              <tr>
+                <td>Update</td>
+                <td><a href="#metalstack.admin.v2.PartitionServiceUpdateRequest">PartitionServiceUpdateRequest</a></td>
+                <td><a href="#metalstack.admin.v2.PartitionServiceUpdateResponse">PartitionServiceUpdateResponse</a></td>
+                <td><p>Update a partition</p></td>
+              </tr>
+            
+              <tr>
+                <td>Delete</td>
+                <td><a href="#metalstack.admin.v2.PartitionServiceDeleteRequest">PartitionServiceDeleteRequest</a></td>
+                <td><a href="#metalstack.admin.v2.PartitionServiceDeleteResponse">PartitionServiceDeleteResponse</a></td>
+                <td><p>Delete a partition</p></td>
+              </tr>
+            
+              <tr>
+                <td>Capacity</td>
+                <td><a href="#metalstack.admin.v2.PartitionServiceCapacityRequest">PartitionServiceCapacityRequest</a></td>
+                <td><a href="#metalstack.admin.v2.PartitionServiceCapacityResponse">PartitionServiceCapacityResponse</a></td>
+                <td><p>Capacity of a partitions</p></td>
               </tr>
             
           </tbody>
@@ -12389,13 +12611,13 @@ <h3 id="metalstack.admin.v2.ProjectService">ProjectService</h3>
     
       
       <div class="file-heading">
-        <h2 id="metalstack/admin/v2/size.proto">metalstack/admin/v2/size.proto</h2><a href="#title">Top</a>
+        <h2 id="metalstack/api/v2/project.proto">metalstack/api/v2/project.proto</h2><a href="#title">Top</a>
       </div>
       <p></p>
 
       
-        <h3 id="metalstack.admin.v2.SizeServiceCreateRequest">SizeServiceCreateRequest</h3>
-        <p>SizeServiceCreateRequest is the request payload for a size create request</p>
+        <h3 id="metalstack.api.v2.Project">Project</h3>
+        <p>Project defines a group of resources belonging to a tenant</p><p>a tenant can have multiple projects</p>
 
         
           <table class="field-table">
@@ -12405,10 +12627,45 @@ <h3 id="metalstack.admin.v2.SizeServiceCreateRequest">SizeServiceCreateRequest</
             <tbody>
               
                 <tr>
-                  <td>size</td>
-                  <td><a href="#metalstack.api.v2.Size">metalstack.api.v2.Size</a></td>
+                  <td>uuid</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Size is the size to create </p></td>
+                  <td><p>Uuid of this project </p></td>
+                </tr>
+              
+                <tr>
+                  <td>meta</td>
+                  <td><a href="#metalstack.api.v2.Meta">Meta</a></td>
+                  <td></td>
+                  <td><p>Meta for this project </p></td>
+                </tr>
+              
+                <tr>
+                  <td>name</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Name of this project must be unique per tenant </p></td>
+                </tr>
+              
+                <tr>
+                  <td>description</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Description of this project </p></td>
+                </tr>
+              
+                <tr>
+                  <td>tenant</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Tenant this project belongs to </p></td>
+                </tr>
+              
+                <tr>
+                  <td>avatar_url</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>AvatarUrl of the Project </p></td>
                 </tr>
               
             </tbody>
@@ -12418,8 +12675,8 @@ <h3 id="metalstack.admin.v2.SizeServiceCreateRequest">SizeServiceCreateRequest</
 
         
       
-        <h3 id="metalstack.admin.v2.SizeServiceCreateResponse">SizeServiceCreateResponse</h3>
-        <p>SizeServiceGetResponse is the response payload for a size create request</p>
+        <h3 id="metalstack.api.v2.ProjectInvite">ProjectInvite</h3>
+        <p>ProjectInvite defines invite to project</p>
 
         
           <table class="field-table">
@@ -12429,10 +12686,66 @@ <h3 id="metalstack.admin.v2.SizeServiceCreateResponse">SizeServiceCreateResponse
             <tbody>
               
                 <tr>
-                  <td>size</td>
-                  <td><a href="#metalstack.api.v2.Size">metalstack.api.v2.Size</a></td>
+                  <td>secret</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Size the size </p></td>
+                  <td><p>Secret is the secret part of the invite, typically part of the url </p></td>
+                </tr>
+              
+                <tr>
+                  <td>project</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Project is the project id for which this invite was created </p></td>
+                </tr>
+              
+                <tr>
+                  <td>role</td>
+                  <td><a href="#metalstack.api.v2.ProjectRole">ProjectRole</a></td>
+                  <td></td>
+                  <td><p>Role is the role in this project the user will get after accepting the invitation </p></td>
+                </tr>
+              
+                <tr>
+                  <td>joined</td>
+                  <td><a href="#bool">bool</a></td>
+                  <td></td>
+                  <td><p>Joined is false as long as a user has not accepted the invite </p></td>
+                </tr>
+              
+                <tr>
+                  <td>project_name</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>ProjectName is the project name for which this invite was created </p></td>
+                </tr>
+              
+                <tr>
+                  <td>tenant</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Tenant is the login of tenant who invites to join this project </p></td>
+                </tr>
+              
+                <tr>
+                  <td>tenant_name</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>TenantName is the name of tenant who invites to join this project </p></td>
+                </tr>
+              
+                <tr>
+                  <td>expires_at</td>
+                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
+                  <td></td>
+                  <td><p>ExpiresAt the date when this invite expires </p></td>
+                </tr>
+              
+                <tr>
+                  <td>joined_at</td>
+                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
+                  <td></td>
+                  <td><p>JoinedAt the date when the member accepted this invite </p></td>
                 </tr>
               
             </tbody>
@@ -12442,8 +12755,8 @@ <h3 id="metalstack.admin.v2.SizeServiceCreateResponse">SizeServiceCreateResponse
 
         
       
-        <h3 id="metalstack.admin.v2.SizeServiceDeleteRequest">SizeServiceDeleteRequest</h3>
-        <p>SizeServiceDeleteRequest is the request payload for a size delete request</p>
+        <h3 id="metalstack.api.v2.ProjectMember">ProjectMember</h3>
+        <p>ProjectMember defines a user that participates at a project</p>
 
         
           <table class="field-table">
@@ -12456,31 +12769,30 @@ <h3 id="metalstack.admin.v2.SizeServiceDeleteRequest">SizeServiceDeleteRequest</
                   <td>id</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>ID of the size to delete </p></td>
+                  <td><p>Id is the user id of the member </p></td>
                 </tr>
               
-            </tbody>
-          </table>
-
-          
-
-        
-      
-        <h3 id="metalstack.admin.v2.SizeServiceDeleteResponse">SizeServiceDeleteResponse</h3>
-        <p>SizeServiceDeleteResponse is the response payload for a size delete request</p>
-
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
+                <tr>
+                  <td>role</td>
+                  <td><a href="#metalstack.api.v2.ProjectRole">ProjectRole</a></td>
+                  <td></td>
+                  <td><p>Role is the role of the member </p></td>
+                </tr>
               
                 <tr>
-                  <td>size</td>
-                  <td><a href="#metalstack.api.v2.Size">metalstack.api.v2.Size</a></td>
+                  <td>inherited_membership</td>
+                  <td><a href="#bool">bool</a></td>
                   <td></td>
-                  <td><p>Size the size </p></td>
+                  <td><p>InheritedMembership indicates that this member has implicit permissions on the project through his membership within the tenant.
+This member does not have direct project membership but gains permissions on this project from the role he has in the tenant.
+Inherited memberships are not included in member lists for users with guest permission but only for direct tenant members. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>created_at</td>
+                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
+                  <td></td>
+                  <td><p>CreatedAt the date when the member was added to the project </p></td>
                 </tr>
               
             </tbody>
@@ -12490,8 +12802,8 @@ <h3 id="metalstack.admin.v2.SizeServiceDeleteResponse">SizeServiceDeleteResponse
 
         
       
-        <h3 id="metalstack.admin.v2.SizeServiceUpdateRequest">SizeServiceUpdateRequest</h3>
-        <p>SizeServiceUpdateRequest is the request payload for a size update request</p>
+        <h3 id="metalstack.api.v2.ProjectServiceCreateRequest">ProjectServiceCreateRequest</h3>
+        <p>ProjectServiceCreateRequest is the request payload to Create a project</p>
 
         
           <table class="field-table">
@@ -12501,45 +12813,39 @@ <h3 id="metalstack.admin.v2.SizeServiceUpdateRequest">SizeServiceUpdateRequest</
             <tbody>
               
                 <tr>
-                  <td>id</td>
+                  <td>login</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Id of this size </p></td>
-                </tr>
-              
-                <tr>
-                  <td>update_meta</td>
-                  <td><a href="#metalstack.api.v2.UpdateMeta">metalstack.api.v2.UpdateMeta</a></td>
-                  <td></td>
-                  <td><p>UpdateMeta contains the timestamp and strategy to be used in this update request </p></td>
+                  <td><p>Login is the tenant of this project
+TODO: is login really a good name? </p></td>
                 </tr>
               
                 <tr>
                   <td>name</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Name of this size </p></td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Name of this project, unique per tenant </p></td>
                 </tr>
               
                 <tr>
                   <td>description</td>
                   <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Description of this size </p></td>
+                  <td></td>
+                  <td><p>Description of this project </p></td>
                 </tr>
               
                 <tr>
-                  <td>constraints</td>
-                  <td><a href="#metalstack.api.v2.SizeConstraint">metalstack.api.v2.SizeConstraint</a></td>
-                  <td>repeated</td>
-                  <td><p>Constraints which must match that a specific machine is considered of this size </p></td>
+                  <td>avatar_url</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Avatar URL of the project </p></td>
                 </tr>
               
                 <tr>
                   <td>labels</td>
-                  <td><a href="#metalstack.api.v2.UpdateLabels">metalstack.api.v2.UpdateLabels</a></td>
-                  <td>optional</td>
-                  <td><p>Labels to update on this size </p></td>
+                  <td><a href="#metalstack.api.v2.Labels">Labels</a></td>
+                  <td></td>
+                  <td><p>Labels on the project </p></td>
                 </tr>
               
             </tbody>
@@ -12549,8 +12855,8 @@ <h3 id="metalstack.admin.v2.SizeServiceUpdateRequest">SizeServiceUpdateRequest</
 
         
       
-        <h3 id="metalstack.admin.v2.SizeServiceUpdateResponse">SizeServiceUpdateResponse</h3>
-        <p>SizeServiceUpdateResponse is the response payload for a size update request</p>
+        <h3 id="metalstack.api.v2.ProjectServiceCreateResponse">ProjectServiceCreateResponse</h3>
+        <p>ProjectServiceCreateResponse is the response payload of creation of a project</p>
 
         
           <table class="field-table">
@@ -12560,10 +12866,10 @@ <h3 id="metalstack.admin.v2.SizeServiceUpdateResponse">SizeServiceUpdateResponse
             <tbody>
               
                 <tr>
-                  <td>size</td>
-                  <td><a href="#metalstack.api.v2.Size">metalstack.api.v2.Size</a></td>
+                  <td>project</td>
+                  <td><a href="#metalstack.api.v2.Project">Project</a></td>
                   <td></td>
-                  <td><p>Size the size </p></td>
+                  <td><p>Project is the project </p></td>
                 </tr>
               
             </tbody>
@@ -12573,55 +12879,8 @@ <h3 id="metalstack.admin.v2.SizeServiceUpdateResponse">SizeServiceUpdateResponse
 
         
       
-
-      
-
-      
-
-      
-        <h3 id="metalstack.admin.v2.SizeService">SizeService</h3>
-        <p>SizeService serves size related functions</p>
-        <table class="enum-table">
-          <thead>
-            <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
-          </thead>
-          <tbody>
-            
-              <tr>
-                <td>Create</td>
-                <td><a href="#metalstack.admin.v2.SizeServiceCreateRequest">SizeServiceCreateRequest</a></td>
-                <td><a href="#metalstack.admin.v2.SizeServiceCreateResponse">SizeServiceCreateResponse</a></td>
-                <td><p>Create a size</p></td>
-              </tr>
-            
-              <tr>
-                <td>Update</td>
-                <td><a href="#metalstack.admin.v2.SizeServiceUpdateRequest">SizeServiceUpdateRequest</a></td>
-                <td><a href="#metalstack.admin.v2.SizeServiceUpdateResponse">SizeServiceUpdateResponse</a></td>
-                <td><p>Update a size</p></td>
-              </tr>
-            
-              <tr>
-                <td>Delete</td>
-                <td><a href="#metalstack.admin.v2.SizeServiceDeleteRequest">SizeServiceDeleteRequest</a></td>
-                <td><a href="#metalstack.admin.v2.SizeServiceDeleteResponse">SizeServiceDeleteResponse</a></td>
-                <td><p>Delete a size</p></td>
-              </tr>
-            
-          </tbody>
-        </table>
-
-        
-    
-      
-      <div class="file-heading">
-        <h2 id="metalstack/api/v2/size_reservation.proto">metalstack/api/v2/size_reservation.proto</h2><a href="#title">Top</a>
-      </div>
-      <p></p>
-
-      
-        <h3 id="metalstack.api.v2.SizeReservation">SizeReservation</h3>
-        <p>SizeReservation</p>
+        <h3 id="metalstack.api.v2.ProjectServiceDeleteRequest">ProjectServiceDeleteRequest</h3>
+        <p>ProjectServiceDeleteRequest is the request payload to delete a project</p>
 
         
           <table class="field-table">
@@ -12631,59 +12890,58 @@ <h3 id="metalstack.api.v2.SizeReservation">SizeReservation</h3>
             <tbody>
               
                 <tr>
-                  <td>id</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Id of this size reservation, is generated on creation </p></td>
-                </tr>
-              
-                <tr>
-                  <td>meta</td>
-                  <td><a href="#metalstack.api.v2.Meta">Meta</a></td>
-                  <td></td>
-                  <td><p>Meta for this size reservation </p></td>
-                </tr>
-              
-                <tr>
-                  <td>name</td>
+                  <td>project</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Name of this size reservation </p></td>
+                  <td><p>Project is the uuid of the project to get </p></td>
                 </tr>
               
-                <tr>
-                  <td>description</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Description of this size reservation </p></td>
-                </tr>
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.api.v2.ProjectServiceDeleteResponse">ProjectServiceDeleteResponse</h3>
+        <p>ProjectServiceDeleteResponse is the response payload to delete a project</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
               
                 <tr>
                   <td>project</td>
-                  <td><a href="#string">string</a></td>
+                  <td><a href="#metalstack.api.v2.Project">Project</a></td>
                   <td></td>
-                  <td><p>Project of the size reservation </p></td>
+                  <td><p>Project is the project </p></td>
                 </tr>
               
-                <tr>
-                  <td>size</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Size id of this size reservation </p></td>
-                </tr>
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.api.v2.ProjectServiceGetRequest">ProjectServiceGetRequest</h3>
+        <p>ProjectServiceGetRequest is the request payload to get a project</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
               
                 <tr>
-                  <td>partitions</td>
+                  <td>project</td>
                   <td><a href="#string">string</a></td>
-                  <td>repeated</td>
-                  <td><p>Partition ids of this size reservation </p></td>
-                </tr>
-              
-                <tr>
-                  <td>amount</td>
-                  <td><a href="#int32">int32</a></td>
                   <td></td>
-                  <td><p>Amount of reservations of this size reservation </p></td>
+                  <td><p>Project is the uuid of the project to get </p></td>
                 </tr>
               
             </tbody>
@@ -12693,8 +12951,8 @@ <h3 id="metalstack.api.v2.SizeReservation">SizeReservation</h3>
 
         
       
-        <h3 id="metalstack.api.v2.SizeReservationQuery">SizeReservationQuery</h3>
-        <p>SizeReservationQuery is used to search size reservations</p>
+        <h3 id="metalstack.api.v2.ProjectServiceGetResponse">ProjectServiceGetResponse</h3>
+        <p>ProjectServiceGetResponse is the response payload to get a projects</p>
 
         
           <table class="field-table">
@@ -12703,53 +12961,18 @@ <h3 id="metalstack.api.v2.SizeReservationQuery">SizeReservationQuery</h3>
             </thead>
             <tbody>
               
-                <tr>
-                  <td>id</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>ID of the size reservation to get </p></td>
-                </tr>
-              
-                <tr>
-                  <td>name</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Name of this size reservation </p></td>
-                </tr>
-              
-                <tr>
-                  <td>description</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Description of this size reservation </p></td>
-                </tr>
-              
-                <tr>
-                  <td>size</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Size id of this size reservation </p></td>
-                </tr>
-              
                 <tr>
                   <td>project</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Project of the size reservation </p></td>
-                </tr>
-              
-                <tr>
-                  <td>partition</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Partition of the size reservation </p></td>
+                  <td><a href="#metalstack.api.v2.Project">Project</a></td>
+                  <td></td>
+                  <td><p>Project is the project </p></td>
                 </tr>
               
                 <tr>
-                  <td>labels</td>
-                  <td><a href="#metalstack.api.v2.Labels">Labels</a></td>
-                  <td>optional</td>
-                  <td><p>Labels lists only size reservations containing the given labels </p></td>
+                  <td>project_members</td>
+                  <td><a href="#metalstack.api.v2.ProjectMember">ProjectMember</a></td>
+                  <td>repeated</td>
+                  <td><p>ProjectMembers in this project, projects guests will only see direct project members and not implicit memberships from tenant permissions </p></td>
                 </tr>
               
             </tbody>
@@ -12759,8 +12982,8 @@ <h3 id="metalstack.api.v2.SizeReservationQuery">SizeReservationQuery</h3>
 
         
       
-        <h3 id="metalstack.api.v2.SizeReservationServiceGetRequest">SizeReservationServiceGetRequest</h3>
-        <p>SizeReservationServiceGetRequest is the request payload for a size get request</p>
+        <h3 id="metalstack.api.v2.ProjectServiceInviteAcceptRequest">ProjectServiceInviteAcceptRequest</h3>
+        <p>ProjectServiceInviteAcceptRequest is the request payload to a accept invite request</p>
 
         
           <table class="field-table">
@@ -12770,17 +12993,10 @@ <h3 id="metalstack.api.v2.SizeReservationServiceGetRequest">SizeReservationServi
             <tbody>
               
                 <tr>
-                  <td>id</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>ID of the size reservation to get </p></td>
-                </tr>
-              
-                <tr>
-                  <td>project</td>
+                  <td>secret</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Project of the size reservation </p></td>
+                  <td><p>Secret is the invitation secret part of the invitation url </p></td>
                 </tr>
               
             </tbody>
@@ -12790,8 +13006,8 @@ <h3 id="metalstack.api.v2.SizeReservationServiceGetRequest">SizeReservationServi
 
         
       
-        <h3 id="metalstack.api.v2.SizeReservationServiceGetResponse">SizeReservationServiceGetResponse</h3>
-        <p>SizeReservationServiceGetResponse is the response payload for a size reservation get request</p>
+        <h3 id="metalstack.api.v2.ProjectServiceInviteAcceptResponse">ProjectServiceInviteAcceptResponse</h3>
+        <p>ProjectServiceInvitesListResponse is the response payload to a accept invite request</p>
 
         
           <table class="field-table">
@@ -12801,10 +13017,17 @@ <h3 id="metalstack.api.v2.SizeReservationServiceGetResponse">SizeReservationServ
             <tbody>
               
                 <tr>
-                  <td>size_reservation</td>
-                  <td><a href="#metalstack.api.v2.SizeReservation">SizeReservation</a></td>
+                  <td>project</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Size reservation </p></td>
+                  <td><p>Project ID of the project joined </p></td>
+                </tr>
+              
+                <tr>
+                  <td>project_name</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>ProjectName if the project joined </p></td>
                 </tr>
               
             </tbody>
@@ -12814,8 +13037,8 @@ <h3 id="metalstack.api.v2.SizeReservationServiceGetResponse">SizeReservationServ
 
         
       
-        <h3 id="metalstack.api.v2.SizeReservationServiceListRequest">SizeReservationServiceListRequest</h3>
-        <p>SizeReservationServiceListRequest is the request payload for a size list request</p>
+        <h3 id="metalstack.api.v2.ProjectServiceInviteDeleteRequest">ProjectServiceInviteDeleteRequest</h3>
+        <p>ProjectServiceInviteDeleteRequest is the request payload to a delete invite</p>
 
         
           <table class="field-table">
@@ -12828,14 +13051,14 @@ <h3 id="metalstack.api.v2.SizeReservationServiceListRequest">SizeReservationServ
                   <td>project</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Project of the size reservation </p></td>
+                  <td><p>Project is the uuid of the project </p></td>
                 </tr>
               
                 <tr>
-                  <td>query</td>
-                  <td><a href="#metalstack.api.v2.SizeReservationQuery">SizeReservationQuery</a></td>
+                  <td>secret</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Query for size reservations </p></td>
+                  <td><p>Secret of the invite to delete </p></td>
                 </tr>
               
             </tbody>
@@ -12845,8 +13068,15 @@ <h3 id="metalstack.api.v2.SizeReservationServiceListRequest">SizeReservationServ
 
         
       
-        <h3 id="metalstack.api.v2.SizeReservationServiceListResponse">SizeReservationServiceListResponse</h3>
-        <p>SizeReservationServiceListResponse is the response payload for a size reservation list request</p>
+        <h3 id="metalstack.api.v2.ProjectServiceInviteDeleteResponse">ProjectServiceInviteDeleteResponse</h3>
+        <p>ProjectServiceInviteDeleteResponse is the response payload of a delete invite request</p>
+
+        
+
+        
+      
+        <h3 id="metalstack.api.v2.ProjectServiceInviteGetRequest">ProjectServiceInviteGetRequest</h3>
+        <p>ProjectServiceInviteGetRequest is the request payload to get a invite</p>
 
         
           <table class="field-table">
@@ -12856,10 +13086,10 @@ <h3 id="metalstack.api.v2.SizeReservationServiceListResponse">SizeReservationSer
             <tbody>
               
                 <tr>
-                  <td>size_reservations</td>
-                  <td><a href="#metalstack.api.v2.SizeReservation">SizeReservation</a></td>
-                  <td>repeated</td>
-                  <td><p>Size reservations </p></td>
+                  <td>secret</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Secret of the invite to list </p></td>
                 </tr>
               
             </tbody>
@@ -12869,48 +13099,8 @@ <h3 id="metalstack.api.v2.SizeReservationServiceListResponse">SizeReservationSer
 
         
       
-
-      
-
-      
-
-      
-        <h3 id="metalstack.api.v2.SizeReservationService">SizeReservationService</h3>
-        <p>SizeReservationService serves size reservation related functions</p>
-        <table class="enum-table">
-          <thead>
-            <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
-          </thead>
-          <tbody>
-            
-              <tr>
-                <td>Get</td>
-                <td><a href="#metalstack.api.v2.SizeReservationServiceGetRequest">SizeReservationServiceGetRequest</a></td>
-                <td><a href="#metalstack.api.v2.SizeReservationServiceGetResponse">SizeReservationServiceGetResponse</a></td>
-                <td><p>Get a size reservation</p></td>
-              </tr>
-            
-              <tr>
-                <td>List</td>
-                <td><a href="#metalstack.api.v2.SizeReservationServiceListRequest">SizeReservationServiceListRequest</a></td>
-                <td><a href="#metalstack.api.v2.SizeReservationServiceListResponse">SizeReservationServiceListResponse</a></td>
-                <td><p>List size reservations</p></td>
-              </tr>
-            
-          </tbody>
-        </table>
-
-        
-    
-      
-      <div class="file-heading">
-        <h2 id="metalstack/admin/v2/size_reservation.proto">metalstack/admin/v2/size_reservation.proto</h2><a href="#title">Top</a>
-      </div>
-      <p></p>
-
-      
-        <h3 id="metalstack.admin.v2.SizeReservationServiceCreateRequest">SizeReservationServiceCreateRequest</h3>
-        <p>SizeReservationServiceCreateRequest is the request payload for a size reservation create request</p>
+        <h3 id="metalstack.api.v2.ProjectServiceInviteGetResponse">ProjectServiceInviteGetResponse</h3>
+        <p>ProjectServiceInviteGetResponse is the response payload to a get invite request</p>
 
         
           <table class="field-table">
@@ -12920,10 +13110,10 @@ <h3 id="metalstack.admin.v2.SizeReservationServiceCreateRequest">SizeReservation
             <tbody>
               
                 <tr>
-                  <td>size_reservation</td>
-                  <td><a href="#metalstack.api.v2.SizeReservation">metalstack.api.v2.SizeReservation</a></td>
+                  <td>invite</td>
+                  <td><a href="#metalstack.api.v2.ProjectInvite">ProjectInvite</a></td>
                   <td></td>
-                  <td><p>SizeReservation is the size reservation to create </p></td>
+                  <td><p>Invite is the invite </p></td>
                 </tr>
               
             </tbody>
@@ -12933,8 +13123,8 @@ <h3 id="metalstack.admin.v2.SizeReservationServiceCreateRequest">SizeReservation
 
         
       
-        <h3 id="metalstack.admin.v2.SizeReservationServiceCreateResponse">SizeReservationServiceCreateResponse</h3>
-        <p>SizeReservationServiceCreateResponse is the response payload for a size reservation create request</p>
+        <h3 id="metalstack.api.v2.ProjectServiceInviteRequest">ProjectServiceInviteRequest</h3>
+        <p>ProjectServiceInviteRequest is used to invite a member to a project</p>
 
         
           <table class="field-table">
@@ -12944,10 +13134,17 @@ <h3 id="metalstack.admin.v2.SizeReservationServiceCreateResponse">SizeReservatio
             <tbody>
               
                 <tr>
-                  <td>size_reservation</td>
-                  <td><a href="#metalstack.api.v2.SizeReservation">metalstack.api.v2.SizeReservation</a></td>
+                  <td>project</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>SizeReservation the size reservation </p></td>
+                  <td><p>Project is the uuid of the project </p></td>
+                </tr>
+              
+                <tr>
+                  <td>role</td>
+                  <td><a href="#metalstack.api.v2.ProjectRole">ProjectRole</a></td>
+                  <td></td>
+                  <td><p>Role of this user in this project </p></td>
                 </tr>
               
             </tbody>
@@ -12957,8 +13154,8 @@ <h3 id="metalstack.admin.v2.SizeReservationServiceCreateResponse">SizeReservatio
 
         
       
-        <h3 id="metalstack.admin.v2.SizeReservationServiceDeleteRequest">SizeReservationServiceDeleteRequest</h3>
-        <p>SizeReservationServiceDeleteRequest is the request payload for a size reservation delete request</p>
+        <h3 id="metalstack.api.v2.ProjectServiceInviteResponse">ProjectServiceInviteResponse</h3>
+        <p>ProjectServiceInviteRequest is the response payload to a invite member request</p>
 
         
           <table class="field-table">
@@ -12968,10 +13165,12 @@ <h3 id="metalstack.admin.v2.SizeReservationServiceDeleteRequest">SizeReservation
             <tbody>
               
                 <tr>
-                  <td>id</td>
-                  <td><a href="#string">string</a></td>
+                  <td>invite</td>
+                  <td><a href="#metalstack.api.v2.ProjectInvite">ProjectInvite</a></td>
                   <td></td>
-                  <td><p>ID of the size reservation to delete </p></td>
+                  <td><p>Inviter contains a secret which can be sent to a potential user
+can be appended to the invitation endpoint at our cloud console like
+console.metalstack.cloud/invite/&lt;secret&gt; </p></td>
                 </tr>
               
             </tbody>
@@ -12981,8 +13180,8 @@ <h3 id="metalstack.admin.v2.SizeReservationServiceDeleteRequest">SizeReservation
 
         
       
-        <h3 id="metalstack.admin.v2.SizeReservationServiceDeleteResponse">SizeReservationServiceDeleteResponse</h3>
-        <p>SizeReservationServiceDeleteResponse is the response payload for a size reservation delete request</p>
+        <h3 id="metalstack.api.v2.ProjectServiceInvitesListRequest">ProjectServiceInvitesListRequest</h3>
+        <p>ProjectServiceInvitesListRequest is the request payload to a list invites request</p>
 
         
           <table class="field-table">
@@ -12992,10 +13191,10 @@ <h3 id="metalstack.admin.v2.SizeReservationServiceDeleteResponse">SizeReservatio
             <tbody>
               
                 <tr>
-                  <td>size_reservation</td>
-                  <td><a href="#metalstack.api.v2.SizeReservation">metalstack.api.v2.SizeReservation</a></td>
+                  <td>project</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>SizeReservation the size reservation </p></td>
+                  <td><p>Project is the uuid of the project </p></td>
                 </tr>
               
             </tbody>
@@ -13005,8 +13204,8 @@ <h3 id="metalstack.admin.v2.SizeReservationServiceDeleteResponse">SizeReservatio
 
         
       
-        <h3 id="metalstack.admin.v2.SizeReservationServiceListRequest">SizeReservationServiceListRequest</h3>
-        <p>SizeReservationServiceListRequest is the request payload for a size list request</p>
+        <h3 id="metalstack.api.v2.ProjectServiceInvitesListResponse">ProjectServiceInvitesListResponse</h3>
+        <p>ProjectServiceInvitesListResponse is the response payload to a list invites request</p>
 
         
           <table class="field-table">
@@ -13016,10 +13215,10 @@ <h3 id="metalstack.admin.v2.SizeReservationServiceListRequest">SizeReservationSe
             <tbody>
               
                 <tr>
-                  <td>query</td>
-                  <td><a href="#metalstack.api.v2.SizeReservationQuery">metalstack.api.v2.SizeReservationQuery</a></td>
-                  <td></td>
-                  <td><p>Query for size reservations </p></td>
+                  <td>invites</td>
+                  <td><a href="#metalstack.api.v2.ProjectInvite">ProjectInvite</a></td>
+                  <td>repeated</td>
+                  <td><p>Invites not already accepted the invitation to this project </p></td>
                 </tr>
               
             </tbody>
@@ -13029,8 +13228,8 @@ <h3 id="metalstack.admin.v2.SizeReservationServiceListRequest">SizeReservationSe
 
         
       
-        <h3 id="metalstack.admin.v2.SizeReservationServiceListResponse">SizeReservationServiceListResponse</h3>
-        <p>SizeReservationServiceListResponse is the response payload for a size reservation list request</p>
+        <h3 id="metalstack.api.v2.ProjectServiceLeaveRequest">ProjectServiceLeaveRequest</h3>
+        <p>ProjectServiceLeaveRequest is used to leave a project</p>
 
         
           <table class="field-table">
@@ -13040,10 +13239,10 @@ <h3 id="metalstack.admin.v2.SizeReservationServiceListResponse">SizeReservationS
             <tbody>
               
                 <tr>
-                  <td>size_reservations</td>
-                  <td><a href="#metalstack.api.v2.SizeReservation">metalstack.api.v2.SizeReservation</a></td>
-                  <td>repeated</td>
-                  <td><p>Size reservations </p></td>
+                  <td>project</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Project is the uuid of the project </p></td>
                 </tr>
               
             </tbody>
@@ -13053,8 +13252,15 @@ <h3 id="metalstack.admin.v2.SizeReservationServiceListResponse">SizeReservationS
 
         
       
-        <h3 id="metalstack.admin.v2.SizeReservationServiceUpdateRequest">SizeReservationServiceUpdateRequest</h3>
-        <p>SizeReservationServiceUpdateRequest is the request payload for a size reservation update request</p>
+        <h3 id="metalstack.api.v2.ProjectServiceLeaveResponse">ProjectServiceLeaveResponse</h3>
+        <p>ProjectServiceLeaveResponse is the response payload to a leave project request</p>
+
+        
+
+        
+      
+        <h3 id="metalstack.api.v2.ProjectServiceListRequest">ProjectServiceListRequest</h3>
+        <p>ProjectServiceListRequest is the request payload to list all projects</p>
 
         
           <table class="field-table">
@@ -13066,50 +13272,29 @@ <h3 id="metalstack.admin.v2.SizeReservationServiceUpdateRequest">SizeReservation
                 <tr>
                   <td>id</td>
                   <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Id of this size reservation </p></td>
-                </tr>
-              
-                <tr>
-                  <td>name</td>
-                  <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Name of this size reservation </p></td>
+                  <td><p>Id lists only projects with this id </p></td>
                 </tr>
               
                 <tr>
-                  <td>description</td>
+                  <td>name</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Description of this size reservation </p></td>
-                </tr>
-              
-                <tr>
-                  <td>update_meta</td>
-                  <td><a href="#metalstack.api.v2.UpdateMeta">metalstack.api.v2.UpdateMeta</a></td>
-                  <td></td>
-                  <td><p>UpdateMeta contains the timestamp and strategy to be used in this update request </p></td>
+                  <td><p>Name lists only projects with this name </p></td>
                 </tr>
               
                 <tr>
-                  <td>partitions</td>
+                  <td>tenant</td>
                   <td><a href="#string">string</a></td>
-                  <td>repeated</td>
-                  <td><p>Partition ids of this size reservation </p></td>
-                </tr>
-              
-                <tr>
-                  <td>amount</td>
-                  <td><a href="#int32">int32</a></td>
                   <td>optional</td>
-                  <td><p>Amount of reservations of this size reservation </p></td>
+                  <td><p>Tenant lists only projects of this tenant </p></td>
                 </tr>
               
                 <tr>
                   <td>labels</td>
-                  <td><a href="#metalstack.api.v2.UpdateLabels">metalstack.api.v2.UpdateLabels</a></td>
+                  <td><a href="#metalstack.api.v2.Labels">Labels</a></td>
                   <td>optional</td>
-                  <td><p>Labels to update of this size reservation </p></td>
+                  <td><p>Labels lists only projects containing the given labels </p></td>
                 </tr>
               
             </tbody>
@@ -13119,8 +13304,8 @@ <h3 id="metalstack.admin.v2.SizeReservationServiceUpdateRequest">SizeReservation
 
         
       
-        <h3 id="metalstack.admin.v2.SizeReservationServiceUpdateResponse">SizeReservationServiceUpdateResponse</h3>
-        <p>SizeReservationServiceUpdateResponse is the response payload for a size reservation update request</p>
+        <h3 id="metalstack.api.v2.ProjectServiceListResponse">ProjectServiceListResponse</h3>
+        <p>ProjectServiceListResponse is the response payload to list all projects</p>
 
         
           <table class="field-table">
@@ -13130,10 +13315,10 @@ <h3 id="metalstack.admin.v2.SizeReservationServiceUpdateResponse">SizeReservatio
             <tbody>
               
                 <tr>
-                  <td>size_reservation</td>
-                  <td><a href="#metalstack.api.v2.SizeReservation">metalstack.api.v2.SizeReservation</a></td>
-                  <td></td>
-                  <td><p>SizeReservation the size reservation </p></td>
+                  <td>projects</td>
+                  <td><a href="#metalstack.api.v2.Project">Project</a></td>
+                  <td>repeated</td>
+                  <td><p>Projects is a list of all your projects </p></td>
                 </tr>
               
             </tbody>
@@ -13143,62 +13328,8 @@ <h3 id="metalstack.admin.v2.SizeReservationServiceUpdateResponse">SizeReservatio
 
         
       
-
-      
-
-      
-
-      
-        <h3 id="metalstack.admin.v2.SizeReservationService">SizeReservationService</h3>
-        <p>SizeReservationService serves size reservation related functions</p>
-        <table class="enum-table">
-          <thead>
-            <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
-          </thead>
-          <tbody>
-            
-              <tr>
-                <td>Create</td>
-                <td><a href="#metalstack.admin.v2.SizeReservationServiceCreateRequest">SizeReservationServiceCreateRequest</a></td>
-                <td><a href="#metalstack.admin.v2.SizeReservationServiceCreateResponse">SizeReservationServiceCreateResponse</a></td>
-                <td><p>Create a size reservation</p></td>
-              </tr>
-            
-              <tr>
-                <td>Update</td>
-                <td><a href="#metalstack.admin.v2.SizeReservationServiceUpdateRequest">SizeReservationServiceUpdateRequest</a></td>
-                <td><a href="#metalstack.admin.v2.SizeReservationServiceUpdateResponse">SizeReservationServiceUpdateResponse</a></td>
-                <td><p>Update a size reservation</p></td>
-              </tr>
-            
-              <tr>
-                <td>Delete</td>
-                <td><a href="#metalstack.admin.v2.SizeReservationServiceDeleteRequest">SizeReservationServiceDeleteRequest</a></td>
-                <td><a href="#metalstack.admin.v2.SizeReservationServiceDeleteResponse">SizeReservationServiceDeleteResponse</a></td>
-                <td><p>Delete a size reservation</p></td>
-              </tr>
-            
-              <tr>
-                <td>List</td>
-                <td><a href="#metalstack.admin.v2.SizeReservationServiceListRequest">SizeReservationServiceListRequest</a></td>
-                <td><a href="#metalstack.admin.v2.SizeReservationServiceListResponse">SizeReservationServiceListResponse</a></td>
-                <td><p>List size reservations</p></td>
-              </tr>
-            
-          </tbody>
-        </table>
-
-        
-    
-      
-      <div class="file-heading">
-        <h2 id="metalstack/api/v2/switch.proto">metalstack/api/v2/switch.proto</h2><a href="#title">Top</a>
-      </div>
-      <p></p>
-
-      
-        <h3 id="metalstack.api.v2.BGPFilter">BGPFilter</h3>
-        <p>BGPFilter can be used to restrict BGP based on CIDRs and VNIs.</p>
+        <h3 id="metalstack.api.v2.ProjectServiceRemoveMemberRequest">ProjectServiceRemoveMemberRequest</h3>
+        <p>ProjectServiceRemoveMemberRequest is used to remove a member from a project</p>
 
         
           <table class="field-table">
@@ -13208,17 +13339,17 @@ <h3 id="metalstack.api.v2.BGPFilter">BGPFilter</h3>
             <tbody>
               
                 <tr>
-                  <td>cidrs</td>
+                  <td>project</td>
                   <td><a href="#string">string</a></td>
-                  <td>repeated</td>
-                  <td><p>CIDRs for which to allow BGP </p></td>
+                  <td></td>
+                  <td><p>Project is the uuid of the project </p></td>
                 </tr>
               
                 <tr>
-                  <td>vnis</td>
+                  <td>member</td>
                   <td><a href="#string">string</a></td>
-                  <td>repeated</td>
-                  <td><p>VNIs for which to allow BGP </p></td>
+                  <td></td>
+                  <td><p>Member is the id of the member to remove from this project </p></td>
                 </tr>
               
             </tbody>
@@ -13228,8 +13359,15 @@ <h3 id="metalstack.api.v2.BGPFilter">BGPFilter</h3>
 
         
       
-        <h3 id="metalstack.api.v2.MachineConnection">MachineConnection</h3>
-        <p>MachineConnection associates a machine with the corresponding switch nic.</p>
+        <h3 id="metalstack.api.v2.ProjectServiceRemoveMemberResponse">ProjectServiceRemoveMemberResponse</h3>
+        <p>ProjectServiceRemoveMemberResponse is the response payload to a remove member request</p>
+
+        
+
+        
+      
+        <h3 id="metalstack.api.v2.ProjectServiceUpdateMemberRequest">ProjectServiceUpdateMemberRequest</h3>
+        <p>ProjectServiceUpdateMemberRequest is used to update a member of a project</p>
 
         
           <table class="field-table">
@@ -13239,17 +13377,24 @@ <h3 id="metalstack.api.v2.MachineConnection">MachineConnection</h3>
             <tbody>
               
                 <tr>
-                  <td>machine_id</td>
+                  <td>project</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>MachineId of the machine connected to the nic. </p></td>
+                  <td><p>Project is the uuid of the project </p></td>
                 </tr>
               
                 <tr>
-                  <td>nic</td>
-                  <td><a href="#metalstack.api.v2.SwitchNic">SwitchNic</a></td>
+                  <td>member</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Nic the machine is connected to. </p></td>
+                  <td><p>Member is the id of the member to remove from this project </p></td>
+                </tr>
+              
+                <tr>
+                  <td>role</td>
+                  <td><a href="#metalstack.api.v2.ProjectRole">ProjectRole</a></td>
+                  <td></td>
+                  <td><p>Role is the role in this project the user will get after the update </p></td>
                 </tr>
               
             </tbody>
@@ -13259,8 +13404,8 @@ <h3 id="metalstack.api.v2.MachineConnection">MachineConnection</h3>
 
         
       
-        <h3 id="metalstack.api.v2.NicState">NicState</h3>
-        <p>NicState represents the current state of a switch port.</p>
+        <h3 id="metalstack.api.v2.ProjectServiceUpdateMemberResponse">ProjectServiceUpdateMemberResponse</h3>
+        <p>ProjectServiceUpdateMemberResponse is the response payload to a update member request</p>
 
         
           <table class="field-table">
@@ -13270,17 +13415,10 @@ <h3 id="metalstack.api.v2.NicState">NicState</h3>
             <tbody>
               
                 <tr>
-                  <td>desired</td>
-                  <td><a href="#metalstack.api.v2.SwitchPortStatus">SwitchPortStatus</a></td>
-                  <td>optional</td>
-                  <td><p>Desired is the desired port state. </p></td>
-                </tr>
-              
-                <tr>
-                  <td>actual</td>
-                  <td><a href="#metalstack.api.v2.SwitchPortStatus">SwitchPortStatus</a></td>
+                  <td>project_member</td>
+                  <td><a href="#metalstack.api.v2.ProjectMember">ProjectMember</a></td>
                   <td></td>
-                  <td><p>Actual is the actual port state. </p></td>
+                  <td><p>ProjectMember is the updated project member </p></td>
                 </tr>
               
             </tbody>
@@ -13290,8 +13428,8 @@ <h3 id="metalstack.api.v2.NicState">NicState</h3>
 
         
       
-        <h3 id="metalstack.api.v2.Switch">Switch</h3>
-        <p>Switch represents a network switch.</p>
+        <h3 id="metalstack.api.v2.ProjectServiceUpdateRequest">ProjectServiceUpdateRequest</h3>
+        <p>ProjectServiceUpdateRequest is the request payload to update a project</p>
 
         
           <table class="field-table">
@@ -13301,101 +13439,217 @@ <h3 id="metalstack.api.v2.Switch">Switch</h3>
             <tbody>
               
                 <tr>
-                  <td>id</td>
+                  <td>project</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Id of the switch. </p></td>
-                </tr>
-              
-                <tr>
-                  <td>meta</td>
-                  <td><a href="#metalstack.api.v2.Meta">Meta</a></td>
-                  <td></td>
-                  <td><p>Meta for this switch. </p></td>
+                  <td><p>Project is the uuid of the project to get </p></td>
                 </tr>
               
                 <tr>
-                  <td>description</td>
-                  <td><a href="#string">string</a></td>
+                  <td>update_meta</td>
+                  <td><a href="#metalstack.api.v2.UpdateMeta">UpdateMeta</a></td>
                   <td></td>
-                  <td><p>Description of the switch. </p></td>
+                  <td><p>UpdateMeta contains the timestamp and strategy to be used in this update request </p></td>
                 </tr>
               
                 <tr>
-                  <td>rack</td>
+                  <td>name</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Rack ID if the switch resides in a rack. </p></td>
-                </tr>
-              
-                <tr>
-                  <td>partition</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Partition the switch belongs to. </p></td>
-                </tr>
-              
-                <tr>
-                  <td>replace_mode</td>
-                  <td><a href="#metalstack.api.v2.SwitchReplaceMode">SwitchReplaceMode</a></td>
-                  <td></td>
-                  <td><p>ReplaceMode is used to mark a switch ready for replacement. </p></td>
+                  <td><p>Name of this project unique per tenant </p></td>
                 </tr>
               
                 <tr>
-                  <td>management_ip</td>
+                  <td>description</td>
                   <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>ManagementIp is the switch&#39;s IP for management access. </p></td>
+                  <td>optional</td>
+                  <td><p>Description of this project </p></td>
                 </tr>
               
                 <tr>
-                  <td>management_user</td>
+                  <td>avatar_url</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>ManagementUser is the user name to use for management access. </p></td>
+                  <td><p>Avatar URL of the project </p></td>
                 </tr>
               
                 <tr>
-                  <td>console_command</td>
-                  <td><a href="#string">string</a></td>
+                  <td>labels</td>
+                  <td><a href="#metalstack.api.v2.UpdateLabels">UpdateLabels</a></td>
                   <td>optional</td>
-                  <td><p>ConsoleCommand is the command for accessing the switch&#39;s console. </p></td>
+                  <td><p>Labels on this project </p></td>
                 </tr>
               
-                <tr>
-                  <td>nics</td>
-                  <td><a href="#metalstack.api.v2.SwitchNic">SwitchNic</a></td>
-                  <td>repeated</td>
-                  <td><p>Nics are the front panel ports of the switch. </p></td>
-                </tr>
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.api.v2.ProjectServiceUpdateResponse">ProjectServiceUpdateResponse</h3>
+        <p>ProjectServiceUpdateResponse is the response payload to update a project</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
               
                 <tr>
-                  <td>os</td>
-                  <td><a href="#metalstack.api.v2.SwitchOS">SwitchOS</a></td>
+                  <td>project</td>
+                  <td><a href="#metalstack.api.v2.Project">Project</a></td>
                   <td></td>
-                  <td><p>SwitchOs is the OS running on the switch. </p></td>
+                  <td><p>Project is the project </p></td>
                 </tr>
               
-                <tr>
-                  <td>machine_connections</td>
-                  <td><a href="#metalstack.api.v2.MachineConnection">MachineConnection</a></td>
-                  <td>repeated</td>
-                  <td><p>MachineConnections map machines to the nics they are connected to. </p></td>
-                </tr>
+            </tbody>
+          </table>
+
+          
+
+        
+      
+
+      
+
+      
+
+      
+        <h3 id="metalstack.api.v2.ProjectService">ProjectService</h3>
+        <p>ProjectService serves project related functions</p>
+        <table class="enum-table">
+          <thead>
+            <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>List</td>
+                <td><a href="#metalstack.api.v2.ProjectServiceListRequest">ProjectServiceListRequest</a></td>
+                <td><a href="#metalstack.api.v2.ProjectServiceListResponse">ProjectServiceListResponse</a></td>
+                <td><p>List all accessible projects</p></td>
+              </tr>
+            
+              <tr>
+                <td>Get</td>
+                <td><a href="#metalstack.api.v2.ProjectServiceGetRequest">ProjectServiceGetRequest</a></td>
+                <td><a href="#metalstack.api.v2.ProjectServiceGetResponse">ProjectServiceGetResponse</a></td>
+                <td><p>Get a project</p></td>
+              </tr>
+            
+              <tr>
+                <td>Create</td>
+                <td><a href="#metalstack.api.v2.ProjectServiceCreateRequest">ProjectServiceCreateRequest</a></td>
+                <td><a href="#metalstack.api.v2.ProjectServiceCreateResponse">ProjectServiceCreateResponse</a></td>
+                <td><p>Create a project</p></td>
+              </tr>
+            
+              <tr>
+                <td>Delete</td>
+                <td><a href="#metalstack.api.v2.ProjectServiceDeleteRequest">ProjectServiceDeleteRequest</a></td>
+                <td><a href="#metalstack.api.v2.ProjectServiceDeleteResponse">ProjectServiceDeleteResponse</a></td>
+                <td><p>Delete a project</p></td>
+              </tr>
+            
+              <tr>
+                <td>Update</td>
+                <td><a href="#metalstack.api.v2.ProjectServiceUpdateRequest">ProjectServiceUpdateRequest</a></td>
+                <td><a href="#metalstack.api.v2.ProjectServiceUpdateResponse">ProjectServiceUpdateResponse</a></td>
+                <td><p>Update a project</p></td>
+              </tr>
+            
+              <tr>
+                <td>Leave</td>
+                <td><a href="#metalstack.api.v2.ProjectServiceLeaveRequest">ProjectServiceLeaveRequest</a></td>
+                <td><a href="#metalstack.api.v2.ProjectServiceLeaveResponse">ProjectServiceLeaveResponse</a></td>
+                <td><p>Leave project</p></td>
+              </tr>
+            
+              <tr>
+                <td>RemoveMember</td>
+                <td><a href="#metalstack.api.v2.ProjectServiceRemoveMemberRequest">ProjectServiceRemoveMemberRequest</a></td>
+                <td><a href="#metalstack.api.v2.ProjectServiceRemoveMemberResponse">ProjectServiceRemoveMemberResponse</a></td>
+                <td><p>RemoveMember remove a user from a project</p></td>
+              </tr>
+            
+              <tr>
+                <td>UpdateMember</td>
+                <td><a href="#metalstack.api.v2.ProjectServiceUpdateMemberRequest">ProjectServiceUpdateMemberRequest</a></td>
+                <td><a href="#metalstack.api.v2.ProjectServiceUpdateMemberResponse">ProjectServiceUpdateMemberResponse</a></td>
+                <td><p>UpdateMember update a user for a project</p></td>
+              </tr>
+            
+              <tr>
+                <td>Invite</td>
+                <td><a href="#metalstack.api.v2.ProjectServiceInviteRequest">ProjectServiceInviteRequest</a></td>
+                <td><a href="#metalstack.api.v2.ProjectServiceInviteResponse">ProjectServiceInviteResponse</a></td>
+                <td><p>Invite a user to a project</p></td>
+              </tr>
+            
+              <tr>
+                <td>InviteAccept</td>
+                <td><a href="#metalstack.api.v2.ProjectServiceInviteAcceptRequest">ProjectServiceInviteAcceptRequest</a></td>
+                <td><a href="#metalstack.api.v2.ProjectServiceInviteAcceptResponse">ProjectServiceInviteAcceptResponse</a></td>
+                <td><p>InviteAccept is called from a user to accept a invitation</p></td>
+              </tr>
+            
+              <tr>
+                <td>InviteDelete</td>
+                <td><a href="#metalstack.api.v2.ProjectServiceInviteDeleteRequest">ProjectServiceInviteDeleteRequest</a></td>
+                <td><a href="#metalstack.api.v2.ProjectServiceInviteDeleteResponse">ProjectServiceInviteDeleteResponse</a></td>
+                <td><p>InviteDelete deletes a pending invitation</p></td>
+              </tr>
+            
+              <tr>
+                <td>InvitesList</td>
+                <td><a href="#metalstack.api.v2.ProjectServiceInvitesListRequest">ProjectServiceInvitesListRequest</a></td>
+                <td><a href="#metalstack.api.v2.ProjectServiceInvitesListResponse">ProjectServiceInvitesListResponse</a></td>
+                <td><p>InvitesList list all invites to a project</p></td>
+              </tr>
+            
+              <tr>
+                <td>InviteGet</td>
+                <td><a href="#metalstack.api.v2.ProjectServiceInviteGetRequest">ProjectServiceInviteGetRequest</a></td>
+                <td><a href="#metalstack.api.v2.ProjectServiceInviteGetResponse">ProjectServiceInviteGetResponse</a></td>
+                <td><p>InviteGet get an invite</p></td>
+              </tr>
+            
+          </tbody>
+        </table>
+
+        
+    
+      
+      <div class="file-heading">
+        <h2 id="metalstack/admin/v2/project.proto">metalstack/admin/v2/project.proto</h2><a href="#title">Top</a>
+      </div>
+      <p></p>
+
+      
+        <h3 id="metalstack.admin.v2.ProjectServiceListRequest">ProjectServiceListRequest</h3>
+        <p>ProjectServiceListRequest is the request payload for the project list request</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
               
                 <tr>
-                  <td>last_sync</td>
-                  <td><a href="#metalstack.api.v2.SwitchSync">SwitchSync</a></td>
-                  <td></td>
-                  <td><p>LastSync contains information about the last heartbeat of the switch. </p></td>
+                  <td>tenant</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Tenant lists only projects of this tenant </p></td>
                 </tr>
               
                 <tr>
-                  <td>last_sync_error</td>
-                  <td><a href="#metalstack.api.v2.SwitchSync">SwitchSync</a></td>
-                  <td></td>
-                  <td><p>LastSyncError contains information about the last unsuccessful heartbeat of the switch. </p></td>
+                  <td>labels</td>
+                  <td><a href="#metalstack.api.v2.Labels">metalstack.api.v2.Labels</a></td>
+                  <td>optional</td>
+                  <td><p>Labels lists only projects containing the given labels </p></td>
                 </tr>
               
             </tbody>
@@ -13405,8 +13659,8 @@ <h3 id="metalstack.api.v2.Switch">Switch</h3>
 
         
       
-        <h3 id="metalstack.api.v2.SwitchBGPPortState">SwitchBGPPortState</h3>
-        <p>SwitchBGPPortState holds information about the BGP state of a port.</p>
+        <h3 id="metalstack.admin.v2.ProjectServiceListResponse">ProjectServiceListResponse</h3>
+        <p>ProjectServiceListResponse is the response payload for the project list request</p>
 
         
           <table class="field-table">
@@ -13416,52 +13670,10 @@ <h3 id="metalstack.api.v2.SwitchBGPPortState">SwitchBGPPortState</h3>
             <tbody>
               
                 <tr>
-                  <td>neighbor</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Neighbor of this port. </p></td>
-                </tr>
-              
-                <tr>
-                  <td>peer_group</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>PeerGroup of this port. </p></td>
-                </tr>
-              
-                <tr>
-                  <td>vrf_name</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>VrfName of the VRF this port is bound to. </p></td>
-                </tr>
-              
-                <tr>
-                  <td>bgp_state</td>
-                  <td><a href="#metalstack.api.v2.BGPState">BGPState</a></td>
-                  <td></td>
-                  <td><p>BgpState of the connection on this port. </p></td>
-                </tr>
-              
-                <tr>
-                  <td>bgp_timer_up_established</td>
-                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
-                  <td></td>
-                  <td><p>BgpTimerUpEstablished reports when this port&#39;s BGP connection was established. </p></td>
-                </tr>
-              
-                <tr>
-                  <td>sent_prefix_counter</td>
-                  <td><a href="#uint64">uint64</a></td>
-                  <td></td>
-                  <td><p>SentPrefixCounter counts the prefixes sent by the switch on this port. </p></td>
-                </tr>
-              
-                <tr>
-                  <td>accepted_prefix_counter</td>
-                  <td><a href="#uint64">uint64</a></td>
-                  <td></td>
-                  <td><p>AcceptedPrefixCounter counts the prefixes received on this port. </p></td>
+                  <td>projects</td>
+                  <td><a href="#metalstack.api.v2.Project">metalstack.api.v2.Project</a></td>
+                  <td>repeated</td>
+                  <td><p>Projects is a list of all projects </p></td>
                 </tr>
               
             </tbody>
@@ -13471,8 +13683,41 @@ <h3 id="metalstack.api.v2.SwitchBGPPortState">SwitchBGPPortState</h3>
 
         
       
-        <h3 id="metalstack.api.v2.SwitchNic">SwitchNic</h3>
-        <p>SwitchNic represents a front panel port and its configuration.</p>
+
+      
+
+      
+
+      
+        <h3 id="metalstack.admin.v2.ProjectService">ProjectService</h3>
+        <p>ProjectService serves project related functions</p>
+        <table class="enum-table">
+          <thead>
+            <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>List</td>
+                <td><a href="#metalstack.admin.v2.ProjectServiceListRequest">ProjectServiceListRequest</a></td>
+                <td><a href="#metalstack.admin.v2.ProjectServiceListResponse">ProjectServiceListResponse</a></td>
+                <td><p>List projects based on various filter criteria</p></td>
+              </tr>
+            
+          </tbody>
+        </table>
+
+        
+    
+      
+      <div class="file-heading">
+        <h2 id="metalstack/admin/v2/size.proto">metalstack/admin/v2/size.proto</h2><a href="#title">Top</a>
+      </div>
+      <p></p>
+
+      
+        <h3 id="metalstack.admin.v2.SizeServiceCreateRequest">SizeServiceCreateRequest</h3>
+        <p>SizeServiceCreateRequest is the request payload for a size create request</p>
 
         
           <table class="field-table">
@@ -13482,52 +13727,10 @@ <h3 id="metalstack.api.v2.SwitchNic">SwitchNic</h3>
             <tbody>
               
                 <tr>
-                  <td>name</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Name of the switch port </p></td>
-                </tr>
-              
-                <tr>
-                  <td>identifier</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Identifier of the port </p></td>
-                </tr>
-              
-                <tr>
-                  <td>mac</td>
-                  <td><a href="#string">string</a></td>
+                  <td>size</td>
+                  <td><a href="#metalstack.api.v2.Size">metalstack.api.v2.Size</a></td>
                   <td></td>
-                  <td><p>MAC address of the port </p></td>
-                </tr>
-              
-                <tr>
-                  <td>vrf</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>VRF name if the port is bound in one </p></td>
-                </tr>
-              
-                <tr>
-                  <td>state</td>
-                  <td><a href="#metalstack.api.v2.NicState">NicState</a></td>
-                  <td>optional</td>
-                  <td><p>NicState describes the current state of the switch port. </p></td>
-                </tr>
-              
-                <tr>
-                  <td>bgp_filter</td>
-                  <td><a href="#metalstack.api.v2.BGPFilter">BGPFilter</a></td>
-                  <td>optional</td>
-                  <td><p>BGPFilter optionally configured on a port. </p></td>
-                </tr>
-              
-                <tr>
-                  <td>bgp_port_state</td>
-                  <td><a href="#metalstack.api.v2.SwitchBGPPortState">SwitchBGPPortState</a></td>
-                  <td>optional</td>
-                  <td><p>BGPPortState represents the current BGP status of the port. </p></td>
+                  <td><p>Size is the size to create </p></td>
                 </tr>
               
             </tbody>
@@ -13537,8 +13740,8 @@ <h3 id="metalstack.api.v2.SwitchNic">SwitchNic</h3>
 
         
       
-        <h3 id="metalstack.api.v2.SwitchOS">SwitchOS</h3>
-        <p>SwitchOS holds information about the NOS and versions running on the switch.</p>
+        <h3 id="metalstack.admin.v2.SizeServiceCreateResponse">SizeServiceCreateResponse</h3>
+        <p>SizeServiceGetResponse is the response payload for a size create request</p>
 
         
           <table class="field-table">
@@ -13548,24 +13751,34 @@ <h3 id="metalstack.api.v2.SwitchOS">SwitchOS</h3>
             <tbody>
               
                 <tr>
-                  <td>vendor</td>
-                  <td><a href="#metalstack.api.v2.SwitchOSVendor">SwitchOSVendor</a></td>
+                  <td>size</td>
+                  <td><a href="#metalstack.api.v2.Size">metalstack.api.v2.Size</a></td>
                   <td></td>
-                  <td><p>Vendor identifies what NOS distribution is running on the switch, e.g. SONiC. </p></td>
+                  <td><p>Size the size </p></td>
                 </tr>
               
-                <tr>
-                  <td>version</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Version specifies what NOS version is currently installed on the switch. </p></td>
-                </tr>
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.admin.v2.SizeServiceDeleteRequest">SizeServiceDeleteRequest</h3>
+        <p>SizeServiceDeleteRequest is the request payload for a size delete request</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
               
                 <tr>
-                  <td>metal_core_version</td>
+                  <td>id</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>MetalCoreVersion is the currently running version of the metal-core. </p></td>
+                  <td><p>ID of the size to delete </p></td>
                 </tr>
               
             </tbody>
@@ -13575,8 +13788,8 @@ <h3 id="metalstack.api.v2.SwitchOS">SwitchOS</h3>
 
         
       
-        <h3 id="metalstack.api.v2.SwitchOSQuery">SwitchOSQuery</h3>
-        <p>SwitchOSQuery holds OS specific query parameters.</p>
+        <h3 id="metalstack.admin.v2.SizeServiceDeleteResponse">SizeServiceDeleteResponse</h3>
+        <p>SizeServiceDeleteResponse is the response payload for a size delete request</p>
 
         
           <table class="field-table">
@@ -13586,17 +13799,10 @@ <h3 id="metalstack.api.v2.SwitchOSQuery">SwitchOSQuery</h3>
             <tbody>
               
                 <tr>
-                  <td>vendor</td>
-                  <td><a href="#metalstack.api.v2.SwitchOSVendor">SwitchOSVendor</a></td>
-                  <td>optional</td>
-                  <td><p>OsVendor of the switch OS by which to filter the switches. </p></td>
-                </tr>
-              
-                <tr>
-                  <td>version</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>OsVersion of the OS by which to filter the switches. </p></td>
+                  <td>size</td>
+                  <td><a href="#metalstack.api.v2.Size">metalstack.api.v2.Size</a></td>
+                  <td></td>
+                  <td><p>Size the size </p></td>
                 </tr>
               
             </tbody>
@@ -13606,8 +13812,8 @@ <h3 id="metalstack.api.v2.SwitchOSQuery">SwitchOSQuery</h3>
 
         
       
-        <h3 id="metalstack.api.v2.SwitchQuery">SwitchQuery</h3>
-        <p>SwitchQuery can be used to query a switch or a list of switches.</p>
+        <h3 id="metalstack.admin.v2.SizeServiceUpdateRequest">SizeServiceUpdateRequest</h3>
+        <p>SizeServiceUpdateRequest is the request payload for a size update request</p>
 
         
           <table class="field-table">
@@ -13619,29 +13825,43 @@ <h3 id="metalstack.api.v2.SwitchQuery">SwitchQuery</h3>
                 <tr>
                   <td>id</td>
                   <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Id of the switch to list. </p></td>
+                  <td></td>
+                  <td><p>Id of this size </p></td>
                 </tr>
               
                 <tr>
-                  <td>partition</td>
+                  <td>update_meta</td>
+                  <td><a href="#metalstack.api.v2.UpdateMeta">metalstack.api.v2.UpdateMeta</a></td>
+                  <td></td>
+                  <td><p>UpdateMeta contains the timestamp and strategy to be used in this update request </p></td>
+                </tr>
+              
+                <tr>
+                  <td>name</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Partition of the switches to list. </p></td>
+                  <td><p>Name of this size </p></td>
                 </tr>
               
                 <tr>
-                  <td>rack</td>
+                  <td>description</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Rack of the switches to list. </p></td>
+                  <td><p>Description of this size </p></td>
                 </tr>
               
                 <tr>
-                  <td>os</td>
-                  <td><a href="#metalstack.api.v2.SwitchOSQuery">SwitchOSQuery</a></td>
+                  <td>constraints</td>
+                  <td><a href="#metalstack.api.v2.SizeConstraint">metalstack.api.v2.SizeConstraint</a></td>
+                  <td>repeated</td>
+                  <td><p>Constraints which must match that a specific machine is considered of this size </p></td>
+                </tr>
+              
+                <tr>
+                  <td>labels</td>
+                  <td><a href="#metalstack.api.v2.UpdateLabels">metalstack.api.v2.UpdateLabels</a></td>
                   <td>optional</td>
-                  <td><p>Switch OS specific queries. </p></td>
+                  <td><p>Labels to update on this size </p></td>
                 </tr>
               
             </tbody>
@@ -13651,8 +13871,8 @@ <h3 id="metalstack.api.v2.SwitchQuery">SwitchQuery</h3>
 
         
       
-        <h3 id="metalstack.api.v2.SwitchSync">SwitchSync</h3>
-        <p>SwitchSync summarizes information about a switch sync.</p>
+        <h3 id="metalstack.admin.v2.SizeServiceUpdateResponse">SizeServiceUpdateResponse</h3>
+        <p>SizeServiceUpdateResponse is the response payload for a size update request</p>
 
         
           <table class="field-table">
@@ -13662,24 +13882,10 @@ <h3 id="metalstack.api.v2.SwitchSync">SwitchSync</h3>
             <tbody>
               
                 <tr>
-                  <td>time</td>
-                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
-                  <td></td>
-                  <td><p>Time of the sync. </p></td>
-                </tr>
-              
-                <tr>
-                  <td>duration</td>
-                  <td><a href="#google.protobuf.Duration">google.protobuf.Duration</a></td>
+                  <td>size</td>
+                  <td><a href="#metalstack.api.v2.Size">metalstack.api.v2.Size</a></td>
                   <td></td>
-                  <td><p>Duration of the sync. </p></td>
-                </tr>
-              
-                <tr>
-                  <td>error</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Error if any occurred. </p></td>
+                  <td><p>Size the size </p></td>
                 </tr>
               
             </tbody>
@@ -13691,166 +13897,126 @@ <h3 id="metalstack.api.v2.SwitchSync">SwitchSync</h3>
       
 
       
-        <h3 id="metalstack.api.v2.BGPState">BGPState</h3>
-        <p>BGPState represents the state of a BGP session.</p>
-        <table class="enum-table">
-          <thead>
-            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
-          </thead>
-          <tbody>
-            
-              <tr>
-                <td>BGP_STATE_UNSPECIFIED</td>
-                <td>0</td>
-                <td><p>BGP_STATE_UNSPECIFIED is not specified.</p></td>
-              </tr>
-            
-              <tr>
-                <td>BGP_STATE_IDLE</td>
-                <td>1</td>
-                <td><p>BGP_STATE_IDLE is the Idle state of a BGP session.</p></td>
-              </tr>
-            
-              <tr>
-                <td>BGP_STATE_CONNECT</td>
-                <td>2</td>
-                <td><p>BGP_STATE_CONNECT is the Connect state of a BGP session.</p></td>
-              </tr>
-            
-              <tr>
-                <td>BGP_STATE_ACTIVE</td>
-                <td>3</td>
-                <td><p>BGP_STATE_ACTIVE is the Active state of a BGP session.</p></td>
-              </tr>
-            
-              <tr>
-                <td>BGP_STATE_OPEN_SENT</td>
-                <td>4</td>
-                <td><p>BGP_STATE_OPEN_SENT is the OpenSent state of a BGP session.</p></td>
-              </tr>
-            
-              <tr>
-                <td>BGP_STATE_OPEN_CONFIRM</td>
-                <td>5</td>
-                <td><p>BGP_STATE_OPEN_CONFIRM is the OpenConfirm state of a BGP session.</p></td>
-              </tr>
-            
-              <tr>
-                <td>BGP_STATE_ESTABLISHED</td>
-                <td>6</td>
-                <td><p>BGP_STATE_ESTABLISHED is the Established state of a BGP session.</p></td>
-              </tr>
-            
-          </tbody>
-        </table>
-      
-        <h3 id="metalstack.api.v2.SwitchOSVendor">SwitchOSVendor</h3>
-        <p>SwitchOSVendor represents a NOS distribution.</p>
-        <table class="enum-table">
-          <thead>
-            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
-          </thead>
-          <tbody>
-            
-              <tr>
-                <td>SWITCH_OS_VENDOR_UNSPECIFIED</td>
-                <td>0</td>
-                <td><p>SWITCH_OS_VENDOR_UNSPECIFIED is not specified.</p></td>
-              </tr>
-            
-              <tr>
-                <td>SWITCH_OS_VENDOR_CUMULUS</td>
-                <td>1</td>
-                <td><p>SWITCH_OS_VENDOR_CUMULUS means this switch is running on Cumulus Linux.</p></td>
-              </tr>
-            
-              <tr>
-                <td>SWITCH_OS_VENDOR_SONIC</td>
-                <td>2</td>
-                <td><p>SWITCH_OS_VENDOR_SONIC means this switch is running on SONiC NOS.</p></td>
-              </tr>
-            
-          </tbody>
-        </table>
+
       
-        <h3 id="metalstack.api.v2.SwitchPortStatus">SwitchPortStatus</h3>
-        <p>SwitchPortStatus specifies the state of a switch port.</p>
-        <table class="enum-table">
-          <thead>
-            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
-          </thead>
-          <tbody>
-            
-              <tr>
-                <td>SWITCH_PORT_STATUS_UNSPECIFIED</td>
-                <td>0</td>
-                <td><p>SWITCH_PORT_STATUS_UNSPECIFIED is not specified.</p></td>
-              </tr>
-            
-              <tr>
-                <td>SWITCH_PORT_STATUS_UP</td>
-                <td>1</td>
-                <td><p>SWITCH_PORT_STATUS_UP means this port is up.</p></td>
-              </tr>
-            
-              <tr>
-                <td>SWITCH_PORT_STATUS_DOWN</td>
-                <td>2</td>
-                <td><p>SWITCH_PORT_STATUS_DOWN means this port is down.</p></td>
-              </tr>
-            
-              <tr>
-                <td>SWITCH_PORT_STATUS_UNKNOWN</td>
-                <td>3</td>
-                <td><p>SWITCH_PORT_STATUS_UNKNOWN means the status of this port is unknown.</p></td>
-              </tr>
-            
-          </tbody>
-        </table>
+
       
-        <h3 id="metalstack.api.v2.SwitchReplaceMode">SwitchReplaceMode</h3>
-        <p>SwitchReplaceMode is used to mark a switch ready for replacement.</p>
+        <h3 id="metalstack.admin.v2.SizeService">SizeService</h3>
+        <p>SizeService serves size related functions</p>
         <table class="enum-table">
           <thead>
-            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
+            <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
           </thead>
           <tbody>
             
               <tr>
-                <td>SWITCH_REPLACE_MODE_UNSPECIFIED</td>
-                <td>0</td>
-                <td><p>SWITCH_REPLACE_MODE_UNSPECIFIED is not specified.</p></td>
+                <td>Create</td>
+                <td><a href="#metalstack.admin.v2.SizeServiceCreateRequest">SizeServiceCreateRequest</a></td>
+                <td><a href="#metalstack.admin.v2.SizeServiceCreateResponse">SizeServiceCreateResponse</a></td>
+                <td><p>Create a size</p></td>
               </tr>
             
               <tr>
-                <td>SWITCH_REPLACE_MODE_REPLACE</td>
-                <td>1</td>
-                <td><p>SWITCH_REPLACE_MODE_REPLACE means this switch is waiting to be replaced.</p></td>
+                <td>Update</td>
+                <td><a href="#metalstack.admin.v2.SizeServiceUpdateRequest">SizeServiceUpdateRequest</a></td>
+                <td><a href="#metalstack.admin.v2.SizeServiceUpdateResponse">SizeServiceUpdateResponse</a></td>
+                <td><p>Update a size</p></td>
               </tr>
             
               <tr>
-                <td>SWITCH_REPLACE_MODE_OPERATIONAL</td>
-                <td>2</td>
-                <td><p>SWITCH_REPLACE_MODE_OPERATIONAL means this switch is operational and cannot be replaced.</p></td>
+                <td>Delete</td>
+                <td><a href="#metalstack.admin.v2.SizeServiceDeleteRequest">SizeServiceDeleteRequest</a></td>
+                <td><a href="#metalstack.admin.v2.SizeServiceDeleteResponse">SizeServiceDeleteResponse</a></td>
+                <td><p>Delete a size</p></td>
               </tr>
             
           </tbody>
         </table>
-      
-
-      
 
-      
+        
     
       
       <div class="file-heading">
-        <h2 id="metalstack/admin/v2/switch.proto">metalstack/admin/v2/switch.proto</h2><a href="#title">Top</a>
+        <h2 id="metalstack/api/v2/size_reservation.proto">metalstack/api/v2/size_reservation.proto</h2><a href="#title">Top</a>
       </div>
       <p></p>
 
       
-        <h3 id="metalstack.admin.v2.SwitchServiceDeleteRequest">SwitchServiceDeleteRequest</h3>
-        <p>SwitchServiceDeleteRequest.</p>
+        <h3 id="metalstack.api.v2.SizeReservation">SizeReservation</h3>
+        <p>SizeReservation</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>id</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Id of this size reservation, is generated on creation </p></td>
+                </tr>
+              
+                <tr>
+                  <td>meta</td>
+                  <td><a href="#metalstack.api.v2.Meta">Meta</a></td>
+                  <td></td>
+                  <td><p>Meta for this size reservation </p></td>
+                </tr>
+              
+                <tr>
+                  <td>name</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Name of this size reservation </p></td>
+                </tr>
+              
+                <tr>
+                  <td>description</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Description of this size reservation </p></td>
+                </tr>
+              
+                <tr>
+                  <td>project</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Project of the size reservation </p></td>
+                </tr>
+              
+                <tr>
+                  <td>size</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Size id of this size reservation </p></td>
+                </tr>
+              
+                <tr>
+                  <td>partitions</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>Partition ids of this size reservation </p></td>
+                </tr>
+              
+                <tr>
+                  <td>amount</td>
+                  <td><a href="#int32">int32</a></td>
+                  <td></td>
+                  <td><p>Amount of reservations of this size reservation </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.api.v2.SizeReservationQuery">SizeReservationQuery</h3>
+        <p>SizeReservationQuery is used to search size reservations</p>
 
         
           <table class="field-table">
@@ -13862,15 +14028,50 @@ <h3 id="metalstack.admin.v2.SwitchServiceDeleteRequest">SwitchServiceDeleteReque
                 <tr>
                   <td>id</td>
                   <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Id of the switch. </p></td>
+                  <td>optional</td>
+                  <td><p>ID of the size reservation to get </p></td>
                 </tr>
               
                 <tr>
-                  <td>force</td>
-                  <td><a href="#bool">bool</a></td>
-                  <td></td>
-                  <td><p>Force will allow switch deletion despite existing machine connections. </p></td>
+                  <td>name</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Name of this size reservation </p></td>
+                </tr>
+              
+                <tr>
+                  <td>description</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Description of this size reservation </p></td>
+                </tr>
+              
+                <tr>
+                  <td>size</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Size id of this size reservation </p></td>
+                </tr>
+              
+                <tr>
+                  <td>project</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Project of the size reservation </p></td>
+                </tr>
+              
+                <tr>
+                  <td>partition</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Partition of the size reservation </p></td>
+                </tr>
+              
+                <tr>
+                  <td>labels</td>
+                  <td><a href="#metalstack.api.v2.Labels">Labels</a></td>
+                  <td>optional</td>
+                  <td><p>Labels lists only size reservations containing the given labels </p></td>
                 </tr>
               
             </tbody>
@@ -13880,8 +14081,8 @@ <h3 id="metalstack.admin.v2.SwitchServiceDeleteRequest">SwitchServiceDeleteReque
 
         
       
-        <h3 id="metalstack.admin.v2.SwitchServiceDeleteResponse">SwitchServiceDeleteResponse</h3>
-        <p>SwitchServiceDeleteResponse.</p>
+        <h3 id="metalstack.api.v2.SizeReservationServiceGetRequest">SizeReservationServiceGetRequest</h3>
+        <p>SizeReservationServiceGetRequest is the request payload for a size get request</p>
 
         
           <table class="field-table">
@@ -13891,10 +14092,17 @@ <h3 id="metalstack.admin.v2.SwitchServiceDeleteResponse">SwitchServiceDeleteResp
             <tbody>
               
                 <tr>
-                  <td>switch</td>
-                  <td><a href="#metalstack.api.v2.Switch">metalstack.api.v2.Switch</a></td>
+                  <td>id</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Switch that has been deleted. </p></td>
+                  <td><p>ID of the size reservation to get </p></td>
+                </tr>
+              
+                <tr>
+                  <td>project</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Project of the size reservation </p></td>
                 </tr>
               
             </tbody>
@@ -13904,8 +14112,8 @@ <h3 id="metalstack.admin.v2.SwitchServiceDeleteResponse">SwitchServiceDeleteResp
 
         
       
-        <h3 id="metalstack.admin.v2.SwitchServiceGetRequest">SwitchServiceGetRequest</h3>
-        <p>SwitchServiceGetRequest.</p>
+        <h3 id="metalstack.api.v2.SizeReservationServiceGetResponse">SizeReservationServiceGetResponse</h3>
+        <p>SizeReservationServiceGetResponse is the response payload for a size reservation get request</p>
 
         
           <table class="field-table">
@@ -13915,10 +14123,10 @@ <h3 id="metalstack.admin.v2.SwitchServiceGetRequest">SwitchServiceGetRequest</h3
             <tbody>
               
                 <tr>
-                  <td>id</td>
-                  <td><a href="#string">string</a></td>
+                  <td>size_reservation</td>
+                  <td><a href="#metalstack.api.v2.SizeReservation">SizeReservation</a></td>
                   <td></td>
-                  <td><p>Id of the switch to get. </p></td>
+                  <td><p>Size reservation </p></td>
                 </tr>
               
             </tbody>
@@ -13928,8 +14136,8 @@ <h3 id="metalstack.admin.v2.SwitchServiceGetRequest">SwitchServiceGetRequest</h3
 
         
       
-        <h3 id="metalstack.admin.v2.SwitchServiceGetResponse">SwitchServiceGetResponse</h3>
-        <p>SwitchServiceGetResponse.</p>
+        <h3 id="metalstack.api.v2.SizeReservationServiceListRequest">SizeReservationServiceListRequest</h3>
+        <p>SizeReservationServiceListRequest is the request payload for a size list request</p>
 
         
           <table class="field-table">
@@ -13939,10 +14147,17 @@ <h3 id="metalstack.admin.v2.SwitchServiceGetResponse">SwitchServiceGetResponse</
             <tbody>
               
                 <tr>
-                  <td>switch</td>
-                  <td><a href="#metalstack.api.v2.Switch">metalstack.api.v2.Switch</a></td>
+                  <td>project</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Switch that was requested. </p></td>
+                  <td><p>Project of the size reservation </p></td>
+                </tr>
+              
+                <tr>
+                  <td>query</td>
+                  <td><a href="#metalstack.api.v2.SizeReservationQuery">SizeReservationQuery</a></td>
+                  <td></td>
+                  <td><p>Query for size reservations </p></td>
                 </tr>
               
             </tbody>
@@ -13952,8 +14167,8 @@ <h3 id="metalstack.admin.v2.SwitchServiceGetResponse">SwitchServiceGetResponse</
 
         
       
-        <h3 id="metalstack.admin.v2.SwitchServiceListRequest">SwitchServiceListRequest</h3>
-        <p>SwitchServiceListRequest.</p>
+        <h3 id="metalstack.api.v2.SizeReservationServiceListResponse">SizeReservationServiceListResponse</h3>
+        <p>SizeReservationServiceListResponse is the response payload for a size reservation list request</p>
 
         
           <table class="field-table">
@@ -13963,10 +14178,10 @@ <h3 id="metalstack.admin.v2.SwitchServiceListRequest">SwitchServiceListRequest</
             <tbody>
               
                 <tr>
-                  <td>query</td>
-                  <td><a href="#metalstack.api.v2.SwitchQuery">metalstack.api.v2.SwitchQuery</a></td>
-                  <td></td>
-                  <td><p>Query to filter the results. </p></td>
+                  <td>size_reservations</td>
+                  <td><a href="#metalstack.api.v2.SizeReservation">SizeReservation</a></td>
+                  <td>repeated</td>
+                  <td><p>Size reservations </p></td>
                 </tr>
               
             </tbody>
@@ -13976,8 +14191,48 @@ <h3 id="metalstack.admin.v2.SwitchServiceListRequest">SwitchServiceListRequest</
 
         
       
-        <h3 id="metalstack.admin.v2.SwitchServiceListResponse">SwitchServiceListResponse</h3>
-        <p>SwitchServiceListResponse.</p>
+
+      
+
+      
+
+      
+        <h3 id="metalstack.api.v2.SizeReservationService">SizeReservationService</h3>
+        <p>SizeReservationService serves size reservation related functions</p>
+        <table class="enum-table">
+          <thead>
+            <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>Get</td>
+                <td><a href="#metalstack.api.v2.SizeReservationServiceGetRequest">SizeReservationServiceGetRequest</a></td>
+                <td><a href="#metalstack.api.v2.SizeReservationServiceGetResponse">SizeReservationServiceGetResponse</a></td>
+                <td><p>Get a size reservation</p></td>
+              </tr>
+            
+              <tr>
+                <td>List</td>
+                <td><a href="#metalstack.api.v2.SizeReservationServiceListRequest">SizeReservationServiceListRequest</a></td>
+                <td><a href="#metalstack.api.v2.SizeReservationServiceListResponse">SizeReservationServiceListResponse</a></td>
+                <td><p>List size reservations</p></td>
+              </tr>
+            
+          </tbody>
+        </table>
+
+        
+    
+      
+      <div class="file-heading">
+        <h2 id="metalstack/admin/v2/size_reservation.proto">metalstack/admin/v2/size_reservation.proto</h2><a href="#title">Top</a>
+      </div>
+      <p></p>
+
+      
+        <h3 id="metalstack.admin.v2.SizeReservationServiceCreateRequest">SizeReservationServiceCreateRequest</h3>
+        <p>SizeReservationServiceCreateRequest is the request payload for a size reservation create request</p>
 
         
           <table class="field-table">
@@ -13987,10 +14242,10 @@ <h3 id="metalstack.admin.v2.SwitchServiceListResponse">SwitchServiceListResponse
             <tbody>
               
                 <tr>
-                  <td>switches</td>
-                  <td><a href="#metalstack.api.v2.Switch">metalstack.api.v2.Switch</a></td>
-                  <td>repeated</td>
-                  <td><p>Switches that match the request query. </p></td>
+                  <td>size_reservation</td>
+                  <td><a href="#metalstack.api.v2.SizeReservation">metalstack.api.v2.SizeReservation</a></td>
+                  <td></td>
+                  <td><p>SizeReservation is the size reservation to create </p></td>
                 </tr>
               
             </tbody>
@@ -14000,8 +14255,8 @@ <h3 id="metalstack.admin.v2.SwitchServiceListResponse">SwitchServiceListResponse
 
         
       
-        <h3 id="metalstack.admin.v2.SwitchServiceMigrateRequest">SwitchServiceMigrateRequest</h3>
-        <p>SwitchServiceMigrateRequest.</p>
+        <h3 id="metalstack.admin.v2.SizeReservationServiceCreateResponse">SizeReservationServiceCreateResponse</h3>
+        <p>SizeReservationServiceCreateResponse is the response payload for a size reservation create request</p>
 
         
           <table class="field-table">
@@ -14011,17 +14266,10 @@ <h3 id="metalstack.admin.v2.SwitchServiceMigrateRequest">SwitchServiceMigrateReq
             <tbody>
               
                 <tr>
-                  <td>old_switch</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>OldSwitch which to migrate away from. </p></td>
-                </tr>
-              
-                <tr>
-                  <td>new_switch</td>
-                  <td><a href="#string">string</a></td>
+                  <td>size_reservation</td>
+                  <td><a href="#metalstack.api.v2.SizeReservation">metalstack.api.v2.SizeReservation</a></td>
                   <td></td>
-                  <td><p>NewSwitch which to migrate to. </p></td>
+                  <td><p>SizeReservation the size reservation </p></td>
                 </tr>
               
             </tbody>
@@ -14031,8 +14279,8 @@ <h3 id="metalstack.admin.v2.SwitchServiceMigrateRequest">SwitchServiceMigrateReq
 
         
       
-        <h3 id="metalstack.admin.v2.SwitchServiceMigrateResponse">SwitchServiceMigrateResponse</h3>
-        <p>SwitchServiceMigrateResponse.</p>
+        <h3 id="metalstack.admin.v2.SizeReservationServiceDeleteRequest">SizeReservationServiceDeleteRequest</h3>
+        <p>SizeReservationServiceDeleteRequest is the request payload for a size reservation delete request</p>
 
         
           <table class="field-table">
@@ -14042,10 +14290,10 @@ <h3 id="metalstack.admin.v2.SwitchServiceMigrateResponse">SwitchServiceMigrateRe
             <tbody>
               
                 <tr>
-                  <td>switch</td>
-                  <td><a href="#metalstack.api.v2.Switch">metalstack.api.v2.Switch</a></td>
+                  <td>id</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Switch that was migrated to. </p></td>
+                  <td><p>ID of the size reservation to delete </p></td>
                 </tr>
               
             </tbody>
@@ -14055,8 +14303,8 @@ <h3 id="metalstack.admin.v2.SwitchServiceMigrateResponse">SwitchServiceMigrateRe
 
         
       
-        <h3 id="metalstack.admin.v2.SwitchServicePortRequest">SwitchServicePortRequest</h3>
-        <p>SwitchServicePortRequest.</p>
+        <h3 id="metalstack.admin.v2.SizeReservationServiceDeleteResponse">SizeReservationServiceDeleteResponse</h3>
+        <p>SizeReservationServiceDeleteResponse is the response payload for a size reservation delete request</p>
 
         
           <table class="field-table">
@@ -14066,24 +14314,10 @@ <h3 id="metalstack.admin.v2.SwitchServicePortRequest">SwitchServicePortRequest</
             <tbody>
               
                 <tr>
-                  <td>id</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Id of the switch. </p></td>
-                </tr>
-              
-                <tr>
-                  <td>nic_name</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>NicName of the port whose status should be changed. </p></td>
-                </tr>
-              
-                <tr>
-                  <td>status</td>
-                  <td><a href="#metalstack.api.v2.SwitchPortStatus">metalstack.api.v2.SwitchPortStatus</a></td>
+                  <td>size_reservation</td>
+                  <td><a href="#metalstack.api.v2.SizeReservation">metalstack.api.v2.SizeReservation</a></td>
                   <td></td>
-                  <td><p>Status that the port should have. </p></td>
+                  <td><p>SizeReservation the size reservation </p></td>
                 </tr>
               
             </tbody>
@@ -14093,8 +14327,8 @@ <h3 id="metalstack.admin.v2.SwitchServicePortRequest">SwitchServicePortRequest</
 
         
       
-        <h3 id="metalstack.admin.v2.SwitchServicePortResponse">SwitchServicePortResponse</h3>
-        <p>SwitchServicePortResponse.</p>
+        <h3 id="metalstack.admin.v2.SizeReservationServiceListRequest">SizeReservationServiceListRequest</h3>
+        <p>SizeReservationServiceListRequest is the request payload for a size list request</p>
 
         
           <table class="field-table">
@@ -14104,10 +14338,10 @@ <h3 id="metalstack.admin.v2.SwitchServicePortResponse">SwitchServicePortResponse
             <tbody>
               
                 <tr>
-                  <td>switch</td>
-                  <td><a href="#metalstack.api.v2.Switch">metalstack.api.v2.Switch</a></td>
+                  <td>query</td>
+                  <td><a href="#metalstack.api.v2.SizeReservationQuery">metalstack.api.v2.SizeReservationQuery</a></td>
                   <td></td>
-                  <td><p>Switch after the port status toggle.. </p></td>
+                  <td><p>Query for size reservations </p></td>
                 </tr>
               
             </tbody>
@@ -14117,8 +14351,8 @@ <h3 id="metalstack.admin.v2.SwitchServicePortResponse">SwitchServicePortResponse
 
         
       
-        <h3 id="metalstack.admin.v2.SwitchServiceUpdateRequest">SwitchServiceUpdateRequest</h3>
-        <p>SwitchServiceUpdateRequest.</p>
+        <h3 id="metalstack.admin.v2.SizeReservationServiceListResponse">SizeReservationServiceListResponse</h3>
+        <p>SizeReservationServiceListResponse is the response payload for a size reservation list request</p>
 
         
           <table class="field-table">
@@ -14128,74 +14362,76 @@ <h3 id="metalstack.admin.v2.SwitchServiceUpdateRequest">SwitchServiceUpdateReque
             <tbody>
               
                 <tr>
-                  <td>id</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>ID of the switch. </p></td>
-                </tr>
-              
-                <tr>
-                  <td>update_meta</td>
-                  <td><a href="#metalstack.api.v2.UpdateMeta">metalstack.api.v2.UpdateMeta</a></td>
-                  <td></td>
-                  <td><p>UpdateMeta contains the timestamp and strategy to be used in this update request. </p></td>
+                  <td>size_reservations</td>
+                  <td><a href="#metalstack.api.v2.SizeReservation">metalstack.api.v2.SizeReservation</a></td>
+                  <td>repeated</td>
+                  <td><p>Size reservations </p></td>
                 </tr>
               
-                <tr>
-                  <td>updated_at</td>
-                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
-                  <td></td>
-                  <td><p>UpdatedAt is the date when this entity was updated.
-must be part of the update request to ensure optimistic locking. </p></td>
-                </tr>
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.admin.v2.SizeReservationServiceUpdateRequest">SizeReservationServiceUpdateRequest</h3>
+        <p>SizeReservationServiceUpdateRequest is the request payload for a size reservation update request</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
               
                 <tr>
-                  <td>description</td>
+                  <td>id</td>
                   <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Description of the switch. </p></td>
+                  <td></td>
+                  <td><p>Id of this size reservation </p></td>
                 </tr>
               
                 <tr>
-                  <td>replace_mode</td>
-                  <td><a href="#metalstack.api.v2.SwitchReplaceMode">metalstack.api.v2.SwitchReplaceMode</a></td>
+                  <td>name</td>
+                  <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Replace mode is used to mark a switch ready for replacement. </p></td>
+                  <td><p>Name of this size reservation </p></td>
                 </tr>
               
                 <tr>
-                  <td>management_ip</td>
+                  <td>description</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Management IP is the switch&#39;s IP for management access. </p></td>
+                  <td><p>Description of this size reservation </p></td>
                 </tr>
               
                 <tr>
-                  <td>management_user</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Management user is the user name to use for management access. </p></td>
+                  <td>update_meta</td>
+                  <td><a href="#metalstack.api.v2.UpdateMeta">metalstack.api.v2.UpdateMeta</a></td>
+                  <td></td>
+                  <td><p>UpdateMeta contains the timestamp and strategy to be used in this update request </p></td>
                 </tr>
               
                 <tr>
-                  <td>console_command</td>
+                  <td>partitions</td>
                   <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Console command is the command for accessing the switch&#39;s console. </p></td>
+                  <td>repeated</td>
+                  <td><p>Partition ids of this size reservation </p></td>
                 </tr>
               
                 <tr>
-                  <td>nics</td>
-                  <td><a href="#metalstack.api.v2.SwitchNic">metalstack.api.v2.SwitchNic</a></td>
-                  <td>repeated</td>
-                  <td><p>Nics are the front panel ports of the switch. </p></td>
+                  <td>amount</td>
+                  <td><a href="#int32">int32</a></td>
+                  <td>optional</td>
+                  <td><p>Amount of reservations of this size reservation </p></td>
                 </tr>
               
                 <tr>
-                  <td>os</td>
-                  <td><a href="#metalstack.api.v2.SwitchOS">metalstack.api.v2.SwitchOS</a></td>
+                  <td>labels</td>
+                  <td><a href="#metalstack.api.v2.UpdateLabels">metalstack.api.v2.UpdateLabels</a></td>
                   <td>optional</td>
-                  <td><p>SwitchOs is the OS running on the switch. </p></td>
+                  <td><p>Labels to update of this size reservation </p></td>
                 </tr>
               
             </tbody>
@@ -14205,8 +14441,8 @@ <h3 id="metalstack.admin.v2.SwitchServiceUpdateRequest">SwitchServiceUpdateReque
 
         
       
-        <h3 id="metalstack.admin.v2.SwitchServiceUpdateResponse">SwitchServiceUpdateResponse</h3>
-        <p>SwitchServiceUpdateResponse.</p>
+        <h3 id="metalstack.admin.v2.SizeReservationServiceUpdateResponse">SizeReservationServiceUpdateResponse</h3>
+        <p>SizeReservationServiceUpdateResponse is the response payload for a size reservation update request</p>
 
         
           <table class="field-table">
@@ -14216,10 +14452,10 @@ <h3 id="metalstack.admin.v2.SwitchServiceUpdateResponse">SwitchServiceUpdateResp
             <tbody>
               
                 <tr>
-                  <td>switch</td>
-                  <td><a href="#metalstack.api.v2.Switch">metalstack.api.v2.Switch</a></td>
+                  <td>size_reservation</td>
+                  <td><a href="#metalstack.api.v2.SizeReservation">metalstack.api.v2.SizeReservation</a></td>
                   <td></td>
-                  <td><p>Switch that was updated. </p></td>
+                  <td><p>SizeReservation the size reservation </p></td>
                 </tr>
               
             </tbody>
@@ -14235,8 +14471,8 @@ <h3 id="metalstack.admin.v2.SwitchServiceUpdateResponse">SwitchServiceUpdateResp
       
 
       
-        <h3 id="metalstack.admin.v2.SwitchService">SwitchService</h3>
-        <p>SwitchService serves switch related functions.</p>
+        <h3 id="metalstack.admin.v2.SizeReservationService">SizeReservationService</h3>
+        <p>SizeReservationService serves size reservation related functions</p>
         <table class="enum-table">
           <thead>
             <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
@@ -14244,45 +14480,31 @@ <h3 id="metalstack.admin.v2.SwitchService">SwitchService</h3>
           <tbody>
             
               <tr>
-                <td>Get</td>
-                <td><a href="#metalstack.admin.v2.SwitchServiceGetRequest">SwitchServiceGetRequest</a></td>
-                <td><a href="#metalstack.admin.v2.SwitchServiceGetResponse">SwitchServiceGetResponse</a></td>
-                <td><p>Get a switch by ID.</p></td>
-              </tr>
-            
-              <tr>
-                <td>List</td>
-                <td><a href="#metalstack.admin.v2.SwitchServiceListRequest">SwitchServiceListRequest</a></td>
-                <td><a href="#metalstack.admin.v2.SwitchServiceListResponse">SwitchServiceListResponse</a></td>
-                <td><p>List switches.</p></td>
+                <td>Create</td>
+                <td><a href="#metalstack.admin.v2.SizeReservationServiceCreateRequest">SizeReservationServiceCreateRequest</a></td>
+                <td><a href="#metalstack.admin.v2.SizeReservationServiceCreateResponse">SizeReservationServiceCreateResponse</a></td>
+                <td><p>Create a size reservation</p></td>
               </tr>
             
               <tr>
                 <td>Update</td>
-                <td><a href="#metalstack.admin.v2.SwitchServiceUpdateRequest">SwitchServiceUpdateRequest</a></td>
-                <td><a href="#metalstack.admin.v2.SwitchServiceUpdateResponse">SwitchServiceUpdateResponse</a></td>
-                <td><p>Update a switch.</p></td>
+                <td><a href="#metalstack.admin.v2.SizeReservationServiceUpdateRequest">SizeReservationServiceUpdateRequest</a></td>
+                <td><a href="#metalstack.admin.v2.SizeReservationServiceUpdateResponse">SizeReservationServiceUpdateResponse</a></td>
+                <td><p>Update a size reservation</p></td>
               </tr>
             
               <tr>
                 <td>Delete</td>
-                <td><a href="#metalstack.admin.v2.SwitchServiceDeleteRequest">SwitchServiceDeleteRequest</a></td>
-                <td><a href="#metalstack.admin.v2.SwitchServiceDeleteResponse">SwitchServiceDeleteResponse</a></td>
-                <td><p>Delete a switch.</p></td>
-              </tr>
-            
-              <tr>
-                <td>Migrate</td>
-                <td><a href="#metalstack.admin.v2.SwitchServiceMigrateRequest">SwitchServiceMigrateRequest</a></td>
-                <td><a href="#metalstack.admin.v2.SwitchServiceMigrateResponse">SwitchServiceMigrateResponse</a></td>
-                <td><p>Migrate a switch.</p></td>
+                <td><a href="#metalstack.admin.v2.SizeReservationServiceDeleteRequest">SizeReservationServiceDeleteRequest</a></td>
+                <td><a href="#metalstack.admin.v2.SizeReservationServiceDeleteResponse">SizeReservationServiceDeleteResponse</a></td>
+                <td><p>Delete a size reservation</p></td>
               </tr>
             
               <tr>
-                <td>Port</td>
-                <td><a href="#metalstack.admin.v2.SwitchServicePortRequest">SwitchServicePortRequest</a></td>
-                <td><a href="#metalstack.admin.v2.SwitchServicePortResponse">SwitchServicePortResponse</a></td>
-                <td><p>Port set the port status of a switch port.</p></td>
+                <td>List</td>
+                <td><a href="#metalstack.admin.v2.SizeReservationServiceListRequest">SizeReservationServiceListRequest</a></td>
+                <td><a href="#metalstack.admin.v2.SizeReservationServiceListResponse">SizeReservationServiceListResponse</a></td>
+                <td><p>List size reservations</p></td>
               </tr>
             
           </tbody>
@@ -14292,13 +14514,13 @@ <h3 id="metalstack.admin.v2.SwitchService">SwitchService</h3>
     
       
       <div class="file-heading">
-        <h2 id="metalstack/admin/v2/task.proto">metalstack/admin/v2/task.proto</h2><a href="#title">Top</a>
+        <h2 id="metalstack/api/v2/switch.proto">metalstack/api/v2/switch.proto</h2><a href="#title">Top</a>
       </div>
       <p></p>
 
       
-        <h3 id="metalstack.admin.v2.TaskInfo">TaskInfo</h3>
-        <p>TaskInfo contains details of an async task</p>
+        <h3 id="metalstack.api.v2.BGPFilter">BGPFilter</h3>
+        <p>BGPFilter can be used to restrict BGP based on CIDRs and VNIs.</p>
 
         
           <table class="field-table">
@@ -14308,136 +14530,260 @@ <h3 id="metalstack.admin.v2.TaskInfo">TaskInfo</h3>
             <tbody>
               
                 <tr>
-                  <td>id</td>
+                  <td>cidrs</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>CIDRs for which to allow BGP </p></td>
+                </tr>
+              
+                <tr>
+                  <td>vnis</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>VNIs for which to allow BGP </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.api.v2.MachineConnection">MachineConnection</h3>
+        <p>MachineConnection associates a machine with the corresponding switch nic.</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>machine_id</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>ID is the identifier of the task. </p></td>
+                  <td><p>MachineId of the machine connected to the nic. </p></td>
                 </tr>
               
                 <tr>
-                  <td>queue</td>
+                  <td>nic</td>
+                  <td><a href="#metalstack.api.v2.SwitchNic">SwitchNic</a></td>
+                  <td></td>
+                  <td><p>Nic the machine is connected to. </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.api.v2.NicState">NicState</h3>
+        <p>NicState represents the current state of a switch port.</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>desired</td>
+                  <td><a href="#metalstack.api.v2.SwitchPortStatus">SwitchPortStatus</a></td>
+                  <td>optional</td>
+                  <td><p>Desired is the desired port state. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>actual</td>
+                  <td><a href="#metalstack.api.v2.SwitchPortStatus">SwitchPortStatus</a></td>
+                  <td></td>
+                  <td><p>Actual is the actual port state. </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.api.v2.Switch">Switch</h3>
+        <p>Switch represents a network switch.</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>id</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Queue is the name of the queue in which the task belongs. </p></td>
+                  <td><p>Id of the switch. </p></td>
                 </tr>
               
                 <tr>
-                  <td>type</td>
+                  <td>meta</td>
+                  <td><a href="#metalstack.api.v2.Meta">Meta</a></td>
+                  <td></td>
+                  <td><p>Meta for this switch. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>description</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Type is the type name of the task. </p></td>
+                  <td><p>Description of the switch. </p></td>
                 </tr>
               
                 <tr>
-                  <td>payload</td>
-                  <td><a href="#bytes">bytes</a></td>
+                  <td>rack</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Rack ID if the switch resides in a rack. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>partition</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Payload is the payload data of the task. </p></td>
+                  <td><p>Partition the switch belongs to. </p></td>
                 </tr>
               
                 <tr>
-                  <td>state</td>
-                  <td><a href="#metalstack.admin.v2.TaskState">TaskState</a></td>
+                  <td>replace_mode</td>
+                  <td><a href="#metalstack.api.v2.SwitchReplaceMode">SwitchReplaceMode</a></td>
                   <td></td>
-                  <td><p>State indicates the task state. </p></td>
+                  <td><p>ReplaceMode is used to mark a switch ready for replacement. </p></td>
                 </tr>
               
                 <tr>
-                  <td>max_retry</td>
-                  <td><a href="#int32">int32</a></td>
+                  <td>management_ip</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>MaxRetry is the maximum number of times the task can be retried. </p></td>
+                  <td><p>ManagementIp is the switch&#39;s IP for management access. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>management_user</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>ManagementUser is the user name to use for management access. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>console_command</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>ConsoleCommand is the command for accessing the switch&#39;s console. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>nics</td>
+                  <td><a href="#metalstack.api.v2.SwitchNic">SwitchNic</a></td>
+                  <td>repeated</td>
+                  <td><p>Nics are the front panel ports of the switch. </p></td>
                 </tr>
               
                 <tr>
-                  <td>retried</td>
-                  <td><a href="#int32">int32</a></td>
+                  <td>os</td>
+                  <td><a href="#metalstack.api.v2.SwitchOS">SwitchOS</a></td>
                   <td></td>
-                  <td><p>Retried is the number of times the task has retried so far. </p></td>
+                  <td><p>SwitchOs is the OS running on the switch. </p></td>
                 </tr>
               
                 <tr>
-                  <td>last_error</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>LastError is the error message from the last failure. </p></td>
+                  <td>machine_connections</td>
+                  <td><a href="#metalstack.api.v2.MachineConnection">MachineConnection</a></td>
+                  <td>repeated</td>
+                  <td><p>MachineConnections map machines to the nics they are connected to. </p></td>
                 </tr>
               
                 <tr>
-                  <td>last_failed_at</td>
-                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
+                  <td>last_sync</td>
+                  <td><a href="#metalstack.api.v2.SwitchSync">SwitchSync</a></td>
                   <td></td>
-                  <td><p>LastFailedAt is the time time of the last failure if any.
-If the task has no failures, LastFailedAt is zero time (i.e. time.Time{}). </p></td>
+                  <td><p>LastSync contains information about the last heartbeat of the switch. </p></td>
                 </tr>
               
                 <tr>
-                  <td>timeout</td>
-                  <td><a href="#google.protobuf.Duration">google.protobuf.Duration</a></td>
+                  <td>last_sync_error</td>
+                  <td><a href="#metalstack.api.v2.SwitchSync">SwitchSync</a></td>
                   <td></td>
-                  <td><p>Timeout is the duration the task can be processed by Handler before being retried, </p></td>
+                  <td><p>LastSyncError contains information about the last unsuccessful heartbeat of the switch. </p></td>
                 </tr>
               
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.api.v2.SwitchBGPPortState">SwitchBGPPortState</h3>
+        <p>SwitchBGPPortState holds information about the BGP state of a port.</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
                 <tr>
-                  <td>deadline</td>
-                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
+                  <td>neighbor</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Deadline is the deadline for the task. </p></td>
+                  <td><p>Neighbor of this port. </p></td>
                 </tr>
               
                 <tr>
-                  <td>group</td>
+                  <td>peer_group</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Group is the name of the group in which the task belongs.
-
-Tasks in the same queue can be grouped together by Group name and will be aggregated into one task
-by a Server processing the queue.
-
-Empty string (default) indicates task does not belong to any groups, and no aggregation will be applied to the task. </p></td>
+                  <td><p>PeerGroup of this port. </p></td>
                 </tr>
               
                 <tr>
-                  <td>next_process_at</td>
-                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
+                  <td>vrf_name</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>NextProcessAt is the time the task is scheduled to be processed,
-zero if not applicable. </p></td>
+                  <td><p>VrfName of the VRF this port is bound to. </p></td>
                 </tr>
               
                 <tr>
-                  <td>is_orphaned</td>
-                  <td><a href="#bool">bool</a></td>
+                  <td>bgp_state</td>
+                  <td><a href="#metalstack.api.v2.BGPState">BGPState</a></td>
                   <td></td>
-                  <td><p>IsOrphaned describes whether the task is left in active state with no worker processing it.
-An orphaned task indicates that the worker has crashed or experienced network failures and was not able to
-extend its lease on the task.
-
-This task will be recovered by running a server against the queue the task is in.
-This field is only applicable to tasks with TaskStateActive. </p></td>
+                  <td><p>BgpState of the connection on this port. </p></td>
                 </tr>
               
                 <tr>
-                  <td>retention</td>
-                  <td><a href="#google.protobuf.Duration">google.protobuf.Duration</a></td>
+                  <td>bgp_timer_up_established</td>
+                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
                   <td></td>
-                  <td><p>Retention is duration of the retention period after the task is successfully processed. </p></td>
+                  <td><p>BgpTimerUpEstablished reports when this port&#39;s BGP connection was established. </p></td>
                 </tr>
               
                 <tr>
-                  <td>completed_at</td>
-                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
+                  <td>sent_prefix_counter</td>
+                  <td><a href="#uint64">uint64</a></td>
                   <td></td>
-                  <td><p>CompletedAt is the time when the task is processed successfully.
-Zero value (i.e. time.Time{}) indicates no value. </p></td>
+                  <td><p>SentPrefixCounter counts the prefixes sent by the switch on this port. </p></td>
                 </tr>
               
                 <tr>
-                  <td>result</td>
-                  <td><a href="#bytes">bytes</a></td>
+                  <td>accepted_prefix_counter</td>
+                  <td><a href="#uint64">uint64</a></td>
                   <td></td>
-                  <td><p>Result holds the result data associated with the task.
-Use ResultWriter to write result data from the Handler. </p></td>
+                  <td><p>AcceptedPrefixCounter counts the prefixes received on this port. </p></td>
                 </tr>
               
             </tbody>
@@ -14447,8 +14793,8 @@ <h3 id="metalstack.admin.v2.TaskInfo">TaskInfo</h3>
 
         
       
-        <h3 id="metalstack.admin.v2.TaskServiceDeleteRequest">TaskServiceDeleteRequest</h3>
-        <p>TaskServiceDeleteRequest is the message to a delete task request</p>
+        <h3 id="metalstack.api.v2.SwitchNic">SwitchNic</h3>
+        <p>SwitchNic represents a front panel port and its configuration.</p>
 
         
           <table class="field-table">
@@ -14458,17 +14804,52 @@ <h3 id="metalstack.admin.v2.TaskServiceDeleteRequest">TaskServiceDeleteRequest</
             <tbody>
               
                 <tr>
-                  <td>task_id</td>
+                  <td>name</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>TaskId to cancel </p></td>
+                  <td><p>Name of the switch port </p></td>
                 </tr>
               
                 <tr>
-                  <td>queue</td>
+                  <td>identifier</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Queue where this task was scheduled to </p></td>
+                  <td><p>Identifier of the port </p></td>
+                </tr>
+              
+                <tr>
+                  <td>mac</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>MAC address of the port </p></td>
+                </tr>
+              
+                <tr>
+                  <td>vrf</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>VRF name if the port is bound in one </p></td>
+                </tr>
+              
+                <tr>
+                  <td>state</td>
+                  <td><a href="#metalstack.api.v2.NicState">NicState</a></td>
+                  <td>optional</td>
+                  <td><p>NicState describes the current state of the switch port. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>bgp_filter</td>
+                  <td><a href="#metalstack.api.v2.BGPFilter">BGPFilter</a></td>
+                  <td>optional</td>
+                  <td><p>BGPFilter optionally configured on a port. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>bgp_port_state</td>
+                  <td><a href="#metalstack.api.v2.SwitchBGPPortState">SwitchBGPPortState</a></td>
+                  <td>optional</td>
+                  <td><p>BGPPortState represents the current BGP status of the port. </p></td>
                 </tr>
               
             </tbody>
@@ -14478,15 +14859,8 @@ <h3 id="metalstack.admin.v2.TaskServiceDeleteRequest">TaskServiceDeleteRequest</
 
         
       
-        <h3 id="metalstack.admin.v2.TaskServiceDeleteResponse">TaskServiceDeleteResponse</h3>
-        <p>TaskServiceDeleteResponse is the response to a task delete request</p>
-
-        
-
-        
-      
-        <h3 id="metalstack.admin.v2.TaskServiceGetRequest">TaskServiceGetRequest</h3>
-        <p>TaskServiceGetRequest is the message to a get task request</p>
+        <h3 id="metalstack.api.v2.SwitchOS">SwitchOS</h3>
+        <p>SwitchOS holds information about the NOS and versions running on the switch.</p>
 
         
           <table class="field-table">
@@ -14496,17 +14870,24 @@ <h3 id="metalstack.admin.v2.TaskServiceGetRequest">TaskServiceGetRequest</h3>
             <tbody>
               
                 <tr>
-                  <td>task_id</td>
+                  <td>vendor</td>
+                  <td><a href="#metalstack.api.v2.SwitchOSVendor">SwitchOSVendor</a></td>
+                  <td></td>
+                  <td><p>Vendor identifies what NOS distribution is running on the switch, e.g. SONiC. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>version</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>TaskId to get </p></td>
+                  <td><p>Version specifies what NOS version is currently installed on the switch. </p></td>
                 </tr>
               
                 <tr>
-                  <td>queue</td>
+                  <td>metal_core_version</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Queue where this task was scheduled to </p></td>
+                  <td><p>MetalCoreVersion is the currently running version of the metal-core. </p></td>
                 </tr>
               
             </tbody>
@@ -14516,8 +14897,8 @@ <h3 id="metalstack.admin.v2.TaskServiceGetRequest">TaskServiceGetRequest</h3>
 
         
       
-        <h3 id="metalstack.admin.v2.TaskServiceGetResponse">TaskServiceGetResponse</h3>
-        <p>TaskServiceGetResponse is the response to a task get request</p>
+        <h3 id="metalstack.api.v2.SwitchOSQuery">SwitchOSQuery</h3>
+        <p>SwitchOSQuery holds OS specific query parameters.</p>
 
         
           <table class="field-table">
@@ -14527,10 +14908,17 @@ <h3 id="metalstack.admin.v2.TaskServiceGetResponse">TaskServiceGetResponse</h3>
             <tbody>
               
                 <tr>
-                  <td>task</td>
-                  <td><a href="#metalstack.admin.v2.TaskInfo">TaskInfo</a></td>
-                  <td></td>
-                  <td><p>Task contains the task details </p></td>
+                  <td>vendor</td>
+                  <td><a href="#metalstack.api.v2.SwitchOSVendor">SwitchOSVendor</a></td>
+                  <td>optional</td>
+                  <td><p>OsVendor of the switch OS by which to filter the switches. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>version</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>OsVersion of the OS by which to filter the switches. </p></td>
                 </tr>
               
             </tbody>
@@ -14540,8 +14928,8 @@ <h3 id="metalstack.admin.v2.TaskServiceGetResponse">TaskServiceGetResponse</h3>
 
         
       
-        <h3 id="metalstack.admin.v2.TaskServiceListRequest">TaskServiceListRequest</h3>
-        <p>TaskServiceListRequest is the message to a task list request</p>
+        <h3 id="metalstack.api.v2.SwitchQuery">SwitchQuery</h3>
+        <p>SwitchQuery can be used to query a switch or a list of switches.</p>
 
         
           <table class="field-table">
@@ -14551,49 +14939,31 @@ <h3 id="metalstack.admin.v2.TaskServiceListRequest">TaskServiceListRequest</h3>
             <tbody>
               
                 <tr>
-                  <td>queue</td>
+                  <td>id</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Queue where this tasks should be listed
-will return tasks from all queues if not specified </p></td>
+                  <td><p>Id of the switch to list. </p></td>
                 </tr>
               
                 <tr>
-                  <td>count</td>
-                  <td><a href="#uint32">uint32</a></td>
+                  <td>partition</td>
+                  <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Count of tasks to return </p></td>
+                  <td><p>Partition of the switches to list. </p></td>
                 </tr>
               
                 <tr>
-                  <td>page</td>
-                  <td><a href="#uint32">uint32</a></td>
+                  <td>rack</td>
+                  <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Page of tasks to return </p></td>
+                  <td><p>Rack of the switches to list. </p></td>
                 </tr>
               
-            </tbody>
-          </table>
-
-          
-
-        
-      
-        <h3 id="metalstack.admin.v2.TaskServiceListResponse">TaskServiceListResponse</h3>
-        <p>TaskServiceListResponse is the response to a task list request</p>
-
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
-              
                 <tr>
-                  <td>tasks</td>
-                  <td><a href="#metalstack.admin.v2.TaskInfo">TaskInfo</a></td>
-                  <td>repeated</td>
-                  <td><p>Tasks contains the requested list of tasks </p></td>
+                  <td>os</td>
+                  <td><a href="#metalstack.api.v2.SwitchOSQuery">SwitchOSQuery</a></td>
+                  <td>optional</td>
+                  <td><p>Switch OS specific queries. </p></td>
                 </tr>
               
             </tbody>
@@ -14603,15 +14973,8 @@ <h3 id="metalstack.admin.v2.TaskServiceListResponse">TaskServiceListResponse</h3
 
         
       
-        <h3 id="metalstack.admin.v2.TaskServiceQueuesRequest">TaskServiceQueuesRequest</h3>
-        <p>TaskServiceQueuesRequest is the message to get all queues</p>
-
-        
-
-        
-      
-        <h3 id="metalstack.admin.v2.TaskServiceQueuesResponse">TaskServiceQueuesResponse</h3>
-        <p>TaskServiceQueuesResponse is the response to a queues request</p>
+        <h3 id="metalstack.api.v2.SwitchSync">SwitchSync</h3>
+        <p>SwitchSync summarizes information about a switch sync.</p>
 
         
           <table class="field-table">
@@ -14621,10 +14984,24 @@ <h3 id="metalstack.admin.v2.TaskServiceQueuesResponse">TaskServiceQueuesResponse
             <tbody>
               
                 <tr>
-                  <td>queues</td>
+                  <td>time</td>
+                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
+                  <td></td>
+                  <td><p>Time of the sync. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>duration</td>
+                  <td><a href="#google.protobuf.Duration">google.protobuf.Duration</a></td>
+                  <td></td>
+                  <td><p>Duration of the sync. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>error</td>
                   <td><a href="#string">string</a></td>
-                  <td>repeated</td>
-                  <td><p>Queues configured for the async system </p></td>
+                  <td>optional</td>
+                  <td><p>Error if any occurred. </p></td>
                 </tr>
               
             </tbody>
@@ -14636,8 +15013,8 @@ <h3 id="metalstack.admin.v2.TaskServiceQueuesResponse">TaskServiceQueuesResponse
       
 
       
-        <h3 id="metalstack.admin.v2.TaskState">TaskState</h3>
-        <p>TaskState defines the state of the task</p>
+        <h3 id="metalstack.api.v2.BGPState">BGPState</h3>
+        <p>BGPState represents the state of a BGP session.</p>
         <table class="enum-table">
           <thead>
             <tr><td>Name</td><td>Number</td><td>Description</td></tr>
@@ -14645,245 +15022,201 @@ <h3 id="metalstack.admin.v2.TaskState">TaskState</h3>
           <tbody>
             
               <tr>
-                <td>TASK_STATE_UNSPECIFIED</td>
+                <td>BGP_STATE_UNSPECIFIED</td>
                 <td>0</td>
-                <td><p>TASK_STATE_UNSPECIFIED indicates a undefined state</p></td>
+                <td><p>BGP_STATE_UNSPECIFIED is not specified.</p></td>
               </tr>
             
               <tr>
-                <td>TASK_STATE_ACTIVE</td>
+                <td>BGP_STATE_IDLE</td>
                 <td>1</td>
-                <td><p>TASK_STATE_ACTIVE indicates that the task is currently being processed by Handler.</p></td>
+                <td><p>BGP_STATE_IDLE is the Idle state of a BGP session.</p></td>
               </tr>
             
               <tr>
-                <td>TASK_STATE_PENDING</td>
+                <td>BGP_STATE_CONNECT</td>
                 <td>2</td>
-                <td><p>TASK_STATE_PENDING indicates that the task is ready to be processed by Handler.</p></td>
+                <td><p>BGP_STATE_CONNECT is the Connect state of a BGP session.</p></td>
               </tr>
             
               <tr>
-                <td>TASK_STATE_SCHEDULED</td>
+                <td>BGP_STATE_ACTIVE</td>
                 <td>3</td>
-                <td><p>TASK_STATE_SCHEDULED indicates that the task is scheduled to be processed some time in the future.</p></td>
+                <td><p>BGP_STATE_ACTIVE is the Active state of a BGP session.</p></td>
               </tr>
             
               <tr>
-                <td>TASK_STATE_RETRY</td>
+                <td>BGP_STATE_OPEN_SENT</td>
                 <td>4</td>
-                <td><p>TASK_STATE_RETRY indicates that the task has previously failed and scheduled to be processed some time in the future.</p></td>
+                <td><p>BGP_STATE_OPEN_SENT is the OpenSent state of a BGP session.</p></td>
               </tr>
             
               <tr>
-                <td>TASK_STATE_ARCHIVED</td>
+                <td>BGP_STATE_OPEN_CONFIRM</td>
                 <td>5</td>
-                <td><p>TASK_STATE_ARCHIVED indicates that the task is archived and stored for inspection purposes.</p></td>
+                <td><p>BGP_STATE_OPEN_CONFIRM is the OpenConfirm state of a BGP session.</p></td>
               </tr>
             
               <tr>
-                <td>TASK_STATE_COMPLETED</td>
+                <td>BGP_STATE_ESTABLISHED</td>
                 <td>6</td>
-                <td><p>TASK_STATE_COMPLETED indicates that the task is processed successfully and retained until the retention TTL expires.</p></td>
+                <td><p>BGP_STATE_ESTABLISHED is the Established state of a BGP session.</p></td>
               </tr>
             
+          </tbody>
+        </table>
+      
+        <h3 id="metalstack.api.v2.SwitchOSVendor">SwitchOSVendor</h3>
+        <p>SwitchOSVendor represents a NOS distribution.</p>
+        <table class="enum-table">
+          <thead>
+            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
+          </thead>
+          <tbody>
+            
               <tr>
-                <td>TASK_STATE_AGGREGATING</td>
-                <td>7</td>
-                <td><p>TASK_STATE_AGGREGATING indicates that the task is waiting in a group to be aggregated into one task.</p></td>
+                <td>SWITCH_OS_VENDOR_UNSPECIFIED</td>
+                <td>0</td>
+                <td><p>SWITCH_OS_VENDOR_UNSPECIFIED is not specified.</p></td>
+              </tr>
+            
+              <tr>
+                <td>SWITCH_OS_VENDOR_CUMULUS</td>
+                <td>1</td>
+                <td><p>SWITCH_OS_VENDOR_CUMULUS means this switch is running on Cumulus Linux.</p></td>
+              </tr>
+            
+              <tr>
+                <td>SWITCH_OS_VENDOR_SONIC</td>
+                <td>2</td>
+                <td><p>SWITCH_OS_VENDOR_SONIC means this switch is running on SONiC NOS.</p></td>
               </tr>
             
           </tbody>
         </table>
       
-
-      
-
-      
-        <h3 id="metalstack.admin.v2.TaskService">TaskService</h3>
-        <p>TaskService provides services to async tasks</p>
+        <h3 id="metalstack.api.v2.SwitchPortStatus">SwitchPortStatus</h3>
+        <p>SwitchPortStatus specifies the state of a switch port.</p>
         <table class="enum-table">
           <thead>
-            <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
+            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
           </thead>
           <tbody>
             
               <tr>
-                <td>Get</td>
-                <td><a href="#metalstack.admin.v2.TaskServiceGetRequest">TaskServiceGetRequest</a></td>
-                <td><a href="#metalstack.admin.v2.TaskServiceGetResponse">TaskServiceGetResponse</a></td>
-                <td><p>Get a specific task</p></td>
+                <td>SWITCH_PORT_STATUS_UNSPECIFIED</td>
+                <td>0</td>
+                <td><p>SWITCH_PORT_STATUS_UNSPECIFIED is not specified.</p></td>
               </tr>
             
               <tr>
-                <td>Delete</td>
-                <td><a href="#metalstack.admin.v2.TaskServiceDeleteRequest">TaskServiceDeleteRequest</a></td>
-                <td><a href="#metalstack.admin.v2.TaskServiceDeleteResponse">TaskServiceDeleteResponse</a></td>
-                <td><p>Delete a specific task</p></td>
+                <td>SWITCH_PORT_STATUS_UP</td>
+                <td>1</td>
+                <td><p>SWITCH_PORT_STATUS_UP means this port is up.</p></td>
               </tr>
             
               <tr>
-                <td>Queues</td>
-                <td><a href="#metalstack.admin.v2.TaskServiceQueuesRequest">TaskServiceQueuesRequest</a></td>
-                <td><a href="#metalstack.admin.v2.TaskServiceQueuesResponse">TaskServiceQueuesResponse</a></td>
-                <td><p>Queues returns all configures queues</p></td>
+                <td>SWITCH_PORT_STATUS_DOWN</td>
+                <td>2</td>
+                <td><p>SWITCH_PORT_STATUS_DOWN means this port is down.</p></td>
               </tr>
             
               <tr>
-                <td>List</td>
-                <td><a href="#metalstack.admin.v2.TaskServiceListRequest">TaskServiceListRequest</a></td>
-                <td><a href="#metalstack.admin.v2.TaskServiceListResponse">TaskServiceListResponse</a></td>
-                <td><p>List list all tasks</p></td>
+                <td>SWITCH_PORT_STATUS_UNKNOWN</td>
+                <td>3</td>
+                <td><p>SWITCH_PORT_STATUS_UNKNOWN means the status of this port is unknown.</p></td>
+              </tr>
+            
+          </tbody>
+        </table>
+      
+        <h3 id="metalstack.api.v2.SwitchReplaceMode">SwitchReplaceMode</h3>
+        <p>SwitchReplaceMode is used to mark a switch ready for replacement.</p>
+        <table class="enum-table">
+          <thead>
+            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>SWITCH_REPLACE_MODE_UNSPECIFIED</td>
+                <td>0</td>
+                <td><p>SWITCH_REPLACE_MODE_UNSPECIFIED is not specified.</p></td>
+              </tr>
+            
+              <tr>
+                <td>SWITCH_REPLACE_MODE_REPLACE</td>
+                <td>1</td>
+                <td><p>SWITCH_REPLACE_MODE_REPLACE means this switch is waiting to be replaced.</p></td>
+              </tr>
+            
+              <tr>
+                <td>SWITCH_REPLACE_MODE_OPERATIONAL</td>
+                <td>2</td>
+                <td><p>SWITCH_REPLACE_MODE_OPERATIONAL means this switch is operational and cannot be replaced.</p></td>
               </tr>
             
           </tbody>
         </table>
+      
 
-        
+      
+
+      
     
       
       <div class="file-heading">
-        <h2 id="metalstack/api/v2/tenant.proto">metalstack/api/v2/tenant.proto</h2><a href="#title">Top</a>
+        <h2 id="metalstack/admin/v2/switch.proto">metalstack/admin/v2/switch.proto</h2><a href="#title">Top</a>
       </div>
       <p></p>
 
       
-        <h3 id="metalstack.api.v2.Tenant">Tenant</h3>
-        <p>Tenant is a customer of the platform</p>
-
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
-              
-                <tr>
-                  <td>login</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Login of the tenant </p></td>
-                </tr>
-              
-                <tr>
-                  <td>meta</td>
-                  <td><a href="#metalstack.api.v2.Meta">Meta</a></td>
-                  <td></td>
-                  <td><p>Meta for this tenant </p></td>
-                </tr>
-              
-                <tr>
-                  <td>name</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Name of the tenant </p></td>
-                </tr>
-              
-                <tr>
-                  <td>email</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Email of the tenant </p></td>
-                </tr>
-              
-                <tr>
-                  <td>description</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Description of this tenant </p></td>
-                </tr>
-              
-                <tr>
-                  <td>avatar_url</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>AvatarUrl of the tenant </p></td>
-                </tr>
-              
-                <tr>
-                  <td>created_by</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>CreatedBy stores who created this tenant </p></td>
-                </tr>
-              
-            </tbody>
-          </table>
-
-          
-
-        
-      
-        <h3 id="metalstack.api.v2.TenantInvite">TenantInvite</h3>
-        <p>TenantInvite defines invite to tenant</p>
+        <h3 id="metalstack.admin.v2.SwitchServiceDeleteRequest">SwitchServiceDeleteRequest</h3>
+        <p>SwitchServiceDeleteRequest.</p>
 
         
           <table class="field-table">
             <thead>
               <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
-              
-                <tr>
-                  <td>secret</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Secret is the secret part of the invite, typically part of the url </p></td>
-                </tr>
-              
-                <tr>
-                  <td>target_tenant</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>TargetTenant is the tenant id for which this invite was created </p></td>
-                </tr>
-              
-                <tr>
-                  <td>role</td>
-                  <td><a href="#metalstack.api.v2.TenantRole">TenantRole</a></td>
-                  <td></td>
-                  <td><p>Role is the role in this tenant the user will get after accepting the invitation </p></td>
-                </tr>
-              
-                <tr>
-                  <td>joined</td>
-                  <td><a href="#bool">bool</a></td>
-                  <td></td>
-                  <td><p>Joined is false as long as a user has not accepted the invite </p></td>
-                </tr>
-              
-                <tr>
-                  <td>target_tenant_name</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>TargetTenantName is the tenant name for which this invite was created </p></td>
-                </tr>
+            </thead>
+            <tbody>
               
                 <tr>
-                  <td>tenant</td>
+                  <td>id</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Tenant is the login of tenant who invites to join this tenant </p></td>
+                  <td><p>Id of the switch. </p></td>
                 </tr>
               
                 <tr>
-                  <td>tenant_name</td>
-                  <td><a href="#string">string</a></td>
+                  <td>force</td>
+                  <td><a href="#bool">bool</a></td>
                   <td></td>
-                  <td><p>TenantName is the name of tenant who invites to join this tenant </p></td>
+                  <td><p>Force will allow switch deletion despite existing machine connections. </p></td>
                 </tr>
               
-                <tr>
-                  <td>expires_at</td>
-                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
-                  <td></td>
-                  <td><p>ExpiresAt the date when this invite expires </p></td>
-                </tr>
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.admin.v2.SwitchServiceDeleteResponse">SwitchServiceDeleteResponse</h3>
+        <p>SwitchServiceDeleteResponse.</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
               
                 <tr>
-                  <td>joined_at</td>
-                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
+                  <td>switch</td>
+                  <td><a href="#metalstack.api.v2.Switch">metalstack.api.v2.Switch</a></td>
                   <td></td>
-                  <td><p>JoinedAt the date when the member accepted this invite </p></td>
+                  <td><p>Switch that has been deleted. </p></td>
                 </tr>
               
             </tbody>
@@ -14893,8 +15226,8 @@ <h3 id="metalstack.api.v2.TenantInvite">TenantInvite</h3>
 
         
       
-        <h3 id="metalstack.api.v2.TenantMember">TenantMember</h3>
-        <p>TenantMember defines a user that participates at a tenant</p>
+        <h3 id="metalstack.admin.v2.SwitchServiceGetRequest">SwitchServiceGetRequest</h3>
+        <p>SwitchServiceGetRequest.</p>
 
         
           <table class="field-table">
@@ -14907,28 +15240,31 @@ <h3 id="metalstack.api.v2.TenantMember">TenantMember</h3>
                   <td>id</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Id is the user id of the member </p></td>
-                </tr>
-              
-                <tr>
-                  <td>role</td>
-                  <td><a href="#metalstack.api.v2.TenantRole">TenantRole</a></td>
-                  <td></td>
-                  <td><p>Role is the role of the member </p></td>
+                  <td><p>Id of the switch to get. </p></td>
                 </tr>
               
-                <tr>
-                  <td>projects</td>
-                  <td><a href="#string">string</a></td>
-                  <td>repeated</td>
-                  <td><p>Projects for the projects in which a user is a direct member </p></td>
-                </tr>
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.admin.v2.SwitchServiceGetResponse">SwitchServiceGetResponse</h3>
+        <p>SwitchServiceGetResponse.</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
               
                 <tr>
-                  <td>created_at</td>
-                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
+                  <td>switch</td>
+                  <td><a href="#metalstack.api.v2.Switch">metalstack.api.v2.Switch</a></td>
                   <td></td>
-                  <td><p>CreatedAt the date when the member was added to the tenant </p></td>
+                  <td><p>Switch that was requested. </p></td>
                 </tr>
               
             </tbody>
@@ -14938,8 +15274,8 @@ <h3 id="metalstack.api.v2.TenantMember">TenantMember</h3>
 
         
       
-        <h3 id="metalstack.api.v2.TenantServiceCreateRequest">TenantServiceCreateRequest</h3>
-        <p>TenantServiceCreateRequest is the request payload of the tenant create request</p>
+        <h3 id="metalstack.admin.v2.SwitchServiceListRequest">SwitchServiceListRequest</h3>
+        <p>SwitchServiceListRequest.</p>
 
         
           <table class="field-table">
@@ -14949,38 +15285,34 @@ <h3 id="metalstack.api.v2.TenantServiceCreateRequest">TenantServiceCreateRequest
             <tbody>
               
                 <tr>
-                  <td>name</td>
-                  <td><a href="#string">string</a></td>
+                  <td>query</td>
+                  <td><a href="#metalstack.api.v2.SwitchQuery">metalstack.api.v2.SwitchQuery</a></td>
                   <td></td>
-                  <td><p>Name of this tenant </p></td>
-                </tr>
-              
-                <tr>
-                  <td>description</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Description of this tenant </p></td>
-                </tr>
-              
-                <tr>
-                  <td>email</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Email of the tenant, if not set will be inherited from the creator </p></td>
+                  <td><p>Query to filter the results. </p></td>
                 </tr>
               
-                <tr>
-                  <td>avatar_url</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>AvatarUrl of the tenant </p></td>
-                </tr>
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.admin.v2.SwitchServiceListResponse">SwitchServiceListResponse</h3>
+        <p>SwitchServiceListResponse.</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
               
                 <tr>
-                  <td>labels</td>
-                  <td><a href="#metalstack.api.v2.Labels">Labels</a></td>
-                  <td></td>
-                  <td><p>Labels on the tenant </p></td>
+                  <td>switches</td>
+                  <td><a href="#metalstack.api.v2.Switch">metalstack.api.v2.Switch</a></td>
+                  <td>repeated</td>
+                  <td><p>Switches that match the request query. </p></td>
                 </tr>
               
             </tbody>
@@ -14990,8 +15322,8 @@ <h3 id="metalstack.api.v2.TenantServiceCreateRequest">TenantServiceCreateRequest
 
         
       
-        <h3 id="metalstack.api.v2.TenantServiceCreateResponse">TenantServiceCreateResponse</h3>
-        <p>TenantServiceCreateResponse is the response payload of the tenant create request</p>
+        <h3 id="metalstack.admin.v2.SwitchServiceMigrateRequest">SwitchServiceMigrateRequest</h3>
+        <p>SwitchServiceMigrateRequest.</p>
 
         
           <table class="field-table">
@@ -15001,10 +15333,17 @@ <h3 id="metalstack.api.v2.TenantServiceCreateResponse">TenantServiceCreateRespon
             <tbody>
               
                 <tr>
-                  <td>tenant</td>
-                  <td><a href="#metalstack.api.v2.Tenant">Tenant</a></td>
+                  <td>old_switch</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Tenant is the tenant </p></td>
+                  <td><p>OldSwitch which to migrate away from. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>new_switch</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>NewSwitch which to migrate to. </p></td>
                 </tr>
               
             </tbody>
@@ -15014,8 +15353,8 @@ <h3 id="metalstack.api.v2.TenantServiceCreateResponse">TenantServiceCreateRespon
 
         
       
-        <h3 id="metalstack.api.v2.TenantServiceDeleteRequest">TenantServiceDeleteRequest</h3>
-        <p>TenantServiceDeleteRequest is the request payload of the tenant delete request</p>
+        <h3 id="metalstack.admin.v2.SwitchServiceMigrateResponse">SwitchServiceMigrateResponse</h3>
+        <p>SwitchServiceMigrateResponse.</p>
 
         
           <table class="field-table">
@@ -15025,10 +15364,10 @@ <h3 id="metalstack.api.v2.TenantServiceDeleteRequest">TenantServiceDeleteRequest
             <tbody>
               
                 <tr>
-                  <td>login</td>
-                  <td><a href="#string">string</a></td>
+                  <td>switch</td>
+                  <td><a href="#metalstack.api.v2.Switch">metalstack.api.v2.Switch</a></td>
                   <td></td>
-                  <td><p>Login of the tenant </p></td>
+                  <td><p>Switch that was migrated to. </p></td>
                 </tr>
               
             </tbody>
@@ -15038,8 +15377,8 @@ <h3 id="metalstack.api.v2.TenantServiceDeleteRequest">TenantServiceDeleteRequest
 
         
       
-        <h3 id="metalstack.api.v2.TenantServiceDeleteResponse">TenantServiceDeleteResponse</h3>
-        <p>TenantServiceDeleteResponse is the response payload of the tenant delete request</p>
+        <h3 id="metalstack.admin.v2.SwitchServicePortRequest">SwitchServicePortRequest</h3>
+        <p>SwitchServicePortRequest.</p>
 
         
           <table class="field-table">
@@ -15049,10 +15388,24 @@ <h3 id="metalstack.api.v2.TenantServiceDeleteResponse">TenantServiceDeleteRespon
             <tbody>
               
                 <tr>
-                  <td>tenant</td>
-                  <td><a href="#metalstack.api.v2.Tenant">Tenant</a></td>
+                  <td>id</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Tenant is the tenant </p></td>
+                  <td><p>Id of the switch. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>nic_name</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>NicName of the port whose status should be changed. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>status</td>
+                  <td><a href="#metalstack.api.v2.SwitchPortStatus">metalstack.api.v2.SwitchPortStatus</a></td>
+                  <td></td>
+                  <td><p>Status that the port should have. </p></td>
                 </tr>
               
             </tbody>
@@ -15062,8 +15415,8 @@ <h3 id="metalstack.api.v2.TenantServiceDeleteResponse">TenantServiceDeleteRespon
 
         
       
-        <h3 id="metalstack.api.v2.TenantServiceGetRequest">TenantServiceGetRequest</h3>
-        <p>TenantServiceGetRequest is the request payload of the tenant get request</p>
+        <h3 id="metalstack.admin.v2.SwitchServicePortResponse">SwitchServicePortResponse</h3>
+        <p>SwitchServicePortResponse.</p>
 
         
           <table class="field-table">
@@ -15073,10 +15426,10 @@ <h3 id="metalstack.api.v2.TenantServiceGetRequest">TenantServiceGetRequest</h3>
             <tbody>
               
                 <tr>
-                  <td>login</td>
-                  <td><a href="#string">string</a></td>
+                  <td>switch</td>
+                  <td><a href="#metalstack.api.v2.Switch">metalstack.api.v2.Switch</a></td>
                   <td></td>
-                  <td><p>Login of the tenant </p></td>
+                  <td><p>Switch after the port status toggle.. </p></td>
                 </tr>
               
             </tbody>
@@ -15086,8 +15439,8 @@ <h3 id="metalstack.api.v2.TenantServiceGetRequest">TenantServiceGetRequest</h3>
 
         
       
-        <h3 id="metalstack.api.v2.TenantServiceGetResponse">TenantServiceGetResponse</h3>
-        <p>TenantServiceGetResponse is the response payload of the tenant get request</p>
+        <h3 id="metalstack.admin.v2.SwitchServiceUpdateRequest">SwitchServiceUpdateRequest</h3>
+        <p>SwitchServiceUpdateRequest.</p>
 
         
           <table class="field-table">
@@ -15097,17 +15450,74 @@ <h3 id="metalstack.api.v2.TenantServiceGetResponse">TenantServiceGetResponse</h3
             <tbody>
               
                 <tr>
-                  <td>tenant</td>
-                  <td><a href="#metalstack.api.v2.Tenant">Tenant</a></td>
-                  <td></td>
-                  <td><p>Tenant is the tenant </p></td>
+                  <td>id</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>ID of the switch. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>update_meta</td>
+                  <td><a href="#metalstack.api.v2.UpdateMeta">metalstack.api.v2.UpdateMeta</a></td>
+                  <td></td>
+                  <td><p>UpdateMeta contains the timestamp and strategy to be used in this update request. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>updated_at</td>
+                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
+                  <td></td>
+                  <td><p>UpdatedAt is the date when this entity was updated.
+must be part of the update request to ensure optimistic locking. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>description</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Description of the switch. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>replace_mode</td>
+                  <td><a href="#metalstack.api.v2.SwitchReplaceMode">metalstack.api.v2.SwitchReplaceMode</a></td>
+                  <td>optional</td>
+                  <td><p>Replace mode is used to mark a switch ready for replacement. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>management_ip</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Management IP is the switch&#39;s IP for management access. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>management_user</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Management user is the user name to use for management access. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>console_command</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Console command is the command for accessing the switch&#39;s console. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>nics</td>
+                  <td><a href="#metalstack.api.v2.SwitchNic">metalstack.api.v2.SwitchNic</a></td>
+                  <td>repeated</td>
+                  <td><p>Nics are the front panel ports of the switch. </p></td>
                 </tr>
               
                 <tr>
-                  <td>tenant_members</td>
-                  <td><a href="#metalstack.api.v2.TenantMember">TenantMember</a></td>
-                  <td>repeated</td>
-                  <td><p>TenantMembers of this tenant </p></td>
+                  <td>os</td>
+                  <td><a href="#metalstack.api.v2.SwitchOS">metalstack.api.v2.SwitchOS</a></td>
+                  <td>optional</td>
+                  <td><p>SwitchOs is the OS running on the switch. </p></td>
                 </tr>
               
             </tbody>
@@ -15117,8 +15527,8 @@ <h3 id="metalstack.api.v2.TenantServiceGetResponse">TenantServiceGetResponse</h3
 
         
       
-        <h3 id="metalstack.api.v2.TenantServiceInviteAcceptRequest">TenantServiceInviteAcceptRequest</h3>
-        <p>TenantServiceInviteAcceptRequest is the request payload to a accept invite request</p>
+        <h3 id="metalstack.admin.v2.SwitchServiceUpdateResponse">SwitchServiceUpdateResponse</h3>
+        <p>SwitchServiceUpdateResponse.</p>
 
         
           <table class="field-table">
@@ -15128,10 +15538,10 @@ <h3 id="metalstack.api.v2.TenantServiceInviteAcceptRequest">TenantServiceInviteA
             <tbody>
               
                 <tr>
-                  <td>secret</td>
-                  <td><a href="#string">string</a></td>
+                  <td>switch</td>
+                  <td><a href="#metalstack.api.v2.Switch">metalstack.api.v2.Switch</a></td>
                   <td></td>
-                  <td><p>Secret is the invitation secret part of the invitation url </p></td>
+                  <td><p>Switch that was updated. </p></td>
                 </tr>
               
             </tbody>
@@ -15141,8 +15551,76 @@ <h3 id="metalstack.api.v2.TenantServiceInviteAcceptRequest">TenantServiceInviteA
 
         
       
-        <h3 id="metalstack.api.v2.TenantServiceInviteAcceptResponse">TenantServiceInviteAcceptResponse</h3>
-        <p>TenantServiceInvitesListResponse is the response payload to a accept invite request</p>
+
+      
+
+      
+
+      
+        <h3 id="metalstack.admin.v2.SwitchService">SwitchService</h3>
+        <p>SwitchService serves switch related functions.</p>
+        <table class="enum-table">
+          <thead>
+            <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>Get</td>
+                <td><a href="#metalstack.admin.v2.SwitchServiceGetRequest">SwitchServiceGetRequest</a></td>
+                <td><a href="#metalstack.admin.v2.SwitchServiceGetResponse">SwitchServiceGetResponse</a></td>
+                <td><p>Get a switch by ID.</p></td>
+              </tr>
+            
+              <tr>
+                <td>List</td>
+                <td><a href="#metalstack.admin.v2.SwitchServiceListRequest">SwitchServiceListRequest</a></td>
+                <td><a href="#metalstack.admin.v2.SwitchServiceListResponse">SwitchServiceListResponse</a></td>
+                <td><p>List switches.</p></td>
+              </tr>
+            
+              <tr>
+                <td>Update</td>
+                <td><a href="#metalstack.admin.v2.SwitchServiceUpdateRequest">SwitchServiceUpdateRequest</a></td>
+                <td><a href="#metalstack.admin.v2.SwitchServiceUpdateResponse">SwitchServiceUpdateResponse</a></td>
+                <td><p>Update a switch.</p></td>
+              </tr>
+            
+              <tr>
+                <td>Delete</td>
+                <td><a href="#metalstack.admin.v2.SwitchServiceDeleteRequest">SwitchServiceDeleteRequest</a></td>
+                <td><a href="#metalstack.admin.v2.SwitchServiceDeleteResponse">SwitchServiceDeleteResponse</a></td>
+                <td><p>Delete a switch.</p></td>
+              </tr>
+            
+              <tr>
+                <td>Migrate</td>
+                <td><a href="#metalstack.admin.v2.SwitchServiceMigrateRequest">SwitchServiceMigrateRequest</a></td>
+                <td><a href="#metalstack.admin.v2.SwitchServiceMigrateResponse">SwitchServiceMigrateResponse</a></td>
+                <td><p>Migrate a switch.</p></td>
+              </tr>
+            
+              <tr>
+                <td>Port</td>
+                <td><a href="#metalstack.admin.v2.SwitchServicePortRequest">SwitchServicePortRequest</a></td>
+                <td><a href="#metalstack.admin.v2.SwitchServicePortResponse">SwitchServicePortResponse</a></td>
+                <td><p>Port set the port status of a switch port.</p></td>
+              </tr>
+            
+          </tbody>
+        </table>
+
+        
+    
+      
+      <div class="file-heading">
+        <h2 id="metalstack/admin/v2/task.proto">metalstack/admin/v2/task.proto</h2><a href="#title">Top</a>
+      </div>
+      <p></p>
+
+      
+        <h3 id="metalstack.admin.v2.TaskInfo">TaskInfo</h3>
+        <p>TaskInfo contains details of an async task</p>
 
         
           <table class="field-table">
@@ -15152,103 +15630,136 @@ <h3 id="metalstack.api.v2.TenantServiceInviteAcceptResponse">TenantServiceInvite
             <tbody>
               
                 <tr>
-                  <td>tenant</td>
+                  <td>id</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Tenant ID of the joined tenant </p></td>
+                  <td><p>ID is the identifier of the task. </p></td>
                 </tr>
               
                 <tr>
-                  <td>tenant_name</td>
+                  <td>queue</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>TenantName of the joined tenant </p></td>
+                  <td><p>Queue is the name of the queue in which the task belongs. </p></td>
                 </tr>
               
-            </tbody>
-          </table>
-
-          
-
-        
-      
-        <h3 id="metalstack.api.v2.TenantServiceInviteDeleteRequest">TenantServiceInviteDeleteRequest</h3>
-        <p>TenantServiceInviteDeleteRequest is the request payload to a delete invite</p>
-
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
-              
                 <tr>
-                  <td>login</td>
+                  <td>type</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Login of the tenant </p></td>
+                  <td><p>Type is the type name of the task. </p></td>
                 </tr>
               
                 <tr>
-                  <td>secret</td>
-                  <td><a href="#string">string</a></td>
+                  <td>payload</td>
+                  <td><a href="#bytes">bytes</a></td>
                   <td></td>
-                  <td><p>Secret of the invite to delete </p></td>
+                  <td><p>Payload is the payload data of the task. </p></td>
                 </tr>
               
-            </tbody>
-          </table>
-
-          
-
-        
-      
-        <h3 id="metalstack.api.v2.TenantServiceInviteDeleteResponse">TenantServiceInviteDeleteResponse</h3>
-        <p>TenantServiceInviteDeleteResponse is the response payload of a delete invite request</p>
-
-        
-
-        
-      
-        <h3 id="metalstack.api.v2.TenantServiceInviteGetRequest">TenantServiceInviteGetRequest</h3>
-        <p>TenantServiceInviteGetRequest is the request payload to get a invite</p>
-
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
+                <tr>
+                  <td>state</td>
+                  <td><a href="#metalstack.admin.v2.TaskState">TaskState</a></td>
+                  <td></td>
+                  <td><p>State indicates the task state. </p></td>
+                </tr>
               
                 <tr>
-                  <td>secret</td>
+                  <td>max_retry</td>
+                  <td><a href="#int32">int32</a></td>
+                  <td></td>
+                  <td><p>MaxRetry is the maximum number of times the task can be retried. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>retried</td>
+                  <td><a href="#int32">int32</a></td>
+                  <td></td>
+                  <td><p>Retried is the number of times the task has retried so far. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>last_error</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Secret of the invite to get </p></td>
+                  <td><p>LastError is the error message from the last failure. </p></td>
                 </tr>
               
-            </tbody>
-          </table>
+                <tr>
+                  <td>last_failed_at</td>
+                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
+                  <td></td>
+                  <td><p>LastFailedAt is the time time of the last failure if any.
+If the task has no failures, LastFailedAt is zero time (i.e. time.Time{}). </p></td>
+                </tr>
+              
+                <tr>
+                  <td>timeout</td>
+                  <td><a href="#google.protobuf.Duration">google.protobuf.Duration</a></td>
+                  <td></td>
+                  <td><p>Timeout is the duration the task can be processed by Handler before being retried, </p></td>
+                </tr>
+              
+                <tr>
+                  <td>deadline</td>
+                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
+                  <td></td>
+                  <td><p>Deadline is the deadline for the task. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>group</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Group is the name of the group in which the task belongs.
 
-          
+Tasks in the same queue can be grouped together by Group name and will be aggregated into one task
+by a Server processing the queue.
 
-        
-      
-        <h3 id="metalstack.api.v2.TenantServiceInviteGetResponse">TenantServiceInviteGetResponse</h3>
-        <p>TenantServiceInviteGetResponse is the response payload to a get invite request</p>
+Empty string (default) indicates task does not belong to any groups, and no aggregation will be applied to the task. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>next_process_at</td>
+                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
+                  <td></td>
+                  <td><p>NextProcessAt is the time the task is scheduled to be processed,
+zero if not applicable. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>is_orphaned</td>
+                  <td><a href="#bool">bool</a></td>
+                  <td></td>
+                  <td><p>IsOrphaned describes whether the task is left in active state with no worker processing it.
+An orphaned task indicates that the worker has crashed or experienced network failures and was not able to
+extend its lease on the task.
 
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
+This task will be recovered by running a server against the queue the task is in.
+This field is only applicable to tasks with TaskStateActive. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>retention</td>
+                  <td><a href="#google.protobuf.Duration">google.protobuf.Duration</a></td>
+                  <td></td>
+                  <td><p>Retention is duration of the retention period after the task is successfully processed. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>completed_at</td>
+                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
+                  <td></td>
+                  <td><p>CompletedAt is the time when the task is processed successfully.
+Zero value (i.e. time.Time{}) indicates no value. </p></td>
+                </tr>
               
                 <tr>
-                  <td>invite</td>
-                  <td><a href="#metalstack.api.v2.TenantInvite">TenantInvite</a></td>
+                  <td>result</td>
+                  <td><a href="#bytes">bytes</a></td>
                   <td></td>
-                  <td><p>Invite is the invite </p></td>
+                  <td><p>Result holds the result data associated with the task.
+Use ResultWriter to write result data from the Handler. </p></td>
                 </tr>
               
             </tbody>
@@ -15258,8 +15769,8 @@ <h3 id="metalstack.api.v2.TenantServiceInviteGetResponse">TenantServiceInviteGet
 
         
       
-        <h3 id="metalstack.api.v2.TenantServiceInviteRequest">TenantServiceInviteRequest</h3>
-        <p>TenantServiceInviteRequest is used to invite a member to a tenant</p>
+        <h3 id="metalstack.admin.v2.TaskServiceDeleteRequest">TaskServiceDeleteRequest</h3>
+        <p>TaskServiceDeleteRequest is the message to a delete task request</p>
 
         
           <table class="field-table">
@@ -15269,17 +15780,17 @@ <h3 id="metalstack.api.v2.TenantServiceInviteRequest">TenantServiceInviteRequest
             <tbody>
               
                 <tr>
-                  <td>login</td>
+                  <td>task_id</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Login of the tenant </p></td>
+                  <td><p>TaskId to cancel </p></td>
                 </tr>
               
                 <tr>
-                  <td>role</td>
-                  <td><a href="#metalstack.api.v2.TenantRole">TenantRole</a></td>
+                  <td>queue</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Role of this user in this tenant </p></td>
+                  <td><p>Queue where this task was scheduled to </p></td>
                 </tr>
               
             </tbody>
@@ -15289,34 +15800,15 @@ <h3 id="metalstack.api.v2.TenantServiceInviteRequest">TenantServiceInviteRequest
 
         
       
-        <h3 id="metalstack.api.v2.TenantServiceInviteResponse">TenantServiceInviteResponse</h3>
-        <p>TenantServiceInviteRequest is the response payload to a invite member request</p>
+        <h3 id="metalstack.admin.v2.TaskServiceDeleteResponse">TaskServiceDeleteResponse</h3>
+        <p>TaskServiceDeleteResponse is the response to a task delete request</p>
 
         
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
-              
-                <tr>
-                  <td>invite</td>
-                  <td><a href="#metalstack.api.v2.TenantInvite">TenantInvite</a></td>
-                  <td></td>
-                  <td><p>Invite contains a secret which can be sent to a potential user
-can be appended to the invitation endpoint at our cloud console like
-console.metalstack.cloud/invite/&lt;secret&gt; </p></td>
-                </tr>
-              
-            </tbody>
-          </table>
-
-          
 
         
       
-        <h3 id="metalstack.api.v2.TenantServiceInvitesListRequest">TenantServiceInvitesListRequest</h3>
-        <p>TenantServiceInvitesListRequest is the request payload to a list invites request</p>
+        <h3 id="metalstack.admin.v2.TaskServiceGetRequest">TaskServiceGetRequest</h3>
+        <p>TaskServiceGetRequest is the message to a get task request</p>
 
         
           <table class="field-table">
@@ -15326,34 +15818,17 @@ <h3 id="metalstack.api.v2.TenantServiceInvitesListRequest">TenantServiceInvitesL
             <tbody>
               
                 <tr>
-                  <td>login</td>
+                  <td>task_id</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Login of the tenant </p></td>
+                  <td><p>TaskId to get </p></td>
                 </tr>
               
-            </tbody>
-          </table>
-
-          
-
-        
-      
-        <h3 id="metalstack.api.v2.TenantServiceInvitesListResponse">TenantServiceInvitesListResponse</h3>
-        <p>TenantServiceInvitesListResponse is the response payload to a list invites request</p>
-
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
-              
                 <tr>
-                  <td>invites</td>
-                  <td><a href="#metalstack.api.v2.TenantInvite">TenantInvite</a></td>
-                  <td>repeated</td>
-                  <td><p>Invites not already accepted the invitation to this tenant </p></td>
+                  <td>queue</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Queue where this task was scheduled to </p></td>
                 </tr>
               
             </tbody>
@@ -15363,8 +15838,8 @@ <h3 id="metalstack.api.v2.TenantServiceInvitesListResponse">TenantServiceInvites
 
         
       
-        <h3 id="metalstack.api.v2.TenantServiceLeaveRequest">TenantServiceLeaveRequest</h3>
-        <p>TenantServiceLeaveTenantRequest is used to leave a tenant</p>
+        <h3 id="metalstack.admin.v2.TaskServiceGetResponse">TaskServiceGetResponse</h3>
+        <p>TaskServiceGetResponse is the response to a task get request</p>
 
         
           <table class="field-table">
@@ -15374,10 +15849,10 @@ <h3 id="metalstack.api.v2.TenantServiceLeaveRequest">TenantServiceLeaveRequest</
             <tbody>
               
                 <tr>
-                  <td>login</td>
-                  <td><a href="#string">string</a></td>
+                  <td>task</td>
+                  <td><a href="#metalstack.admin.v2.TaskInfo">TaskInfo</a></td>
                   <td></td>
-                  <td><p>Login of the tenant </p></td>
+                  <td><p>Task contains the task details </p></td>
                 </tr>
               
             </tbody>
@@ -15387,15 +15862,8 @@ <h3 id="metalstack.api.v2.TenantServiceLeaveRequest">TenantServiceLeaveRequest</
 
         
       
-        <h3 id="metalstack.api.v2.TenantServiceLeaveResponse">TenantServiceLeaveResponse</h3>
-        <p>TenantServiceLeaveTenantResponse is the response payload to a leave tenant request</p>
-
-        
-
-        
-      
-        <h3 id="metalstack.api.v2.TenantServiceListRequest">TenantServiceListRequest</h3>
-        <p>TenantServiceListRequest is the request payload of the tenant list request</p>
+        <h3 id="metalstack.admin.v2.TaskServiceListRequest">TaskServiceListRequest</h3>
+        <p>TaskServiceListRequest is the message to a task list request</p>
 
         
           <table class="field-table">
@@ -15405,24 +15873,25 @@ <h3 id="metalstack.api.v2.TenantServiceListRequest">TenantServiceListRequest</h3
             <tbody>
               
                 <tr>
-                  <td>id</td>
+                  <td>queue</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Id filters tenants by id </p></td>
+                  <td><p>Queue where this tasks should be listed
+will return tasks from all queues if not specified </p></td>
                 </tr>
               
                 <tr>
-                  <td>name</td>
-                  <td><a href="#string">string</a></td>
+                  <td>count</td>
+                  <td><a href="#uint32">uint32</a></td>
                   <td>optional</td>
-                  <td><p>Name filters tenants by name </p></td>
+                  <td><p>Count of tasks to return </p></td>
                 </tr>
               
                 <tr>
-                  <td>labels</td>
-                  <td><a href="#metalstack.api.v2.Labels">Labels</a></td>
+                  <td>page</td>
+                  <td><a href="#uint32">uint32</a></td>
                   <td>optional</td>
-                  <td><p>Labels lists only projects containing the given labels </p></td>
+                  <td><p>Page of tasks to return </p></td>
                 </tr>
               
             </tbody>
@@ -15432,8 +15901,8 @@ <h3 id="metalstack.api.v2.TenantServiceListRequest">TenantServiceListRequest</h3
 
         
       
-        <h3 id="metalstack.api.v2.TenantServiceListResponse">TenantServiceListResponse</h3>
-        <p>TenantServiceListResponse is the response payload of the tenant list request</p>
+        <h3 id="metalstack.admin.v2.TaskServiceListResponse">TaskServiceListResponse</h3>
+        <p>TaskServiceListResponse is the response to a task list request</p>
 
         
           <table class="field-table">
@@ -15443,10 +15912,10 @@ <h3 id="metalstack.api.v2.TenantServiceListResponse">TenantServiceListResponse</
             <tbody>
               
                 <tr>
-                  <td>tenants</td>
-                  <td><a href="#metalstack.api.v2.Tenant">Tenant</a></td>
+                  <td>tasks</td>
+                  <td><a href="#metalstack.admin.v2.TaskInfo">TaskInfo</a></td>
                   <td>repeated</td>
-                  <td><p>Tenants is the list of tenants </p></td>
+                  <td><p>Tasks contains the requested list of tasks </p></td>
                 </tr>
               
             </tbody>
@@ -15456,8 +15925,15 @@ <h3 id="metalstack.api.v2.TenantServiceListResponse">TenantServiceListResponse</
 
         
       
-        <h3 id="metalstack.api.v2.TenantServiceRemoveMemberRequest">TenantServiceRemoveMemberRequest</h3>
-        <p>TenantServiceRemoveMemberRequest is used to remove a member from a tenant</p>
+        <h3 id="metalstack.admin.v2.TaskServiceQueuesRequest">TaskServiceQueuesRequest</h3>
+        <p>TaskServiceQueuesRequest is the message to get all queues</p>
+
+        
+
+        
+      
+        <h3 id="metalstack.admin.v2.TaskServiceQueuesResponse">TaskServiceQueuesResponse</h3>
+        <p>TaskServiceQueuesResponse is the response to a queues request</p>
 
         
           <table class="field-table">
@@ -15467,17 +15943,10 @@ <h3 id="metalstack.api.v2.TenantServiceRemoveMemberRequest">TenantServiceRemoveM
             <tbody>
               
                 <tr>
-                  <td>login</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Login of the tenant </p></td>
-                </tr>
-              
-                <tr>
-                  <td>member</td>
+                  <td>queues</td>
                   <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Member is the id of the member to remove from this tenant </p></td>
+                  <td>repeated</td>
+                  <td><p>Queues configured for the async system </p></td>
                 </tr>
               
             </tbody>
@@ -15487,15 +15956,121 @@ <h3 id="metalstack.api.v2.TenantServiceRemoveMemberRequest">TenantServiceRemoveM
 
         
       
-        <h3 id="metalstack.api.v2.TenantServiceRemoveMemberResponse">TenantServiceRemoveMemberResponse</h3>
-        <p>TenantServiceRemoveMemberResponse is the response payload to a remove member request</p>
-
-        
 
-        
       
-        <h3 id="metalstack.api.v2.TenantServiceUpdateMemberRequest">TenantServiceUpdateMemberRequest</h3>
-        <p>TenantServiceUpdateMemberRequest is used to update a member from a tenant</p>
+        <h3 id="metalstack.admin.v2.TaskState">TaskState</h3>
+        <p>TaskState defines the state of the task</p>
+        <table class="enum-table">
+          <thead>
+            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>TASK_STATE_UNSPECIFIED</td>
+                <td>0</td>
+                <td><p>TASK_STATE_UNSPECIFIED indicates a undefined state</p></td>
+              </tr>
+            
+              <tr>
+                <td>TASK_STATE_ACTIVE</td>
+                <td>1</td>
+                <td><p>TASK_STATE_ACTIVE indicates that the task is currently being processed by Handler.</p></td>
+              </tr>
+            
+              <tr>
+                <td>TASK_STATE_PENDING</td>
+                <td>2</td>
+                <td><p>TASK_STATE_PENDING indicates that the task is ready to be processed by Handler.</p></td>
+              </tr>
+            
+              <tr>
+                <td>TASK_STATE_SCHEDULED</td>
+                <td>3</td>
+                <td><p>TASK_STATE_SCHEDULED indicates that the task is scheduled to be processed some time in the future.</p></td>
+              </tr>
+            
+              <tr>
+                <td>TASK_STATE_RETRY</td>
+                <td>4</td>
+                <td><p>TASK_STATE_RETRY indicates that the task has previously failed and scheduled to be processed some time in the future.</p></td>
+              </tr>
+            
+              <tr>
+                <td>TASK_STATE_ARCHIVED</td>
+                <td>5</td>
+                <td><p>TASK_STATE_ARCHIVED indicates that the task is archived and stored for inspection purposes.</p></td>
+              </tr>
+            
+              <tr>
+                <td>TASK_STATE_COMPLETED</td>
+                <td>6</td>
+                <td><p>TASK_STATE_COMPLETED indicates that the task is processed successfully and retained until the retention TTL expires.</p></td>
+              </tr>
+            
+              <tr>
+                <td>TASK_STATE_AGGREGATING</td>
+                <td>7</td>
+                <td><p>TASK_STATE_AGGREGATING indicates that the task is waiting in a group to be aggregated into one task.</p></td>
+              </tr>
+            
+          </tbody>
+        </table>
+      
+
+      
+
+      
+        <h3 id="metalstack.admin.v2.TaskService">TaskService</h3>
+        <p>TaskService provides services to async tasks</p>
+        <table class="enum-table">
+          <thead>
+            <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>Get</td>
+                <td><a href="#metalstack.admin.v2.TaskServiceGetRequest">TaskServiceGetRequest</a></td>
+                <td><a href="#metalstack.admin.v2.TaskServiceGetResponse">TaskServiceGetResponse</a></td>
+                <td><p>Get a specific task</p></td>
+              </tr>
+            
+              <tr>
+                <td>Delete</td>
+                <td><a href="#metalstack.admin.v2.TaskServiceDeleteRequest">TaskServiceDeleteRequest</a></td>
+                <td><a href="#metalstack.admin.v2.TaskServiceDeleteResponse">TaskServiceDeleteResponse</a></td>
+                <td><p>Delete a specific task</p></td>
+              </tr>
+            
+              <tr>
+                <td>Queues</td>
+                <td><a href="#metalstack.admin.v2.TaskServiceQueuesRequest">TaskServiceQueuesRequest</a></td>
+                <td><a href="#metalstack.admin.v2.TaskServiceQueuesResponse">TaskServiceQueuesResponse</a></td>
+                <td><p>Queues returns all configures queues</p></td>
+              </tr>
+            
+              <tr>
+                <td>List</td>
+                <td><a href="#metalstack.admin.v2.TaskServiceListRequest">TaskServiceListRequest</a></td>
+                <td><a href="#metalstack.admin.v2.TaskServiceListResponse">TaskServiceListResponse</a></td>
+                <td><p>List list all tasks</p></td>
+              </tr>
+            
+          </tbody>
+        </table>
+
+        
+    
+      
+      <div class="file-heading">
+        <h2 id="metalstack/api/v2/tenant.proto">metalstack/api/v2/tenant.proto</h2><a href="#title">Top</a>
+      </div>
+      <p></p>
+
+      
+        <h3 id="metalstack.api.v2.Tenant">Tenant</h3>
+        <p>Tenant is a customer of the platform</p>
 
         
           <table class="field-table">
@@ -15512,41 +16087,45 @@ <h3 id="metalstack.api.v2.TenantServiceUpdateMemberRequest">TenantServiceUpdateM
                 </tr>
               
                 <tr>
-                  <td>member</td>
+                  <td>meta</td>
+                  <td><a href="#metalstack.api.v2.Meta">Meta</a></td>
+                  <td></td>
+                  <td><p>Meta for this tenant </p></td>
+                </tr>
+              
+                <tr>
+                  <td>name</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Member is the id of the member to update in this tenant </p></td>
+                  <td><p>Name of the tenant </p></td>
                 </tr>
               
                 <tr>
-                  <td>role</td>
-                  <td><a href="#metalstack.api.v2.TenantRole">TenantRole</a></td>
+                  <td>email</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Role of this user in this tenant </p></td>
+                  <td><p>Email of the tenant </p></td>
                 </tr>
               
-            </tbody>
-          </table>
-
-          
-
-        
-      
-        <h3 id="metalstack.api.v2.TenantServiceUpdateMemberResponse">TenantServiceUpdateMemberResponse</h3>
-        <p>TenantServiceUpdateMemberResponse is the response payload to a update member request</p>
-
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
+                <tr>
+                  <td>description</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Description of this tenant </p></td>
+                </tr>
               
                 <tr>
-                  <td>tenant_member</td>
-                  <td><a href="#metalstack.api.v2.TenantMember">TenantMember</a></td>
+                  <td>avatar_url</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>TenantMember is the updated membership </p></td>
+                  <td><p>AvatarUrl of the tenant </p></td>
+                </tr>
+              
+                <tr>
+                  <td>created_by</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>CreatedBy stores who created this tenant </p></td>
                 </tr>
               
             </tbody>
@@ -15556,8 +16135,8 @@ <h3 id="metalstack.api.v2.TenantServiceUpdateMemberResponse">TenantServiceUpdate
 
         
       
-        <h3 id="metalstack.api.v2.TenantServiceUpdateRequest">TenantServiceUpdateRequest</h3>
-        <p>TenantServiceUpdateRequest is the request payload of the tenant update request</p>
+        <h3 id="metalstack.api.v2.TenantInvite">TenantInvite</h3>
+        <p>TenantInvite defines invite to tenant</p>
 
         
           <table class="field-table">
@@ -15567,52 +16146,66 @@ <h3 id="metalstack.api.v2.TenantServiceUpdateRequest">TenantServiceUpdateRequest
             <tbody>
               
                 <tr>
-                  <td>login</td>
+                  <td>secret</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Login of the tenant </p></td>
+                  <td><p>Secret is the secret part of the invite, typically part of the url </p></td>
                 </tr>
               
                 <tr>
-                  <td>update_meta</td>
-                  <td><a href="#metalstack.api.v2.UpdateMeta">UpdateMeta</a></td>
+                  <td>target_tenant</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>UpdateMeta contains the timestamp and strategy to be used in this update request </p></td>
+                  <td><p>TargetTenant is the tenant id for which this invite was created </p></td>
                 </tr>
               
                 <tr>
-                  <td>name</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Name of the tenant </p></td>
+                  <td>role</td>
+                  <td><a href="#metalstack.api.v2.TenantRole">TenantRole</a></td>
+                  <td></td>
+                  <td><p>Role is the role in this tenant the user will get after accepting the invitation </p></td>
                 </tr>
               
                 <tr>
-                  <td>email</td>
+                  <td>joined</td>
+                  <td><a href="#bool">bool</a></td>
+                  <td></td>
+                  <td><p>Joined is false as long as a user has not accepted the invite </p></td>
+                </tr>
+              
+                <tr>
+                  <td>target_tenant_name</td>
                   <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Email of the tenant </p></td>
+                  <td></td>
+                  <td><p>TargetTenantName is the tenant name for which this invite was created </p></td>
                 </tr>
               
                 <tr>
-                  <td>description</td>
+                  <td>tenant</td>
                   <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Description of this tenant </p></td>
+                  <td></td>
+                  <td><p>Tenant is the login of tenant who invites to join this tenant </p></td>
                 </tr>
               
                 <tr>
-                  <td>avatar_url</td>
+                  <td>tenant_name</td>
                   <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>AvatarUrl of the tenant </p></td>
+                  <td></td>
+                  <td><p>TenantName is the name of tenant who invites to join this tenant </p></td>
                 </tr>
               
                 <tr>
-                  <td>labels</td>
-                  <td><a href="#metalstack.api.v2.UpdateLabels">UpdateLabels</a></td>
-                  <td>optional</td>
-                  <td><p>Labels on the tenant </p></td>
+                  <td>expires_at</td>
+                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
+                  <td></td>
+                  <td><p>ExpiresAt the date when this invite expires </p></td>
+                </tr>
+              
+                <tr>
+                  <td>joined_at</td>
+                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
+                  <td></td>
+                  <td><p>JoinedAt the date when the member accepted this invite </p></td>
                 </tr>
               
             </tbody>
@@ -15622,8 +16215,8 @@ <h3 id="metalstack.api.v2.TenantServiceUpdateRequest">TenantServiceUpdateRequest
 
         
       
-        <h3 id="metalstack.api.v2.TenantServiceUpdateResponse">TenantServiceUpdateResponse</h3>
-        <p>TenantServiceUpdateResponse is the response payload of the tenant update request</p>
+        <h3 id="metalstack.api.v2.TenantMember">TenantMember</h3>
+        <p>TenantMember defines a user that participates at a tenant</p>
 
         
           <table class="field-table">
@@ -15633,137 +16226,41 @@ <h3 id="metalstack.api.v2.TenantServiceUpdateResponse">TenantServiceUpdateRespon
             <tbody>
               
                 <tr>
-                  <td>tenant</td>
-                  <td><a href="#metalstack.api.v2.Tenant">Tenant</a></td>
+                  <td>id</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Tenant is the tenant </p></td>
+                  <td><p>Id is the user id of the member </p></td>
                 </tr>
               
-            </tbody>
-          </table>
-
-          
-
-        
-      
-
-      
-
-      
-
-      
-        <h3 id="metalstack.api.v2.TenantService">TenantService</h3>
-        <p>TenantService serves tenant related functions</p>
-        <table class="enum-table">
-          <thead>
-            <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
-          </thead>
-          <tbody>
-            
-              <tr>
-                <td>Create</td>
-                <td><a href="#metalstack.api.v2.TenantServiceCreateRequest">TenantServiceCreateRequest</a></td>
-                <td><a href="#metalstack.api.v2.TenantServiceCreateResponse">TenantServiceCreateResponse</a></td>
-                <td><p>Create a tenant</p></td>
-              </tr>
-            
-              <tr>
-                <td>List</td>
-                <td><a href="#metalstack.api.v2.TenantServiceListRequest">TenantServiceListRequest</a></td>
-                <td><a href="#metalstack.api.v2.TenantServiceListResponse">TenantServiceListResponse</a></td>
-                <td><p>List tenants</p></td>
-              </tr>
-            
-              <tr>
-                <td>Get</td>
-                <td><a href="#metalstack.api.v2.TenantServiceGetRequest">TenantServiceGetRequest</a></td>
-                <td><a href="#metalstack.api.v2.TenantServiceGetResponse">TenantServiceGetResponse</a></td>
-                <td><p>Get a tenant</p></td>
-              </tr>
-            
-              <tr>
-                <td>Update</td>
-                <td><a href="#metalstack.api.v2.TenantServiceUpdateRequest">TenantServiceUpdateRequest</a></td>
-                <td><a href="#metalstack.api.v2.TenantServiceUpdateResponse">TenantServiceUpdateResponse</a></td>
-                <td><p>Update a tenant</p></td>
-              </tr>
-            
-              <tr>
-                <td>Delete</td>
-                <td><a href="#metalstack.api.v2.TenantServiceDeleteRequest">TenantServiceDeleteRequest</a></td>
-                <td><a href="#metalstack.api.v2.TenantServiceDeleteResponse">TenantServiceDeleteResponse</a></td>
-                <td><p>Delete a tenant</p></td>
-              </tr>
-            
-              <tr>
-                <td>Leave</td>
-                <td><a href="#metalstack.api.v2.TenantServiceLeaveRequest">TenantServiceLeaveRequest</a></td>
-                <td><a href="#metalstack.api.v2.TenantServiceLeaveResponse">TenantServiceLeaveResponse</a></td>
-                <td><p>Leave remove a member of a tenant</p></td>
-              </tr>
-            
-              <tr>
-                <td>RemoveMember</td>
-                <td><a href="#metalstack.api.v2.TenantServiceRemoveMemberRequest">TenantServiceRemoveMemberRequest</a></td>
-                <td><a href="#metalstack.api.v2.TenantServiceRemoveMemberResponse">TenantServiceRemoveMemberResponse</a></td>
-                <td><p>RemoveMember remove a member of a tenant</p></td>
-              </tr>
-            
-              <tr>
-                <td>UpdateMember</td>
-                <td><a href="#metalstack.api.v2.TenantServiceUpdateMemberRequest">TenantServiceUpdateMemberRequest</a></td>
-                <td><a href="#metalstack.api.v2.TenantServiceUpdateMemberResponse">TenantServiceUpdateMemberResponse</a></td>
-                <td><p>UpdateMember update a member of a tenant</p></td>
-              </tr>
-            
-              <tr>
-                <td>Invite</td>
-                <td><a href="#metalstack.api.v2.TenantServiceInviteRequest">TenantServiceInviteRequest</a></td>
-                <td><a href="#metalstack.api.v2.TenantServiceInviteResponse">TenantServiceInviteResponse</a></td>
-                <td><p>Invite a user to a tenant</p></td>
-              </tr>
-            
-              <tr>
-                <td>InviteAccept</td>
-                <td><a href="#metalstack.api.v2.TenantServiceInviteAcceptRequest">TenantServiceInviteAcceptRequest</a></td>
-                <td><a href="#metalstack.api.v2.TenantServiceInviteAcceptResponse">TenantServiceInviteAcceptResponse</a></td>
-                <td><p>InviteAccept is called from a user to accept an invitation</p></td>
-              </tr>
-            
-              <tr>
-                <td>InviteDelete</td>
-                <td><a href="#metalstack.api.v2.TenantServiceInviteDeleteRequest">TenantServiceInviteDeleteRequest</a></td>
-                <td><a href="#metalstack.api.v2.TenantServiceInviteDeleteResponse">TenantServiceInviteDeleteResponse</a></td>
-                <td><p>InviteDelete deletes a pending invitation</p></td>
-              </tr>
-            
-              <tr>
-                <td>InvitesList</td>
-                <td><a href="#metalstack.api.v2.TenantServiceInvitesListRequest">TenantServiceInvitesListRequest</a></td>
-                <td><a href="#metalstack.api.v2.TenantServiceInvitesListResponse">TenantServiceInvitesListResponse</a></td>
-                <td><p>InvitesList list all invites to a tenant</p></td>
-              </tr>
-            
-              <tr>
-                <td>InviteGet</td>
-                <td><a href="#metalstack.api.v2.TenantServiceInviteGetRequest">TenantServiceInviteGetRequest</a></td>
-                <td><a href="#metalstack.api.v2.TenantServiceInviteGetResponse">TenantServiceInviteGetResponse</a></td>
-                <td><p>InviteGet get an invite</p></td>
-              </tr>
-            
-          </tbody>
-        </table>
+                <tr>
+                  <td>role</td>
+                  <td><a href="#metalstack.api.v2.TenantRole">TenantRole</a></td>
+                  <td></td>
+                  <td><p>Role is the role of the member </p></td>
+                </tr>
+              
+                <tr>
+                  <td>projects</td>
+                  <td><a href="#string">string</a></td>
+                  <td>repeated</td>
+                  <td><p>Projects for the projects in which a user is a direct member </p></td>
+                </tr>
+              
+                <tr>
+                  <td>created_at</td>
+                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
+                  <td></td>
+                  <td><p>CreatedAt the date when the member was added to the tenant </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
 
-        
-    
-      
-      <div class="file-heading">
-        <h2 id="metalstack/admin/v2/tenant.proto">metalstack/admin/v2/tenant.proto</h2><a href="#title">Top</a>
-      </div>
-      <p></p>
+          
 
+        
       
-        <h3 id="metalstack.admin.v2.TenantServiceCreateRequest">TenantServiceCreateRequest</h3>
+        <h3 id="metalstack.api.v2.TenantServiceCreateRequest">TenantServiceCreateRequest</h3>
         <p>TenantServiceCreateRequest is the request payload of the tenant create request</p>
 
         
@@ -15803,7 +16300,7 @@ <h3 id="metalstack.admin.v2.TenantServiceCreateRequest">TenantServiceCreateReque
               
                 <tr>
                   <td>labels</td>
-                  <td><a href="#metalstack.api.v2.Labels">metalstack.api.v2.Labels</a></td>
+                  <td><a href="#metalstack.api.v2.Labels">Labels</a></td>
                   <td></td>
                   <td><p>Labels on the tenant </p></td>
                 </tr>
@@ -15815,7 +16312,7 @@ <h3 id="metalstack.admin.v2.TenantServiceCreateRequest">TenantServiceCreateReque
 
         
       
-        <h3 id="metalstack.admin.v2.TenantServiceCreateResponse">TenantServiceCreateResponse</h3>
+        <h3 id="metalstack.api.v2.TenantServiceCreateResponse">TenantServiceCreateResponse</h3>
         <p>TenantServiceCreateResponse is the response payload of the tenant create request</p>
 
         
@@ -15827,7 +16324,7 @@ <h3 id="metalstack.admin.v2.TenantServiceCreateResponse">TenantServiceCreateResp
               
                 <tr>
                   <td>tenant</td>
-                  <td><a href="#metalstack.api.v2.Tenant">metalstack.api.v2.Tenant</a></td>
+                  <td><a href="#metalstack.api.v2.Tenant">Tenant</a></td>
                   <td></td>
                   <td><p>Tenant is the tenant </p></td>
                 </tr>
@@ -15839,8 +16336,8 @@ <h3 id="metalstack.admin.v2.TenantServiceCreateResponse">TenantServiceCreateResp
 
         
       
-        <h3 id="metalstack.admin.v2.TenantServiceListRequest">TenantServiceListRequest</h3>
-        <p>TenantServiceListRequest is the request payload for a tenant list request</p>
+        <h3 id="metalstack.api.v2.TenantServiceDeleteRequest">TenantServiceDeleteRequest</h3>
+        <p>TenantServiceDeleteRequest is the request payload of the tenant delete request</p>
 
         
           <table class="field-table">
@@ -15852,22 +16349,8 @@ <h3 id="metalstack.admin.v2.TenantServiceListRequest">TenantServiceListRequest</
                 <tr>
                   <td>login</td>
                   <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Login of the tenant to list </p></td>
-                </tr>
-              
-                <tr>
-                  <td>name</td>
-                  <td><a href="#string">string</a></td>
-                  <td>optional</td>
-                  <td><p>Name of the tenant to list </p></td>
-                </tr>
-              
-                <tr>
-                  <td>paging</td>
-                  <td><a href="#metalstack.api.v2.Paging">metalstack.api.v2.Paging</a></td>
                   <td></td>
-                  <td><p>Paging details for the list request </p></td>
+                  <td><p>Login of the tenant </p></td>
                 </tr>
               
             </tbody>
@@ -15877,8 +16360,8 @@ <h3 id="metalstack.admin.v2.TenantServiceListRequest">TenantServiceListRequest</
 
         
       
-        <h3 id="metalstack.admin.v2.TenantServiceListResponse">TenantServiceListResponse</h3>
-        <p>TenantServiceListResponse is the response payload for a tenant list request</p>
+        <h3 id="metalstack.api.v2.TenantServiceDeleteResponse">TenantServiceDeleteResponse</h3>
+        <p>TenantServiceDeleteResponse is the response payload of the tenant delete request</p>
 
         
           <table class="field-table">
@@ -15888,17 +16371,10 @@ <h3 id="metalstack.admin.v2.TenantServiceListResponse">TenantServiceListResponse
             <tbody>
               
                 <tr>
-                  <td>tenants</td>
-                  <td><a href="#metalstack.api.v2.Tenant">metalstack.api.v2.Tenant</a></td>
-                  <td>repeated</td>
-                  <td><p>Tenants are the list of tenants </p></td>
-                </tr>
-              
-                <tr>
-                  <td>next_page</td>
-                  <td><a href="#uint64">uint64</a></td>
-                  <td>optional</td>
-                  <td><p>NextPage is used for pagination, returns the next page to be fetched and must then be provided in the list request. </p></td>
+                  <td>tenant</td>
+                  <td><a href="#metalstack.api.v2.Tenant">Tenant</a></td>
+                  <td></td>
+                  <td><p>Tenant is the tenant </p></td>
                 </tr>
               
             </tbody>
@@ -15908,48 +16384,32 @@ <h3 id="metalstack.admin.v2.TenantServiceListResponse">TenantServiceListResponse
 
         
       
+        <h3 id="metalstack.api.v2.TenantServiceGetRequest">TenantServiceGetRequest</h3>
+        <p>TenantServiceGetRequest is the request payload of the tenant get request</p>
 
-      
-
-      
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>login</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Login of the tenant </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
 
-      
-        <h3 id="metalstack.admin.v2.TenantService">TenantService</h3>
-        <p>TenantService serves tenant related functions</p>
-        <table class="enum-table">
-          <thead>
-            <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
-          </thead>
-          <tbody>
-            
-              <tr>
-                <td>Create</td>
-                <td><a href="#metalstack.admin.v2.TenantServiceCreateRequest">TenantServiceCreateRequest</a></td>
-                <td><a href="#metalstack.admin.v2.TenantServiceCreateResponse">TenantServiceCreateResponse</a></td>
-                <td><p>Create a tenant</p></td>
-              </tr>
-            
-              <tr>
-                <td>List</td>
-                <td><a href="#metalstack.admin.v2.TenantServiceListRequest">TenantServiceListRequest</a></td>
-                <td><a href="#metalstack.admin.v2.TenantServiceListResponse">TenantServiceListResponse</a></td>
-                <td><p>List all tenants</p></td>
-              </tr>
-            
-          </tbody>
-        </table>
+          
 
         
-    
-      
-      <div class="file-heading">
-        <h2 id="metalstack/api/v2/token.proto">metalstack/api/v2/token.proto</h2><a href="#title">Top</a>
-      </div>
-      <p></p>
-
       
-        <h3 id="metalstack.api.v2.MethodPermission">MethodPermission</h3>
-        <p>MethodPermission is a mapping from a subject/project to a service method</p>
+        <h3 id="metalstack.api.v2.TenantServiceGetResponse">TenantServiceGetResponse</h3>
+        <p>TenantServiceGetResponse is the response payload of the tenant get request</p>
 
         
           <table class="field-table">
@@ -15959,22 +16419,17 @@ <h3 id="metalstack.api.v2.MethodPermission">MethodPermission</h3>
             <tbody>
               
                 <tr>
-                  <td>subject</td>
-                  <td><a href="#string">string</a></td>
+                  <td>tenant</td>
+                  <td><a href="#metalstack.api.v2.Tenant">Tenant</a></td>
                   <td></td>
-                  <td><p>Subject maybe either the project or the tenant
-for which the methods should be allowed
-
-asterisk (*) can be specified to match any subject
-empty string (&#34;&#34;) can be specified for requests that do not require a subject, e.g. partition list
-otherwise either a projectid or a tenant login should be specified </p></td>
+                  <td><p>Tenant is the tenant </p></td>
                 </tr>
               
                 <tr>
-                  <td>methods</td>
-                  <td><a href="#string">string</a></td>
+                  <td>tenant_members</td>
+                  <td><a href="#metalstack.api.v2.TenantMember">TenantMember</a></td>
                   <td>repeated</td>
-                  <td><p>Methods which should be accessible </p></td>
+                  <td><p>TenantMembers of this tenant </p></td>
                 </tr>
               
             </tbody>
@@ -15984,8 +16439,8 @@ <h3 id="metalstack.api.v2.MethodPermission">MethodPermission</h3>
 
         
       
-        <h3 id="metalstack.api.v2.Token">Token</h3>
-        <p>Token generates a jwt authentication token to access the api</p><p>There are two different types of tokens, api- and user- tokens</p><p>A user token is used to authenticate end user requests for example from a cli.</p><p>The configured roles in a user token are expanded in the api server</p><p>based on the memberships in other projects and tenants based on the role granted there.</p><p>User tokens will never contain permissions.</p><p>Permissions are always derived from the tenant and project roles and memberships.</p><p>The api token should be used to authenticate services.</p><p>In contrast to a user token, the api token permissions and roles apply as configured during the token create process.</p>
+        <h3 id="metalstack.api.v2.TenantServiceInviteAcceptRequest">TenantServiceInviteAcceptRequest</h3>
+        <p>TenantServiceInviteAcceptRequest is the request payload to a accept invite request</p>
 
         
           <table class="field-table">
@@ -15995,95 +16450,41 @@ <h3 id="metalstack.api.v2.Token">Token</h3>
             <tbody>
               
                 <tr>
-                  <td>uuid</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Uuid of the jwt token, used to reference it by revoke </p></td>
-                </tr>
-              
-                <tr>
-                  <td>user</td>
+                  <td>secret</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>User who created this token </p></td>
+                  <td><p>Secret is the invitation secret part of the invitation url </p></td>
                 </tr>
               
-                <tr>
-                  <td>meta</td>
-                  <td><a href="#metalstack.api.v2.Meta">Meta</a></td>
-                  <td></td>
-                  <td><p>Meta for this token </p></td>
-                </tr>
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.api.v2.TenantServiceInviteAcceptResponse">TenantServiceInviteAcceptResponse</h3>
+        <p>TenantServiceInvitesListResponse is the response payload to a accept invite request</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
               
                 <tr>
-                  <td>description</td>
+                  <td>tenant</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Description is a user given description of this token. </p></td>
-                </tr>
-              
-                <tr>
-                  <td>permissions</td>
-                  <td><a href="#metalstack.api.v2.MethodPermission">MethodPermission</a></td>
-                  <td>repeated</td>
-                  <td><p>Permissions is a list of service methods this token can be used for </p></td>
-                </tr>
-              
-                <tr>
-                  <td>expires</td>
-                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
-                  <td></td>
-                  <td><p>Expires gives the date in the future after which this token can not be used anymore </p></td>
-                </tr>
-              
-                <tr>
-                  <td>issued_at</td>
-                  <td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
-                  <td></td>
-                  <td><p>IssuedAt gives the date when this token was created </p></td>
+                  <td><p>Tenant ID of the joined tenant </p></td>
                 </tr>
               
                 <tr>
-                  <td>token_type</td>
-                  <td><a href="#metalstack.api.v2.TokenType">TokenType</a></td>
+                  <td>tenant_name</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>TokenType describes the type of this token </p></td>
-                </tr>
-              
-                <tr>
-                  <td>project_roles</td>
-                  <td><a href="#metalstack.api.v2.Token.ProjectRolesEntry">Token.ProjectRolesEntry</a></td>
-                  <td>repeated</td>
-                  <td><p>ProjectRoles associates a project id with the corresponding role of the token owner </p></td>
-                </tr>
-              
-                <tr>
-                  <td>tenant_roles</td>
-                  <td><a href="#metalstack.api.v2.Token.TenantRolesEntry">Token.TenantRolesEntry</a></td>
-                  <td>repeated</td>
-                  <td><p>TenantRoles associates a tenant id with the corresponding role of the token owner </p></td>
-                </tr>
-              
-                <tr>
-                  <td>admin_role</td>
-                  <td><a href="#metalstack.api.v2.AdminRole">AdminRole</a></td>
-                  <td>optional</td>
-                  <td><p>AdminRole defines the admin role of the token owner </p></td>
-                </tr>
-              
-                <tr>
-                  <td>infra_role</td>
-                  <td><a href="#metalstack.api.v2.InfraRole">InfraRole</a></td>
-                  <td>optional</td>
-                  <td><p>InfraRole defines the infrastructure role of the token owner </p></td>
-                </tr>
-              
-                <tr>
-                  <td>machine_roles</td>
-                  <td><a href="#metalstack.api.v2.Token.MachineRolesEntry">Token.MachineRolesEntry</a></td>
-                  <td>repeated</td>
-                  <td><p>MachineRoles associates a machine uuid with the corresponding role of the token owner
-TODO: decide if we need this map from machine.uuid-&gt;role, we could instead use the subject in the token instead </p></td>
+                  <td><p>TenantName of the joined tenant </p></td>
                 </tr>
               
             </tbody>
@@ -16093,8 +16494,8 @@ <h3 id="metalstack.api.v2.Token">Token</h3>
 
         
       
-        <h3 id="metalstack.api.v2.Token.MachineRolesEntry">Token.MachineRolesEntry</h3>
-        <p></p>
+        <h3 id="metalstack.api.v2.TenantServiceInviteDeleteRequest">TenantServiceInviteDeleteRequest</h3>
+        <p>TenantServiceInviteDeleteRequest is the request payload to a delete invite</p>
 
         
           <table class="field-table">
@@ -16104,17 +16505,17 @@ <h3 id="metalstack.api.v2.Token.MachineRolesEntry">Token.MachineRolesEntry</h3>
             <tbody>
               
                 <tr>
-                  <td>key</td>
+                  <td>login</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p> </p></td>
+                  <td><p>Login of the tenant </p></td>
                 </tr>
               
                 <tr>
-                  <td>value</td>
-                  <td><a href="#metalstack.api.v2.MachineRole">MachineRole</a></td>
+                  <td>secret</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p> </p></td>
+                  <td><p>Secret of the invite to delete </p></td>
                 </tr>
               
             </tbody>
@@ -16124,8 +16525,15 @@ <h3 id="metalstack.api.v2.Token.MachineRolesEntry">Token.MachineRolesEntry</h3>
 
         
       
-        <h3 id="metalstack.api.v2.Token.ProjectRolesEntry">Token.ProjectRolesEntry</h3>
-        <p></p>
+        <h3 id="metalstack.api.v2.TenantServiceInviteDeleteResponse">TenantServiceInviteDeleteResponse</h3>
+        <p>TenantServiceInviteDeleteResponse is the response payload of a delete invite request</p>
+
+        
+
+        
+      
+        <h3 id="metalstack.api.v2.TenantServiceInviteGetRequest">TenantServiceInviteGetRequest</h3>
+        <p>TenantServiceInviteGetRequest is the request payload to get a invite</p>
 
         
           <table class="field-table">
@@ -16135,17 +16543,10 @@ <h3 id="metalstack.api.v2.Token.ProjectRolesEntry">Token.ProjectRolesEntry</h3>
             <tbody>
               
                 <tr>
-                  <td>key</td>
+                  <td>secret</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p> </p></td>
-                </tr>
-              
-                <tr>
-                  <td>value</td>
-                  <td><a href="#metalstack.api.v2.ProjectRole">ProjectRole</a></td>
-                  <td></td>
-                  <td><p> </p></td>
+                  <td><p>Secret of the invite to get </p></td>
                 </tr>
               
             </tbody>
@@ -16155,8 +16556,8 @@ <h3 id="metalstack.api.v2.Token.ProjectRolesEntry">Token.ProjectRolesEntry</h3>
 
         
       
-        <h3 id="metalstack.api.v2.Token.TenantRolesEntry">Token.TenantRolesEntry</h3>
-        <p></p>
+        <h3 id="metalstack.api.v2.TenantServiceInviteGetResponse">TenantServiceInviteGetResponse</h3>
+        <p>TenantServiceInviteGetResponse is the response payload to a get invite request</p>
 
         
           <table class="field-table">
@@ -16166,17 +16567,10 @@ <h3 id="metalstack.api.v2.Token.TenantRolesEntry">Token.TenantRolesEntry</h3>
             <tbody>
               
                 <tr>
-                  <td>key</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p> </p></td>
-                </tr>
-              
-                <tr>
-                  <td>value</td>
-                  <td><a href="#metalstack.api.v2.TenantRole">TenantRole</a></td>
+                  <td>invite</td>
+                  <td><a href="#metalstack.api.v2.TenantInvite">TenantInvite</a></td>
                   <td></td>
-                  <td><p> </p></td>
+                  <td><p>Invite is the invite </p></td>
                 </tr>
               
             </tbody>
@@ -16186,8 +16580,8 @@ <h3 id="metalstack.api.v2.Token.TenantRolesEntry">Token.TenantRolesEntry</h3>
 
         
       
-        <h3 id="metalstack.api.v2.TokenServiceCreateRequest">TokenServiceCreateRequest</h3>
-        <p>TokenServiceCreateRequest is the request payload to create a token</p>
+        <h3 id="metalstack.api.v2.TenantServiceInviteRequest">TenantServiceInviteRequest</h3>
+        <p>TenantServiceInviteRequest is used to invite a member to a tenant</p>
 
         
           <table class="field-table">
@@ -16197,66 +16591,17 @@ <h3 id="metalstack.api.v2.TokenServiceCreateRequest">TokenServiceCreateRequest</
             <tbody>
               
                 <tr>
-                  <td>description</td>
+                  <td>login</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Description of the token </p></td>
-                </tr>
-              
-                <tr>
-                  <td>permissions</td>
-                  <td><a href="#metalstack.api.v2.MethodPermission">MethodPermission</a></td>
-                  <td>repeated</td>
-                  <td><p>Permissions is a list of service methods this token can be used for </p></td>
-                </tr>
-              
-                <tr>
-                  <td>expires</td>
-                  <td><a href="#google.protobuf.Duration">google.protobuf.Duration</a></td>
-                  <td></td>
-                  <td><p>Expires gives the duration since now, after which this token can not be used anymore </p></td>
-                </tr>
-              
-                <tr>
-                  <td>project_roles</td>
-                  <td><a href="#metalstack.api.v2.TokenServiceCreateRequest.ProjectRolesEntry">TokenServiceCreateRequest.ProjectRolesEntry</a></td>
-                  <td>repeated</td>
-                  <td><p>ProjectRoles associates a project id with the corresponding role of the token owner </p></td>
-                </tr>
-              
-                <tr>
-                  <td>tenant_roles</td>
-                  <td><a href="#metalstack.api.v2.TokenServiceCreateRequest.TenantRolesEntry">TokenServiceCreateRequest.TenantRolesEntry</a></td>
-                  <td>repeated</td>
-                  <td><p>TenantRoles associates a tenant id with the corresponding role of the token owner </p></td>
-                </tr>
-              
-                <tr>
-                  <td>admin_role</td>
-                  <td><a href="#metalstack.api.v2.AdminRole">AdminRole</a></td>
-                  <td>optional</td>
-                  <td><p>AdminRole defines the admin role of the token owner </p></td>
-                </tr>
-              
-                <tr>
-                  <td>infra_role</td>
-                  <td><a href="#metalstack.api.v2.InfraRole">InfraRole</a></td>
-                  <td>optional</td>
-                  <td><p>InfraRole defines the infrastructure role of the token owner </p></td>
-                </tr>
-              
-                <tr>
-                  <td>machine_roles</td>
-                  <td><a href="#metalstack.api.v2.TokenServiceCreateRequest.MachineRolesEntry">TokenServiceCreateRequest.MachineRolesEntry</a></td>
-                  <td>repeated</td>
-                  <td><p>MachineRoles associates a machine uuid with the corresponding role of the token owner </p></td>
+                  <td><p>Login of the tenant </p></td>
                 </tr>
               
                 <tr>
-                  <td>labels</td>
-                  <td><a href="#metalstack.api.v2.Labels">Labels</a></td>
+                  <td>role</td>
+                  <td><a href="#metalstack.api.v2.TenantRole">TenantRole</a></td>
                   <td></td>
-                  <td><p>Labels on this token </p></td>
+                  <td><p>Role of this user in this tenant </p></td>
                 </tr>
               
             </tbody>
@@ -16266,8 +16611,8 @@ <h3 id="metalstack.api.v2.TokenServiceCreateRequest">TokenServiceCreateRequest</
 
         
       
-        <h3 id="metalstack.api.v2.TokenServiceCreateRequest.MachineRolesEntry">TokenServiceCreateRequest.MachineRolesEntry</h3>
-        <p></p>
+        <h3 id="metalstack.api.v2.TenantServiceInviteResponse">TenantServiceInviteResponse</h3>
+        <p>TenantServiceInviteRequest is the response payload to a invite member request</p>
 
         
           <table class="field-table">
@@ -16277,17 +16622,12 @@ <h3 id="metalstack.api.v2.TokenServiceCreateRequest.MachineRolesEntry">TokenServ
             <tbody>
               
                 <tr>
-                  <td>key</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p> </p></td>
-                </tr>
-              
-                <tr>
-                  <td>value</td>
-                  <td><a href="#metalstack.api.v2.MachineRole">MachineRole</a></td>
+                  <td>invite</td>
+                  <td><a href="#metalstack.api.v2.TenantInvite">TenantInvite</a></td>
                   <td></td>
-                  <td><p> </p></td>
+                  <td><p>Invite contains a secret which can be sent to a potential user
+can be appended to the invitation endpoint at our cloud console like
+console.metalstack.cloud/invite/&lt;secret&gt; </p></td>
                 </tr>
               
             </tbody>
@@ -16297,8 +16637,8 @@ <h3 id="metalstack.api.v2.TokenServiceCreateRequest.MachineRolesEntry">TokenServ
 
         
       
-        <h3 id="metalstack.api.v2.TokenServiceCreateRequest.ProjectRolesEntry">TokenServiceCreateRequest.ProjectRolesEntry</h3>
-        <p></p>
+        <h3 id="metalstack.api.v2.TenantServiceInvitesListRequest">TenantServiceInvitesListRequest</h3>
+        <p>TenantServiceInvitesListRequest is the request payload to a list invites request</p>
 
         
           <table class="field-table">
@@ -16308,17 +16648,10 @@ <h3 id="metalstack.api.v2.TokenServiceCreateRequest.ProjectRolesEntry">TokenServ
             <tbody>
               
                 <tr>
-                  <td>key</td>
+                  <td>login</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p> </p></td>
-                </tr>
-              
-                <tr>
-                  <td>value</td>
-                  <td><a href="#metalstack.api.v2.ProjectRole">ProjectRole</a></td>
-                  <td></td>
-                  <td><p> </p></td>
+                  <td><p>Login of the tenant </p></td>
                 </tr>
               
             </tbody>
@@ -16328,8 +16661,8 @@ <h3 id="metalstack.api.v2.TokenServiceCreateRequest.ProjectRolesEntry">TokenServ
 
         
       
-        <h3 id="metalstack.api.v2.TokenServiceCreateRequest.TenantRolesEntry">TokenServiceCreateRequest.TenantRolesEntry</h3>
-        <p></p>
+        <h3 id="metalstack.api.v2.TenantServiceInvitesListResponse">TenantServiceInvitesListResponse</h3>
+        <p>TenantServiceInvitesListResponse is the response payload to a list invites request</p>
 
         
           <table class="field-table">
@@ -16339,17 +16672,10 @@ <h3 id="metalstack.api.v2.TokenServiceCreateRequest.TenantRolesEntry">TokenServi
             <tbody>
               
                 <tr>
-                  <td>key</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p> </p></td>
-                </tr>
-              
-                <tr>
-                  <td>value</td>
-                  <td><a href="#metalstack.api.v2.TenantRole">TenantRole</a></td>
-                  <td></td>
-                  <td><p> </p></td>
+                  <td>invites</td>
+                  <td><a href="#metalstack.api.v2.TenantInvite">TenantInvite</a></td>
+                  <td>repeated</td>
+                  <td><p>Invites not already accepted the invitation to this tenant </p></td>
                 </tr>
               
             </tbody>
@@ -16359,8 +16685,8 @@ <h3 id="metalstack.api.v2.TokenServiceCreateRequest.TenantRolesEntry">TokenServi
 
         
       
-        <h3 id="metalstack.api.v2.TokenServiceCreateResponse">TokenServiceCreateResponse</h3>
-        <p>TokenServiceCreateResponse is the response payload of a token create request</p>
+        <h3 id="metalstack.api.v2.TenantServiceLeaveRequest">TenantServiceLeaveRequest</h3>
+        <p>TenantServiceLeaveTenantRequest is used to leave a tenant</p>
 
         
           <table class="field-table">
@@ -16370,17 +16696,10 @@ <h3 id="metalstack.api.v2.TokenServiceCreateResponse">TokenServiceCreateResponse
             <tbody>
               
                 <tr>
-                  <td>token</td>
-                  <td><a href="#metalstack.api.v2.Token">Token</a></td>
-                  <td></td>
-                  <td><p>Token which was created </p></td>
-                </tr>
-              
-                <tr>
-                  <td>secret</td>
+                  <td>login</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Secret is the body if the jwt token, should be used in api requests as bearer token </p></td>
+                  <td><p>Login of the tenant </p></td>
                 </tr>
               
             </tbody>
@@ -16390,8 +16709,15 @@ <h3 id="metalstack.api.v2.TokenServiceCreateResponse">TokenServiceCreateResponse
 
         
       
-        <h3 id="metalstack.api.v2.TokenServiceGetRequest">TokenServiceGetRequest</h3>
-        <p>TokenServiceGetRequest is the request payload of a token get request</p>
+        <h3 id="metalstack.api.v2.TenantServiceLeaveResponse">TenantServiceLeaveResponse</h3>
+        <p>TenantServiceLeaveTenantResponse is the response payload to a leave tenant request</p>
+
+        
+
+        
+      
+        <h3 id="metalstack.api.v2.TenantServiceListRequest">TenantServiceListRequest</h3>
+        <p>TenantServiceListRequest is the request payload of the tenant list request</p>
 
         
           <table class="field-table">
@@ -16401,10 +16727,24 @@ <h3 id="metalstack.api.v2.TokenServiceGetRequest">TokenServiceGetRequest</h3>
             <tbody>
               
                 <tr>
-                  <td>uuid</td>
+                  <td>id</td>
                   <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Uuid of the token to get </p></td>
+                  <td>optional</td>
+                  <td><p>Id filters tenants by id </p></td>
+                </tr>
+              
+                <tr>
+                  <td>name</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Name filters tenants by name </p></td>
+                </tr>
+              
+                <tr>
+                  <td>labels</td>
+                  <td><a href="#metalstack.api.v2.Labels">Labels</a></td>
+                  <td>optional</td>
+                  <td><p>Labels lists only projects containing the given labels </p></td>
                 </tr>
               
             </tbody>
@@ -16414,8 +16754,8 @@ <h3 id="metalstack.api.v2.TokenServiceGetRequest">TokenServiceGetRequest</h3>
 
         
       
-        <h3 id="metalstack.api.v2.TokenServiceGetResponse">TokenServiceGetResponse</h3>
-        <p>TokenServiceGetResponse is the response payload of a token get request</p>
+        <h3 id="metalstack.api.v2.TenantServiceListResponse">TenantServiceListResponse</h3>
+        <p>TenantServiceListResponse is the response payload of the tenant list request</p>
 
         
           <table class="field-table">
@@ -16425,10 +16765,10 @@ <h3 id="metalstack.api.v2.TokenServiceGetResponse">TokenServiceGetResponse</h3>
             <tbody>
               
                 <tr>
-                  <td>token</td>
-                  <td><a href="#metalstack.api.v2.Token">Token</a></td>
-                  <td></td>
-                  <td><p>Token is the token </p></td>
+                  <td>tenants</td>
+                  <td><a href="#metalstack.api.v2.Tenant">Tenant</a></td>
+                  <td>repeated</td>
+                  <td><p>Tenants is the list of tenants </p></td>
                 </tr>
               
             </tbody>
@@ -16438,15 +16778,8 @@ <h3 id="metalstack.api.v2.TokenServiceGetResponse">TokenServiceGetResponse</h3>
 
         
       
-        <h3 id="metalstack.api.v2.TokenServiceListRequest">TokenServiceListRequest</h3>
-        <p>TokenServiceListRequest is the request payload to list tokens</p>
-
-        
-
-        
-      
-        <h3 id="metalstack.api.v2.TokenServiceListResponse">TokenServiceListResponse</h3>
-        <p>TokenServiceListResponse is the response payload of a token list request</p>
+        <h3 id="metalstack.api.v2.TenantServiceRemoveMemberRequest">TenantServiceRemoveMemberRequest</h3>
+        <p>TenantServiceRemoveMemberRequest is used to remove a member from a tenant</p>
 
         
           <table class="field-table">
@@ -16456,10 +16789,17 @@ <h3 id="metalstack.api.v2.TokenServiceListResponse">TokenServiceListResponse</h3
             <tbody>
               
                 <tr>
-                  <td>tokens</td>
-                  <td><a href="#metalstack.api.v2.Token">Token</a></td>
-                  <td>repeated</td>
-                  <td><p>Tokens is a list of tokens without the secrets </p></td>
+                  <td>login</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Login of the tenant </p></td>
+                </tr>
+              
+                <tr>
+                  <td>member</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Member is the id of the member to remove from this tenant </p></td>
                 </tr>
               
             </tbody>
@@ -16469,15 +16809,15 @@ <h3 id="metalstack.api.v2.TokenServiceListResponse">TokenServiceListResponse</h3
 
         
       
-        <h3 id="metalstack.api.v2.TokenServiceRefreshRequest">TokenServiceRefreshRequest</h3>
-        <p>TokenServiceRefreshRequest is the request payload of a token refresh request</p><p>Permissions, Roles and Expiration duration and all other properties are inherited from the calling token.</p><p>The expiration duration will be calculated from the existing token (exp - iat)</p>
+        <h3 id="metalstack.api.v2.TenantServiceRemoveMemberResponse">TenantServiceRemoveMemberResponse</h3>
+        <p>TenantServiceRemoveMemberResponse is the response payload to a remove member request</p>
 
         
 
         
       
-        <h3 id="metalstack.api.v2.TokenServiceRefreshResponse">TokenServiceRefreshResponse</h3>
-        <p>TokenServiceRefreshResponse is the response payload of a token refresh request</p>
+        <h3 id="metalstack.api.v2.TenantServiceUpdateMemberRequest">TenantServiceUpdateMemberRequest</h3>
+        <p>TenantServiceUpdateMemberRequest is used to update a member from a tenant</p>
 
         
           <table class="field-table">
@@ -16487,17 +16827,24 @@ <h3 id="metalstack.api.v2.TokenServiceRefreshResponse">TokenServiceRefreshRespon
             <tbody>
               
                 <tr>
-                  <td>token</td>
-                  <td><a href="#metalstack.api.v2.Token">Token</a></td>
+                  <td>login</td>
+                  <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Token which was refreshed </p></td>
+                  <td><p>Login of the tenant </p></td>
                 </tr>
               
                 <tr>
-                  <td>secret</td>
+                  <td>member</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Secret is the body if the jwt token, should be used in api requests as bearer token </p></td>
+                  <td><p>Member is the id of the member to update in this tenant </p></td>
+                </tr>
+              
+                <tr>
+                  <td>role</td>
+                  <td><a href="#metalstack.api.v2.TenantRole">TenantRole</a></td>
+                  <td></td>
+                  <td><p>Role of this user in this tenant </p></td>
                 </tr>
               
             </tbody>
@@ -16507,8 +16854,8 @@ <h3 id="metalstack.api.v2.TokenServiceRefreshResponse">TokenServiceRefreshRespon
 
         
       
-        <h3 id="metalstack.api.v2.TokenServiceRevokeRequest">TokenServiceRevokeRequest</h3>
-        <p>TokenServiceRevokeRequest is the request payload of a token revoke request</p>
+        <h3 id="metalstack.api.v2.TenantServiceUpdateMemberResponse">TenantServiceUpdateMemberResponse</h3>
+        <p>TenantServiceUpdateMemberResponse is the response payload to a update member request</p>
 
         
           <table class="field-table">
@@ -16518,10 +16865,10 @@ <h3 id="metalstack.api.v2.TokenServiceRevokeRequest">TokenServiceRevokeRequest</
             <tbody>
               
                 <tr>
-                  <td>uuid</td>
-                  <td><a href="#string">string</a></td>
+                  <td>tenant_member</td>
+                  <td><a href="#metalstack.api.v2.TenantMember">TenantMember</a></td>
                   <td></td>
-                  <td><p>Uuid of the token to revoke </p></td>
+                  <td><p>TenantMember is the updated membership </p></td>
                 </tr>
               
             </tbody>
@@ -16531,15 +16878,8 @@ <h3 id="metalstack.api.v2.TokenServiceRevokeRequest">TokenServiceRevokeRequest</
 
         
       
-        <h3 id="metalstack.api.v2.TokenServiceRevokeResponse">TokenServiceRevokeResponse</h3>
-        <p>TokenServiceRevokeResponse is the response payload of a token revoke request</p>
-
-        
-
-        
-      
-        <h3 id="metalstack.api.v2.TokenServiceUpdateRequest">TokenServiceUpdateRequest</h3>
-        <p>TokenServiceUpdateRequest is the request payload of a token update request</p>
+        <h3 id="metalstack.api.v2.TenantServiceUpdateRequest">TenantServiceUpdateRequest</h3>
+        <p>TenantServiceUpdateRequest is the request payload of the tenant update request</p>
 
         
           <table class="field-table">
@@ -16549,74 +16889,76 @@ <h3 id="metalstack.api.v2.TokenServiceUpdateRequest">TokenServiceUpdateRequest</
             <tbody>
               
                 <tr>
-                  <td>uuid</td>
+                  <td>login</td>
                   <td><a href="#string">string</a></td>
                   <td></td>
-                  <td><p>Uuid of the token to update </p></td>
+                  <td><p>Login of the tenant </p></td>
                 </tr>
               
                 <tr>
                   <td>update_meta</td>
                   <td><a href="#metalstack.api.v2.UpdateMeta">UpdateMeta</a></td>
                   <td></td>
-                  <td><p>UpdateMeta contains the timestamp and strategy to be used in this update request
-TokenUpdate is not guarded with optlock in the backend </p></td>
+                  <td><p>UpdateMeta contains the timestamp and strategy to be used in this update request </p></td>
                 </tr>
               
                 <tr>
-                  <td>description</td>
+                  <td>name</td>
                   <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>Description is a user given description of this token. </p></td>
-                </tr>
-              
-                <tr>
-                  <td>permissions</td>
-                  <td><a href="#metalstack.api.v2.MethodPermission">MethodPermission</a></td>
-                  <td>repeated</td>
-                  <td><p>Permissions is a list of service methods this token can be used for </p></td>
+                  <td><p>Name of the tenant </p></td>
                 </tr>
               
                 <tr>
-                  <td>project_roles</td>
-                  <td><a href="#metalstack.api.v2.TokenServiceUpdateRequest.ProjectRolesEntry">TokenServiceUpdateRequest.ProjectRolesEntry</a></td>
-                  <td>repeated</td>
-                  <td><p>ProjectRoles associates a project id with the corresponding role of the token owner </p></td>
+                  <td>email</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Email of the tenant </p></td>
                 </tr>
               
                 <tr>
-                  <td>tenant_roles</td>
-                  <td><a href="#metalstack.api.v2.TokenServiceUpdateRequest.TenantRolesEntry">TokenServiceUpdateRequest.TenantRolesEntry</a></td>
-                  <td>repeated</td>
-                  <td><p>TenantRoles associates a tenant id with the corresponding role of the token owner </p></td>
+                  <td>description</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Description of this tenant </p></td>
                 </tr>
               
                 <tr>
-                  <td>admin_role</td>
-                  <td><a href="#metalstack.api.v2.AdminRole">AdminRole</a></td>
+                  <td>avatar_url</td>
+                  <td><a href="#string">string</a></td>
                   <td>optional</td>
-                  <td><p>AdminRole defines the admin role of the token owner </p></td>
+                  <td><p>AvatarUrl of the tenant </p></td>
                 </tr>
               
                 <tr>
-                  <td>infra_role</td>
-                  <td><a href="#metalstack.api.v2.InfraRole">InfraRole</a></td>
+                  <td>labels</td>
+                  <td><a href="#metalstack.api.v2.UpdateLabels">UpdateLabels</a></td>
                   <td>optional</td>
-                  <td><p>InfraRole defines the infrastructure role of the token owner </p></td>
+                  <td><p>Labels on the tenant </p></td>
                 </tr>
               
-                <tr>
-                  <td>machine_roles</td>
-                  <td><a href="#metalstack.api.v2.TokenServiceUpdateRequest.MachineRolesEntry">TokenServiceUpdateRequest.MachineRolesEntry</a></td>
-                  <td>repeated</td>
-                  <td><p>MachineRoles associates a machine uuid with the corresponding role of the token owner </p></td>
-                </tr>
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="metalstack.api.v2.TenantServiceUpdateResponse">TenantServiceUpdateResponse</h3>
+        <p>TenantServiceUpdateResponse is the response payload of the tenant update request</p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
               
                 <tr>
-                  <td>labels</td>
-                  <td><a href="#metalstack.api.v2.UpdateLabels">UpdateLabels</a></td>
+                  <td>tenant</td>
+                  <td><a href="#metalstack.api.v2.Tenant">Tenant</a></td>
                   <td></td>
-                  <td><p>Labels on this token </p></td>
+                  <td><p>Tenant is the tenant </p></td>
                 </tr>
               
             </tbody>
@@ -16626,8 +16968,125 @@ <h3 id="metalstack.api.v2.TokenServiceUpdateRequest">TokenServiceUpdateRequest</
 
         
       
-        <h3 id="metalstack.api.v2.TokenServiceUpdateRequest.MachineRolesEntry">TokenServiceUpdateRequest.MachineRolesEntry</h3>
-        <p></p>
+
+      
+
+      
+
+      
+        <h3 id="metalstack.api.v2.TenantService">TenantService</h3>
+        <p>TenantService serves tenant related functions</p>
+        <table class="enum-table">
+          <thead>
+            <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>Create</td>
+                <td><a href="#metalstack.api.v2.TenantServiceCreateRequest">TenantServiceCreateRequest</a></td>
+                <td><a href="#metalstack.api.v2.TenantServiceCreateResponse">TenantServiceCreateResponse</a></td>
+                <td><p>Create a tenant</p></td>
+              </tr>
+            
+              <tr>
+                <td>List</td>
+                <td><a href="#metalstack.api.v2.TenantServiceListRequest">TenantServiceListRequest</a></td>
+                <td><a href="#metalstack.api.v2.TenantServiceListResponse">TenantServiceListResponse</a></td>
+                <td><p>List tenants</p></td>
+              </tr>
+            
+              <tr>
+                <td>Get</td>
+                <td><a href="#metalstack.api.v2.TenantServiceGetRequest">TenantServiceGetRequest</a></td>
+                <td><a href="#metalstack.api.v2.TenantServiceGetResponse">TenantServiceGetResponse</a></td>
+                <td><p>Get a tenant</p></td>
+              </tr>
+            
+              <tr>
+                <td>Update</td>
+                <td><a href="#metalstack.api.v2.TenantServiceUpdateRequest">TenantServiceUpdateRequest</a></td>
+                <td><a href="#metalstack.api.v2.TenantServiceUpdateResponse">TenantServiceUpdateResponse</a></td>
+                <td><p>Update a tenant</p></td>
+              </tr>
+            
+              <tr>
+                <td>Delete</td>
+                <td><a href="#metalstack.api.v2.TenantServiceDeleteRequest">TenantServiceDeleteRequest</a></td>
+                <td><a href="#metalstack.api.v2.TenantServiceDeleteResponse">TenantServiceDeleteResponse</a></td>
+                <td><p>Delete a tenant</p></td>
+              </tr>
+            
+              <tr>
+                <td>Leave</td>
+                <td><a href="#metalstack.api.v2.TenantServiceLeaveRequest">TenantServiceLeaveRequest</a></td>
+                <td><a href="#metalstack.api.v2.TenantServiceLeaveResponse">TenantServiceLeaveResponse</a></td>
+                <td><p>Leave remove a member of a tenant</p></td>
+              </tr>
+            
+              <tr>
+                <td>RemoveMember</td>
+                <td><a href="#metalstack.api.v2.TenantServiceRemoveMemberRequest">TenantServiceRemoveMemberRequest</a></td>
+                <td><a href="#metalstack.api.v2.TenantServiceRemoveMemberResponse">TenantServiceRemoveMemberResponse</a></td>
+                <td><p>RemoveMember remove a member of a tenant</p></td>
+              </tr>
+            
+              <tr>
+                <td>UpdateMember</td>
+                <td><a href="#metalstack.api.v2.TenantServiceUpdateMemberRequest">TenantServiceUpdateMemberRequest</a></td>
+                <td><a href="#metalstack.api.v2.TenantServiceUpdateMemberResponse">TenantServiceUpdateMemberResponse</a></td>
+                <td><p>UpdateMember update a member of a tenant</p></td>
+              </tr>
+            
+              <tr>
+                <td>Invite</td>
+                <td><a href="#metalstack.api.v2.TenantServiceInviteRequest">TenantServiceInviteRequest</a></td>
+                <td><a href="#metalstack.api.v2.TenantServiceInviteResponse">TenantServiceInviteResponse</a></td>
+                <td><p>Invite a user to a tenant</p></td>
+              </tr>
+            
+              <tr>
+                <td>InviteAccept</td>
+                <td><a href="#metalstack.api.v2.TenantServiceInviteAcceptRequest">TenantServiceInviteAcceptRequest</a></td>
+                <td><a href="#metalstack.api.v2.TenantServiceInviteAcceptResponse">TenantServiceInviteAcceptResponse</a></td>
+                <td><p>InviteAccept is called from a user to accept an invitation</p></td>
+              </tr>
+            
+              <tr>
+                <td>InviteDelete</td>
+                <td><a href="#metalstack.api.v2.TenantServiceInviteDeleteRequest">TenantServiceInviteDeleteRequest</a></td>
+                <td><a href="#metalstack.api.v2.TenantServiceInviteDeleteResponse">TenantServiceInviteDeleteResponse</a></td>
+                <td><p>InviteDelete deletes a pending invitation</p></td>
+              </tr>
+            
+              <tr>
+                <td>InvitesList</td>
+                <td><a href="#metalstack.api.v2.TenantServiceInvitesListRequest">TenantServiceInvitesListRequest</a></td>
+                <td><a href="#metalstack.api.v2.TenantServiceInvitesListResponse">TenantServiceInvitesListResponse</a></td>
+                <td><p>InvitesList list all invites to a tenant</p></td>
+              </tr>
+            
+              <tr>
+                <td>InviteGet</td>
+                <td><a href="#metalstack.api.v2.TenantServiceInviteGetRequest">TenantServiceInviteGetRequest</a></td>
+                <td><a href="#metalstack.api.v2.TenantServiceInviteGetResponse">TenantServiceInviteGetResponse</a></td>
+                <td><p>InviteGet get an invite</p></td>
+              </tr>
+            
+          </tbody>
+        </table>
+
+        
+    
+      
+      <div class="file-heading">
+        <h2 id="metalstack/admin/v2/tenant.proto">metalstack/admin/v2/tenant.proto</h2><a href="#title">Top</a>
+      </div>
+      <p></p>
+
+      
+        <h3 id="metalstack.admin.v2.TenantServiceCreateRequest">TenantServiceCreateRequest</h3>
+        <p>TenantServiceCreateRequest is the request payload of the tenant create request</p>
 
         
           <table class="field-table">
@@ -16637,17 +17096,38 @@ <h3 id="metalstack.api.v2.TokenServiceUpdateRequest.MachineRolesEntry">TokenServ
             <tbody>
               
                 <tr>
-                  <td>key</td>
+                  <td>name</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>Name of this tenant </p></td>
+                </tr>
+              
+                <tr>
+                  <td>description</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Description of this tenant </p></td>
+                </tr>
+              
+                <tr>
+                  <td>email</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Email of the tenant, if not set will be inherited from the creator </p></td>
+                </tr>
+              
+                <tr>
+                  <td>avatar_url</td>
                   <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p> </p></td>
+                  <td>optional</td>
+                  <td><p>AvatarUrl of the tenant </p></td>
                 </tr>
               
                 <tr>
-                  <td>value</td>
-                  <td><a href="#metalstack.api.v2.MachineRole">MachineRole</a></td>
+                  <td>labels</td>
+                  <td><a href="#metalstack.api.v2.Labels">metalstack.api.v2.Labels</a></td>
                   <td></td>
-                  <td><p> </p></td>
+                  <td><p>Labels on the tenant </p></td>
                 </tr>
               
             </tbody>
@@ -16657,8 +17137,8 @@ <h3 id="metalstack.api.v2.TokenServiceUpdateRequest.MachineRolesEntry">TokenServ
 
         
       
-        <h3 id="metalstack.api.v2.TokenServiceUpdateRequest.ProjectRolesEntry">TokenServiceUpdateRequest.ProjectRolesEntry</h3>
-        <p></p>
+        <h3 id="metalstack.admin.v2.TenantServiceCreateResponse">TenantServiceCreateResponse</h3>
+        <p>TenantServiceCreateResponse is the response payload of the tenant create request</p>
 
         
           <table class="field-table">
@@ -16668,17 +17148,10 @@ <h3 id="metalstack.api.v2.TokenServiceUpdateRequest.ProjectRolesEntry">TokenServ
             <tbody>
               
                 <tr>
-                  <td>key</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p> </p></td>
-                </tr>
-              
-                <tr>
-                  <td>value</td>
-                  <td><a href="#metalstack.api.v2.ProjectRole">ProjectRole</a></td>
+                  <td>tenant</td>
+                  <td><a href="#metalstack.api.v2.Tenant">metalstack.api.v2.Tenant</a></td>
                   <td></td>
-                  <td><p> </p></td>
+                  <td><p>Tenant is the tenant </p></td>
                 </tr>
               
             </tbody>
@@ -16688,8 +17161,8 @@ <h3 id="metalstack.api.v2.TokenServiceUpdateRequest.ProjectRolesEntry">TokenServ
 
         
       
-        <h3 id="metalstack.api.v2.TokenServiceUpdateRequest.TenantRolesEntry">TokenServiceUpdateRequest.TenantRolesEntry</h3>
-        <p></p>
+        <h3 id="metalstack.admin.v2.TenantServiceListRequest">TenantServiceListRequest</h3>
+        <p>TenantServiceListRequest is the request payload for a tenant list request</p>
 
         
           <table class="field-table">
@@ -16699,17 +17172,24 @@ <h3 id="metalstack.api.v2.TokenServiceUpdateRequest.TenantRolesEntry">TokenServi
             <tbody>
               
                 <tr>
-                  <td>key</td>
+                  <td>login</td>
                   <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p> </p></td>
+                  <td>optional</td>
+                  <td><p>Login of the tenant to list </p></td>
                 </tr>
               
                 <tr>
-                  <td>value</td>
-                  <td><a href="#metalstack.api.v2.TenantRole">TenantRole</a></td>
+                  <td>name</td>
+                  <td><a href="#string">string</a></td>
+                  <td>optional</td>
+                  <td><p>Name of the tenant to list </p></td>
+                </tr>
+              
+                <tr>
+                  <td>paging</td>
+                  <td><a href="#metalstack.api.v2.Paging">metalstack.api.v2.Paging</a></td>
                   <td></td>
-                  <td><p> </p></td>
+                  <td><p>Paging details for the list request </p></td>
                 </tr>
               
             </tbody>
@@ -16719,8 +17199,8 @@ <h3 id="metalstack.api.v2.TokenServiceUpdateRequest.TenantRolesEntry">TokenServi
 
         
       
-        <h3 id="metalstack.api.v2.TokenServiceUpdateResponse">TokenServiceUpdateResponse</h3>
-        <p>TokenServiceUpdateResponse is the response payload of a token update request</p>
+        <h3 id="metalstack.admin.v2.TenantServiceListResponse">TenantServiceListResponse</h3>
+        <p>TenantServiceListResponse is the response payload for a tenant list request</p>
 
         
           <table class="field-table">
@@ -16730,10 +17210,17 @@ <h3 id="metalstack.api.v2.TokenServiceUpdateResponse">TokenServiceUpdateResponse
             <tbody>
               
                 <tr>
-                  <td>token</td>
-                  <td><a href="#metalstack.api.v2.Token">Token</a></td>
-                  <td></td>
-                  <td><p>Token is the updated token </p></td>
+                  <td>tenants</td>
+                  <td><a href="#metalstack.api.v2.Tenant">metalstack.api.v2.Tenant</a></td>
+                  <td>repeated</td>
+                  <td><p>Tenants are the list of tenants </p></td>
+                </tr>
+              
+                <tr>
+                  <td>next_page</td>
+                  <td><a href="#uint64">uint64</a></td>
+                  <td>optional</td>
+                  <td><p>NextPage is used for pagination, returns the next page to be fetched and must then be provided in the list request. </p></td>
                 </tr>
               
             </tbody>
@@ -16745,87 +17232,30 @@ <h3 id="metalstack.api.v2.TokenServiceUpdateResponse">TokenServiceUpdateResponse
       
 
       
-        <h3 id="metalstack.api.v2.TokenType">TokenType</h3>
-        <p>TokenType specifies different use cases of tokens</p>
-        <table class="enum-table">
-          <thead>
-            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
-          </thead>
-          <tbody>
-            
-              <tr>
-                <td>TOKEN_TYPE_UNSPECIFIED</td>
-                <td>0</td>
-                <td><p>TOKEN_TYPE_UNSPECIFIED is not specified</p></td>
-              </tr>
-            
-              <tr>
-                <td>TOKEN_TYPE_API</td>
-                <td>1</td>
-                <td><p>TOKEN_TYPE_API is a token for api usage</p></td>
-              </tr>
-            
-              <tr>
-                <td>TOKEN_TYPE_USER</td>
-                <td>2</td>
-                <td><p>TOKEN_TYPE_USER is a token to access the api with cli, a web application or other user induced actions.</p></td>
-              </tr>
-            
-          </tbody>
-        </table>
-      
 
       
 
       
-        <h3 id="metalstack.api.v2.TokenService">TokenService</h3>
-        <p>TokenService serves token related functions</p>
+        <h3 id="metalstack.admin.v2.TenantService">TenantService</h3>
+        <p>TenantService serves tenant related functions</p>
         <table class="enum-table">
           <thead>
             <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
           </thead>
           <tbody>
             
-              <tr>
-                <td>Get</td>
-                <td><a href="#metalstack.api.v2.TokenServiceGetRequest">TokenServiceGetRequest</a></td>
-                <td><a href="#metalstack.api.v2.TokenServiceGetResponse">TokenServiceGetResponse</a></td>
-                <td><p>Get a token</p></td>
-              </tr>
-            
               <tr>
                 <td>Create</td>
-                <td><a href="#metalstack.api.v2.TokenServiceCreateRequest">TokenServiceCreateRequest</a></td>
-                <td><a href="#metalstack.api.v2.TokenServiceCreateResponse">TokenServiceCreateResponse</a></td>
-                <td><p>Create a token to authenticate against the platform, the secret will be only visible in the response.</p></td>
-              </tr>
-            
-              <tr>
-                <td>Update</td>
-                <td><a href="#metalstack.api.v2.TokenServiceUpdateRequest">TokenServiceUpdateRequest</a></td>
-                <td><a href="#metalstack.api.v2.TokenServiceUpdateResponse">TokenServiceUpdateResponse</a></td>
-                <td><p>Update a token</p></td>
+                <td><a href="#metalstack.admin.v2.TenantServiceCreateRequest">TenantServiceCreateRequest</a></td>
+                <td><a href="#metalstack.admin.v2.TenantServiceCreateResponse">TenantServiceCreateResponse</a></td>
+                <td><p>Create a tenant</p></td>
               </tr>
             
               <tr>
                 <td>List</td>
-                <td><a href="#metalstack.api.v2.TokenServiceListRequest">TokenServiceListRequest</a></td>
-                <td><a href="#metalstack.api.v2.TokenServiceListResponse">TokenServiceListResponse</a></td>
-                <td><p>List all your tokens</p></td>
-              </tr>
-            
-              <tr>
-                <td>Revoke</td>
-                <td><a href="#metalstack.api.v2.TokenServiceRevokeRequest">TokenServiceRevokeRequest</a></td>
-                <td><a href="#metalstack.api.v2.TokenServiceRevokeResponse">TokenServiceRevokeResponse</a></td>
-                <td><p>Revoke a token, no further usage is possible afterwards</p></td>
-              </tr>
-            
-              <tr>
-                <td>Refresh</td>
-                <td><a href="#metalstack.api.v2.TokenServiceRefreshRequest">TokenServiceRefreshRequest</a></td>
-                <td><a href="#metalstack.api.v2.TokenServiceRefreshResponse">TokenServiceRefreshResponse</a></td>
-                <td><p>Refresh a token, this will create a new token with the exact same permissions as the calling token contains</p></td>
+                <td><a href="#metalstack.admin.v2.TenantServiceListRequest">TenantServiceListRequest</a></td>
+                <td><a href="#metalstack.admin.v2.TenantServiceListResponse">TenantServiceListResponse</a></td>
+                <td><p>List all tenants</p></td>
               </tr>
             
           </tbody>
@@ -17933,115 +18363,6 @@ <h3 id="metalstack.api.v2.UserService">UserService</h3>
         
     
       
-      <div class="file-heading">
-        <h2 id="metalstack/api/v2/version.proto">metalstack/api/v2/version.proto</h2><a href="#title">Top</a>
-      </div>
-      <p></p>
-
-      
-        <h3 id="metalstack.api.v2.Version">Version</h3>
-        <p>Version of the application</p>
-
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
-              
-                <tr>
-                  <td>version</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Version of the application </p></td>
-                </tr>
-              
-                <tr>
-                  <td>revision</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>Revision of the application </p></td>
-                </tr>
-              
-                <tr>
-                  <td>git_sha1</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>GitSHA1 of the application </p></td>
-                </tr>
-              
-                <tr>
-                  <td>build_date</td>
-                  <td><a href="#string">string</a></td>
-                  <td></td>
-                  <td><p>BuildDate of the application </p></td>
-                </tr>
-              
-            </tbody>
-          </table>
-
-          
-
-        
-      
-        <h3 id="metalstack.api.v2.VersionServiceGetRequest">VersionServiceGetRequest</h3>
-        <p>VersionServiceGetRequest is the request payload to get the version</p>
-
-        
-
-        
-      
-        <h3 id="metalstack.api.v2.VersionServiceGetResponse">VersionServiceGetResponse</h3>
-        <p>VersionServiceGetResponse is the response payload with the version</p>
-
-        
-          <table class="field-table">
-            <thead>
-              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
-            </thead>
-            <tbody>
-              
-                <tr>
-                  <td>version</td>
-                  <td><a href="#metalstack.api.v2.Version">Version</a></td>
-                  <td></td>
-                  <td><p>Version of the application </p></td>
-                </tr>
-              
-            </tbody>
-          </table>
-
-          
-
-        
-      
-
-      
-
-      
-
-      
-        <h3 id="metalstack.api.v2.VersionService">VersionService</h3>
-        <p>VersionService serves version related functions</p>
-        <table class="enum-table">
-          <thead>
-            <tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>
-          </thead>
-          <tbody>
-            
-              <tr>
-                <td>Get</td>
-                <td><a href="#metalstack.api.v2.VersionServiceGetRequest">VersionServiceGetRequest</a></td>
-                <td><a href="#metalstack.api.v2.VersionServiceGetResponse">VersionServiceGetResponse</a></td>
-                <td><p>Get the version</p></td>
-              </tr>
-            
-          </tbody>
-        </table>
-
-        
-    
-      
       <div class="file-heading">
         <h2 id="metalstack/infra/v2/bmc.proto">metalstack/infra/v2/bmc.proto</h2><a href="#title">Top</a>
       </div>
diff --git a/generate/Makefile b/generate/Makefile
index b58fb34e..3fe460f3 100644
--- a/generate/Makefile
+++ b/generate/Makefile
@@ -17,4 +17,4 @@ go-mocks:
 		--tmpfs /.cache:uid=$$(id -u),gid=$$(id -g) \
 		-w /work \
 		-v ${PWD}:/work \
-		vektra/mockery:v3.6.3
+		vektra/mockery:v3.6.4
diff --git a/go.mod b/go.mod
index bb6dac42..a5a42311 100644
--- a/go.mod
+++ b/go.mod
@@ -1,10 +1,10 @@
 module github.com/metal-stack/api
 
-go 1.25
+go 1.26
 
 require (
 	buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.11-20260209202127-80ab13bee0bf.1
-	buf.build/go/protovalidate v1.1.0
+	buf.build/go/protovalidate v1.1.2
 	connectrpc.com/connect v1.19.1
 	github.com/bufbuild/protocompile v0.14.1
 	github.com/go-task/slim-sprig/v3 v3.0.0
@@ -25,7 +25,7 @@ require (
 	github.com/minio/minlz v1.0.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/stretchr/objx v0.5.3 // indirect
-	golang.org/x/exp v0.0.0-20260209203927-2842357ff358 // indirect
+	golang.org/x/exp v0.0.0-20260212183809-81e46e3db34a // indirect
 	golang.org/x/text v0.34.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20260209200024-4cfbd4190f57 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20260209200024-4cfbd4190f57 // indirect
diff --git a/go.sum b/go.sum
index 965c62d0..39b99ab0 100644
--- a/go.sum
+++ b/go.sum
@@ -1,7 +1,7 @@
 buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.11-20260209202127-80ab13bee0bf.1 h1:PMmTMyvHScV9Mn8wc6ASge9uRcHy0jtqPd+fM35LmsQ=
 buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.11-20260209202127-80ab13bee0bf.1/go.mod h1:tvtbpgaVXZX4g6Pn+AnzFycuRK3MOz5HJfEGeEllXYM=
-buf.build/go/protovalidate v1.1.0 h1:pQqEQRpOo4SqS60qkvmhLTTQU9JwzEvdyiqAtXa5SeY=
-buf.build/go/protovalidate v1.1.0/go.mod h1:bGZcPiAQDC3ErCHK3t74jSoJDFOs2JH3d7LWuTEIdss=
+buf.build/go/protovalidate v1.1.2 h1:83vYHoY8f34hB8MeitGaYE3CGVPFxwdEUuskh5qQpA0=
+buf.build/go/protovalidate v1.1.2/go.mod h1:Ez3z+w4c+wG+EpW8ovgZaZPnPl2XVF6kaxgcv1NG/QE=
 cel.dev/expr v0.25.1 h1:1KrZg61W6TWSxuNZ37Xy49ps13NUovb66QLprthtwi4=
 cel.dev/expr v0.25.1/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4=
 connectrpc.com/connect v1.19.1 h1:R5M57z05+90EfEvCY1b7hBxDVOUl45PrtXtAV2fOC14=
@@ -49,8 +49,8 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
 go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
-golang.org/x/exp v0.0.0-20260209203927-2842357ff358 h1:kpfSV7uLwKJbFSEgNhWzGSL47NDSF/5pYYQw1V0ub6c=
-golang.org/x/exp v0.0.0-20260209203927-2842357ff358/go.mod h1:R3t0oliuryB5eenPWl3rrQxwnNM3WTwnsRZZiXLAAW8=
+golang.org/x/exp v0.0.0-20260212183809-81e46e3db34a h1:ovFr6Z0MNmU7nH8VaX5xqw+05ST2uO1exVfZPVqRC5o=
+golang.org/x/exp v0.0.0-20260212183809-81e46e3db34a/go.mod h1:K79w1Vqn7PoiZn+TkNpx3BUWUQksGO3JcVX6qIjytmA=
 golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk=
 golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA=
 google.golang.org/genproto/googleapis/api v0.0.0-20260209200024-4cfbd4190f57 h1:JLQynH/LBHfCTSbDWl+py8C+Rg/k1OVH3xfcaiANuF0=
diff --git a/go/client/client.go b/go/client/client.go
index 79704409..e8fcab3e 100755
--- a/go/client/client.go
+++ b/go/client/client.go
@@ -22,6 +22,7 @@ type (
 		interceptors []connect.Interceptor
 	}
 	Adminv2 interface {
+		Component() adminv2connect.ComponentServiceClient
 		Filesystem() adminv2connect.FilesystemServiceClient
 		Image() adminv2connect.ImageServiceClient
 		IP() adminv2connect.IPServiceClient
@@ -39,6 +40,7 @@ type (
 	}
 
 	adminv2 struct {
+		componentservice       adminv2connect.ComponentServiceClient
 		filesystemservice      adminv2connect.FilesystemServiceClient
 		imageservice           adminv2connect.ImageServiceClient
 		ipservice              adminv2connect.IPServiceClient
@@ -94,15 +96,17 @@ type (
 	Infrav2 interface {
 		BMC() infrav2connect.BMCServiceClient
 		Boot() infrav2connect.BootServiceClient
+		Component() infrav2connect.ComponentServiceClient
 		Event() infrav2connect.EventServiceClient
 		Switch() infrav2connect.SwitchServiceClient
 	}
 
 	infrav2 struct {
-		bmcservice    infrav2connect.BMCServiceClient
-		bootservice   infrav2connect.BootServiceClient
-		eventservice  infrav2connect.EventServiceClient
-		switchservice infrav2connect.SwitchServiceClient
+		bmcservice       infrav2connect.BMCServiceClient
+		bootservice      infrav2connect.BootServiceClient
+		componentservice infrav2connect.ComponentServiceClient
+		eventservice     infrav2connect.EventServiceClient
+		switchservice    infrav2connect.SwitchServiceClient
 	}
 )
 
@@ -137,6 +141,12 @@ func New(config *DialConfig) (Client, error) {
 
 func (c *client) Adminv2() Adminv2 {
 	a := &adminv2{
+		componentservice: adminv2connect.NewComponentServiceClient(
+			c.config.HttpClient(),
+			c.config.BaseURL,
+			connect.WithInterceptors(c.interceptors...),
+			compress.WithAll(compress.LevelBalanced),
+		),
 		filesystemservice: adminv2connect.NewFilesystemServiceClient(
 			c.config.HttpClient(),
 			c.config.BaseURL,
@@ -225,6 +235,9 @@ func (c *client) Adminv2() Adminv2 {
 	return a
 }
 
+func (c *adminv2) Component() adminv2connect.ComponentServiceClient {
+	return c.componentservice
+}
 func (c *adminv2) Filesystem() adminv2connect.FilesystemServiceClient {
 	return c.filesystemservice
 }
@@ -424,6 +437,12 @@ func (c *client) Infrav2() Infrav2 {
 			connect.WithInterceptors(c.interceptors...),
 			compress.WithAll(compress.LevelBalanced),
 		),
+		componentservice: infrav2connect.NewComponentServiceClient(
+			c.config.HttpClient(),
+			c.config.BaseURL,
+			connect.WithInterceptors(c.interceptors...),
+			compress.WithAll(compress.LevelBalanced),
+		),
 		eventservice: infrav2connect.NewEventServiceClient(
 			c.config.HttpClient(),
 			c.config.BaseURL,
@@ -446,6 +465,9 @@ func (c *infrav2) BMC() infrav2connect.BMCServiceClient {
 func (c *infrav2) Boot() infrav2connect.BootServiceClient {
 	return c.bootservice
 }
+func (c *infrav2) Component() infrav2connect.ComponentServiceClient {
+	return c.componentservice
+}
 func (c *infrav2) Event() infrav2connect.EventServiceClient {
 	return c.eventservice
 }
diff --git a/go/metalstack/admin/v2/adminv2connect/component.connect.go b/go/metalstack/admin/v2/adminv2connect/component.connect.go
new file mode 100644
index 00000000..7010f538
--- /dev/null
+++ b/go/metalstack/admin/v2/adminv2connect/component.connect.go
@@ -0,0 +1,114 @@
+// Code generated by protoc-gen-connect-go. DO NOT EDIT.
+//
+// Source: metalstack/admin/v2/component.proto
+
+package adminv2connect
+
+import (
+	connect "connectrpc.com/connect"
+	context "context"
+	errors "errors"
+	v2 "github.com/metal-stack/api/go/metalstack/admin/v2"
+	http "net/http"
+	strings "strings"
+)
+
+// This is a compile-time assertion to ensure that this generated file and the connect package are
+// compatible. If you get a compiler error that this constant is not defined, this code was
+// generated with a version of connect newer than the one compiled into your binary. You can fix the
+// problem by either regenerating this code with an older version of connect or updating the connect
+// version compiled into your binary.
+const _ = connect.IsAtLeastVersion1_13_0
+
+const (
+	// ComponentServiceName is the fully-qualified name of the ComponentService service.
+	ComponentServiceName = "metalstack.admin.v2.ComponentService"
+)
+
+// These constants are the fully-qualified names of the RPCs defined in this package. They're
+// exposed at runtime as Spec.Procedure and as the final two segments of the HTTP route.
+//
+// Note that these are different from the fully-qualified method names used by
+// google.golang.org/protobuf/reflect/protoreflect. To convert from these constants to
+// reflection-formatted method names, remove the leading slash and convert the remaining slash to a
+// period.
+const (
+	// ComponentServiceListProcedure is the fully-qualified name of the ComponentService's List RPC.
+	ComponentServiceListProcedure = "/metalstack.admin.v2.ComponentService/List"
+)
+
+// ComponentServiceClient is a client for the metalstack.admin.v2.ComponentService service.
+type ComponentServiceClient interface {
+	// List all components with their status
+	List(context.Context, *v2.ComponentServiceListRequest) (*v2.ComponentServiceListResponse, error)
+}
+
+// NewComponentServiceClient constructs a client for the metalstack.admin.v2.ComponentService
+// service. By default, it uses the Connect protocol with the binary Protobuf Codec, asks for
+// gzipped responses, and sends uncompressed requests. To use the gRPC or gRPC-Web protocols, supply
+// the connect.WithGRPC() or connect.WithGRPCWeb() options.
+//
+// The URL supplied here should be the base URL for the Connect or gRPC server (for example,
+// http://api.acme.com or https://acme.com/grpc).
+func NewComponentServiceClient(httpClient connect.HTTPClient, baseURL string, opts ...connect.ClientOption) ComponentServiceClient {
+	baseURL = strings.TrimRight(baseURL, "/")
+	componentServiceMethods := v2.File_metalstack_admin_v2_component_proto.Services().ByName("ComponentService").Methods()
+	return &componentServiceClient{
+		list: connect.NewClient[v2.ComponentServiceListRequest, v2.ComponentServiceListResponse](
+			httpClient,
+			baseURL+ComponentServiceListProcedure,
+			connect.WithSchema(componentServiceMethods.ByName("List")),
+			connect.WithClientOptions(opts...),
+		),
+	}
+}
+
+// componentServiceClient implements ComponentServiceClient.
+type componentServiceClient struct {
+	list *connect.Client[v2.ComponentServiceListRequest, v2.ComponentServiceListResponse]
+}
+
+// List calls metalstack.admin.v2.ComponentService.List.
+func (c *componentServiceClient) List(ctx context.Context, req *v2.ComponentServiceListRequest) (*v2.ComponentServiceListResponse, error) {
+	response, err := c.list.CallUnary(ctx, connect.NewRequest(req))
+	if response != nil {
+		return response.Msg, err
+	}
+	return nil, err
+}
+
+// ComponentServiceHandler is an implementation of the metalstack.admin.v2.ComponentService service.
+type ComponentServiceHandler interface {
+	// List all components with their status
+	List(context.Context, *v2.ComponentServiceListRequest) (*v2.ComponentServiceListResponse, error)
+}
+
+// NewComponentServiceHandler builds an HTTP handler from the service implementation. It returns the
+// path on which to mount the handler and the handler itself.
+//
+// By default, handlers support the Connect, gRPC, and gRPC-Web protocols with the binary Protobuf
+// and JSON codecs. They also support gzip compression.
+func NewComponentServiceHandler(svc ComponentServiceHandler, opts ...connect.HandlerOption) (string, http.Handler) {
+	componentServiceMethods := v2.File_metalstack_admin_v2_component_proto.Services().ByName("ComponentService").Methods()
+	componentServiceListHandler := connect.NewUnaryHandlerSimple(
+		ComponentServiceListProcedure,
+		svc.List,
+		connect.WithSchema(componentServiceMethods.ByName("List")),
+		connect.WithHandlerOptions(opts...),
+	)
+	return "/metalstack.admin.v2.ComponentService/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		switch r.URL.Path {
+		case ComponentServiceListProcedure:
+			componentServiceListHandler.ServeHTTP(w, r)
+		default:
+			http.NotFound(w, r)
+		}
+	})
+}
+
+// UnimplementedComponentServiceHandler returns CodeUnimplemented from all methods.
+type UnimplementedComponentServiceHandler struct{}
+
+func (UnimplementedComponentServiceHandler) List(context.Context, *v2.ComponentServiceListRequest) (*v2.ComponentServiceListResponse, error) {
+	return nil, connect.NewError(connect.CodeUnimplemented, errors.New("metalstack.admin.v2.ComponentService.List is not implemented"))
+}
diff --git a/go/metalstack/admin/v2/component.pb.go b/go/metalstack/admin/v2/component.pb.go
new file mode 100644
index 00000000..c283a07f
--- /dev/null
+++ b/go/metalstack/admin/v2/component.pb.go
@@ -0,0 +1,287 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.36.11
+// 	protoc        (unknown)
+// source: metalstack/admin/v2/component.proto
+
+package adminv2
+
+import (
+	_ "buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go/buf/validate"
+	v21 "github.com/metal-stack/api/go/metalstack/api/v2"
+	v2 "github.com/metal-stack/api/go/metalstack/infra/v2"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
+	reflect "reflect"
+	sync "sync"
+	unsafe "unsafe"
+)
+
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+// ComponentServiceListRequest
+type ComponentServiceListRequest struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *ComponentServiceListRequest) Reset() {
+	*x = ComponentServiceListRequest{}
+	mi := &file_metalstack_admin_v2_component_proto_msgTypes[0]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *ComponentServiceListRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ComponentServiceListRequest) ProtoMessage() {}
+
+func (x *ComponentServiceListRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_metalstack_admin_v2_component_proto_msgTypes[0]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ComponentServiceListRequest.ProtoReflect.Descriptor instead.
+func (*ComponentServiceListRequest) Descriptor() ([]byte, []int) {
+	return file_metalstack_admin_v2_component_proto_rawDescGZIP(), []int{0}
+}
+
+// ComponentServiceListResponse
+type ComponentServiceListResponse struct {
+	state protoimpl.MessageState `protogen:"open.v1"`
+	// Components
+	Components    []*Component `protobuf:"bytes,1,rep,name=components,proto3" json:"components,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *ComponentServiceListResponse) Reset() {
+	*x = ComponentServiceListResponse{}
+	mi := &file_metalstack_admin_v2_component_proto_msgTypes[1]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *ComponentServiceListResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ComponentServiceListResponse) ProtoMessage() {}
+
+func (x *ComponentServiceListResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_metalstack_admin_v2_component_proto_msgTypes[1]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ComponentServiceListResponse.ProtoReflect.Descriptor instead.
+func (*ComponentServiceListResponse) Descriptor() ([]byte, []int) {
+	return file_metalstack_admin_v2_component_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *ComponentServiceListResponse) GetComponents() []*Component {
+	if x != nil {
+		return x.Components
+	}
+	return nil
+}
+
+// Component represents a microservice connected to our apiserver
+type Component struct {
+	state protoimpl.MessageState `protogen:"open.v1"`
+	// UUID identifies this component event
+	Uuid string `protobuf:"bytes,1,opt,name=uuid,proto3" json:"uuid,omitempty"`
+	// Type defines which service is actually pinging
+	Type v2.ComponentType `protobuf:"varint,2,opt,name=type,proto3,enum=metalstack.infra.v2.ComponentType" json:"type,omitempty"`
+	// Identifier is a unique identifier of this service, e.g. if two instance are running, this might be the pod id.
+	// micro_service and identifier guarantee uniqueness.
+	Identifier string `protobuf:"bytes,3,opt,name=identifier,proto3" json:"identifier,omitempty"`
+	// StartedAt is the timestamp this service was started
+	StartedAt *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=started_at,json=startedAt,proto3" json:"started_at,omitempty"`
+	// Version of this service
+	Version *v21.Version `protobuf:"bytes,5,opt,name=version,proto3" json:"version,omitempty"`
+	// Token is the token which is actually used by this microservice.
+	Token         *v21.Token `protobuf:"bytes,6,opt,name=token,proto3" json:"token,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *Component) Reset() {
+	*x = Component{}
+	mi := &file_metalstack_admin_v2_component_proto_msgTypes[2]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *Component) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Component) ProtoMessage() {}
+
+func (x *Component) ProtoReflect() protoreflect.Message {
+	mi := &file_metalstack_admin_v2_component_proto_msgTypes[2]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use Component.ProtoReflect.Descriptor instead.
+func (*Component) Descriptor() ([]byte, []int) {
+	return file_metalstack_admin_v2_component_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *Component) GetUuid() string {
+	if x != nil {
+		return x.Uuid
+	}
+	return ""
+}
+
+func (x *Component) GetType() v2.ComponentType {
+	if x != nil {
+		return x.Type
+	}
+	return v2.ComponentType(0)
+}
+
+func (x *Component) GetIdentifier() string {
+	if x != nil {
+		return x.Identifier
+	}
+	return ""
+}
+
+func (x *Component) GetStartedAt() *timestamppb.Timestamp {
+	if x != nil {
+		return x.StartedAt
+	}
+	return nil
+}
+
+func (x *Component) GetVersion() *v21.Version {
+	if x != nil {
+		return x.Version
+	}
+	return nil
+}
+
+func (x *Component) GetToken() *v21.Token {
+	if x != nil {
+		return x.Token
+	}
+	return nil
+}
+
+var File_metalstack_admin_v2_component_proto protoreflect.FileDescriptor
+
+const file_metalstack_admin_v2_component_proto_rawDesc = "" +
+	"\n" +
+	"#metalstack/admin/v2/component.proto\x12\x13metalstack.admin.v2\x1a\x1bbuf/validate/validate.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1emetalstack/api/v2/common.proto\x1a(metalstack/api/v2/predefined_rules.proto\x1a\x1dmetalstack/api/v2/token.proto\x1a\x1fmetalstack/api/v2/version.proto\x1a#metalstack/infra/v2/component.proto\"\x1d\n" +
+	"\x1bComponentServiceListRequest\"^\n" +
+	"\x1cComponentServiceListResponse\x12>\n" +
+	"\n" +
+	"components\x18\x01 \x03(\v2\x1e.metalstack.admin.v2.ComponentR\n" +
+	"components\"\xb9\x02\n" +
+	"\tComponent\x12\x1c\n" +
+	"\x04uuid\x18\x01 \x01(\tB\b\xbaH\x05r\x03\xb0\x01\x01R\x04uuid\x12@\n" +
+	"\x04type\x18\x02 \x01(\x0e2\".metalstack.infra.v2.ComponentTypeB\b\xbaH\x05\x82\x01\x02\x10\x01R\x04type\x12+\n" +
+	"\n" +
+	"identifier\x18\x03 \x01(\tB\v\xbaH\br\x06\xc0\xb3\xae\xb1\x02\x01R\n" +
+	"identifier\x129\n" +
+	"\n" +
+	"started_at\x18\x04 \x01(\v2\x1a.google.protobuf.TimestampR\tstartedAt\x124\n" +
+	"\aversion\x18\x05 \x01(\v2\x1a.metalstack.api.v2.VersionR\aversion\x12.\n" +
+	"\x05token\x18\x06 \x01(\v2\x18.metalstack.api.v2.TokenR\x05token2\x8b\x01\n" +
+	"\x10ComponentService\x12w\n" +
+	"\x04List\x120.metalstack.admin.v2.ComponentServiceListRequest\x1a1.metalstack.admin.v2.ComponentServiceListResponse\"\n" +
+	"\xd2\xf3\x18\x02\x01\x02\xe0\xf3\x18\x02B\xd2\x01\n" +
+	"\x17com.metalstack.admin.v2B\x0eComponentProtoP\x01Z9github.com/metal-stack/api/go/metalstack/admin/v2;adminv2\xa2\x02\x03MAX\xaa\x02\x13Metalstack.Admin.V2\xca\x02\x13Metalstack\\Admin\\V2\xe2\x02\x1fMetalstack\\Admin\\V2\\GPBMetadata\xea\x02\x15Metalstack::Admin::V2b\x06proto3"
+
+var (
+	file_metalstack_admin_v2_component_proto_rawDescOnce sync.Once
+	file_metalstack_admin_v2_component_proto_rawDescData []byte
+)
+
+func file_metalstack_admin_v2_component_proto_rawDescGZIP() []byte {
+	file_metalstack_admin_v2_component_proto_rawDescOnce.Do(func() {
+		file_metalstack_admin_v2_component_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_metalstack_admin_v2_component_proto_rawDesc), len(file_metalstack_admin_v2_component_proto_rawDesc)))
+	})
+	return file_metalstack_admin_v2_component_proto_rawDescData
+}
+
+var file_metalstack_admin_v2_component_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
+var file_metalstack_admin_v2_component_proto_goTypes = []any{
+	(*ComponentServiceListRequest)(nil),  // 0: metalstack.admin.v2.ComponentServiceListRequest
+	(*ComponentServiceListResponse)(nil), // 1: metalstack.admin.v2.ComponentServiceListResponse
+	(*Component)(nil),                    // 2: metalstack.admin.v2.Component
+	(v2.ComponentType)(0),                // 3: metalstack.infra.v2.ComponentType
+	(*timestamppb.Timestamp)(nil),        // 4: google.protobuf.Timestamp
+	(*v21.Version)(nil),                  // 5: metalstack.api.v2.Version
+	(*v21.Token)(nil),                    // 6: metalstack.api.v2.Token
+}
+var file_metalstack_admin_v2_component_proto_depIdxs = []int32{
+	2, // 0: metalstack.admin.v2.ComponentServiceListResponse.components:type_name -> metalstack.admin.v2.Component
+	3, // 1: metalstack.admin.v2.Component.type:type_name -> metalstack.infra.v2.ComponentType
+	4, // 2: metalstack.admin.v2.Component.started_at:type_name -> google.protobuf.Timestamp
+	5, // 3: metalstack.admin.v2.Component.version:type_name -> metalstack.api.v2.Version
+	6, // 4: metalstack.admin.v2.Component.token:type_name -> metalstack.api.v2.Token
+	0, // 5: metalstack.admin.v2.ComponentService.List:input_type -> metalstack.admin.v2.ComponentServiceListRequest
+	1, // 6: metalstack.admin.v2.ComponentService.List:output_type -> metalstack.admin.v2.ComponentServiceListResponse
+	6, // [6:7] is the sub-list for method output_type
+	5, // [5:6] is the sub-list for method input_type
+	5, // [5:5] is the sub-list for extension type_name
+	5, // [5:5] is the sub-list for extension extendee
+	0, // [0:5] is the sub-list for field type_name
+}
+
+func init() { file_metalstack_admin_v2_component_proto_init() }
+func file_metalstack_admin_v2_component_proto_init() {
+	if File_metalstack_admin_v2_component_proto != nil {
+		return
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: unsafe.Slice(unsafe.StringData(file_metalstack_admin_v2_component_proto_rawDesc), len(file_metalstack_admin_v2_component_proto_rawDesc)),
+			NumEnums:      0,
+			NumMessages:   3,
+			NumExtensions: 0,
+			NumServices:   1,
+		},
+		GoTypes:           file_metalstack_admin_v2_component_proto_goTypes,
+		DependencyIndexes: file_metalstack_admin_v2_component_proto_depIdxs,
+		MessageInfos:      file_metalstack_admin_v2_component_proto_msgTypes,
+	}.Build()
+	File_metalstack_admin_v2_component_proto = out.File
+	file_metalstack_admin_v2_component_proto_goTypes = nil
+	file_metalstack_admin_v2_component_proto_depIdxs = nil
+}
diff --git a/go/metalstack/admin/v2/partition.pb.go b/go/metalstack/admin/v2/partition.pb.go
index 8b68debb..f42e47d3 100644
--- a/go/metalstack/admin/v2/partition.pb.go
+++ b/go/metalstack/admin/v2/partition.pb.go
@@ -743,12 +743,12 @@ const file_metalstack_admin_v2_partition_proto_rawDesc = "" +
 	"\n" +
 	"\b_project\"y\n" +
 	" PartitionServiceCapacityResponse\x12U\n" +
-	"\x12partition_capacity\x18\x01 \x03(\v2&.metalstack.admin.v2.PartitionCapacityR\x11partitionCapacity\"\x93\x01\n" +
-	"\x11PartitionCapacity\x12\x1c\n" +
-	"\tpartition\x18\x01 \x01(\tR\tpartition\x12`\n" +
-	"\x17machine_size_capacities\x18\x02 \x03(\v2(.metalstack.admin.v2.MachineSizeCapacityR\x15machineSizeCapacities\"\xf6\x03\n" +
-	"\x13MachineSizeCapacity\x12\x12\n" +
-	"\x04size\x18\x02 \x01(\tR\x04size\x12\x14\n" +
+	"\x12partition_capacity\x18\x01 \x03(\v2&.metalstack.admin.v2.PartitionCapacityR\x11partitionCapacity\"\xa0\x01\n" +
+	"\x11PartitionCapacity\x12)\n" +
+	"\tpartition\x18\x01 \x01(\tB\v\xbaH\br\x06г\xae\xb1\x02\x01R\tpartition\x12`\n" +
+	"\x17machine_size_capacities\x18\x02 \x03(\v2(.metalstack.admin.v2.MachineSizeCapacityR\x15machineSizeCapacities\"\x83\x04\n" +
+	"\x13MachineSizeCapacity\x12\x1f\n" +
+	"\x04size\x18\x02 \x01(\tB\v\xbaH\br\x06\xc0\xb3\xae\xb1\x02\x01R\x04size\x12\x14\n" +
 	"\x05total\x18\x03 \x01(\x03R\x05total\x12\x1f\n" +
 	"\vphoned_home\x18\x04 \x01(\x03R\n" +
 	"phonedHome\x12\x18\n" +
diff --git a/go/metalstack/infra/v2/component.pb.go b/go/metalstack/infra/v2/component.pb.go
new file mode 100644
index 00000000..a09af28d
--- /dev/null
+++ b/go/metalstack/infra/v2/component.pb.go
@@ -0,0 +1,291 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.36.11
+// 	protoc        (unknown)
+// source: metalstack/infra/v2/component.proto
+
+package infrav2
+
+import (
+	_ "buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go/buf/validate"
+	v2 "github.com/metal-stack/api/go/metalstack/api/v2"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
+	reflect "reflect"
+	sync "sync"
+	unsafe "unsafe"
+)
+
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+// ComponentType defines which service is actually pinging
+type ComponentType int32
+
+const (
+	// COMPONENT_TYPE_UNSPECIFIED is unspecified
+	ComponentType_COMPONENT_TYPE_UNSPECIFIED ComponentType = 0
+	// COMPONENT_TYPE_PIXIECORE is pixiecore
+	ComponentType_COMPONENT_TYPE_PIXIECORE ComponentType = 1
+	// COMPONENT_TYPE_METAL_CORE is metal-core
+	ComponentType_COMPONENT_TYPE_METAL_CORE ComponentType = 2
+	// COMPONENT_TYPE_METAL_BMC is metal-bmc
+	ComponentType_COMPONENT_TYPE_METAL_BMC ComponentType = 3
+	// COMPONENT_TYPE_METAL_IMAGE_CACHE_SYNC is metal-image-cache-sync
+	ComponentType_COMPONENT_TYPE_METAL_IMAGE_CACHE_SYNC ComponentType = 4
+	// COMPONENT_TYPE_METAL_CONSOLE is metal-console
+	ComponentType_COMPONENT_TYPE_METAL_CONSOLE ComponentType = 5
+	// COMPONENT_TYPE_METAL_METRICS_EXPORTER is metal-metrics-exporter
+	ComponentType_COMPONENT_TYPE_METAL_METRICS_EXPORTER ComponentType = 6
+)
+
+// Enum value maps for ComponentType.
+var (
+	ComponentType_name = map[int32]string{
+		0: "COMPONENT_TYPE_UNSPECIFIED",
+		1: "COMPONENT_TYPE_PIXIECORE",
+		2: "COMPONENT_TYPE_METAL_CORE",
+		3: "COMPONENT_TYPE_METAL_BMC",
+		4: "COMPONENT_TYPE_METAL_IMAGE_CACHE_SYNC",
+		5: "COMPONENT_TYPE_METAL_CONSOLE",
+		6: "COMPONENT_TYPE_METAL_METRICS_EXPORTER",
+	}
+	ComponentType_value = map[string]int32{
+		"COMPONENT_TYPE_UNSPECIFIED":            0,
+		"COMPONENT_TYPE_PIXIECORE":              1,
+		"COMPONENT_TYPE_METAL_CORE":             2,
+		"COMPONENT_TYPE_METAL_BMC":              3,
+		"COMPONENT_TYPE_METAL_IMAGE_CACHE_SYNC": 4,
+		"COMPONENT_TYPE_METAL_CONSOLE":          5,
+		"COMPONENT_TYPE_METAL_METRICS_EXPORTER": 6,
+	}
+)
+
+func (x ComponentType) Enum() *ComponentType {
+	p := new(ComponentType)
+	*p = x
+	return p
+}
+
+func (x ComponentType) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (ComponentType) Descriptor() protoreflect.EnumDescriptor {
+	return file_metalstack_infra_v2_component_proto_enumTypes[0].Descriptor()
+}
+
+func (ComponentType) Type() protoreflect.EnumType {
+	return &file_metalstack_infra_v2_component_proto_enumTypes[0]
+}
+
+func (x ComponentType) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use ComponentType.Descriptor instead.
+func (ComponentType) EnumDescriptor() ([]byte, []int) {
+	return file_metalstack_infra_v2_component_proto_rawDescGZIP(), []int{0}
+}
+
+// ComponentServicePingRequest is sent from a microservice to report its state regularly
+type ComponentServicePingRequest struct {
+	state protoimpl.MessageState `protogen:"open.v1"`
+	// Type defines which service is actually pinging
+	Type ComponentType `protobuf:"varint,1,opt,name=type,proto3,enum=metalstack.infra.v2.ComponentType" json:"type,omitempty"`
+	// Identifier is a unique identifier of this service, e.g. if two instance are running, this might be the pod id.
+	// micro_service and identifier guarantee uniqueness.
+	Identifier string `protobuf:"bytes,2,opt,name=identifier,proto3" json:"identifier,omitempty"`
+	// StartedAt is the timestamp this service was started
+	StartedAt *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=started_at,json=startedAt,proto3" json:"started_at,omitempty"`
+	// Version of this service
+	Version       *v2.Version `protobuf:"bytes,4,opt,name=version,proto3" json:"version,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *ComponentServicePingRequest) Reset() {
+	*x = ComponentServicePingRequest{}
+	mi := &file_metalstack_infra_v2_component_proto_msgTypes[0]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *ComponentServicePingRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ComponentServicePingRequest) ProtoMessage() {}
+
+func (x *ComponentServicePingRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_metalstack_infra_v2_component_proto_msgTypes[0]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ComponentServicePingRequest.ProtoReflect.Descriptor instead.
+func (*ComponentServicePingRequest) Descriptor() ([]byte, []int) {
+	return file_metalstack_infra_v2_component_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *ComponentServicePingRequest) GetType() ComponentType {
+	if x != nil {
+		return x.Type
+	}
+	return ComponentType_COMPONENT_TYPE_UNSPECIFIED
+}
+
+func (x *ComponentServicePingRequest) GetIdentifier() string {
+	if x != nil {
+		return x.Identifier
+	}
+	return ""
+}
+
+func (x *ComponentServicePingRequest) GetStartedAt() *timestamppb.Timestamp {
+	if x != nil {
+		return x.StartedAt
+	}
+	return nil
+}
+
+func (x *ComponentServicePingRequest) GetVersion() *v2.Version {
+	if x != nil {
+		return x.Version
+	}
+	return nil
+}
+
+// ComponentServicePingResponse is the response to a ping request
+type ComponentServicePingResponse struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *ComponentServicePingResponse) Reset() {
+	*x = ComponentServicePingResponse{}
+	mi := &file_metalstack_infra_v2_component_proto_msgTypes[1]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *ComponentServicePingResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ComponentServicePingResponse) ProtoMessage() {}
+
+func (x *ComponentServicePingResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_metalstack_infra_v2_component_proto_msgTypes[1]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ComponentServicePingResponse.ProtoReflect.Descriptor instead.
+func (*ComponentServicePingResponse) Descriptor() ([]byte, []int) {
+	return file_metalstack_infra_v2_component_proto_rawDescGZIP(), []int{1}
+}
+
+var File_metalstack_infra_v2_component_proto protoreflect.FileDescriptor
+
+const file_metalstack_infra_v2_component_proto_rawDesc = "" +
+	"\n" +
+	"#metalstack/infra/v2/component.proto\x12\x13metalstack.infra.v2\x1a\x1bbuf/validate/validate.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1emetalstack/api/v2/common.proto\x1a(metalstack/api/v2/predefined_rules.proto\x1a\x1fmetalstack/api/v2/version.proto\"\x87\x02\n" +
+	"\x1bComponentServicePingRequest\x12@\n" +
+	"\x04type\x18\x01 \x01(\x0e2\".metalstack.infra.v2.ComponentTypeB\b\xbaH\x05\x82\x01\x02\x10\x01R\x04type\x12+\n" +
+	"\n" +
+	"identifier\x18\x02 \x01(\tB\v\xbaH\br\x06\xc0\xb3\xae\xb1\x02\x01R\n" +
+	"identifier\x12C\n" +
+	"\n" +
+	"started_at\x18\x03 \x01(\v2\x1a.google.protobuf.TimestampB\b\xbaH\x05\xb2\x01\x028\x01R\tstartedAt\x124\n" +
+	"\aversion\x18\x04 \x01(\v2\x1a.metalstack.api.v2.VersionR\aversion\"\x1e\n" +
+	"\x1cComponentServicePingResponse*\x8c\x03\n" +
+	"\rComponentType\x12/\n" +
+	"\x1aCOMPONENT_TYPE_UNSPECIFIED\x10\x00\x1a\x0f\x82\xb2\x19\vunspecified\x12+\n" +
+	"\x18COMPONENT_TYPE_PIXIECORE\x10\x01\x1a\r\x82\xb2\x19\tpixiecore\x12-\n" +
+	"\x19COMPONENT_TYPE_METAL_CORE\x10\x02\x1a\x0e\x82\xb2\x19\n" +
+	"metal-core\x12+\n" +
+	"\x18COMPONENT_TYPE_METAL_BMC\x10\x03\x1a\r\x82\xb2\x19\tmetal-bmc\x12E\n" +
+	"%COMPONENT_TYPE_METAL_IMAGE_CACHE_SYNC\x10\x04\x1a\x1a\x82\xb2\x19\x16metal-image-cache-sync\x123\n" +
+	"\x1cCOMPONENT_TYPE_METAL_CONSOLE\x10\x05\x1a\x11\x82\xb2\x19\rmetal-console\x12E\n" +
+	"%COMPONENT_TYPE_METAL_METRICS_EXPORTER\x10\x06\x1a\x1a\x82\xb2\x19\x16metal-metrics-exporter2\x8a\x01\n" +
+	"\x10ComponentService\x12v\n" +
+	"\x04Ping\x120.metalstack.infra.v2.ComponentServicePingRequest\x1a1.metalstack.infra.v2.ComponentServicePingResponse\"\t\xe0\xf3\x18\x02\xea\xf3\x18\x01\x01B\xd2\x01\n" +
+	"\x17com.metalstack.infra.v2B\x0eComponentProtoP\x01Z9github.com/metal-stack/api/go/metalstack/infra/v2;infrav2\xa2\x02\x03MIX\xaa\x02\x13Metalstack.Infra.V2\xca\x02\x13Metalstack\\Infra\\V2\xe2\x02\x1fMetalstack\\Infra\\V2\\GPBMetadata\xea\x02\x15Metalstack::Infra::V2b\x06proto3"
+
+var (
+	file_metalstack_infra_v2_component_proto_rawDescOnce sync.Once
+	file_metalstack_infra_v2_component_proto_rawDescData []byte
+)
+
+func file_metalstack_infra_v2_component_proto_rawDescGZIP() []byte {
+	file_metalstack_infra_v2_component_proto_rawDescOnce.Do(func() {
+		file_metalstack_infra_v2_component_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_metalstack_infra_v2_component_proto_rawDesc), len(file_metalstack_infra_v2_component_proto_rawDesc)))
+	})
+	return file_metalstack_infra_v2_component_proto_rawDescData
+}
+
+var file_metalstack_infra_v2_component_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
+var file_metalstack_infra_v2_component_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_metalstack_infra_v2_component_proto_goTypes = []any{
+	(ComponentType)(0),                   // 0: metalstack.infra.v2.ComponentType
+	(*ComponentServicePingRequest)(nil),  // 1: metalstack.infra.v2.ComponentServicePingRequest
+	(*ComponentServicePingResponse)(nil), // 2: metalstack.infra.v2.ComponentServicePingResponse
+	(*timestamppb.Timestamp)(nil),        // 3: google.protobuf.Timestamp
+	(*v2.Version)(nil),                   // 4: metalstack.api.v2.Version
+}
+var file_metalstack_infra_v2_component_proto_depIdxs = []int32{
+	0, // 0: metalstack.infra.v2.ComponentServicePingRequest.type:type_name -> metalstack.infra.v2.ComponentType
+	3, // 1: metalstack.infra.v2.ComponentServicePingRequest.started_at:type_name -> google.protobuf.Timestamp
+	4, // 2: metalstack.infra.v2.ComponentServicePingRequest.version:type_name -> metalstack.api.v2.Version
+	1, // 3: metalstack.infra.v2.ComponentService.Ping:input_type -> metalstack.infra.v2.ComponentServicePingRequest
+	2, // 4: metalstack.infra.v2.ComponentService.Ping:output_type -> metalstack.infra.v2.ComponentServicePingResponse
+	4, // [4:5] is the sub-list for method output_type
+	3, // [3:4] is the sub-list for method input_type
+	3, // [3:3] is the sub-list for extension type_name
+	3, // [3:3] is the sub-list for extension extendee
+	0, // [0:3] is the sub-list for field type_name
+}
+
+func init() { file_metalstack_infra_v2_component_proto_init() }
+func file_metalstack_infra_v2_component_proto_init() {
+	if File_metalstack_infra_v2_component_proto != nil {
+		return
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: unsafe.Slice(unsafe.StringData(file_metalstack_infra_v2_component_proto_rawDesc), len(file_metalstack_infra_v2_component_proto_rawDesc)),
+			NumEnums:      1,
+			NumMessages:   2,
+			NumExtensions: 0,
+			NumServices:   1,
+		},
+		GoTypes:           file_metalstack_infra_v2_component_proto_goTypes,
+		DependencyIndexes: file_metalstack_infra_v2_component_proto_depIdxs,
+		EnumInfos:         file_metalstack_infra_v2_component_proto_enumTypes,
+		MessageInfos:      file_metalstack_infra_v2_component_proto_msgTypes,
+	}.Build()
+	File_metalstack_infra_v2_component_proto = out.File
+	file_metalstack_infra_v2_component_proto_goTypes = nil
+	file_metalstack_infra_v2_component_proto_depIdxs = nil
+}
diff --git a/go/metalstack/infra/v2/infrav2connect/component.connect.go b/go/metalstack/infra/v2/infrav2connect/component.connect.go
new file mode 100644
index 00000000..3cbc2c51
--- /dev/null
+++ b/go/metalstack/infra/v2/infrav2connect/component.connect.go
@@ -0,0 +1,116 @@
+// Code generated by protoc-gen-connect-go. DO NOT EDIT.
+//
+// Source: metalstack/infra/v2/component.proto
+
+package infrav2connect
+
+import (
+	connect "connectrpc.com/connect"
+	context "context"
+	errors "errors"
+	v2 "github.com/metal-stack/api/go/metalstack/infra/v2"
+	http "net/http"
+	strings "strings"
+)
+
+// This is a compile-time assertion to ensure that this generated file and the connect package are
+// compatible. If you get a compiler error that this constant is not defined, this code was
+// generated with a version of connect newer than the one compiled into your binary. You can fix the
+// problem by either regenerating this code with an older version of connect or updating the connect
+// version compiled into your binary.
+const _ = connect.IsAtLeastVersion1_13_0
+
+const (
+	// ComponentServiceName is the fully-qualified name of the ComponentService service.
+	ComponentServiceName = "metalstack.infra.v2.ComponentService"
+)
+
+// These constants are the fully-qualified names of the RPCs defined in this package. They're
+// exposed at runtime as Spec.Procedure and as the final two segments of the HTTP route.
+//
+// Note that these are different from the fully-qualified method names used by
+// google.golang.org/protobuf/reflect/protoreflect. To convert from these constants to
+// reflection-formatted method names, remove the leading slash and convert the remaining slash to a
+// period.
+const (
+	// ComponentServicePingProcedure is the fully-qualified name of the ComponentService's Ping RPC.
+	ComponentServicePingProcedure = "/metalstack.infra.v2.ComponentService/Ping"
+)
+
+// ComponentServiceClient is a client for the metalstack.infra.v2.ComponentService service.
+type ComponentServiceClient interface {
+	// Ping must be called from every connected microservice in a recurring manner
+	// to get visibility of all required microservices.
+	Ping(context.Context, *v2.ComponentServicePingRequest) (*v2.ComponentServicePingResponse, error)
+}
+
+// NewComponentServiceClient constructs a client for the metalstack.infra.v2.ComponentService
+// service. By default, it uses the Connect protocol with the binary Protobuf Codec, asks for
+// gzipped responses, and sends uncompressed requests. To use the gRPC or gRPC-Web protocols, supply
+// the connect.WithGRPC() or connect.WithGRPCWeb() options.
+//
+// The URL supplied here should be the base URL for the Connect or gRPC server (for example,
+// http://api.acme.com or https://acme.com/grpc).
+func NewComponentServiceClient(httpClient connect.HTTPClient, baseURL string, opts ...connect.ClientOption) ComponentServiceClient {
+	baseURL = strings.TrimRight(baseURL, "/")
+	componentServiceMethods := v2.File_metalstack_infra_v2_component_proto.Services().ByName("ComponentService").Methods()
+	return &componentServiceClient{
+		ping: connect.NewClient[v2.ComponentServicePingRequest, v2.ComponentServicePingResponse](
+			httpClient,
+			baseURL+ComponentServicePingProcedure,
+			connect.WithSchema(componentServiceMethods.ByName("Ping")),
+			connect.WithClientOptions(opts...),
+		),
+	}
+}
+
+// componentServiceClient implements ComponentServiceClient.
+type componentServiceClient struct {
+	ping *connect.Client[v2.ComponentServicePingRequest, v2.ComponentServicePingResponse]
+}
+
+// Ping calls metalstack.infra.v2.ComponentService.Ping.
+func (c *componentServiceClient) Ping(ctx context.Context, req *v2.ComponentServicePingRequest) (*v2.ComponentServicePingResponse, error) {
+	response, err := c.ping.CallUnary(ctx, connect.NewRequest(req))
+	if response != nil {
+		return response.Msg, err
+	}
+	return nil, err
+}
+
+// ComponentServiceHandler is an implementation of the metalstack.infra.v2.ComponentService service.
+type ComponentServiceHandler interface {
+	// Ping must be called from every connected microservice in a recurring manner
+	// to get visibility of all required microservices.
+	Ping(context.Context, *v2.ComponentServicePingRequest) (*v2.ComponentServicePingResponse, error)
+}
+
+// NewComponentServiceHandler builds an HTTP handler from the service implementation. It returns the
+// path on which to mount the handler and the handler itself.
+//
+// By default, handlers support the Connect, gRPC, and gRPC-Web protocols with the binary Protobuf
+// and JSON codecs. They also support gzip compression.
+func NewComponentServiceHandler(svc ComponentServiceHandler, opts ...connect.HandlerOption) (string, http.Handler) {
+	componentServiceMethods := v2.File_metalstack_infra_v2_component_proto.Services().ByName("ComponentService").Methods()
+	componentServicePingHandler := connect.NewUnaryHandlerSimple(
+		ComponentServicePingProcedure,
+		svc.Ping,
+		connect.WithSchema(componentServiceMethods.ByName("Ping")),
+		connect.WithHandlerOptions(opts...),
+	)
+	return "/metalstack.infra.v2.ComponentService/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		switch r.URL.Path {
+		case ComponentServicePingProcedure:
+			componentServicePingHandler.ServeHTTP(w, r)
+		default:
+			http.NotFound(w, r)
+		}
+	})
+}
+
+// UnimplementedComponentServiceHandler returns CodeUnimplemented from all methods.
+type UnimplementedComponentServiceHandler struct{}
+
+func (UnimplementedComponentServiceHandler) Ping(context.Context, *v2.ComponentServicePingRequest) (*v2.ComponentServicePingResponse, error) {
+	return nil, connect.NewError(connect.CodeUnimplemented, errors.New("metalstack.infra.v2.ComponentService.Ping is not implemented"))
+}
diff --git a/go/permissions/servicepermissions.go b/go/permissions/servicepermissions.go
index a6866748..aa07c6b7 100755
--- a/go/permissions/servicepermissions.go
+++ b/go/permissions/servicepermissions.go
@@ -7,6 +7,7 @@ import (
 
 func GetServices() []string {
 	return []string{
+		"metalstack.admin.v2.ComponentService",
 		"metalstack.admin.v2.FilesystemService",
 		"metalstack.admin.v2.IPService",
 		"metalstack.admin.v2.ImageService",
@@ -38,6 +39,7 @@ func GetServices() []string {
 		"metalstack.api.v2.VersionService",
 		"metalstack.infra.v2.BMCService",
 		"metalstack.infra.v2.BootService",
+		"metalstack.infra.v2.ComponentService",
 		"metalstack.infra.v2.EventService",
 		"metalstack.infra.v2.SwitchService",
 	}
@@ -48,6 +50,7 @@ func GetServicePermissions() *ServicePermissions {
 		Roles: Roles{
 			Admin: Admin{
 				"ADMIN_ROLE_EDITOR": []string{
+					"/metalstack.admin.v2.ComponentService/List",
 					"/metalstack.admin.v2.FilesystemService/Create",
 					"/metalstack.admin.v2.FilesystemService/Update",
 					"/metalstack.admin.v2.FilesystemService/Delete",
@@ -98,6 +101,7 @@ func GetServicePermissions() *ServicePermissions {
 					"/metalstack.admin.v2.VPNService/ListNodes",
 				},
 				"ADMIN_ROLE_VIEWER": []string{
+					"/metalstack.admin.v2.ComponentService/List",
 					"/metalstack.admin.v2.ImageService/Usage",
 					"/metalstack.admin.v2.IPService/List",
 					"/metalstack.admin.v2.MachineService/Get",
@@ -127,6 +131,7 @@ func GetServicePermissions() *ServicePermissions {
 					"/metalstack.infra.v2.BMCService/BMCCommandDone",
 					"/metalstack.infra.v2.BootService/Dhcp",
 					"/metalstack.infra.v2.BootService/Boot",
+					"/metalstack.infra.v2.ComponentService/Ping",
 					"/metalstack.infra.v2.EventService/Send",
 					"/metalstack.infra.v2.SwitchService/Get",
 					"/metalstack.infra.v2.SwitchService/Register",
@@ -243,6 +248,7 @@ func GetServicePermissions() *ServicePermissions {
 		Methods: map[string]bool{
 			"/grpc.reflection.v1.ServerReflection/ServerReflectionInfo":      true,
 			"/grpc.reflection.v1alpha.ServerReflection/ServerReflectionInfo": true,
+			"/metalstack.admin.v2.ComponentService/List":                     true,
 			"/metalstack.admin.v2.FilesystemService/Create":                  true,
 			"/metalstack.admin.v2.FilesystemService/Delete":                  true,
 			"/metalstack.admin.v2.FilesystemService/Update":                  true,
@@ -367,6 +373,7 @@ func GetServicePermissions() *ServicePermissions {
 			"/metalstack.infra.v2.BootService/Register":                      true,
 			"/metalstack.infra.v2.BootService/SuperUserPassword":             true,
 			"/metalstack.infra.v2.BootService/Wait":                          true,
+			"/metalstack.infra.v2.ComponentService/Ping":                     true,
 			"/metalstack.infra.v2.EventService/Send":                         true,
 			"/metalstack.infra.v2.SwitchService/Get":                         true,
 			"/metalstack.infra.v2.SwitchService/Heartbeat":                   true,
@@ -408,6 +415,7 @@ func GetServicePermissions() *ServicePermissions {
 				"/metalstack.api.v2.UserService/Get":               true,
 			},
 			Admin: map[string]bool{
+				"/metalstack.admin.v2.ComponentService/List":          true,
 				"/metalstack.admin.v2.FilesystemService/Create":       true,
 				"/metalstack.admin.v2.FilesystemService/Delete":       true,
 				"/metalstack.admin.v2.FilesystemService/Update":       true,
@@ -463,6 +471,7 @@ func GetServicePermissions() *ServicePermissions {
 				"/metalstack.infra.v2.BMCService/WaitForBMCCommand": true,
 				"/metalstack.infra.v2.BootService/Boot":             true,
 				"/metalstack.infra.v2.BootService/Dhcp":             true,
+				"/metalstack.infra.v2.ComponentService/Ping":        true,
 				"/metalstack.infra.v2.EventService/Send":            true,
 				"/metalstack.infra.v2.SwitchService/Get":            true,
 				"/metalstack.infra.v2.SwitchService/Heartbeat":      true,
@@ -519,6 +528,7 @@ func GetServicePermissions() *ServicePermissions {
 			},
 		},
 		Auditable: map[string]bool{
+			"/metalstack.admin.v2.ComponentService/List":             false,
 			"/metalstack.admin.v2.FilesystemService/Create":          true,
 			"/metalstack.admin.v2.FilesystemService/Delete":          true,
 			"/metalstack.admin.v2.FilesystemService/Update":          true,
@@ -643,6 +653,7 @@ func GetServicePermissions() *ServicePermissions {
 			"/metalstack.infra.v2.BootService/Register":              false,
 			"/metalstack.infra.v2.BootService/SuperUserPassword":     false,
 			"/metalstack.infra.v2.BootService/Wait":                  false,
+			"/metalstack.infra.v2.ComponentService/Ping":             false,
 			"/metalstack.infra.v2.EventService/Send":                 false,
 			"/metalstack.infra.v2.SwitchService/Get":                 false,
 			"/metalstack.infra.v2.SwitchService/Heartbeat":           false,
diff --git a/go/tests/mock_clients.go b/go/tests/mock_clients.go
index ae59a8ab..d88ae10d 100755
--- a/go/tests/mock_clients.go
+++ b/go/tests/mock_clients.go
@@ -32,6 +32,7 @@ type (
 		t *testing.T
 	}
 	adminv2 struct {
+		componentservice       *adminv2mocks.ComponentServiceClient
 		filesystemservice      *adminv2mocks.FilesystemServiceClient
 		imageservice           *adminv2mocks.ImageServiceClient
 		ipservice              *adminv2mocks.IPServiceClient
@@ -49,6 +50,7 @@ type (
 	}
 
 	Adminv2MockFns struct {
+		Component       func(m *mock.Mock)
 		Filesystem      func(m *mock.Mock)
 		Image           func(m *mock.Mock)
 		IP              func(m *mock.Mock)
@@ -100,17 +102,19 @@ type (
 		Version         func(m *mock.Mock)
 	}
 	infrav2 struct {
-		bmcservice    *infrav2mocks.BMCServiceClient
-		bootservice   *infrav2mocks.BootServiceClient
-		eventservice  *infrav2mocks.EventServiceClient
-		switchservice *infrav2mocks.SwitchServiceClient
+		bmcservice       *infrav2mocks.BMCServiceClient
+		bootservice      *infrav2mocks.BootServiceClient
+		componentservice *infrav2mocks.ComponentServiceClient
+		eventservice     *infrav2mocks.EventServiceClient
+		switchservice    *infrav2mocks.SwitchServiceClient
 	}
 
 	Infrav2MockFns struct {
-		BMC    func(m *mock.Mock)
-		Boot   func(m *mock.Mock)
-		Event  func(m *mock.Mock)
-		Switch func(m *mock.Mock)
+		BMC       func(m *mock.Mock)
+		Boot      func(m *mock.Mock)
+		Component func(m *mock.Mock)
+		Event     func(m *mock.Mock)
+		Switch    func(m *mock.Mock)
 	}
 )
 
@@ -142,6 +146,7 @@ func (w wrapper) Adminv2(fns *Adminv2MockFns) *adminv2 {
 
 func newadminv2(t *testing.T, fns *Adminv2MockFns) *adminv2 {
 	a := &adminv2{
+		componentservice:       adminv2mocks.NewComponentServiceClient(t),
 		filesystemservice:      adminv2mocks.NewFilesystemServiceClient(t),
 		imageservice:           adminv2mocks.NewImageServiceClient(t),
 		ipservice:              adminv2mocks.NewIPServiceClient(t),
@@ -159,6 +164,9 @@ func newadminv2(t *testing.T, fns *Adminv2MockFns) *adminv2 {
 	}
 
 	if fns != nil {
+		if fns.Component != nil {
+			fns.Component(&a.componentservice.Mock)
+		}
 		if fns.Filesystem != nil {
 			fns.Filesystem(&a.filesystemservice.Mock)
 		}
@@ -207,6 +215,9 @@ func newadminv2(t *testing.T, fns *Adminv2MockFns) *adminv2 {
 	return a
 }
 
+func (c *adminv2) Component() adminv2connect.ComponentServiceClient {
+	return c.componentservice
+}
 func (c *adminv2) Filesystem() adminv2connect.FilesystemServiceClient {
 	return c.filesystemservice
 }
@@ -377,10 +388,11 @@ func (w wrapper) Infrav2(fns *Infrav2MockFns) *infrav2 {
 
 func newinfrav2(t *testing.T, fns *Infrav2MockFns) *infrav2 {
 	a := &infrav2{
-		bmcservice:    infrav2mocks.NewBMCServiceClient(t),
-		bootservice:   infrav2mocks.NewBootServiceClient(t),
-		eventservice:  infrav2mocks.NewEventServiceClient(t),
-		switchservice: infrav2mocks.NewSwitchServiceClient(t),
+		bmcservice:       infrav2mocks.NewBMCServiceClient(t),
+		bootservice:      infrav2mocks.NewBootServiceClient(t),
+		componentservice: infrav2mocks.NewComponentServiceClient(t),
+		eventservice:     infrav2mocks.NewEventServiceClient(t),
+		switchservice:    infrav2mocks.NewSwitchServiceClient(t),
 	}
 
 	if fns != nil {
@@ -390,6 +402,9 @@ func newinfrav2(t *testing.T, fns *Infrav2MockFns) *infrav2 {
 		if fns.Boot != nil {
 			fns.Boot(&a.bootservice.Mock)
 		}
+		if fns.Component != nil {
+			fns.Component(&a.componentservice.Mock)
+		}
 		if fns.Event != nil {
 			fns.Event(&a.eventservice.Mock)
 		}
@@ -408,6 +423,9 @@ func (c *infrav2) BMC() infrav2connect.BMCServiceClient {
 func (c *infrav2) Boot() infrav2connect.BootServiceClient {
 	return c.bootservice
 }
+func (c *infrav2) Component() infrav2connect.ComponentServiceClient {
+	return c.componentservice
+}
 func (c *infrav2) Event() infrav2connect.EventServiceClient {
 	return c.eventservice
 }
diff --git a/go/tests/mocks/client/Adminv2.go b/go/tests/mocks/client/Adminv2.go
index 43fdda69..e6733eba 100644
--- a/go/tests/mocks/client/Adminv2.go
+++ b/go/tests/mocks/client/Adminv2.go
@@ -36,6 +36,52 @@ func (_m *Adminv2) EXPECT() *Adminv2_Expecter {
 	return &Adminv2_Expecter{mock: &_m.Mock}
 }
 
+// Component provides a mock function for the type Adminv2
+func (_mock *Adminv2) Component() adminv2connect.ComponentServiceClient {
+	ret := _mock.Called()
+
+	if len(ret) == 0 {
+		panic("no return value specified for Component")
+	}
+
+	var r0 adminv2connect.ComponentServiceClient
+	if returnFunc, ok := ret.Get(0).(func() adminv2connect.ComponentServiceClient); ok {
+		r0 = returnFunc()
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(adminv2connect.ComponentServiceClient)
+		}
+	}
+	return r0
+}
+
+// Adminv2_Component_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Component'
+type Adminv2_Component_Call struct {
+	*mock.Call
+}
+
+// Component is a helper method to define mock.On call
+func (_e *Adminv2_Expecter) Component() *Adminv2_Component_Call {
+	return &Adminv2_Component_Call{Call: _e.mock.On("Component")}
+}
+
+func (_c *Adminv2_Component_Call) Run(run func()) *Adminv2_Component_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run()
+	})
+	return _c
+}
+
+func (_c *Adminv2_Component_Call) Return(componentServiceClient adminv2connect.ComponentServiceClient) *Adminv2_Component_Call {
+	_c.Call.Return(componentServiceClient)
+	return _c
+}
+
+func (_c *Adminv2_Component_Call) RunAndReturn(run func() adminv2connect.ComponentServiceClient) *Adminv2_Component_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // Filesystem provides a mock function for the type Adminv2
 func (_mock *Adminv2) Filesystem() adminv2connect.FilesystemServiceClient {
 	ret := _mock.Called()
diff --git a/go/tests/mocks/client/Infrav2.go b/go/tests/mocks/client/Infrav2.go
index 07d18623..8514237e 100644
--- a/go/tests/mocks/client/Infrav2.go
+++ b/go/tests/mocks/client/Infrav2.go
@@ -128,6 +128,52 @@ func (_c *Infrav2_Boot_Call) RunAndReturn(run func() infrav2connect.BootServiceC
 	return _c
 }
 
+// Component provides a mock function for the type Infrav2
+func (_mock *Infrav2) Component() infrav2connect.ComponentServiceClient {
+	ret := _mock.Called()
+
+	if len(ret) == 0 {
+		panic("no return value specified for Component")
+	}
+
+	var r0 infrav2connect.ComponentServiceClient
+	if returnFunc, ok := ret.Get(0).(func() infrav2connect.ComponentServiceClient); ok {
+		r0 = returnFunc()
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(infrav2connect.ComponentServiceClient)
+		}
+	}
+	return r0
+}
+
+// Infrav2_Component_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Component'
+type Infrav2_Component_Call struct {
+	*mock.Call
+}
+
+// Component is a helper method to define mock.On call
+func (_e *Infrav2_Expecter) Component() *Infrav2_Component_Call {
+	return &Infrav2_Component_Call{Call: _e.mock.On("Component")}
+}
+
+func (_c *Infrav2_Component_Call) Run(run func()) *Infrav2_Component_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run()
+	})
+	return _c
+}
+
+func (_c *Infrav2_Component_Call) Return(componentServiceClient infrav2connect.ComponentServiceClient) *Infrav2_Component_Call {
+	_c.Call.Return(componentServiceClient)
+	return _c
+}
+
+func (_c *Infrav2_Component_Call) RunAndReturn(run func() infrav2connect.ComponentServiceClient) *Infrav2_Component_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // Event provides a mock function for the type Infrav2
 func (_mock *Infrav2) Event() infrav2connect.EventServiceClient {
 	ret := _mock.Called()
diff --git a/go/tests/mocks/metalstack/admin/v2/adminv2connect/ComponentServiceClient.go b/go/tests/mocks/metalstack/admin/v2/adminv2connect/ComponentServiceClient.go
new file mode 100644
index 00000000..20b4efe9
--- /dev/null
+++ b/go/tests/mocks/metalstack/admin/v2/adminv2connect/ComponentServiceClient.go
@@ -0,0 +1,107 @@
+// Code generated by mockery; DO NOT EDIT.
+// github.com/vektra/mockery
+// template: testify
+
+package adminv2connect
+
+import (
+	"context"
+
+	"github.com/metal-stack/api/go/metalstack/admin/v2"
+	mock "github.com/stretchr/testify/mock"
+)
+
+// NewComponentServiceClient creates a new instance of ComponentServiceClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewComponentServiceClient(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *ComponentServiceClient {
+	mock := &ComponentServiceClient{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
+
+// ComponentServiceClient is an autogenerated mock type for the ComponentServiceClient type
+type ComponentServiceClient struct {
+	mock.Mock
+}
+
+type ComponentServiceClient_Expecter struct {
+	mock *mock.Mock
+}
+
+func (_m *ComponentServiceClient) EXPECT() *ComponentServiceClient_Expecter {
+	return &ComponentServiceClient_Expecter{mock: &_m.Mock}
+}
+
+// List provides a mock function for the type ComponentServiceClient
+func (_mock *ComponentServiceClient) List(context1 context.Context, componentServiceListRequest *adminv2.ComponentServiceListRequest) (*adminv2.ComponentServiceListResponse, error) {
+	ret := _mock.Called(context1, componentServiceListRequest)
+
+	if len(ret) == 0 {
+		panic("no return value specified for List")
+	}
+
+	var r0 *adminv2.ComponentServiceListResponse
+	var r1 error
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *adminv2.ComponentServiceListRequest) (*adminv2.ComponentServiceListResponse, error)); ok {
+		return returnFunc(context1, componentServiceListRequest)
+	}
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *adminv2.ComponentServiceListRequest) *adminv2.ComponentServiceListResponse); ok {
+		r0 = returnFunc(context1, componentServiceListRequest)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*adminv2.ComponentServiceListResponse)
+		}
+	}
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *adminv2.ComponentServiceListRequest) error); ok {
+		r1 = returnFunc(context1, componentServiceListRequest)
+	} else {
+		r1 = ret.Error(1)
+	}
+	return r0, r1
+}
+
+// ComponentServiceClient_List_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'List'
+type ComponentServiceClient_List_Call struct {
+	*mock.Call
+}
+
+// List is a helper method to define mock.On call
+//   - context1 context.Context
+//   - componentServiceListRequest *adminv2.ComponentServiceListRequest
+func (_e *ComponentServiceClient_Expecter) List(context1 interface{}, componentServiceListRequest interface{}) *ComponentServiceClient_List_Call {
+	return &ComponentServiceClient_List_Call{Call: _e.mock.On("List", context1, componentServiceListRequest)}
+}
+
+func (_c *ComponentServiceClient_List_Call) Run(run func(context1 context.Context, componentServiceListRequest *adminv2.ComponentServiceListRequest)) *ComponentServiceClient_List_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		var arg0 context.Context
+		if args[0] != nil {
+			arg0 = args[0].(context.Context)
+		}
+		var arg1 *adminv2.ComponentServiceListRequest
+		if args[1] != nil {
+			arg1 = args[1].(*adminv2.ComponentServiceListRequest)
+		}
+		run(
+			arg0,
+			arg1,
+		)
+	})
+	return _c
+}
+
+func (_c *ComponentServiceClient_List_Call) Return(componentServiceListResponse *adminv2.ComponentServiceListResponse, err error) *ComponentServiceClient_List_Call {
+	_c.Call.Return(componentServiceListResponse, err)
+	return _c
+}
+
+func (_c *ComponentServiceClient_List_Call) RunAndReturn(run func(context1 context.Context, componentServiceListRequest *adminv2.ComponentServiceListRequest) (*adminv2.ComponentServiceListResponse, error)) *ComponentServiceClient_List_Call {
+	_c.Call.Return(run)
+	return _c
+}
diff --git a/go/tests/mocks/metalstack/admin/v2/adminv2connect/ComponentServiceHandler.go b/go/tests/mocks/metalstack/admin/v2/adminv2connect/ComponentServiceHandler.go
new file mode 100644
index 00000000..5048ceea
--- /dev/null
+++ b/go/tests/mocks/metalstack/admin/v2/adminv2connect/ComponentServiceHandler.go
@@ -0,0 +1,107 @@
+// Code generated by mockery; DO NOT EDIT.
+// github.com/vektra/mockery
+// template: testify
+
+package adminv2connect
+
+import (
+	"context"
+
+	"github.com/metal-stack/api/go/metalstack/admin/v2"
+	mock "github.com/stretchr/testify/mock"
+)
+
+// NewComponentServiceHandler creates a new instance of ComponentServiceHandler. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewComponentServiceHandler(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *ComponentServiceHandler {
+	mock := &ComponentServiceHandler{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
+
+// ComponentServiceHandler is an autogenerated mock type for the ComponentServiceHandler type
+type ComponentServiceHandler struct {
+	mock.Mock
+}
+
+type ComponentServiceHandler_Expecter struct {
+	mock *mock.Mock
+}
+
+func (_m *ComponentServiceHandler) EXPECT() *ComponentServiceHandler_Expecter {
+	return &ComponentServiceHandler_Expecter{mock: &_m.Mock}
+}
+
+// List provides a mock function for the type ComponentServiceHandler
+func (_mock *ComponentServiceHandler) List(context1 context.Context, componentServiceListRequest *adminv2.ComponentServiceListRequest) (*adminv2.ComponentServiceListResponse, error) {
+	ret := _mock.Called(context1, componentServiceListRequest)
+
+	if len(ret) == 0 {
+		panic("no return value specified for List")
+	}
+
+	var r0 *adminv2.ComponentServiceListResponse
+	var r1 error
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *adminv2.ComponentServiceListRequest) (*adminv2.ComponentServiceListResponse, error)); ok {
+		return returnFunc(context1, componentServiceListRequest)
+	}
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *adminv2.ComponentServiceListRequest) *adminv2.ComponentServiceListResponse); ok {
+		r0 = returnFunc(context1, componentServiceListRequest)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*adminv2.ComponentServiceListResponse)
+		}
+	}
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *adminv2.ComponentServiceListRequest) error); ok {
+		r1 = returnFunc(context1, componentServiceListRequest)
+	} else {
+		r1 = ret.Error(1)
+	}
+	return r0, r1
+}
+
+// ComponentServiceHandler_List_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'List'
+type ComponentServiceHandler_List_Call struct {
+	*mock.Call
+}
+
+// List is a helper method to define mock.On call
+//   - context1 context.Context
+//   - componentServiceListRequest *adminv2.ComponentServiceListRequest
+func (_e *ComponentServiceHandler_Expecter) List(context1 interface{}, componentServiceListRequest interface{}) *ComponentServiceHandler_List_Call {
+	return &ComponentServiceHandler_List_Call{Call: _e.mock.On("List", context1, componentServiceListRequest)}
+}
+
+func (_c *ComponentServiceHandler_List_Call) Run(run func(context1 context.Context, componentServiceListRequest *adminv2.ComponentServiceListRequest)) *ComponentServiceHandler_List_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		var arg0 context.Context
+		if args[0] != nil {
+			arg0 = args[0].(context.Context)
+		}
+		var arg1 *adminv2.ComponentServiceListRequest
+		if args[1] != nil {
+			arg1 = args[1].(*adminv2.ComponentServiceListRequest)
+		}
+		run(
+			arg0,
+			arg1,
+		)
+	})
+	return _c
+}
+
+func (_c *ComponentServiceHandler_List_Call) Return(componentServiceListResponse *adminv2.ComponentServiceListResponse, err error) *ComponentServiceHandler_List_Call {
+	_c.Call.Return(componentServiceListResponse, err)
+	return _c
+}
+
+func (_c *ComponentServiceHandler_List_Call) RunAndReturn(run func(context1 context.Context, componentServiceListRequest *adminv2.ComponentServiceListRequest) (*adminv2.ComponentServiceListResponse, error)) *ComponentServiceHandler_List_Call {
+	_c.Call.Return(run)
+	return _c
+}
diff --git a/go/tests/mocks/metalstack/infra/v2/infrav2connect/ComponentServiceClient.go b/go/tests/mocks/metalstack/infra/v2/infrav2connect/ComponentServiceClient.go
new file mode 100644
index 00000000..354b857a
--- /dev/null
+++ b/go/tests/mocks/metalstack/infra/v2/infrav2connect/ComponentServiceClient.go
@@ -0,0 +1,107 @@
+// Code generated by mockery; DO NOT EDIT.
+// github.com/vektra/mockery
+// template: testify
+
+package infrav2connect
+
+import (
+	"context"
+
+	"github.com/metal-stack/api/go/metalstack/infra/v2"
+	mock "github.com/stretchr/testify/mock"
+)
+
+// NewComponentServiceClient creates a new instance of ComponentServiceClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewComponentServiceClient(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *ComponentServiceClient {
+	mock := &ComponentServiceClient{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
+
+// ComponentServiceClient is an autogenerated mock type for the ComponentServiceClient type
+type ComponentServiceClient struct {
+	mock.Mock
+}
+
+type ComponentServiceClient_Expecter struct {
+	mock *mock.Mock
+}
+
+func (_m *ComponentServiceClient) EXPECT() *ComponentServiceClient_Expecter {
+	return &ComponentServiceClient_Expecter{mock: &_m.Mock}
+}
+
+// Ping provides a mock function for the type ComponentServiceClient
+func (_mock *ComponentServiceClient) Ping(context1 context.Context, componentServicePingRequest *infrav2.ComponentServicePingRequest) (*infrav2.ComponentServicePingResponse, error) {
+	ret := _mock.Called(context1, componentServicePingRequest)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Ping")
+	}
+
+	var r0 *infrav2.ComponentServicePingResponse
+	var r1 error
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *infrav2.ComponentServicePingRequest) (*infrav2.ComponentServicePingResponse, error)); ok {
+		return returnFunc(context1, componentServicePingRequest)
+	}
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *infrav2.ComponentServicePingRequest) *infrav2.ComponentServicePingResponse); ok {
+		r0 = returnFunc(context1, componentServicePingRequest)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*infrav2.ComponentServicePingResponse)
+		}
+	}
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *infrav2.ComponentServicePingRequest) error); ok {
+		r1 = returnFunc(context1, componentServicePingRequest)
+	} else {
+		r1 = ret.Error(1)
+	}
+	return r0, r1
+}
+
+// ComponentServiceClient_Ping_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Ping'
+type ComponentServiceClient_Ping_Call struct {
+	*mock.Call
+}
+
+// Ping is a helper method to define mock.On call
+//   - context1 context.Context
+//   - componentServicePingRequest *infrav2.ComponentServicePingRequest
+func (_e *ComponentServiceClient_Expecter) Ping(context1 interface{}, componentServicePingRequest interface{}) *ComponentServiceClient_Ping_Call {
+	return &ComponentServiceClient_Ping_Call{Call: _e.mock.On("Ping", context1, componentServicePingRequest)}
+}
+
+func (_c *ComponentServiceClient_Ping_Call) Run(run func(context1 context.Context, componentServicePingRequest *infrav2.ComponentServicePingRequest)) *ComponentServiceClient_Ping_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		var arg0 context.Context
+		if args[0] != nil {
+			arg0 = args[0].(context.Context)
+		}
+		var arg1 *infrav2.ComponentServicePingRequest
+		if args[1] != nil {
+			arg1 = args[1].(*infrav2.ComponentServicePingRequest)
+		}
+		run(
+			arg0,
+			arg1,
+		)
+	})
+	return _c
+}
+
+func (_c *ComponentServiceClient_Ping_Call) Return(componentServicePingResponse *infrav2.ComponentServicePingResponse, err error) *ComponentServiceClient_Ping_Call {
+	_c.Call.Return(componentServicePingResponse, err)
+	return _c
+}
+
+func (_c *ComponentServiceClient_Ping_Call) RunAndReturn(run func(context1 context.Context, componentServicePingRequest *infrav2.ComponentServicePingRequest) (*infrav2.ComponentServicePingResponse, error)) *ComponentServiceClient_Ping_Call {
+	_c.Call.Return(run)
+	return _c
+}
diff --git a/go/tests/mocks/metalstack/infra/v2/infrav2connect/ComponentServiceHandler.go b/go/tests/mocks/metalstack/infra/v2/infrav2connect/ComponentServiceHandler.go
new file mode 100644
index 00000000..0e5f9ccc
--- /dev/null
+++ b/go/tests/mocks/metalstack/infra/v2/infrav2connect/ComponentServiceHandler.go
@@ -0,0 +1,107 @@
+// Code generated by mockery; DO NOT EDIT.
+// github.com/vektra/mockery
+// template: testify
+
+package infrav2connect
+
+import (
+	"context"
+
+	"github.com/metal-stack/api/go/metalstack/infra/v2"
+	mock "github.com/stretchr/testify/mock"
+)
+
+// NewComponentServiceHandler creates a new instance of ComponentServiceHandler. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewComponentServiceHandler(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *ComponentServiceHandler {
+	mock := &ComponentServiceHandler{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
+
+// ComponentServiceHandler is an autogenerated mock type for the ComponentServiceHandler type
+type ComponentServiceHandler struct {
+	mock.Mock
+}
+
+type ComponentServiceHandler_Expecter struct {
+	mock *mock.Mock
+}
+
+func (_m *ComponentServiceHandler) EXPECT() *ComponentServiceHandler_Expecter {
+	return &ComponentServiceHandler_Expecter{mock: &_m.Mock}
+}
+
+// Ping provides a mock function for the type ComponentServiceHandler
+func (_mock *ComponentServiceHandler) Ping(context1 context.Context, componentServicePingRequest *infrav2.ComponentServicePingRequest) (*infrav2.ComponentServicePingResponse, error) {
+	ret := _mock.Called(context1, componentServicePingRequest)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Ping")
+	}
+
+	var r0 *infrav2.ComponentServicePingResponse
+	var r1 error
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *infrav2.ComponentServicePingRequest) (*infrav2.ComponentServicePingResponse, error)); ok {
+		return returnFunc(context1, componentServicePingRequest)
+	}
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *infrav2.ComponentServicePingRequest) *infrav2.ComponentServicePingResponse); ok {
+		r0 = returnFunc(context1, componentServicePingRequest)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*infrav2.ComponentServicePingResponse)
+		}
+	}
+	if returnFunc, ok := ret.Get(1).(func(context.Context, *infrav2.ComponentServicePingRequest) error); ok {
+		r1 = returnFunc(context1, componentServicePingRequest)
+	} else {
+		r1 = ret.Error(1)
+	}
+	return r0, r1
+}
+
+// ComponentServiceHandler_Ping_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Ping'
+type ComponentServiceHandler_Ping_Call struct {
+	*mock.Call
+}
+
+// Ping is a helper method to define mock.On call
+//   - context1 context.Context
+//   - componentServicePingRequest *infrav2.ComponentServicePingRequest
+func (_e *ComponentServiceHandler_Expecter) Ping(context1 interface{}, componentServicePingRequest interface{}) *ComponentServiceHandler_Ping_Call {
+	return &ComponentServiceHandler_Ping_Call{Call: _e.mock.On("Ping", context1, componentServicePingRequest)}
+}
+
+func (_c *ComponentServiceHandler_Ping_Call) Run(run func(context1 context.Context, componentServicePingRequest *infrav2.ComponentServicePingRequest)) *ComponentServiceHandler_Ping_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		var arg0 context.Context
+		if args[0] != nil {
+			arg0 = args[0].(context.Context)
+		}
+		var arg1 *infrav2.ComponentServicePingRequest
+		if args[1] != nil {
+			arg1 = args[1].(*infrav2.ComponentServicePingRequest)
+		}
+		run(
+			arg0,
+			arg1,
+		)
+	})
+	return _c
+}
+
+func (_c *ComponentServiceHandler_Ping_Call) Return(componentServicePingResponse *infrav2.ComponentServicePingResponse, err error) *ComponentServiceHandler_Ping_Call {
+	_c.Call.Return(componentServicePingResponse, err)
+	return _c
+}
+
+func (_c *ComponentServiceHandler_Ping_Call) RunAndReturn(run func(context1 context.Context, componentServicePingRequest *infrav2.ComponentServicePingRequest) (*infrav2.ComponentServicePingResponse, error)) *ComponentServiceHandler_Ping_Call {
+	_c.Call.Return(run)
+	return _c
+}
diff --git a/js/metalstack/admin/v2/component_pb.d.ts b/js/metalstack/admin/v2/component_pb.d.ts
new file mode 100644
index 00000000..c201eb49
--- /dev/null
+++ b/js/metalstack/admin/v2/component_pb.d.ts
@@ -0,0 +1,105 @@
+import type { GenFile, GenMessage, GenService } from "@bufbuild/protobuf/codegenv2";
+import type { Timestamp } from "@bufbuild/protobuf/wkt";
+import type { Token } from "../../api/v2/token_pb";
+import type { Version } from "../../api/v2/version_pb";
+import type { ComponentType } from "../../infra/v2/component_pb";
+import type { Message } from "@bufbuild/protobuf";
+/**
+ * Describes the file metalstack/admin/v2/component.proto.
+ */
+export declare const file_metalstack_admin_v2_component: GenFile;
+/**
+ * ComponentServiceListRequest
+ *
+ * @generated from message metalstack.admin.v2.ComponentServiceListRequest
+ */
+export type ComponentServiceListRequest = Message<"metalstack.admin.v2.ComponentServiceListRequest"> & {};
+/**
+ * Describes the message metalstack.admin.v2.ComponentServiceListRequest.
+ * Use `create(ComponentServiceListRequestSchema)` to create a new message.
+ */
+export declare const ComponentServiceListRequestSchema: GenMessage<ComponentServiceListRequest>;
+/**
+ * ComponentServiceListResponse
+ *
+ * @generated from message metalstack.admin.v2.ComponentServiceListResponse
+ */
+export type ComponentServiceListResponse = Message<"metalstack.admin.v2.ComponentServiceListResponse"> & {
+    /**
+     * Components
+     *
+     * @generated from field: repeated metalstack.admin.v2.Component components = 1;
+     */
+    components: Component[];
+};
+/**
+ * Describes the message metalstack.admin.v2.ComponentServiceListResponse.
+ * Use `create(ComponentServiceListResponseSchema)` to create a new message.
+ */
+export declare const ComponentServiceListResponseSchema: GenMessage<ComponentServiceListResponse>;
+/**
+ * Component represents a microservice connected to our apiserver
+ *
+ * @generated from message metalstack.admin.v2.Component
+ */
+export type Component = Message<"metalstack.admin.v2.Component"> & {
+    /**
+     * UUID identifies this component event
+     *
+     * @generated from field: string uuid = 1;
+     */
+    uuid: string;
+    /**
+     * Type defines which service is actually pinging
+     *
+     * @generated from field: metalstack.infra.v2.ComponentType type = 2;
+     */
+    type: ComponentType;
+    /**
+     * Identifier is a unique identifier of this service, e.g. if two instance are running, this might be the pod id.
+     * micro_service and identifier guarantee uniqueness.
+     *
+     * @generated from field: string identifier = 3;
+     */
+    identifier: string;
+    /**
+     * StartedAt is the timestamp this service was started
+     *
+     * @generated from field: google.protobuf.Timestamp started_at = 4;
+     */
+    startedAt?: Timestamp;
+    /**
+     * Version of this service
+     *
+     * @generated from field: metalstack.api.v2.Version version = 5;
+     */
+    version?: Version;
+    /**
+     * Token is the token which is actually used by this microservice.
+     *
+     * @generated from field: metalstack.api.v2.Token token = 6;
+     */
+    token?: Token;
+};
+/**
+ * Describes the message metalstack.admin.v2.Component.
+ * Use `create(ComponentSchema)` to create a new message.
+ */
+export declare const ComponentSchema: GenMessage<Component>;
+/**
+ * ComponentService serves microservice related functions
+ *
+ * @generated from service metalstack.admin.v2.ComponentService
+ */
+export declare const ComponentService: GenService<{
+    /**
+     * List all components with their status
+     *
+     * @generated from rpc metalstack.admin.v2.ComponentService.List
+     */
+    list: {
+        methodKind: "unary";
+        input: typeof ComponentServiceListRequestSchema;
+        output: typeof ComponentServiceListResponseSchema;
+    };
+}>;
diff --git a/js/metalstack/admin/v2/component_pb.js b/js/metalstack/admin/v2/component_pb.js
new file mode 100644
index 00000000..e2cfae16
--- /dev/null
+++ b/js/metalstack/admin/v2/component_pb.js
@@ -0,0 +1,36 @@
+// @generated by protoc-gen-es v2.11.0 with parameter "target=ts"
+// @generated from file metalstack/admin/v2/component.proto (package metalstack.admin.v2, syntax proto3)
+/* eslint-disable */
+import { fileDesc, messageDesc, serviceDesc } from "@bufbuild/protobuf/codegenv2";
+import { file_buf_validate_validate } from "../../../buf/validate/validate_pb";
+import { file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";
+import { file_metalstack_api_v2_common } from "../../api/v2/common_pb";
+import { file_metalstack_api_v2_predefined_rules } from "../../api/v2/predefined_rules_pb";
+import { file_metalstack_api_v2_token } from "../../api/v2/token_pb";
+import { file_metalstack_api_v2_version } from "../../api/v2/version_pb";
+import { file_metalstack_infra_v2_component } from "../../infra/v2/component_pb";
+/**
+ * Describes the file metalstack/admin/v2/component.proto.
+ */
+export const file_metalstack_admin_v2_component = /*@__PURE__*/ fileDesc("CiNtZXRhbHN0YWNrL2FkbWluL3YyL2NvbXBvbmVudC5wcm90bxITbWV0YWxzdGFjay5hZG1pbi52MiIdChtDb21wb25lbnRTZXJ2aWNlTGlzdFJlcXVlc3QiUgocQ29tcG9uZW50U2VydmljZUxpc3RSZXNwb25zZRIyCgpjb21wb25lbnRzGAEgAygLMh4ubWV0YWxzdGFjay5hZG1pbi52Mi5Db21wb25lbnQihgIKCUNvbXBvbmVudBIWCgR1dWlkGAEgASgJQgi6SAVyA7ABARI6CgR0eXBlGAIgASgOMiIubWV0YWxzdGFjay5pbmZyYS52Mi5Db21wb25lbnRUeXBlQgi6SAWCAQIQARIfCgppZGVudGlmaWVyGAMgASgJQgu6SAhyBsCzrrECARIuCgpzdGFydGVkX2F0GAQgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIrCgd2ZXJzaW9uGAUgASgLMhoubWV0YWxzdGFjay5hcGkudjIuVmVyc2lvbhInCgV0b2tlbhgGIAEoCzIYLm1ldGFsc3RhY2suYXBpLnYyLlRva2VuMosBChBDb21wb25lbnRTZXJ2aWNlEncKBExpc3QSMC5tZXRhbHN0YWNrLmFkbWluLnYyLkNvbXBvbmVudFNlcnZpY2VMaXN0UmVxdWVzdBoxLm1ldGFsc3RhY2suYWRtaW4udjIuQ29tcG9uZW50U2VydmljZUxpc3RSZXNwb25zZSIK0vMYAgEC4PMYAkLSAQoXY29tLm1ldGFsc3RhY2suYWRtaW4udjJCDkNvbXBvbmVudFByb3RvUAFaOWdpdGh1Yi5jb20vbWV0YWwtc3RhY2svYXBpL2dvL21ldGFsc3RhY2svYWRtaW4vdjI7YWRtaW52MqICA01BWKoCE01ldGFsc3RhY2suQWRtaW4uVjLKAhNNZXRhbHN0YWNrXEFkbWluXFYy4gIfTWV0YWxzdGFja1xBZG1pblxWMlxHUEJNZXRhZGF0YeoCFU1ldGFsc3RhY2s6OkFkbWluOjpWMmIGcHJvdG8z", [file_buf_validate_validate, file_google_protobuf_timestamp, file_metalstack_api_v2_common, file_metalstack_api_v2_predefined_rules, file_metalstack_api_v2_token, file_metalstack_api_v2_version, file_metalstack_infra_v2_component]);
+/**
+ * Describes the message metalstack.admin.v2.ComponentServiceListRequest.
+ * Use `create(ComponentServiceListRequestSchema)` to create a new message.
+ */
+export const ComponentServiceListRequestSchema = /*@__PURE__*/ messageDesc(file_metalstack_admin_v2_component, 0);
+/**
+ * Describes the message metalstack.admin.v2.ComponentServiceListResponse.
+ * Use `create(ComponentServiceListResponseSchema)` to create a new message.
+ */
+export const ComponentServiceListResponseSchema = /*@__PURE__*/ messageDesc(file_metalstack_admin_v2_component, 1);
+/**
+ * Describes the message metalstack.admin.v2.Component.
+ * Use `create(ComponentSchema)` to create a new message.
+ */
+export const ComponentSchema = /*@__PURE__*/ messageDesc(file_metalstack_admin_v2_component, 2);
+/**
+ * ComponentService serves microservice related functions
+ *
+ * @generated from service metalstack.admin.v2.ComponentService
+ */
+export const ComponentService = /*@__PURE__*/ serviceDesc(file_metalstack_admin_v2_component, 0);
diff --git a/js/metalstack/admin/v2/component_pb.ts b/js/metalstack/admin/v2/component_pb.ts
new file mode 100644
index 00000000..0e05f1ae
--- /dev/null
+++ b/js/metalstack/admin/v2/component_pb.ts
@@ -0,0 +1,137 @@
+// @generated by protoc-gen-es v2.11.0 with parameter "target=ts"
+// @generated from file metalstack/admin/v2/component.proto (package metalstack.admin.v2, syntax proto3)
+/* eslint-disable */
+
+import type { GenFile, GenMessage, GenService } from "@bufbuild/protobuf/codegenv2";
+import { fileDesc, messageDesc, serviceDesc } from "@bufbuild/protobuf/codegenv2";
+import { file_buf_validate_validate } from "../../../buf/validate/validate_pb";
+import type { Timestamp } from "@bufbuild/protobuf/wkt";
+import { file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";
+import { file_metalstack_api_v2_common } from "../../api/v2/common_pb";
+import { file_metalstack_api_v2_predefined_rules } from "../../api/v2/predefined_rules_pb";
+import type { Token } from "../../api/v2/token_pb";
+import { file_metalstack_api_v2_token } from "../../api/v2/token_pb";
+import type { Version } from "../../api/v2/version_pb";
+import { file_metalstack_api_v2_version } from "../../api/v2/version_pb";
+import type { ComponentType } from "../../infra/v2/component_pb";
+import { file_metalstack_infra_v2_component } from "../../infra/v2/component_pb";
+import type { Message } from "@bufbuild/protobuf";
+
+/**
+ * Describes the file metalstack/admin/v2/component.proto.
+ */
+export const file_metalstack_admin_v2_component: GenFile = /*@__PURE__*/
+  fileDesc("CiNtZXRhbHN0YWNrL2FkbWluL3YyL2NvbXBvbmVudC5wcm90bxITbWV0YWxzdGFjay5hZG1pbi52MiIdChtDb21wb25lbnRTZXJ2aWNlTGlzdFJlcXVlc3QiUgocQ29tcG9uZW50U2VydmljZUxpc3RSZXNwb25zZRIyCgpjb21wb25lbnRzGAEgAygLMh4ubWV0YWxzdGFjay5hZG1pbi52Mi5Db21wb25lbnQihgIKCUNvbXBvbmVudBIWCgR1dWlkGAEgASgJQgi6SAVyA7ABARI6CgR0eXBlGAIgASgOMiIubWV0YWxzdGFjay5pbmZyYS52Mi5Db21wb25lbnRUeXBlQgi6SAWCAQIQARIfCgppZGVudGlmaWVyGAMgASgJQgu6SAhyBsCzrrECARIuCgpzdGFydGVkX2F0GAQgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIrCgd2ZXJzaW9uGAUgASgLMhoubWV0YWxzdGFjay5hcGkudjIuVmVyc2lvbhInCgV0b2tlbhgGIAEoCzIYLm1ldGFsc3RhY2suYXBpLnYyLlRva2VuMosBChBDb21wb25lbnRTZXJ2aWNlEncKBExpc3QSMC5tZXRhbHN0YWNrLmFkbWluLnYyLkNvbXBvbmVudFNlcnZpY2VMaXN0UmVxdWVzdBoxLm1ldGFsc3RhY2suYWRtaW4udjIuQ29tcG9uZW50U2VydmljZUxpc3RSZXNwb25zZSIK0vMYAgEC4PMYAkLSAQoXY29tLm1ldGFsc3RhY2suYWRtaW4udjJCDkNvbXBvbmVudFByb3RvUAFaOWdpdGh1Yi5jb20vbWV0YWwtc3RhY2svYXBpL2dvL21ldGFsc3RhY2svYWRtaW4vdjI7YWRtaW52MqICA01BWKoCE01ldGFsc3RhY2suQWRtaW4uVjLKAhNNZXRhbHN0YWNrXEFkbWluXFYy4gIfTWV0YWxzdGFja1xBZG1pblxWMlxHUEJNZXRhZGF0YeoCFU1ldGFsc3RhY2s6OkFkbWluOjpWMmIGcHJvdG8z", [file_buf_validate_validate, file_google_protobuf_timestamp, file_metalstack_api_v2_common, file_metalstack_api_v2_predefined_rules, file_metalstack_api_v2_token, file_metalstack_api_v2_version, file_metalstack_infra_v2_component]);
+
+/**
+ * ComponentServiceListRequest
+ *
+ * @generated from message metalstack.admin.v2.ComponentServiceListRequest
+ */
+export type ComponentServiceListRequest = Message<"metalstack.admin.v2.ComponentServiceListRequest"> & {
+};
+
+/**
+ * Describes the message metalstack.admin.v2.ComponentServiceListRequest.
+ * Use `create(ComponentServiceListRequestSchema)` to create a new message.
+ */
+export const ComponentServiceListRequestSchema: GenMessage<ComponentServiceListRequest> = /*@__PURE__*/
+  messageDesc(file_metalstack_admin_v2_component, 0);
+
+/**
+ * ComponentServiceListResponse
+ *
+ * @generated from message metalstack.admin.v2.ComponentServiceListResponse
+ */
+export type ComponentServiceListResponse = Message<"metalstack.admin.v2.ComponentServiceListResponse"> & {
+  /**
+   * Components
+   *
+   * @generated from field: repeated metalstack.admin.v2.Component components = 1;
+   */
+  components: Component[];
+};
+
+/**
+ * Describes the message metalstack.admin.v2.ComponentServiceListResponse.
+ * Use `create(ComponentServiceListResponseSchema)` to create a new message.
+ */
+export const ComponentServiceListResponseSchema: GenMessage<ComponentServiceListResponse> = /*@__PURE__*/
+  messageDesc(file_metalstack_admin_v2_component, 1);
+
+/**
+ * Component represents a microservice connected to our apiserver
+ *
+ * @generated from message metalstack.admin.v2.Component
+ */
+export type Component = Message<"metalstack.admin.v2.Component"> & {
+  /**
+   * UUID identifies this component event
+   *
+   * @generated from field: string uuid = 1;
+   */
+  uuid: string;
+
+  /**
+   * Type defines which service is actually pinging
+   *
+   * @generated from field: metalstack.infra.v2.ComponentType type = 2;
+   */
+  type: ComponentType;
+
+  /**
+   * Identifier is a unique identifier of this service, e.g. if two instance are running, this might be the pod id.
+   * micro_service and identifier guarantee uniqueness.
+   *
+   * @generated from field: string identifier = 3;
+   */
+  identifier: string;
+
+  /**
+   * StartedAt is the timestamp this service was started
+   *
+   * @generated from field: google.protobuf.Timestamp started_at = 4;
+   */
+  startedAt?: Timestamp;
+
+  /**
+   * Version of this service
+   *
+   * @generated from field: metalstack.api.v2.Version version = 5;
+   */
+  version?: Version;
+
+  /**
+   * Token is the token which is actually used by this microservice.
+   *
+   * @generated from field: metalstack.api.v2.Token token = 6;
+   */
+  token?: Token;
+};
+
+/**
+ * Describes the message metalstack.admin.v2.Component.
+ * Use `create(ComponentSchema)` to create a new message.
+ */
+export const ComponentSchema: GenMessage<Component> = /*@__PURE__*/
+  messageDesc(file_metalstack_admin_v2_component, 2);
+
+/**
+ * ComponentService serves microservice related functions
+ *
+ * @generated from service metalstack.admin.v2.ComponentService
+ */
+export const ComponentService: GenService<{
+  /**
+   * List all components with their status
+   *
+   * @generated from rpc metalstack.admin.v2.ComponentService.List
+   */
+  list: {
+    methodKind: "unary";
+    input: typeof ComponentServiceListRequestSchema;
+    output: typeof ComponentServiceListResponseSchema;
+  },
+}> = /*@__PURE__*/
+  serviceDesc(file_metalstack_admin_v2_component, 0);
+
diff --git a/js/metalstack/admin/v2/partition_pb.js b/js/metalstack/admin/v2/partition_pb.js
index 3f319d73..65cb1d50 100644
--- a/js/metalstack/admin/v2/partition_pb.js
+++ b/js/metalstack/admin/v2/partition_pb.js
@@ -9,7 +9,7 @@ import { file_metalstack_api_v2_predefined_rules } from "../../api/v2/predefined
 /**
  * Describes the file metalstack/admin/v2/partition.proto.
  */
-export const file_metalstack_admin_v2_partition = /*@__PURE__*/ fileDesc("CiNtZXRhbHN0YWNrL2FkbWluL3YyL3BhcnRpdGlvbi5wcm90bxITbWV0YWxzdGFjay5hZG1pbi52MiJQCh1QYXJ0aXRpb25TZXJ2aWNlQ3JlYXRlUmVxdWVzdBIvCglwYXJ0aXRpb24YASABKAsyHC5tZXRhbHN0YWNrLmFwaS52Mi5QYXJ0aXRpb24izwMKHVBhcnRpdGlvblNlcnZpY2VVcGRhdGVSZXF1ZXN0EhcKAmlkGAEgASgJQgu6SAhyBtCzrrECARI6Cgt1cGRhdGVfbWV0YRgCIAEoCzIdLm1ldGFsc3RhY2suYXBpLnYyLlVwZGF0ZU1ldGFCBrpIA8gBARIlCgtkZXNjcmlwdGlvbhgDIAEoCUILukgIcgbIs66xAgFIAIgBARJJChJib290X2NvbmZpZ3VyYXRpb24YBCABKAsyLS5tZXRhbHN0YWNrLmFwaS52Mi5QYXJ0aXRpb25Cb290Q29uZmlndXJhdGlvbhI6CgpkbnNfc2VydmVyGAUgAygLMhwubWV0YWxzdGFjay5hcGkudjIuRE5TU2VydmVyQgi6SAWSAQIQAxI6CgpudHBfc2VydmVyGAYgAygLMhwubWV0YWxzdGFjay5hcGkudjIuTlRQU2VydmVyQgi6SAWSAQIQChIeChZtZ210X3NlcnZpY2VfYWRkcmVzc2VzGAcgAygJEjQKBmxhYmVscxgIIAEoCzIfLm1ldGFsc3RhY2suYXBpLnYyLlVwZGF0ZUxhYmVsc0gBiAEBQg4KDF9kZXNjcmlwdGlvbkIJCgdfbGFiZWxzIjgKHVBhcnRpdGlvblNlcnZpY2VEZWxldGVSZXF1ZXN0EhcKAmlkGAEgASgJQgu6SAhyBtCzrrECASJRCh5QYXJ0aXRpb25TZXJ2aWNlQ3JlYXRlUmVzcG9uc2USLwoJcGFydGl0aW9uGAEgASgLMhwubWV0YWxzdGFjay5hcGkudjIuUGFydGl0aW9uIlEKHlBhcnRpdGlvblNlcnZpY2VVcGRhdGVSZXNwb25zZRIvCglwYXJ0aXRpb24YASABKAsyHC5tZXRhbHN0YWNrLmFwaS52Mi5QYXJ0aXRpb24iUQoeUGFydGl0aW9uU2VydmljZURlbGV0ZVJlc3BvbnNlEi8KCXBhcnRpdGlvbhgBIAEoCzIcLm1ldGFsc3RhY2suYXBpLnYyLlBhcnRpdGlvbiKbAQofUGFydGl0aW9uU2VydmljZUNhcGFjaXR5UmVxdWVzdBIcCgJpZBgBIAEoCUILukgIcgbQs66xAgFIAIgBARIeCgRzaXplGAIgASgJQgu6SAhyBsCzrrECAUgBiAEBEh4KB3Byb2plY3QYAyABKAlCCLpIBXIDsAEBSAKIAQFCBQoDX2lkQgcKBV9zaXplQgoKCF9wcm9qZWN0ImYKIFBhcnRpdGlvblNlcnZpY2VDYXBhY2l0eVJlc3BvbnNlEkIKEnBhcnRpdGlvbl9jYXBhY2l0eRgBIAMoCzImLm1ldGFsc3RhY2suYWRtaW4udjIuUGFydGl0aW9uQ2FwYWNpdHkicQoRUGFydGl0aW9uQ2FwYWNpdHkSEQoJcGFydGl0aW9uGAEgASgJEkkKF21hY2hpbmVfc2l6ZV9jYXBhY2l0aWVzGAIgAygLMigubWV0YWxzdGFjay5hZG1pbi52Mi5NYWNoaW5lU2l6ZUNhcGFjaXR5IsQCChNNYWNoaW5lU2l6ZUNhcGFjaXR5EgwKBHNpemUYAiABKAkSDQoFdG90YWwYAyABKAMSEwoLcGhvbmVkX2hvbWUYBCABKAMSDwoHd2FpdGluZxgFIAEoAxINCgVvdGhlchgGIAEoAxIWCg5vdGhlcl9tYWNoaW5lcxgHIAMoCRIRCglhbGxvY2F0ZWQYCCABKAMSEwoLYWxsb2NhdGFibGUYCSABKAMSDAoEZnJlZRgKIAEoAxITCgt1bmF2YWlsYWJsZRgLIAEoAxIOCgZmYXVsdHkYDCABKAMSFwoPZmF1bHR5X21hY2hpbmVzGA0gAygJEhQKDHJlc2VydmF0aW9ucxgOIAEoAxIZChF1c2VkX3Jlc2VydmF0aW9ucxgPIAEoAxIeChZyZW1haW5pbmdfcmVzZXJ2YXRpb25zGBAgASgDMpIEChBQYXJ0aXRpb25TZXJ2aWNlEnwKBkNyZWF0ZRIyLm1ldGFsc3RhY2suYWRtaW4udjIuUGFydGl0aW9uU2VydmljZUNyZWF0ZVJlcXVlc3QaMy5tZXRhbHN0YWNrLmFkbWluLnYyLlBhcnRpdGlvblNlcnZpY2VDcmVhdGVSZXNwb25zZSIJ0vMYAQHg8xgBEnwKBlVwZGF0ZRIyLm1ldGFsc3RhY2suYWRtaW4udjIuUGFydGl0aW9uU2VydmljZVVwZGF0ZVJlcXVlc3QaMy5tZXRhbHN0YWNrLmFkbWluLnYyLlBhcnRpdGlvblNlcnZpY2VVcGRhdGVSZXNwb25zZSIJ0vMYAQHg8xgBEnwKBkRlbGV0ZRIyLm1ldGFsc3RhY2suYWRtaW4udjIuUGFydGl0aW9uU2VydmljZURlbGV0ZVJlcXVlc3QaMy5tZXRhbHN0YWNrLmFkbWluLnYyLlBhcnRpdGlvblNlcnZpY2VEZWxldGVSZXNwb25zZSIJ0vMYAQHg8xgBEoMBCghDYXBhY2l0eRI0Lm1ldGFsc3RhY2suYWRtaW4udjIuUGFydGl0aW9uU2VydmljZUNhcGFjaXR5UmVxdWVzdBo1Lm1ldGFsc3RhY2suYWRtaW4udjIuUGFydGl0aW9uU2VydmljZUNhcGFjaXR5UmVzcG9uc2UiCtLzGAICAeDzGAJC0gEKF2NvbS5tZXRhbHN0YWNrLmFkbWluLnYyQg5QYXJ0aXRpb25Qcm90b1ABWjlnaXRodWIuY29tL21ldGFsLXN0YWNrL2FwaS9nby9tZXRhbHN0YWNrL2FkbWluL3YyO2FkbWludjKiAgNNQViqAhNNZXRhbHN0YWNrLkFkbWluLlYyygITTWV0YWxzdGFja1xBZG1pblxWMuICH01ldGFsc3RhY2tcQWRtaW5cVjJcR1BCTWV0YWRhdGHqAhVNZXRhbHN0YWNrOjpBZG1pbjo6VjJiBnByb3RvMw", [file_buf_validate_validate, file_metalstack_api_v2_common, file_metalstack_api_v2_partition, file_metalstack_api_v2_predefined_rules]);
+export const file_metalstack_admin_v2_partition = /*@__PURE__*/ fileDesc("CiNtZXRhbHN0YWNrL2FkbWluL3YyL3BhcnRpdGlvbi5wcm90bxITbWV0YWxzdGFjay5hZG1pbi52MiJQCh1QYXJ0aXRpb25TZXJ2aWNlQ3JlYXRlUmVxdWVzdBIvCglwYXJ0aXRpb24YASABKAsyHC5tZXRhbHN0YWNrLmFwaS52Mi5QYXJ0aXRpb24izwMKHVBhcnRpdGlvblNlcnZpY2VVcGRhdGVSZXF1ZXN0EhcKAmlkGAEgASgJQgu6SAhyBtCzrrECARI6Cgt1cGRhdGVfbWV0YRgCIAEoCzIdLm1ldGFsc3RhY2suYXBpLnYyLlVwZGF0ZU1ldGFCBrpIA8gBARIlCgtkZXNjcmlwdGlvbhgDIAEoCUILukgIcgbIs66xAgFIAIgBARJJChJib290X2NvbmZpZ3VyYXRpb24YBCABKAsyLS5tZXRhbHN0YWNrLmFwaS52Mi5QYXJ0aXRpb25Cb290Q29uZmlndXJhdGlvbhI6CgpkbnNfc2VydmVyGAUgAygLMhwubWV0YWxzdGFjay5hcGkudjIuRE5TU2VydmVyQgi6SAWSAQIQAxI6CgpudHBfc2VydmVyGAYgAygLMhwubWV0YWxzdGFjay5hcGkudjIuTlRQU2VydmVyQgi6SAWSAQIQChIeChZtZ210X3NlcnZpY2VfYWRkcmVzc2VzGAcgAygJEjQKBmxhYmVscxgIIAEoCzIfLm1ldGFsc3RhY2suYXBpLnYyLlVwZGF0ZUxhYmVsc0gBiAEBQg4KDF9kZXNjcmlwdGlvbkIJCgdfbGFiZWxzIjgKHVBhcnRpdGlvblNlcnZpY2VEZWxldGVSZXF1ZXN0EhcKAmlkGAEgASgJQgu6SAhyBtCzrrECASJRCh5QYXJ0aXRpb25TZXJ2aWNlQ3JlYXRlUmVzcG9uc2USLwoJcGFydGl0aW9uGAEgASgLMhwubWV0YWxzdGFjay5hcGkudjIuUGFydGl0aW9uIlEKHlBhcnRpdGlvblNlcnZpY2VVcGRhdGVSZXNwb25zZRIvCglwYXJ0aXRpb24YASABKAsyHC5tZXRhbHN0YWNrLmFwaS52Mi5QYXJ0aXRpb24iUQoeUGFydGl0aW9uU2VydmljZURlbGV0ZVJlc3BvbnNlEi8KCXBhcnRpdGlvbhgBIAEoCzIcLm1ldGFsc3RhY2suYXBpLnYyLlBhcnRpdGlvbiKbAQofUGFydGl0aW9uU2VydmljZUNhcGFjaXR5UmVxdWVzdBIcCgJpZBgBIAEoCUILukgIcgbQs66xAgFIAIgBARIeCgRzaXplGAIgASgJQgu6SAhyBsCzrrECAUgBiAEBEh4KB3Byb2plY3QYAyABKAlCCLpIBXIDsAEBSAKIAQFCBQoDX2lkQgcKBV9zaXplQgoKCF9wcm9qZWN0ImYKIFBhcnRpdGlvblNlcnZpY2VDYXBhY2l0eVJlc3BvbnNlEkIKEnBhcnRpdGlvbl9jYXBhY2l0eRgBIAMoCzImLm1ldGFsc3RhY2suYWRtaW4udjIuUGFydGl0aW9uQ2FwYWNpdHkifgoRUGFydGl0aW9uQ2FwYWNpdHkSHgoJcGFydGl0aW9uGAEgASgJQgu6SAhyBtCzrrECARJJChdtYWNoaW5lX3NpemVfY2FwYWNpdGllcxgCIAMoCzIoLm1ldGFsc3RhY2suYWRtaW4udjIuTWFjaGluZVNpemVDYXBhY2l0eSLRAgoTTWFjaGluZVNpemVDYXBhY2l0eRIZCgRzaXplGAIgASgJQgu6SAhyBsCzrrECARINCgV0b3RhbBgDIAEoAxITCgtwaG9uZWRfaG9tZRgEIAEoAxIPCgd3YWl0aW5nGAUgASgDEg0KBW90aGVyGAYgASgDEhYKDm90aGVyX21hY2hpbmVzGAcgAygJEhEKCWFsbG9jYXRlZBgIIAEoAxITCgthbGxvY2F0YWJsZRgJIAEoAxIMCgRmcmVlGAogASgDEhMKC3VuYXZhaWxhYmxlGAsgASgDEg4KBmZhdWx0eRgMIAEoAxIXCg9mYXVsdHlfbWFjaGluZXMYDSADKAkSFAoMcmVzZXJ2YXRpb25zGA4gASgDEhkKEXVzZWRfcmVzZXJ2YXRpb25zGA8gASgDEh4KFnJlbWFpbmluZ19yZXNlcnZhdGlvbnMYECABKAMykgQKEFBhcnRpdGlvblNlcnZpY2USfAoGQ3JlYXRlEjIubWV0YWxzdGFjay5hZG1pbi52Mi5QYXJ0aXRpb25TZXJ2aWNlQ3JlYXRlUmVxdWVzdBozLm1ldGFsc3RhY2suYWRtaW4udjIuUGFydGl0aW9uU2VydmljZUNyZWF0ZVJlc3BvbnNlIgnS8xgBAeDzGAESfAoGVXBkYXRlEjIubWV0YWxzdGFjay5hZG1pbi52Mi5QYXJ0aXRpb25TZXJ2aWNlVXBkYXRlUmVxdWVzdBozLm1ldGFsc3RhY2suYWRtaW4udjIuUGFydGl0aW9uU2VydmljZVVwZGF0ZVJlc3BvbnNlIgnS8xgBAeDzGAESfAoGRGVsZXRlEjIubWV0YWxzdGFjay5hZG1pbi52Mi5QYXJ0aXRpb25TZXJ2aWNlRGVsZXRlUmVxdWVzdBozLm1ldGFsc3RhY2suYWRtaW4udjIuUGFydGl0aW9uU2VydmljZURlbGV0ZVJlc3BvbnNlIgnS8xgBAeDzGAESgwEKCENhcGFjaXR5EjQubWV0YWxzdGFjay5hZG1pbi52Mi5QYXJ0aXRpb25TZXJ2aWNlQ2FwYWNpdHlSZXF1ZXN0GjUubWV0YWxzdGFjay5hZG1pbi52Mi5QYXJ0aXRpb25TZXJ2aWNlQ2FwYWNpdHlSZXNwb25zZSIK0vMYAgIB4PMYAkLSAQoXY29tLm1ldGFsc3RhY2suYWRtaW4udjJCDlBhcnRpdGlvblByb3RvUAFaOWdpdGh1Yi5jb20vbWV0YWwtc3RhY2svYXBpL2dvL21ldGFsc3RhY2svYWRtaW4vdjI7YWRtaW52MqICA01BWKoCE01ldGFsc3RhY2suQWRtaW4uVjLKAhNNZXRhbHN0YWNrXEFkbWluXFYy4gIfTWV0YWxzdGFja1xBZG1pblxWMlxHUEJNZXRhZGF0YeoCFU1ldGFsc3RhY2s6OkFkbWluOjpWMmIGcHJvdG8z", [file_buf_validate_validate, file_metalstack_api_v2_common, file_metalstack_api_v2_partition, file_metalstack_api_v2_predefined_rules]);
 /**
  * Describes the message metalstack.admin.v2.PartitionServiceCreateRequest.
  * Use `create(PartitionServiceCreateRequestSchema)` to create a new message.
diff --git a/js/metalstack/admin/v2/partition_pb.ts b/js/metalstack/admin/v2/partition_pb.ts
index abd10d61..16b219d1 100644
--- a/js/metalstack/admin/v2/partition_pb.ts
+++ b/js/metalstack/admin/v2/partition_pb.ts
@@ -16,7 +16,7 @@ import type { Message } from "@bufbuild/protobuf";
  * Describes the file metalstack/admin/v2/partition.proto.
  */
 export const file_metalstack_admin_v2_partition: GenFile = /*@__PURE__*/
-  fileDesc("CiNtZXRhbHN0YWNrL2FkbWluL3YyL3BhcnRpdGlvbi5wcm90bxITbWV0YWxzdGFjay5hZG1pbi52MiJQCh1QYXJ0aXRpb25TZXJ2aWNlQ3JlYXRlUmVxdWVzdBIvCglwYXJ0aXRpb24YASABKAsyHC5tZXRhbHN0YWNrLmFwaS52Mi5QYXJ0aXRpb24izwMKHVBhcnRpdGlvblNlcnZpY2VVcGRhdGVSZXF1ZXN0EhcKAmlkGAEgASgJQgu6SAhyBtCzrrECARI6Cgt1cGRhdGVfbWV0YRgCIAEoCzIdLm1ldGFsc3RhY2suYXBpLnYyLlVwZGF0ZU1ldGFCBrpIA8gBARIlCgtkZXNjcmlwdGlvbhgDIAEoCUILukgIcgbIs66xAgFIAIgBARJJChJib290X2NvbmZpZ3VyYXRpb24YBCABKAsyLS5tZXRhbHN0YWNrLmFwaS52Mi5QYXJ0aXRpb25Cb290Q29uZmlndXJhdGlvbhI6CgpkbnNfc2VydmVyGAUgAygLMhwubWV0YWxzdGFjay5hcGkudjIuRE5TU2VydmVyQgi6SAWSAQIQAxI6CgpudHBfc2VydmVyGAYgAygLMhwubWV0YWxzdGFjay5hcGkudjIuTlRQU2VydmVyQgi6SAWSAQIQChIeChZtZ210X3NlcnZpY2VfYWRkcmVzc2VzGAcgAygJEjQKBmxhYmVscxgIIAEoCzIfLm1ldGFsc3RhY2suYXBpLnYyLlVwZGF0ZUxhYmVsc0gBiAEBQg4KDF9kZXNjcmlwdGlvbkIJCgdfbGFiZWxzIjgKHVBhcnRpdGlvblNlcnZpY2VEZWxldGVSZXF1ZXN0EhcKAmlkGAEgASgJQgu6SAhyBtCzrrECASJRCh5QYXJ0aXRpb25TZXJ2aWNlQ3JlYXRlUmVzcG9uc2USLwoJcGFydGl0aW9uGAEgASgLMhwubWV0YWxzdGFjay5hcGkudjIuUGFydGl0aW9uIlEKHlBhcnRpdGlvblNlcnZpY2VVcGRhdGVSZXNwb25zZRIvCglwYXJ0aXRpb24YASABKAsyHC5tZXRhbHN0YWNrLmFwaS52Mi5QYXJ0aXRpb24iUQoeUGFydGl0aW9uU2VydmljZURlbGV0ZVJlc3BvbnNlEi8KCXBhcnRpdGlvbhgBIAEoCzIcLm1ldGFsc3RhY2suYXBpLnYyLlBhcnRpdGlvbiKbAQofUGFydGl0aW9uU2VydmljZUNhcGFjaXR5UmVxdWVzdBIcCgJpZBgBIAEoCUILukgIcgbQs66xAgFIAIgBARIeCgRzaXplGAIgASgJQgu6SAhyBsCzrrECAUgBiAEBEh4KB3Byb2plY3QYAyABKAlCCLpIBXIDsAEBSAKIAQFCBQoDX2lkQgcKBV9zaXplQgoKCF9wcm9qZWN0ImYKIFBhcnRpdGlvblNlcnZpY2VDYXBhY2l0eVJlc3BvbnNlEkIKEnBhcnRpdGlvbl9jYXBhY2l0eRgBIAMoCzImLm1ldGFsc3RhY2suYWRtaW4udjIuUGFydGl0aW9uQ2FwYWNpdHkicQoRUGFydGl0aW9uQ2FwYWNpdHkSEQoJcGFydGl0aW9uGAEgASgJEkkKF21hY2hpbmVfc2l6ZV9jYXBhY2l0aWVzGAIgAygLMigubWV0YWxzdGFjay5hZG1pbi52Mi5NYWNoaW5lU2l6ZUNhcGFjaXR5IsQCChNNYWNoaW5lU2l6ZUNhcGFjaXR5EgwKBHNpemUYAiABKAkSDQoFdG90YWwYAyABKAMSEwoLcGhvbmVkX2hvbWUYBCABKAMSDwoHd2FpdGluZxgFIAEoAxINCgVvdGhlchgGIAEoAxIWCg5vdGhlcl9tYWNoaW5lcxgHIAMoCRIRCglhbGxvY2F0ZWQYCCABKAMSEwoLYWxsb2NhdGFibGUYCSABKAMSDAoEZnJlZRgKIAEoAxITCgt1bmF2YWlsYWJsZRgLIAEoAxIOCgZmYXVsdHkYDCABKAMSFwoPZmF1bHR5X21hY2hpbmVzGA0gAygJEhQKDHJlc2VydmF0aW9ucxgOIAEoAxIZChF1c2VkX3Jlc2VydmF0aW9ucxgPIAEoAxIeChZyZW1haW5pbmdfcmVzZXJ2YXRpb25zGBAgASgDMpIEChBQYXJ0aXRpb25TZXJ2aWNlEnwKBkNyZWF0ZRIyLm1ldGFsc3RhY2suYWRtaW4udjIuUGFydGl0aW9uU2VydmljZUNyZWF0ZVJlcXVlc3QaMy5tZXRhbHN0YWNrLmFkbWluLnYyLlBhcnRpdGlvblNlcnZpY2VDcmVhdGVSZXNwb25zZSIJ0vMYAQHg8xgBEnwKBlVwZGF0ZRIyLm1ldGFsc3RhY2suYWRtaW4udjIuUGFydGl0aW9uU2VydmljZVVwZGF0ZVJlcXVlc3QaMy5tZXRhbHN0YWNrLmFkbWluLnYyLlBhcnRpdGlvblNlcnZpY2VVcGRhdGVSZXNwb25zZSIJ0vMYAQHg8xgBEnwKBkRlbGV0ZRIyLm1ldGFsc3RhY2suYWRtaW4udjIuUGFydGl0aW9uU2VydmljZURlbGV0ZVJlcXVlc3QaMy5tZXRhbHN0YWNrLmFkbWluLnYyLlBhcnRpdGlvblNlcnZpY2VEZWxldGVSZXNwb25zZSIJ0vMYAQHg8xgBEoMBCghDYXBhY2l0eRI0Lm1ldGFsc3RhY2suYWRtaW4udjIuUGFydGl0aW9uU2VydmljZUNhcGFjaXR5UmVxdWVzdBo1Lm1ldGFsc3RhY2suYWRtaW4udjIuUGFydGl0aW9uU2VydmljZUNhcGFjaXR5UmVzcG9uc2UiCtLzGAICAeDzGAJC0gEKF2NvbS5tZXRhbHN0YWNrLmFkbWluLnYyQg5QYXJ0aXRpb25Qcm90b1ABWjlnaXRodWIuY29tL21ldGFsLXN0YWNrL2FwaS9nby9tZXRhbHN0YWNrL2FkbWluL3YyO2FkbWludjKiAgNNQViqAhNNZXRhbHN0YWNrLkFkbWluLlYyygITTWV0YWxzdGFja1xBZG1pblxWMuICH01ldGFsc3RhY2tcQWRtaW5cVjJcR1BCTWV0YWRhdGHqAhVNZXRhbHN0YWNrOjpBZG1pbjo6VjJiBnByb3RvMw", [file_buf_validate_validate, file_metalstack_api_v2_common, file_metalstack_api_v2_partition, file_metalstack_api_v2_predefined_rules]);
+  fileDesc("CiNtZXRhbHN0YWNrL2FkbWluL3YyL3BhcnRpdGlvbi5wcm90bxITbWV0YWxzdGFjay5hZG1pbi52MiJQCh1QYXJ0aXRpb25TZXJ2aWNlQ3JlYXRlUmVxdWVzdBIvCglwYXJ0aXRpb24YASABKAsyHC5tZXRhbHN0YWNrLmFwaS52Mi5QYXJ0aXRpb24izwMKHVBhcnRpdGlvblNlcnZpY2VVcGRhdGVSZXF1ZXN0EhcKAmlkGAEgASgJQgu6SAhyBtCzrrECARI6Cgt1cGRhdGVfbWV0YRgCIAEoCzIdLm1ldGFsc3RhY2suYXBpLnYyLlVwZGF0ZU1ldGFCBrpIA8gBARIlCgtkZXNjcmlwdGlvbhgDIAEoCUILukgIcgbIs66xAgFIAIgBARJJChJib290X2NvbmZpZ3VyYXRpb24YBCABKAsyLS5tZXRhbHN0YWNrLmFwaS52Mi5QYXJ0aXRpb25Cb290Q29uZmlndXJhdGlvbhI6CgpkbnNfc2VydmVyGAUgAygLMhwubWV0YWxzdGFjay5hcGkudjIuRE5TU2VydmVyQgi6SAWSAQIQAxI6CgpudHBfc2VydmVyGAYgAygLMhwubWV0YWxzdGFjay5hcGkudjIuTlRQU2VydmVyQgi6SAWSAQIQChIeChZtZ210X3NlcnZpY2VfYWRkcmVzc2VzGAcgAygJEjQKBmxhYmVscxgIIAEoCzIfLm1ldGFsc3RhY2suYXBpLnYyLlVwZGF0ZUxhYmVsc0gBiAEBQg4KDF9kZXNjcmlwdGlvbkIJCgdfbGFiZWxzIjgKHVBhcnRpdGlvblNlcnZpY2VEZWxldGVSZXF1ZXN0EhcKAmlkGAEgASgJQgu6SAhyBtCzrrECASJRCh5QYXJ0aXRpb25TZXJ2aWNlQ3JlYXRlUmVzcG9uc2USLwoJcGFydGl0aW9uGAEgASgLMhwubWV0YWxzdGFjay5hcGkudjIuUGFydGl0aW9uIlEKHlBhcnRpdGlvblNlcnZpY2VVcGRhdGVSZXNwb25zZRIvCglwYXJ0aXRpb24YASABKAsyHC5tZXRhbHN0YWNrLmFwaS52Mi5QYXJ0aXRpb24iUQoeUGFydGl0aW9uU2VydmljZURlbGV0ZVJlc3BvbnNlEi8KCXBhcnRpdGlvbhgBIAEoCzIcLm1ldGFsc3RhY2suYXBpLnYyLlBhcnRpdGlvbiKbAQofUGFydGl0aW9uU2VydmljZUNhcGFjaXR5UmVxdWVzdBIcCgJpZBgBIAEoCUILukgIcgbQs66xAgFIAIgBARIeCgRzaXplGAIgASgJQgu6SAhyBsCzrrECAUgBiAEBEh4KB3Byb2plY3QYAyABKAlCCLpIBXIDsAEBSAKIAQFCBQoDX2lkQgcKBV9zaXplQgoKCF9wcm9qZWN0ImYKIFBhcnRpdGlvblNlcnZpY2VDYXBhY2l0eVJlc3BvbnNlEkIKEnBhcnRpdGlvbl9jYXBhY2l0eRgBIAMoCzImLm1ldGFsc3RhY2suYWRtaW4udjIuUGFydGl0aW9uQ2FwYWNpdHkifgoRUGFydGl0aW9uQ2FwYWNpdHkSHgoJcGFydGl0aW9uGAEgASgJQgu6SAhyBtCzrrECARJJChdtYWNoaW5lX3NpemVfY2FwYWNpdGllcxgCIAMoCzIoLm1ldGFsc3RhY2suYWRtaW4udjIuTWFjaGluZVNpemVDYXBhY2l0eSLRAgoTTWFjaGluZVNpemVDYXBhY2l0eRIZCgRzaXplGAIgASgJQgu6SAhyBsCzrrECARINCgV0b3RhbBgDIAEoAxITCgtwaG9uZWRfaG9tZRgEIAEoAxIPCgd3YWl0aW5nGAUgASgDEg0KBW90aGVyGAYgASgDEhYKDm90aGVyX21hY2hpbmVzGAcgAygJEhEKCWFsbG9jYXRlZBgIIAEoAxITCgthbGxvY2F0YWJsZRgJIAEoAxIMCgRmcmVlGAogASgDEhMKC3VuYXZhaWxhYmxlGAsgASgDEg4KBmZhdWx0eRgMIAEoAxIXCg9mYXVsdHlfbWFjaGluZXMYDSADKAkSFAoMcmVzZXJ2YXRpb25zGA4gASgDEhkKEXVzZWRfcmVzZXJ2YXRpb25zGA8gASgDEh4KFnJlbWFpbmluZ19yZXNlcnZhdGlvbnMYECABKAMykgQKEFBhcnRpdGlvblNlcnZpY2USfAoGQ3JlYXRlEjIubWV0YWxzdGFjay5hZG1pbi52Mi5QYXJ0aXRpb25TZXJ2aWNlQ3JlYXRlUmVxdWVzdBozLm1ldGFsc3RhY2suYWRtaW4udjIuUGFydGl0aW9uU2VydmljZUNyZWF0ZVJlc3BvbnNlIgnS8xgBAeDzGAESfAoGVXBkYXRlEjIubWV0YWxzdGFjay5hZG1pbi52Mi5QYXJ0aXRpb25TZXJ2aWNlVXBkYXRlUmVxdWVzdBozLm1ldGFsc3RhY2suYWRtaW4udjIuUGFydGl0aW9uU2VydmljZVVwZGF0ZVJlc3BvbnNlIgnS8xgBAeDzGAESfAoGRGVsZXRlEjIubWV0YWxzdGFjay5hZG1pbi52Mi5QYXJ0aXRpb25TZXJ2aWNlRGVsZXRlUmVxdWVzdBozLm1ldGFsc3RhY2suYWRtaW4udjIuUGFydGl0aW9uU2VydmljZURlbGV0ZVJlc3BvbnNlIgnS8xgBAeDzGAESgwEKCENhcGFjaXR5EjQubWV0YWxzdGFjay5hZG1pbi52Mi5QYXJ0aXRpb25TZXJ2aWNlQ2FwYWNpdHlSZXF1ZXN0GjUubWV0YWxzdGFjay5hZG1pbi52Mi5QYXJ0aXRpb25TZXJ2aWNlQ2FwYWNpdHlSZXNwb25zZSIK0vMYAgIB4PMYAkLSAQoXY29tLm1ldGFsc3RhY2suYWRtaW4udjJCDlBhcnRpdGlvblByb3RvUAFaOWdpdGh1Yi5jb20vbWV0YWwtc3RhY2svYXBpL2dvL21ldGFsc3RhY2svYWRtaW4vdjI7YWRtaW52MqICA01BWKoCE01ldGFsc3RhY2suQWRtaW4uVjLKAhNNZXRhbHN0YWNrXEFkbWluXFYy4gIfTWV0YWxzdGFja1xBZG1pblxWMlxHUEJNZXRhZGF0YeoCFU1ldGFsc3RhY2s6OkFkbWluOjpWMmIGcHJvdG8z", [file_buf_validate_validate, file_metalstack_api_v2_common, file_metalstack_api_v2_partition, file_metalstack_api_v2_predefined_rules]);
 
 /**
  * PartitionServiceCreateRequest is the request payload for a partition create request
diff --git a/js/metalstack/infra/v2/component_pb.d.ts b/js/metalstack/infra/v2/component_pb.d.ts
new file mode 100644
index 00000000..e8f1f884
--- /dev/null
+++ b/js/metalstack/infra/v2/component_pb.d.ts
@@ -0,0 +1,130 @@
+import type { GenEnum, GenFile, GenMessage, GenService } from "@bufbuild/protobuf/codegenv2";
+import type { Timestamp } from "@bufbuild/protobuf/wkt";
+import type { Version } from "../../api/v2/version_pb";
+import type { Message } from "@bufbuild/protobuf";
+/**
+ * Describes the file metalstack/infra/v2/component.proto.
+ */
+export declare const file_metalstack_infra_v2_component: GenFile;
+/**
+ * ComponentServicePingRequest is sent from a microservice to report its state regularly
+ *
+ * @generated from message metalstack.infra.v2.ComponentServicePingRequest
+ */
+export type ComponentServicePingRequest = Message<"metalstack.infra.v2.ComponentServicePingRequest"> & {
+    /**
+     * Type defines which service is actually pinging
+     *
+     * @generated from field: metalstack.infra.v2.ComponentType type = 1;
+     */
+    type: ComponentType;
+    /**
+     * Identifier is a unique identifier of this service, e.g. if two instance are running, this might be the pod id.
+     * micro_service and identifier guarantee uniqueness.
+     *
+     * @generated from field: string identifier = 2;
+     */
+    identifier: string;
+    /**
+     * StartedAt is the timestamp this service was started
+     *
+     * @generated from field: google.protobuf.Timestamp started_at = 3;
+     */
+    startedAt?: Timestamp;
+    /**
+     * Version of this service
+     *
+     * @generated from field: metalstack.api.v2.Version version = 4;
+     */
+    version?: Version;
+};
+/**
+ * Describes the message metalstack.infra.v2.ComponentServicePingRequest.
+ * Use `create(ComponentServicePingRequestSchema)` to create a new message.
+ */
+export declare const ComponentServicePingRequestSchema: GenMessage<ComponentServicePingRequest>;
+/**
+ * ComponentServicePingResponse is the response to a ping request
+ *
+ * @generated from message metalstack.infra.v2.ComponentServicePingResponse
+ */
+export type ComponentServicePingResponse = Message<"metalstack.infra.v2.ComponentServicePingResponse"> & {};
+/**
+ * Describes the message metalstack.infra.v2.ComponentServicePingResponse.
+ * Use `create(ComponentServicePingResponseSchema)` to create a new message.
+ */
+export declare const ComponentServicePingResponseSchema: GenMessage<ComponentServicePingResponse>;
+/**
+ * ComponentType defines which service is actually pinging
+ *
+ * @generated from enum metalstack.infra.v2.ComponentType
+ */
+export declare enum ComponentType {
+    /**
+     * COMPONENT_TYPE_UNSPECIFIED is unspecified
+     *
+     * @generated from enum value: COMPONENT_TYPE_UNSPECIFIED = 0;
+     */
+    UNSPECIFIED = 0,
+    /**
+     * COMPONENT_TYPE_PIXIECORE is pixiecore
+     *
+     * @generated from enum value: COMPONENT_TYPE_PIXIECORE = 1;
+     */
+    PIXIECORE = 1,
+    /**
+     * COMPONENT_TYPE_METAL_CORE is metal-core
+     *
+     * @generated from enum value: COMPONENT_TYPE_METAL_CORE = 2;
+     */
+    METAL_CORE = 2,
+    /**
+     * COMPONENT_TYPE_METAL_BMC is metal-bmc
+     *
+     * @generated from enum value: COMPONENT_TYPE_METAL_BMC = 3;
+     */
+    METAL_BMC = 3,
+    /**
+     * COMPONENT_TYPE_METAL_IMAGE_CACHE_SYNC is metal-image-cache-sync
+     *
+     * @generated from enum value: COMPONENT_TYPE_METAL_IMAGE_CACHE_SYNC = 4;
+     */
+    METAL_IMAGE_CACHE_SYNC = 4,
+    /**
+     * COMPONENT_TYPE_METAL_CONSOLE is metal-console
+     *
+     * @generated from enum value: COMPONENT_TYPE_METAL_CONSOLE = 5;
+     */
+    METAL_CONSOLE = 5,
+    /**
+     * COMPONENT_TYPE_METAL_METRICS_EXPORTER is metal-metrics-exporter
+     *
+     * TODO what about gepm, ccm, etc. I would allow them to call this service but would not introduce
+     * enums for all of them as they are not strictly metal-stack components.
+     *
+     * @generated from enum value: COMPONENT_TYPE_METAL_METRICS_EXPORTER = 6;
+     */
+    METAL_METRICS_EXPORTER = 6
+}
+/**
+ * Describes the enum metalstack.infra.v2.ComponentType.
+ */
+export declare const ComponentTypeSchema: GenEnum<ComponentType>;
+/**
+ * ComponentService serves component, e.g. microservices related functions.
+ *
+ * @generated from service metalstack.infra.v2.ComponentService
+ */
+export declare const ComponentService: GenService<{
+    /**
+     * Ping must be called from every connected microservice in a recurring manner
+     * to get visibility of all required microservices.
+     *
+     * @generated from rpc metalstack.infra.v2.ComponentService.Ping
+     */
+    ping: {
+        methodKind: "unary";
+        input: typeof ComponentServicePingRequestSchema;
+        output: typeof ComponentServicePingResponseSchema;
+    };
+}>;
diff --git a/js/metalstack/infra/v2/component_pb.js b/js/metalstack/infra/v2/component_pb.js
new file mode 100644
index 00000000..d1a37a44
--- /dev/null
+++ b/js/metalstack/infra/v2/component_pb.js
@@ -0,0 +1,86 @@
+// @generated by protoc-gen-es v2.11.0 with parameter "target=ts"
+// @generated from file metalstack/infra/v2/component.proto (package metalstack.infra.v2, syntax proto3)
+/* eslint-disable */
+import { enumDesc, fileDesc, messageDesc, serviceDesc } from "@bufbuild/protobuf/codegenv2";
+import { file_buf_validate_validate } from "../../../buf/validate/validate_pb";
+import { file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";
+import { file_metalstack_api_v2_common } from "../../api/v2/common_pb";
+import { file_metalstack_api_v2_predefined_rules } from "../../api/v2/predefined_rules_pb";
+import { file_metalstack_api_v2_version } from "../../api/v2/version_pb";
+/**
+ * Describes the file metalstack/infra/v2/component.proto.
+ */
+export const file_metalstack_infra_v2_component = /*@__PURE__*/ fileDesc("CiNtZXRhbHN0YWNrL2luZnJhL3YyL2NvbXBvbmVudC5wcm90bxITbWV0YWxzdGFjay5pbmZyYS52MiLhAQobQ29tcG9uZW50U2VydmljZVBpbmdSZXF1ZXN0EjoKBHR5cGUYASABKA4yIi5tZXRhbHN0YWNrLmluZnJhLnYyLkNvbXBvbmVudFR5cGVCCLpIBYIBAhABEh8KCmlkZW50aWZpZXIYAiABKAlCC7pICHIGwLOusQIBEjgKCnN0YXJ0ZWRfYXQYAyABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgi6SAWyAQI4ARIrCgd2ZXJzaW9uGAQgASgLMhoubWV0YWxzdGFjay5hcGkudjIuVmVyc2lvbiIeChxDb21wb25lbnRTZXJ2aWNlUGluZ1Jlc3BvbnNlKowDCg1Db21wb25lbnRUeXBlEi8KGkNPTVBPTkVOVF9UWVBFX1VOU1BFQ0lGSUVEEAAaD4KyGQt1bnNwZWNpZmllZBIrChhDT01QT05FTlRfVFlQRV9QSVhJRUNPUkUQARoNgrIZCXBpeGllY29yZRItChlDT01QT05FTlRfVFlQRV9NRVRBTF9DT1JFEAIaDoKyGQptZXRhbC1jb3JlEisKGENPTVBPTkVOVF9UWVBFX01FVEFMX0JNQxADGg2CshkJbWV0YWwtYm1jEkUKJUNPTVBPTkVOVF9UWVBFX01FVEFMX0lNQUdFX0NBQ0hFX1NZTkMQBBoagrIZFm1ldGFsLWltYWdlLWNhY2hlLXN5bmMSMwocQ09NUE9ORU5UX1RZUEVfTUVUQUxfQ09OU09MRRAFGhGCshkNbWV0YWwtY29uc29sZRJFCiVDT01QT05FTlRfVFlQRV9NRVRBTF9NRVRSSUNTX0VYUE9SVEVSEAYaGoKyGRZtZXRhbC1tZXRyaWNzLWV4cG9ydGVyMooBChBDb21wb25lbnRTZXJ2aWNlEnYKBFBpbmcSMC5tZXRhbHN0YWNrLmluZnJhLnYyLkNvbXBvbmVudFNlcnZpY2VQaW5nUmVxdWVzdBoxLm1ldGFsc3RhY2suaW5mcmEudjIuQ29tcG9uZW50U2VydmljZVBpbmdSZXNwb25zZSIJ4PMYAurzGAEBQtIBChdjb20ubWV0YWxzdGFjay5pbmZyYS52MkIOQ29tcG9uZW50UHJvdG9QAVo5Z2l0aHViLmNvbS9tZXRhbC1zdGFjay9hcGkvZ28vbWV0YWxzdGFjay9pbmZyYS92MjtpbmZyYXYyogIDTUlYqgITTWV0YWxzdGFjay5JbmZyYS5WMsoCE01ldGFsc3RhY2tcSW5mcmFcVjLiAh9NZXRhbHN0YWNrXEluZnJhXFYyXEdQQk1ldGFkYXRh6gIVTWV0YWxzdGFjazo6SW5mcmE6OlYyYgZwcm90bzM", [file_buf_validate_validate, file_google_protobuf_timestamp, file_metalstack_api_v2_common, file_metalstack_api_v2_predefined_rules, file_metalstack_api_v2_version]);
+/**
+ * Describes the message metalstack.infra.v2.ComponentServicePingRequest.
+ * Use `create(ComponentServicePingRequestSchema)` to create a new message.
+ */
+export const ComponentServicePingRequestSchema = /*@__PURE__*/ messageDesc(file_metalstack_infra_v2_component, 0);
+/**
+ * Describes the message metalstack.infra.v2.ComponentServicePingResponse.
+ * Use `create(ComponentServicePingResponseSchema)` to create a new message.
+ */
+export const ComponentServicePingResponseSchema = /*@__PURE__*/ messageDesc(file_metalstack_infra_v2_component, 1);
+/**
+ * ComponentType defines which service is actually pinging
+ *
+ * @generated from enum metalstack.infra.v2.ComponentType
+ */
+export var ComponentType;
+(function (ComponentType) {
+    /**
+     * COMPONENT_TYPE_UNSPECIFIED is unspecified
+     *
+     * @generated from enum value: COMPONENT_TYPE_UNSPECIFIED = 0;
+     */
+    ComponentType[ComponentType["UNSPECIFIED"] = 0] = "UNSPECIFIED";
+    /**
+     * COMPONENT_TYPE_PIXIECORE is pixiecore
+     *
+     * @generated from enum value: COMPONENT_TYPE_PIXIECORE = 1;
+     */
+    ComponentType[ComponentType["PIXIECORE"] = 1] = "PIXIECORE";
+    /**
+     * COMPONENT_TYPE_METAL_CORE is metal-core
+     *
+     * @generated from enum value: COMPONENT_TYPE_METAL_CORE = 2;
+     */
+    ComponentType[ComponentType["METAL_CORE"] = 2] = "METAL_CORE";
+    /**
+     * COMPONENT_TYPE_METAL_BMC is metal-bmc
+     *
+     * @generated from enum value: COMPONENT_TYPE_METAL_BMC = 3;
+     */
+    ComponentType[ComponentType["METAL_BMC"] = 3] = "METAL_BMC";
+    /**
+     * COMPONENT_TYPE_METAL_IMAGE_CACHE_SYNC is metal-image-cache-sync
+     *
+     * @generated from enum value: COMPONENT_TYPE_METAL_IMAGE_CACHE_SYNC = 4;
+     */
+    ComponentType[ComponentType["METAL_IMAGE_CACHE_SYNC"] = 4] = "METAL_IMAGE_CACHE_SYNC";
+    /**
+     * COMPONENT_TYPE_METAL_CONSOLE is metal-console
+     *
+     * @generated from enum value: COMPONENT_TYPE_METAL_CONSOLE = 5;
+     */
+    ComponentType[ComponentType["METAL_CONSOLE"] = 5] = "METAL_CONSOLE";
+    /**
+     * COMPONENT_TYPE_METAL_METRICS_EXPORTER is metal-metrics-exporter
+     *
+     * TODO what about gepm, ccm, etc. I would allow them to call this service but would not introduce
+     * enums for all of them as they are not strictly metal-stack components.
+     *
+     * @generated from enum value: COMPONENT_TYPE_METAL_METRICS_EXPORTER = 6;
+     */
+    ComponentType[ComponentType["METAL_METRICS_EXPORTER"] = 6] = "METAL_METRICS_EXPORTER";
+})(ComponentType || (ComponentType = {}));
+/**
+ * Describes the enum metalstack.infra.v2.ComponentType.
+ */
+export const ComponentTypeSchema = /*@__PURE__*/ enumDesc(file_metalstack_infra_v2_component, 0);
+/**
+ * ComponentService serves component, e.g. microservices related functions.
+ *
+ * @generated from service metalstack.infra.v2.ComponentService
+ */
+export const ComponentService = /*@__PURE__*/ serviceDesc(file_metalstack_infra_v2_component, 0);
diff --git a/js/metalstack/infra/v2/component_pb.ts b/js/metalstack/infra/v2/component_pb.ts
new file mode 100644
index 00000000..45544b16
--- /dev/null
+++ b/js/metalstack/infra/v2/component_pb.ts
@@ -0,0 +1,164 @@
+// @generated by protoc-gen-es v2.11.0 with parameter "target=ts"
+// @generated from file metalstack/infra/v2/component.proto (package metalstack.infra.v2, syntax proto3)
+/* eslint-disable */
+
+import type { GenEnum, GenFile, GenMessage, GenService } from "@bufbuild/protobuf/codegenv2";
+import { enumDesc, fileDesc, messageDesc, serviceDesc } from "@bufbuild/protobuf/codegenv2";
+import { file_buf_validate_validate } from "../../../buf/validate/validate_pb";
+import type { Timestamp } from "@bufbuild/protobuf/wkt";
+import { file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";
+import { file_metalstack_api_v2_common } from "../../api/v2/common_pb";
+import { file_metalstack_api_v2_predefined_rules } from "../../api/v2/predefined_rules_pb";
+import type { Version } from "../../api/v2/version_pb";
+import { file_metalstack_api_v2_version } from "../../api/v2/version_pb";
+import type { Message } from "@bufbuild/protobuf";
+
+/**
+ * Describes the file metalstack/infra/v2/component.proto.
+ */
+export const file_metalstack_infra_v2_component: GenFile = /*@__PURE__*/
+  fileDesc("CiNtZXRhbHN0YWNrL2luZnJhL3YyL2NvbXBvbmVudC5wcm90bxITbWV0YWxzdGFjay5pbmZyYS52MiLhAQobQ29tcG9uZW50U2VydmljZVBpbmdSZXF1ZXN0EjoKBHR5cGUYASABKA4yIi5tZXRhbHN0YWNrLmluZnJhLnYyLkNvbXBvbmVudFR5cGVCCLpIBYIBAhABEh8KCmlkZW50aWZpZXIYAiABKAlCC7pICHIGwLOusQIBEjgKCnN0YXJ0ZWRfYXQYAyABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgi6SAWyAQI4ARIrCgd2ZXJzaW9uGAQgASgLMhoubWV0YWxzdGFjay5hcGkudjIuVmVyc2lvbiIeChxDb21wb25lbnRTZXJ2aWNlUGluZ1Jlc3BvbnNlKowDCg1Db21wb25lbnRUeXBlEi8KGkNPTVBPTkVOVF9UWVBFX1VOU1BFQ0lGSUVEEAAaD4KyGQt1bnNwZWNpZmllZBIrChhDT01QT05FTlRfVFlQRV9QSVhJRUNPUkUQARoNgrIZCXBpeGllY29yZRItChlDT01QT05FTlRfVFlQRV9NRVRBTF9DT1JFEAIaDoKyGQptZXRhbC1jb3JlEisKGENPTVBPTkVOVF9UWVBFX01FVEFMX0JNQxADGg2CshkJbWV0YWwtYm1jEkUKJUNPTVBPTkVOVF9UWVBFX01FVEFMX0lNQUdFX0NBQ0hFX1NZTkMQBBoagrIZFm1ldGFsLWltYWdlLWNhY2hlLXN5bmMSMwocQ09NUE9ORU5UX1RZUEVfTUVUQUxfQ09OU09MRRAFGhGCshkNbWV0YWwtY29uc29sZRJFCiVDT01QT05FTlRfVFlQRV9NRVRBTF9NRVRSSUNTX0VYUE9SVEVSEAYaGoKyGRZtZXRhbC1tZXRyaWNzLWV4cG9ydGVyMooBChBDb21wb25lbnRTZXJ2aWNlEnYKBFBpbmcSMC5tZXRhbHN0YWNrLmluZnJhLnYyLkNvbXBvbmVudFNlcnZpY2VQaW5nUmVxdWVzdBoxLm1ldGFsc3RhY2suaW5mcmEudjIuQ29tcG9uZW50U2VydmljZVBpbmdSZXNwb25zZSIJ4PMYAurzGAEBQtIBChdjb20ubWV0YWxzdGFjay5pbmZyYS52MkIOQ29tcG9uZW50UHJvdG9QAVo5Z2l0aHViLmNvbS9tZXRhbC1zdGFjay9hcGkvZ28vbWV0YWxzdGFjay9pbmZyYS92MjtpbmZyYXYyogIDTUlYqgITTWV0YWxzdGFjay5JbmZyYS5WMsoCE01ldGFsc3RhY2tcSW5mcmFcVjLiAh9NZXRhbHN0YWNrXEluZnJhXFYyXEdQQk1ldGFkYXRh6gIVTWV0YWxzdGFjazo6SW5mcmE6OlYyYgZwcm90bzM", [file_buf_validate_validate, file_google_protobuf_timestamp, file_metalstack_api_v2_common, file_metalstack_api_v2_predefined_rules, file_metalstack_api_v2_version]);
+
+/**
+ * ComponentServicePingRequest is sent from a microservice to report its state regularly
+ *
+ * @generated from message metalstack.infra.v2.ComponentServicePingRequest
+ */
+export type ComponentServicePingRequest = Message<"metalstack.infra.v2.ComponentServicePingRequest"> & {
+  /**
+   * Type defines which service is actually pinging
+   *
+   * @generated from field: metalstack.infra.v2.ComponentType type = 1;
+   */
+  type: ComponentType;
+
+  /**
+   * Identifier is a unique identifier of this service, e.g. if two instance are running, this might be the pod id.
+   * micro_service and identifier guarantee uniqueness.
+   *
+   * @generated from field: string identifier = 2;
+   */
+  identifier: string;
+
+  /**
+   * StartedAt is the timestamp this service was started
+   *
+   * @generated from field: google.protobuf.Timestamp started_at = 3;
+   */
+  startedAt?: Timestamp;
+
+  /**
+   * Version of this service
+   *
+   * @generated from field: metalstack.api.v2.Version version = 4;
+   */
+  version?: Version;
+};
+
+/**
+ * Describes the message metalstack.infra.v2.ComponentServicePingRequest.
+ * Use `create(ComponentServicePingRequestSchema)` to create a new message.
+ */
+export const ComponentServicePingRequestSchema: GenMessage<ComponentServicePingRequest> = /*@__PURE__*/
+  messageDesc(file_metalstack_infra_v2_component, 0);
+
+/**
+ * ComponentServicePingResponse is the response to a ping request
+ *
+ * @generated from message metalstack.infra.v2.ComponentServicePingResponse
+ */
+export type ComponentServicePingResponse = Message<"metalstack.infra.v2.ComponentServicePingResponse"> & {
+};
+
+/**
+ * Describes the message metalstack.infra.v2.ComponentServicePingResponse.
+ * Use `create(ComponentServicePingResponseSchema)` to create a new message.
+ */
+export const ComponentServicePingResponseSchema: GenMessage<ComponentServicePingResponse> = /*@__PURE__*/
+  messageDesc(file_metalstack_infra_v2_component, 1);
+
+/**
+ * ComponentType defines which service is actually pinging
+ *
+ * @generated from enum metalstack.infra.v2.ComponentType
+ */
+export enum ComponentType {
+  /**
+   * COMPONENT_TYPE_UNSPECIFIED is unspecified
+   *
+   * @generated from enum value: COMPONENT_TYPE_UNSPECIFIED = 0;
+   */
+  UNSPECIFIED = 0,
+
+  /**
+   * COMPONENT_TYPE_PIXIECORE is pixiecore
+   *
+   * @generated from enum value: COMPONENT_TYPE_PIXIECORE = 1;
+   */
+  PIXIECORE = 1,
+
+  /**
+   * COMPONENT_TYPE_METAL_CORE is metal-core
+   *
+   * @generated from enum value: COMPONENT_TYPE_METAL_CORE = 2;
+   */
+  METAL_CORE = 2,
+
+  /**
+   * COMPONENT_TYPE_METAL_BMC is metal-bmc
+   *
+   * @generated from enum value: COMPONENT_TYPE_METAL_BMC = 3;
+   */
+  METAL_BMC = 3,
+
+  /**
+   * COMPONENT_TYPE_METAL_IMAGE_CACHE_SYNC is metal-image-cache-sync
+   *
+   * @generated from enum value: COMPONENT_TYPE_METAL_IMAGE_CACHE_SYNC = 4;
+   */
+  METAL_IMAGE_CACHE_SYNC = 4,
+
+  /**
+   * COMPONENT_TYPE_METAL_CONSOLE is metal-console
+   *
+   * @generated from enum value: COMPONENT_TYPE_METAL_CONSOLE = 5;
+   */
+  METAL_CONSOLE = 5,
+
+  /**
+   * COMPONENT_TYPE_METAL_METRICS_EXPORTER is metal-metrics-exporter
+   *
+   * TODO what about gepm, ccm, etc. I would allow them to call this service but would not introduce
+   * enums for all of them as they are not strictly metal-stack components.
+   *
+   * @generated from enum value: COMPONENT_TYPE_METAL_METRICS_EXPORTER = 6;
+   */
+  METAL_METRICS_EXPORTER = 6,
+}
+
+/**
+ * Describes the enum metalstack.infra.v2.ComponentType.
+ */
+export const ComponentTypeSchema: GenEnum<ComponentType> = /*@__PURE__*/
+  enumDesc(file_metalstack_infra_v2_component, 0);
+
+/**
+ * ComponentService serves component, e.g. microservices related functions.
+ *
+ * @generated from service metalstack.infra.v2.ComponentService
+ */
+export const ComponentService: GenService<{
+  /**
+   * Ping must be called from every connected microservice in a recurring manner
+   * to get visibility of all required microservices.
+   *
+   * @generated from rpc metalstack.infra.v2.ComponentService.Ping
+   */
+  ping: {
+    methodKind: "unary";
+    input: typeof ComponentServicePingRequestSchema;
+    output: typeof ComponentServicePingResponseSchema;
+  },
+}> = /*@__PURE__*/
+  serviceDesc(file_metalstack_infra_v2_component, 0);
+
diff --git a/proto/metalstack/admin/v2/component.proto b/proto/metalstack/admin/v2/component.proto
new file mode 100644
index 00000000..970fded2
--- /dev/null
+++ b/proto/metalstack/admin/v2/component.proto
@@ -0,0 +1,47 @@
+syntax = "proto3";
+
+package metalstack.admin.v2;
+
+import "buf/validate/validate.proto";
+import "google/protobuf/timestamp.proto";
+import "metalstack/api/v2/common.proto";
+import "metalstack/api/v2/predefined_rules.proto";
+import "metalstack/api/v2/token.proto";
+import "metalstack/api/v2/version.proto";
+import "metalstack/infra/v2/component.proto";
+
+// ComponentService serves microservice related functions
+service ComponentService {
+  // List all components with their status
+  rpc List(ComponentServiceListRequest) returns (ComponentServiceListResponse) {
+    option (metalstack.api.v2.admin_roles) = ADMIN_ROLE_EDITOR;
+    option (metalstack.api.v2.admin_roles) = ADMIN_ROLE_VIEWER;
+    option (metalstack.api.v2.auditing) = AUDITING_EXCLUDED;
+  }
+}
+
+// ComponentServiceListRequest
+message ComponentServiceListRequest {}
+
+// ComponentServiceListResponse
+message ComponentServiceListResponse {
+  // Components
+  repeated Component components = 1;
+}
+
+// Component represents a microservice connected to our apiserver
+message Component {
+  // UUID identifies this component event
+  string uuid = 1 [(buf.validate.field).string.uuid = true];
+  // Type defines which service is actually pinging
+  metalstack.infra.v2.ComponentType type = 2 [(buf.validate.field).enum.defined_only = true];
+  // Identifier is a unique identifier of this service, e.g. if two instance are running, this might be the pod id.
+  // micro_service and identifier guarantee uniqueness.
+  string identifier = 3 [(buf.validate.field).string.(metalstack.api.v2.is_name) = true];
+  // StartedAt is the timestamp this service was started
+  google.protobuf.Timestamp started_at = 4;
+  // Version of this service
+  metalstack.api.v2.Version version = 5;
+  // Token is the token which is actually used by this microservice.
+  metalstack.api.v2.Token token = 6;
+}
diff --git a/proto/metalstack/admin/v2/partition.proto b/proto/metalstack/admin/v2/partition.proto
index 25a0ceb3..2ba80525 100644
--- a/proto/metalstack/admin/v2/partition.proto
+++ b/proto/metalstack/admin/v2/partition.proto
@@ -103,7 +103,7 @@ message PartitionServiceCapacityResponse {
 // PartitionCapacity is the capacity of one partition
 message PartitionCapacity {
   // Partition of which this capacity is reported.
-  string partition = 1;
+  string partition = 1 [(buf.validate.field).string.(metalstack.api.v2.is_partition) = true];
   // MachineSizeCapacities is the capacity per machine size.
   repeated MachineSizeCapacity machine_size_capacities = 2;
 }
@@ -111,7 +111,7 @@ message PartitionCapacity {
 // ServerCapacity is the capacity of one server type, eg machine size
 message MachineSizeCapacity {
   // Size is the size id correlating to all counts in this server capacity.
-  string size = 2;
+  string size = 2 [(buf.validate.field).string.(metalstack.api.v2.is_name) = true];
   // Total is the total amount of machines for this size.
   int64 total = 3;
 
diff --git a/proto/metalstack/infra/v2/component.proto b/proto/metalstack/infra/v2/component.proto
new file mode 100644
index 00000000..9208162a
--- /dev/null
+++ b/proto/metalstack/infra/v2/component.proto
@@ -0,0 +1,55 @@
+syntax = "proto3";
+
+package metalstack.infra.v2;
+
+import "buf/validate/validate.proto";
+import "google/protobuf/timestamp.proto";
+import "metalstack/api/v2/common.proto";
+import "metalstack/api/v2/predefined_rules.proto";
+import "metalstack/api/v2/version.proto";
+
+// ComponentService serves component, e.g. microservices related functions.
+service ComponentService {
+  // Ping must be called from every connected microservice in a recurring manner
+  // to get visibility of all required microservices.
+  rpc Ping(ComponentServicePingRequest) returns (ComponentServicePingResponse) {
+    option (metalstack.api.v2.infra_roles) = INFRA_ROLE_EDITOR;
+    option (metalstack.api.v2.auditing) = AUDITING_EXCLUDED;
+  }
+}
+
+// ComponentServicePingRequest is sent from a microservice to report its state regularly
+message ComponentServicePingRequest {
+  // Type defines which service is actually pinging
+  ComponentType type = 1 [(buf.validate.field).enum.defined_only = true];
+  // Identifier is a unique identifier of this service, e.g. if two instance are running, this might be the pod id.
+  // micro_service and identifier guarantee uniqueness.
+  string identifier = 2 [(buf.validate.field).string.(metalstack.api.v2.is_name) = true];
+  // StartedAt is the timestamp this service was started
+  google.protobuf.Timestamp started_at = 3 [(buf.validate.field).timestamp.lt_now = true];
+  // Version of this service
+  metalstack.api.v2.Version version = 4;
+}
+
+// ComponentServicePingResponse is the response to a ping request
+message ComponentServicePingResponse {}
+
+// ComponentType defines which service is actually pinging
+enum ComponentType {
+  // COMPONENT_TYPE_UNSPECIFIED is unspecified
+  COMPONENT_TYPE_UNSPECIFIED = 0 [(metalstack.api.v2.enum_string_value) = "unspecified"];
+  // COMPONENT_TYPE_PIXIECORE is pixiecore
+  COMPONENT_TYPE_PIXIECORE = 1 [(metalstack.api.v2.enum_string_value) = "pixiecore"];
+  // COMPONENT_TYPE_METAL_CORE is metal-core
+  COMPONENT_TYPE_METAL_CORE = 2 [(metalstack.api.v2.enum_string_value) = "metal-core"];
+  // COMPONENT_TYPE_METAL_BMC is metal-bmc
+  COMPONENT_TYPE_METAL_BMC = 3 [(metalstack.api.v2.enum_string_value) = "metal-bmc"];
+  // COMPONENT_TYPE_METAL_IMAGE_CACHE_SYNC is metal-image-cache-sync
+  COMPONENT_TYPE_METAL_IMAGE_CACHE_SYNC = 4 [(metalstack.api.v2.enum_string_value) = "metal-image-cache-sync"];
+  // COMPONENT_TYPE_METAL_CONSOLE is metal-console
+  COMPONENT_TYPE_METAL_CONSOLE = 5 [(metalstack.api.v2.enum_string_value) = "metal-console"];
+  // COMPONENT_TYPE_METAL_METRICS_EXPORTER is metal-metrics-exporter
+  COMPONENT_TYPE_METAL_METRICS_EXPORTER = 6 [(metalstack.api.v2.enum_string_value) = "metal-metrics-exporter"];
+  // TODO what about gepm, ccm, etc. I would allow them to call this service but would not introduce
+  // enums for all of them as they are not strictly metal-stack components.
+}
diff --git a/python/metalstack/admin/v2/component_connect.py b/python/metalstack/admin/v2/component_connect.py
new file mode 100644
index 00000000..27a85db2
--- /dev/null
+++ b/python/metalstack/admin/v2/component_connect.py
@@ -0,0 +1,120 @@
+# -*- coding: utf-8 -*-
+# Generated by https://github.com/connectrpc/connect-python.  DO NOT EDIT!
+# source: metalstack/admin/v2/component.proto
+
+from collections.abc import AsyncGenerator, AsyncIterator, Iterable, Iterator, Mapping
+from typing import Protocol
+
+from connectrpc.client import ConnectClient, ConnectClientSync
+from connectrpc.code import Code
+from connectrpc.errors import ConnectError
+from connectrpc.interceptor import Interceptor, InterceptorSync
+from connectrpc.method import IdempotencyLevel, MethodInfo
+from connectrpc.request import Headers, RequestContext
+from connectrpc.server import ConnectASGIApplication, ConnectWSGIApplication, Endpoint, EndpointSync
+import metalstack.admin.v2.component_pb2 as metalstack_dot_admin_dot_v2_dot_component__pb2
+
+
+class ComponentService(Protocol):
+    async def list(self, request: metalstack_dot_admin_dot_v2_dot_component__pb2.ComponentServiceListRequest, ctx: RequestContext) -> metalstack_dot_admin_dot_v2_dot_component__pb2.ComponentServiceListResponse:
+        raise ConnectError(Code.UNIMPLEMENTED, "Not implemented")
+
+
+class ComponentServiceASGIApplication(ConnectASGIApplication[ComponentService]):
+    def __init__(self, service: ComponentService | AsyncGenerator[ComponentService], *, interceptors: Iterable[Interceptor]=(), read_max_bytes: int | None = None) -> None:
+        super().__init__(
+            service=service,
+            endpoints=lambda svc: {
+                "/metalstack.admin.v2.ComponentService/List": Endpoint.unary(
+                    method=MethodInfo(
+                        name="List",
+                        service_name="metalstack.admin.v2.ComponentService",
+                        input=metalstack_dot_admin_dot_v2_dot_component__pb2.ComponentServiceListRequest,
+                        output=metalstack_dot_admin_dot_v2_dot_component__pb2.ComponentServiceListResponse,
+                        idempotency_level=IdempotencyLevel.UNKNOWN,
+                    ),
+                    function=svc.list,
+                ),
+            },
+            interceptors=interceptors,
+            read_max_bytes=read_max_bytes,
+        )
+
+    @property
+    def path(self) -> str:
+        """Returns the URL path to mount the application to when serving multiple applications."""
+        return "/metalstack.admin.v2.ComponentService"
+
+
+class ComponentServiceClient(ConnectClient):
+    async def list(
+        self,
+        request: metalstack_dot_admin_dot_v2_dot_component__pb2.ComponentServiceListRequest,
+        *,
+        headers: Headers | Mapping[str, str] | None = None,
+        timeout_ms: int | None = None,
+    ) -> metalstack_dot_admin_dot_v2_dot_component__pb2.ComponentServiceListResponse:
+        return await self.execute_unary(
+            request=request,
+            method=MethodInfo(
+                name="List",
+                service_name="metalstack.admin.v2.ComponentService",
+                input=metalstack_dot_admin_dot_v2_dot_component__pb2.ComponentServiceListRequest,
+                output=metalstack_dot_admin_dot_v2_dot_component__pb2.ComponentServiceListResponse,
+                idempotency_level=IdempotencyLevel.UNKNOWN,
+            ),
+            headers=headers,
+            timeout_ms=timeout_ms,
+        )
+
+
+class ComponentServiceSync(Protocol):
+    def list(self, request: metalstack_dot_admin_dot_v2_dot_component__pb2.ComponentServiceListRequest, ctx: RequestContext) -> metalstack_dot_admin_dot_v2_dot_component__pb2.ComponentServiceListResponse:
+        raise ConnectError(Code.UNIMPLEMENTED, "Not implemented")
+
+
+class ComponentServiceWSGIApplication(ConnectWSGIApplication):
+    def __init__(self, service: ComponentServiceSync, interceptors: Iterable[InterceptorSync]=(), read_max_bytes: int | None = None) -> None:
+        super().__init__(
+            endpoints={
+                "/metalstack.admin.v2.ComponentService/List": EndpointSync.unary(
+                    method=MethodInfo(
+                        name="List",
+                        service_name="metalstack.admin.v2.ComponentService",
+                        input=metalstack_dot_admin_dot_v2_dot_component__pb2.ComponentServiceListRequest,
+                        output=metalstack_dot_admin_dot_v2_dot_component__pb2.ComponentServiceListResponse,
+                        idempotency_level=IdempotencyLevel.UNKNOWN,
+                    ),
+                    function=service.list,
+                ),
+            },
+            interceptors=interceptors,
+            read_max_bytes=read_max_bytes,
+        )
+
+    @property
+    def path(self) -> str:
+        """Returns the URL path to mount the application to when serving multiple applications."""
+        return "/metalstack.admin.v2.ComponentService"
+
+
+class ComponentServiceClientSync(ConnectClientSync):
+    def list(
+        self,
+        request: metalstack_dot_admin_dot_v2_dot_component__pb2.ComponentServiceListRequest,
+        *,
+        headers: Headers | Mapping[str, str] | None = None,
+        timeout_ms: int | None = None,
+    ) -> metalstack_dot_admin_dot_v2_dot_component__pb2.ComponentServiceListResponse:
+        return self.execute_unary(
+            request=request,
+            method=MethodInfo(
+                name="List",
+                service_name="metalstack.admin.v2.ComponentService",
+                input=metalstack_dot_admin_dot_v2_dot_component__pb2.ComponentServiceListRequest,
+                output=metalstack_dot_admin_dot_v2_dot_component__pb2.ComponentServiceListResponse,
+                idempotency_level=IdempotencyLevel.UNKNOWN,
+            ),
+            headers=headers,
+            timeout_ms=timeout_ms,
+        )
diff --git a/python/metalstack/admin/v2/component_pb2.py b/python/metalstack/admin/v2/component_pb2.py
new file mode 100644
index 00000000..6ab02598
--- /dev/null
+++ b/python/metalstack/admin/v2/component_pb2.py
@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: metalstack/admin/v2/component.proto
+# Protobuf Python Version: 6.33.5
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import runtime_version as _runtime_version
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+_runtime_version.ValidateProtobufRuntimeVersion(
+    _runtime_version.Domain.PUBLIC,
+    6,
+    33,
+    5,
+    '',
+    'metalstack/admin/v2/component.proto'
+)
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from buf.validate import validate_pb2 as buf_dot_validate_dot_validate__pb2
+from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2
+from metalstack.api.v2 import common_pb2 as metalstack_dot_api_dot_v2_dot_common__pb2
+from metalstack.api.v2 import predefined_rules_pb2 as metalstack_dot_api_dot_v2_dot_predefined__rules__pb2
+from metalstack.api.v2 import token_pb2 as metalstack_dot_api_dot_v2_dot_token__pb2
+from metalstack.api.v2 import version_pb2 as metalstack_dot_api_dot_v2_dot_version__pb2
+from metalstack.infra.v2 import component_pb2 as metalstack_dot_infra_dot_v2_dot_component__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n#metalstack/admin/v2/component.proto\x12\x13metalstack.admin.v2\x1a\x1b\x62uf/validate/validate.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1emetalstack/api/v2/common.proto\x1a(metalstack/api/v2/predefined_rules.proto\x1a\x1dmetalstack/api/v2/token.proto\x1a\x1fmetalstack/api/v2/version.proto\x1a#metalstack/infra/v2/component.proto\"\x1d\n\x1b\x43omponentServiceListRequest\"^\n\x1c\x43omponentServiceListResponse\x12>\n\ncomponents\x18\x01 \x03(\x0b\x32\x1e.metalstack.admin.v2.ComponentR\ncomponents\"\xb9\x02\n\tComponent\x12\x1c\n\x04uuid\x18\x01 \x01(\tB\x08\xbaH\x05r\x03\xb0\x01\x01R\x04uuid\x12@\n\x04type\x18\x02 \x01(\x0e\x32\".metalstack.infra.v2.ComponentTypeB\x08\xbaH\x05\x82\x01\x02\x10\x01R\x04type\x12+\n\nidentifier\x18\x03 \x01(\tB\x0b\xbaH\x08r\x06\xc0\xb3\xae\xb1\x02\x01R\nidentifier\x12\x39\n\nstarted_at\x18\x04 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tstartedAt\x12\x34\n\x07version\x18\x05 \x01(\x0b\x32\x1a.metalstack.api.v2.VersionR\x07version\x12.\n\x05token\x18\x06 \x01(\x0b\x32\x18.metalstack.api.v2.TokenR\x05token2\x8b\x01\n\x10\x43omponentService\x12w\n\x04List\x12\x30.metalstack.admin.v2.ComponentServiceListRequest\x1a\x31.metalstack.admin.v2.ComponentServiceListResponse\"\n\xd2\xf3\x18\x02\x01\x02\xe0\xf3\x18\x02\x42\xd2\x01\n\x17\x63om.metalstack.admin.v2B\x0e\x43omponentProtoP\x01Z9github.com/metal-stack/api/go/metalstack/admin/v2;adminv2\xa2\x02\x03MAX\xaa\x02\x13Metalstack.Admin.V2\xca\x02\x13Metalstack\\Admin\\V2\xe2\x02\x1fMetalstack\\Admin\\V2\\GPBMetadata\xea\x02\x15Metalstack::Admin::V2b\x06proto3')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'metalstack.admin.v2.component_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  _globals['DESCRIPTOR']._loaded_options = None
+  _globals['DESCRIPTOR']._serialized_options = b'\n\027com.metalstack.admin.v2B\016ComponentProtoP\001Z9github.com/metal-stack/api/go/metalstack/admin/v2;adminv2\242\002\003MAX\252\002\023Metalstack.Admin.V2\312\002\023Metalstack\\Admin\\V2\342\002\037Metalstack\\Admin\\V2\\GPBMetadata\352\002\025Metalstack::Admin::V2'
+  _globals['_COMPONENT'].fields_by_name['uuid']._loaded_options = None
+  _globals['_COMPONENT'].fields_by_name['uuid']._serialized_options = b'\272H\005r\003\260\001\001'
+  _globals['_COMPONENT'].fields_by_name['type']._loaded_options = None
+  _globals['_COMPONENT'].fields_by_name['type']._serialized_options = b'\272H\005\202\001\002\020\001'
+  _globals['_COMPONENT'].fields_by_name['identifier']._loaded_options = None
+  _globals['_COMPONENT'].fields_by_name['identifier']._serialized_options = b'\272H\010r\006\300\263\256\261\002\001'
+  _globals['_COMPONENTSERVICE'].methods_by_name['List']._loaded_options = None
+  _globals['_COMPONENTSERVICE'].methods_by_name['List']._serialized_options = b'\322\363\030\002\001\002\340\363\030\002'
+  _globals['_COMPONENTSERVICELISTREQUEST']._serialized_start=297
+  _globals['_COMPONENTSERVICELISTREQUEST']._serialized_end=326
+  _globals['_COMPONENTSERVICELISTRESPONSE']._serialized_start=328
+  _globals['_COMPONENTSERVICELISTRESPONSE']._serialized_end=422
+  _globals['_COMPONENT']._serialized_start=425
+  _globals['_COMPONENT']._serialized_end=738
+  _globals['_COMPONENTSERVICE']._serialized_start=741
+  _globals['_COMPONENTSERVICE']._serialized_end=880
+# @@protoc_insertion_point(module_scope)
diff --git a/python/metalstack/admin/v2/component_pb2.pyi b/python/metalstack/admin/v2/component_pb2.pyi
new file mode 100644
index 00000000..21428fa7
--- /dev/null
+++ b/python/metalstack/admin/v2/component_pb2.pyi
@@ -0,0 +1,42 @@
+import datetime
+
+from buf.validate import validate_pb2 as _validate_pb2
+from google.protobuf import timestamp_pb2 as _timestamp_pb2
+from metalstack.api.v2 import common_pb2 as _common_pb2
+from metalstack.api.v2 import predefined_rules_pb2 as _predefined_rules_pb2
+from metalstack.api.v2 import token_pb2 as _token_pb2
+from metalstack.api.v2 import version_pb2 as _version_pb2
+from metalstack.infra.v2 import component_pb2 as _component_pb2
+from google.protobuf.internal import containers as _containers
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from collections.abc import Iterable as _Iterable, Mapping as _Mapping
+from typing import ClassVar as _ClassVar, Optional as _Optional, Union as _Union
+
+DESCRIPTOR: _descriptor.FileDescriptor
+
+class ComponentServiceListRequest(_message.Message):
+    __slots__ = ()
+    def __init__(self) -> None: ...
+
+class ComponentServiceListResponse(_message.Message):
+    __slots__ = ("components",)
+    COMPONENTS_FIELD_NUMBER: _ClassVar[int]
+    components: _containers.RepeatedCompositeFieldContainer[Component]
+    def __init__(self, components: _Optional[_Iterable[_Union[Component, _Mapping]]] = ...) -> None: ...
+
+class Component(_message.Message):
+    __slots__ = ("uuid", "type", "identifier", "started_at", "version", "token")
+    UUID_FIELD_NUMBER: _ClassVar[int]
+    TYPE_FIELD_NUMBER: _ClassVar[int]
+    IDENTIFIER_FIELD_NUMBER: _ClassVar[int]
+    STARTED_AT_FIELD_NUMBER: _ClassVar[int]
+    VERSION_FIELD_NUMBER: _ClassVar[int]
+    TOKEN_FIELD_NUMBER: _ClassVar[int]
+    uuid: str
+    type: _component_pb2.ComponentType
+    identifier: str
+    started_at: _timestamp_pb2.Timestamp
+    version: _version_pb2.Version
+    token: _token_pb2.Token
+    def __init__(self, uuid: _Optional[str] = ..., type: _Optional[_Union[_component_pb2.ComponentType, str]] = ..., identifier: _Optional[str] = ..., started_at: _Optional[_Union[datetime.datetime, _timestamp_pb2.Timestamp, _Mapping]] = ..., version: _Optional[_Union[_version_pb2.Version, _Mapping]] = ..., token: _Optional[_Union[_token_pb2.Token, _Mapping]] = ...) -> None: ...
diff --git a/python/metalstack/admin/v2/partition_pb2.py b/python/metalstack/admin/v2/partition_pb2.py
index 01472232..e05f22de 100644
--- a/python/metalstack/admin/v2/partition_pb2.py
+++ b/python/metalstack/admin/v2/partition_pb2.py
@@ -28,7 +28,7 @@
 from metalstack.api.v2 import predefined_rules_pb2 as metalstack_dot_api_dot_v2_dot_predefined__rules__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n#metalstack/admin/v2/partition.proto\x12\x13metalstack.admin.v2\x1a\x1b\x62uf/validate/validate.proto\x1a\x1emetalstack/api/v2/common.proto\x1a!metalstack/api/v2/partition.proto\x1a(metalstack/api/v2/predefined_rules.proto\"[\n\x1dPartitionServiceCreateRequest\x12:\n\tpartition\x18\x01 \x01(\x0b\x32\x1c.metalstack.api.v2.PartitionR\tpartition\"\xb3\x04\n\x1dPartitionServiceUpdateRequest\x12\x1b\n\x02id\x18\x01 \x01(\tB\x0b\xbaH\x08r\x06\xd0\xb3\xae\xb1\x02\x01R\x02id\x12\x46\n\x0bupdate_meta\x18\x02 \x01(\x0b\x32\x1d.metalstack.api.v2.UpdateMetaB\x06\xbaH\x03\xc8\x01\x01R\nupdateMeta\x12\x32\n\x0b\x64\x65scription\x18\x03 \x01(\tB\x0b\xbaH\x08r\x06\xc8\xb3\xae\xb1\x02\x01H\x00R\x0b\x64\x65scription\x88\x01\x01\x12\\\n\x12\x62oot_configuration\x18\x04 \x01(\x0b\x32-.metalstack.api.v2.PartitionBootConfigurationR\x11\x62ootConfiguration\x12\x45\n\ndns_server\x18\x05 \x03(\x0b\x32\x1c.metalstack.api.v2.DNSServerB\x08\xbaH\x05\x92\x01\x02\x10\x03R\tdnsServer\x12\x45\n\nntp_server\x18\x06 \x03(\x0b\x32\x1c.metalstack.api.v2.NTPServerB\x08\xbaH\x05\x92\x01\x02\x10\nR\tntpServer\x12\x34\n\x16mgmt_service_addresses\x18\x07 \x03(\tR\x14mgmtServiceAddresses\x12<\n\x06labels\x18\x08 \x01(\x0b\x32\x1f.metalstack.api.v2.UpdateLabelsH\x01R\x06labels\x88\x01\x01\x42\x0e\n\x0c_descriptionB\t\n\x07_labels\"<\n\x1dPartitionServiceDeleteRequest\x12\x1b\n\x02id\x18\x01 \x01(\tB\x0b\xbaH\x08r\x06\xd0\xb3\xae\xb1\x02\x01R\x02id\"\\\n\x1ePartitionServiceCreateResponse\x12:\n\tpartition\x18\x01 \x01(\x0b\x32\x1c.metalstack.api.v2.PartitionR\tpartition\"\\\n\x1ePartitionServiceUpdateResponse\x12:\n\tpartition\x18\x01 \x01(\x0b\x32\x1c.metalstack.api.v2.PartitionR\tpartition\"\\\n\x1ePartitionServiceDeleteResponse\x12:\n\tpartition\x18\x01 \x01(\x0b\x32\x1c.metalstack.api.v2.PartitionR\tpartition\"\xae\x01\n\x1fPartitionServiceCapacityRequest\x12 \n\x02id\x18\x01 \x01(\tB\x0b\xbaH\x08r\x06\xd0\xb3\xae\xb1\x02\x01H\x00R\x02id\x88\x01\x01\x12$\n\x04size\x18\x02 \x01(\tB\x0b\xbaH\x08r\x06\xc0\xb3\xae\xb1\x02\x01H\x01R\x04size\x88\x01\x01\x12\'\n\x07project\x18\x03 \x01(\tB\x08\xbaH\x05r\x03\xb0\x01\x01H\x02R\x07project\x88\x01\x01\x42\x05\n\x03_idB\x07\n\x05_sizeB\n\n\x08_project\"y\n PartitionServiceCapacityResponse\x12U\n\x12partition_capacity\x18\x01 \x03(\x0b\x32&.metalstack.admin.v2.PartitionCapacityR\x11partitionCapacity\"\x93\x01\n\x11PartitionCapacity\x12\x1c\n\tpartition\x18\x01 \x01(\tR\tpartition\x12`\n\x17machine_size_capacities\x18\x02 \x03(\x0b\x32(.metalstack.admin.v2.MachineSizeCapacityR\x15machineSizeCapacities\"\xf6\x03\n\x13MachineSizeCapacity\x12\x12\n\x04size\x18\x02 \x01(\tR\x04size\x12\x14\n\x05total\x18\x03 \x01(\x03R\x05total\x12\x1f\n\x0bphoned_home\x18\x04 \x01(\x03R\nphonedHome\x12\x18\n\x07waiting\x18\x05 \x01(\x03R\x07waiting\x12\x14\n\x05other\x18\x06 \x01(\x03R\x05other\x12%\n\x0eother_machines\x18\x07 \x03(\tR\rotherMachines\x12\x1c\n\tallocated\x18\x08 \x01(\x03R\tallocated\x12 \n\x0b\x61llocatable\x18\t \x01(\x03R\x0b\x61llocatable\x12\x12\n\x04\x66ree\x18\n \x01(\x03R\x04\x66ree\x12 \n\x0bunavailable\x18\x0b \x01(\x03R\x0bunavailable\x12\x16\n\x06\x66\x61ulty\x18\x0c \x01(\x03R\x06\x66\x61ulty\x12\'\n\x0f\x66\x61ulty_machines\x18\r \x03(\tR\x0e\x66\x61ultyMachines\x12\"\n\x0creservations\x18\x0e \x01(\x03R\x0creservations\x12+\n\x11used_reservations\x18\x0f \x01(\x03R\x10usedReservations\x12\x35\n\x16remaining_reservations\x18\x10 \x01(\x03R\x15remainingReservations2\x92\x04\n\x10PartitionService\x12|\n\x06\x43reate\x12\x32.metalstack.admin.v2.PartitionServiceCreateRequest\x1a\x33.metalstack.admin.v2.PartitionServiceCreateResponse\"\t\xd2\xf3\x18\x01\x01\xe0\xf3\x18\x01\x12|\n\x06Update\x12\x32.metalstack.admin.v2.PartitionServiceUpdateRequest\x1a\x33.metalstack.admin.v2.PartitionServiceUpdateResponse\"\t\xd2\xf3\x18\x01\x01\xe0\xf3\x18\x01\x12|\n\x06\x44\x65lete\x12\x32.metalstack.admin.v2.PartitionServiceDeleteRequest\x1a\x33.metalstack.admin.v2.PartitionServiceDeleteResponse\"\t\xd2\xf3\x18\x01\x01\xe0\xf3\x18\x01\x12\x83\x01\n\x08\x43\x61pacity\x12\x34.metalstack.admin.v2.PartitionServiceCapacityRequest\x1a\x35.metalstack.admin.v2.PartitionServiceCapacityResponse\"\n\xd2\xf3\x18\x02\x02\x01\xe0\xf3\x18\x02\x42\xd2\x01\n\x17\x63om.metalstack.admin.v2B\x0ePartitionProtoP\x01Z9github.com/metal-stack/api/go/metalstack/admin/v2;adminv2\xa2\x02\x03MAX\xaa\x02\x13Metalstack.Admin.V2\xca\x02\x13Metalstack\\Admin\\V2\xe2\x02\x1fMetalstack\\Admin\\V2\\GPBMetadata\xea\x02\x15Metalstack::Admin::V2b\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n#metalstack/admin/v2/partition.proto\x12\x13metalstack.admin.v2\x1a\x1b\x62uf/validate/validate.proto\x1a\x1emetalstack/api/v2/common.proto\x1a!metalstack/api/v2/partition.proto\x1a(metalstack/api/v2/predefined_rules.proto\"[\n\x1dPartitionServiceCreateRequest\x12:\n\tpartition\x18\x01 \x01(\x0b\x32\x1c.metalstack.api.v2.PartitionR\tpartition\"\xb3\x04\n\x1dPartitionServiceUpdateRequest\x12\x1b\n\x02id\x18\x01 \x01(\tB\x0b\xbaH\x08r\x06\xd0\xb3\xae\xb1\x02\x01R\x02id\x12\x46\n\x0bupdate_meta\x18\x02 \x01(\x0b\x32\x1d.metalstack.api.v2.UpdateMetaB\x06\xbaH\x03\xc8\x01\x01R\nupdateMeta\x12\x32\n\x0b\x64\x65scription\x18\x03 \x01(\tB\x0b\xbaH\x08r\x06\xc8\xb3\xae\xb1\x02\x01H\x00R\x0b\x64\x65scription\x88\x01\x01\x12\\\n\x12\x62oot_configuration\x18\x04 \x01(\x0b\x32-.metalstack.api.v2.PartitionBootConfigurationR\x11\x62ootConfiguration\x12\x45\n\ndns_server\x18\x05 \x03(\x0b\x32\x1c.metalstack.api.v2.DNSServerB\x08\xbaH\x05\x92\x01\x02\x10\x03R\tdnsServer\x12\x45\n\nntp_server\x18\x06 \x03(\x0b\x32\x1c.metalstack.api.v2.NTPServerB\x08\xbaH\x05\x92\x01\x02\x10\nR\tntpServer\x12\x34\n\x16mgmt_service_addresses\x18\x07 \x03(\tR\x14mgmtServiceAddresses\x12<\n\x06labels\x18\x08 \x01(\x0b\x32\x1f.metalstack.api.v2.UpdateLabelsH\x01R\x06labels\x88\x01\x01\x42\x0e\n\x0c_descriptionB\t\n\x07_labels\"<\n\x1dPartitionServiceDeleteRequest\x12\x1b\n\x02id\x18\x01 \x01(\tB\x0b\xbaH\x08r\x06\xd0\xb3\xae\xb1\x02\x01R\x02id\"\\\n\x1ePartitionServiceCreateResponse\x12:\n\tpartition\x18\x01 \x01(\x0b\x32\x1c.metalstack.api.v2.PartitionR\tpartition\"\\\n\x1ePartitionServiceUpdateResponse\x12:\n\tpartition\x18\x01 \x01(\x0b\x32\x1c.metalstack.api.v2.PartitionR\tpartition\"\\\n\x1ePartitionServiceDeleteResponse\x12:\n\tpartition\x18\x01 \x01(\x0b\x32\x1c.metalstack.api.v2.PartitionR\tpartition\"\xae\x01\n\x1fPartitionServiceCapacityRequest\x12 \n\x02id\x18\x01 \x01(\tB\x0b\xbaH\x08r\x06\xd0\xb3\xae\xb1\x02\x01H\x00R\x02id\x88\x01\x01\x12$\n\x04size\x18\x02 \x01(\tB\x0b\xbaH\x08r\x06\xc0\xb3\xae\xb1\x02\x01H\x01R\x04size\x88\x01\x01\x12\'\n\x07project\x18\x03 \x01(\tB\x08\xbaH\x05r\x03\xb0\x01\x01H\x02R\x07project\x88\x01\x01\x42\x05\n\x03_idB\x07\n\x05_sizeB\n\n\x08_project\"y\n PartitionServiceCapacityResponse\x12U\n\x12partition_capacity\x18\x01 \x03(\x0b\x32&.metalstack.admin.v2.PartitionCapacityR\x11partitionCapacity\"\xa0\x01\n\x11PartitionCapacity\x12)\n\tpartition\x18\x01 \x01(\tB\x0b\xbaH\x08r\x06\xd0\xb3\xae\xb1\x02\x01R\tpartition\x12`\n\x17machine_size_capacities\x18\x02 \x03(\x0b\x32(.metalstack.admin.v2.MachineSizeCapacityR\x15machineSizeCapacities\"\x83\x04\n\x13MachineSizeCapacity\x12\x1f\n\x04size\x18\x02 \x01(\tB\x0b\xbaH\x08r\x06\xc0\xb3\xae\xb1\x02\x01R\x04size\x12\x14\n\x05total\x18\x03 \x01(\x03R\x05total\x12\x1f\n\x0bphoned_home\x18\x04 \x01(\x03R\nphonedHome\x12\x18\n\x07waiting\x18\x05 \x01(\x03R\x07waiting\x12\x14\n\x05other\x18\x06 \x01(\x03R\x05other\x12%\n\x0eother_machines\x18\x07 \x03(\tR\rotherMachines\x12\x1c\n\tallocated\x18\x08 \x01(\x03R\tallocated\x12 \n\x0b\x61llocatable\x18\t \x01(\x03R\x0b\x61llocatable\x12\x12\n\x04\x66ree\x18\n \x01(\x03R\x04\x66ree\x12 \n\x0bunavailable\x18\x0b \x01(\x03R\x0bunavailable\x12\x16\n\x06\x66\x61ulty\x18\x0c \x01(\x03R\x06\x66\x61ulty\x12\'\n\x0f\x66\x61ulty_machines\x18\r \x03(\tR\x0e\x66\x61ultyMachines\x12\"\n\x0creservations\x18\x0e \x01(\x03R\x0creservations\x12+\n\x11used_reservations\x18\x0f \x01(\x03R\x10usedReservations\x12\x35\n\x16remaining_reservations\x18\x10 \x01(\x03R\x15remainingReservations2\x92\x04\n\x10PartitionService\x12|\n\x06\x43reate\x12\x32.metalstack.admin.v2.PartitionServiceCreateRequest\x1a\x33.metalstack.admin.v2.PartitionServiceCreateResponse\"\t\xd2\xf3\x18\x01\x01\xe0\xf3\x18\x01\x12|\n\x06Update\x12\x32.metalstack.admin.v2.PartitionServiceUpdateRequest\x1a\x33.metalstack.admin.v2.PartitionServiceUpdateResponse\"\t\xd2\xf3\x18\x01\x01\xe0\xf3\x18\x01\x12|\n\x06\x44\x65lete\x12\x32.metalstack.admin.v2.PartitionServiceDeleteRequest\x1a\x33.metalstack.admin.v2.PartitionServiceDeleteResponse\"\t\xd2\xf3\x18\x01\x01\xe0\xf3\x18\x01\x12\x83\x01\n\x08\x43\x61pacity\x12\x34.metalstack.admin.v2.PartitionServiceCapacityRequest\x1a\x35.metalstack.admin.v2.PartitionServiceCapacityResponse\"\n\xd2\xf3\x18\x02\x02\x01\xe0\xf3\x18\x02\x42\xd2\x01\n\x17\x63om.metalstack.admin.v2B\x0ePartitionProtoP\x01Z9github.com/metal-stack/api/go/metalstack/admin/v2;adminv2\xa2\x02\x03MAX\xaa\x02\x13Metalstack.Admin.V2\xca\x02\x13Metalstack\\Admin\\V2\xe2\x02\x1fMetalstack\\Admin\\V2\\GPBMetadata\xea\x02\x15Metalstack::Admin::V2b\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -54,6 +54,10 @@
   _globals['_PARTITIONSERVICECAPACITYREQUEST'].fields_by_name['size']._serialized_options = b'\272H\010r\006\300\263\256\261\002\001'
   _globals['_PARTITIONSERVICECAPACITYREQUEST'].fields_by_name['project']._loaded_options = None
   _globals['_PARTITIONSERVICECAPACITYREQUEST'].fields_by_name['project']._serialized_options = b'\272H\005r\003\260\001\001'
+  _globals['_PARTITIONCAPACITY'].fields_by_name['partition']._loaded_options = None
+  _globals['_PARTITIONCAPACITY'].fields_by_name['partition']._serialized_options = b'\272H\010r\006\320\263\256\261\002\001'
+  _globals['_MACHINESIZECAPACITY'].fields_by_name['size']._loaded_options = None
+  _globals['_MACHINESIZECAPACITY'].fields_by_name['size']._serialized_options = b'\272H\010r\006\300\263\256\261\002\001'
   _globals['_PARTITIONSERVICE'].methods_by_name['Create']._loaded_options = None
   _globals['_PARTITIONSERVICE'].methods_by_name['Create']._serialized_options = b'\322\363\030\001\001\340\363\030\001'
   _globals['_PARTITIONSERVICE'].methods_by_name['Update']._loaded_options = None
@@ -79,9 +83,9 @@
   _globals['_PARTITIONSERVICECAPACITYRESPONSE']._serialized_start=1378
   _globals['_PARTITIONSERVICECAPACITYRESPONSE']._serialized_end=1499
   _globals['_PARTITIONCAPACITY']._serialized_start=1502
-  _globals['_PARTITIONCAPACITY']._serialized_end=1649
-  _globals['_MACHINESIZECAPACITY']._serialized_start=1652
-  _globals['_MACHINESIZECAPACITY']._serialized_end=2154
-  _globals['_PARTITIONSERVICE']._serialized_start=2157
-  _globals['_PARTITIONSERVICE']._serialized_end=2687
+  _globals['_PARTITIONCAPACITY']._serialized_end=1662
+  _globals['_MACHINESIZECAPACITY']._serialized_start=1665
+  _globals['_MACHINESIZECAPACITY']._serialized_end=2180
+  _globals['_PARTITIONSERVICE']._serialized_start=2183
+  _globals['_PARTITIONSERVICE']._serialized_end=2713
 # @@protoc_insertion_point(module_scope)
diff --git a/python/metalstack/client/client.py b/python/metalstack/client/client.py
index b397149b..a27ea63c 100755
--- a/python/metalstack/client/client.py
+++ b/python/metalstack/client/client.py
@@ -2,6 +2,7 @@
 
 import pyqwest
 
+import metalstack.admin.v2.component_connect as admin_component_connect
 import metalstack.admin.v2.filesystem_connect as admin_filesystem_connect
 import metalstack.admin.v2.image_connect as admin_image_connect
 import metalstack.admin.v2.ip_connect as admin_ip_connect
@@ -35,6 +36,7 @@
 
 import metalstack.infra.v2.bmc_connect as infra_bmc_connect
 import metalstack.infra.v2.boot_connect as infra_boot_connect
+import metalstack.infra.v2.component_connect as infra_component_connect
 import metalstack.infra.v2.event_connect as infra_event_connect
 import metalstack.infra.v2.switch_connect as infra_switch_connect
 
@@ -69,6 +71,9 @@ def __init__(self, baseurl: str, client: pyqwest.SyncClient = None):
             self._client = client
 
 
+        def component(self):
+            return admin_component_connect.ComponentServiceClientSync(address=self._baseurl, http_client=self._client)
+
         def filesystem(self):
             return admin_filesystem_connect.FilesystemServiceClientSync(address=self._baseurl, http_client=self._client)
 
@@ -176,6 +181,9 @@ def bmc(self):
         def boot(self):
             return infra_boot_connect.BootServiceClientSync(address=self._baseurl, http_client=self._client)
 
+        def component(self):
+            return infra_component_connect.ComponentServiceClientSync(address=self._baseurl, http_client=self._client)
+
         def event(self):
             return infra_event_connect.EventServiceClientSync(address=self._baseurl, http_client=self._client)
 
diff --git a/python/metalstack/infra/v2/component_connect.py b/python/metalstack/infra/v2/component_connect.py
new file mode 100644
index 00000000..bc9113c1
--- /dev/null
+++ b/python/metalstack/infra/v2/component_connect.py
@@ -0,0 +1,120 @@
+# -*- coding: utf-8 -*-
+# Generated by https://github.com/connectrpc/connect-python.  DO NOT EDIT!
+# source: metalstack/infra/v2/component.proto
+
+from collections.abc import AsyncGenerator, AsyncIterator, Iterable, Iterator, Mapping
+from typing import Protocol
+
+from connectrpc.client import ConnectClient, ConnectClientSync
+from connectrpc.code import Code
+from connectrpc.errors import ConnectError
+from connectrpc.interceptor import Interceptor, InterceptorSync
+from connectrpc.method import IdempotencyLevel, MethodInfo
+from connectrpc.request import Headers, RequestContext
+from connectrpc.server import ConnectASGIApplication, ConnectWSGIApplication, Endpoint, EndpointSync
+import metalstack.infra.v2.component_pb2 as metalstack_dot_infra_dot_v2_dot_component__pb2
+
+
+class ComponentService(Protocol):
+    async def ping(self, request: metalstack_dot_infra_dot_v2_dot_component__pb2.ComponentServicePingRequest, ctx: RequestContext) -> metalstack_dot_infra_dot_v2_dot_component__pb2.ComponentServicePingResponse:
+        raise ConnectError(Code.UNIMPLEMENTED, "Not implemented")
+
+
+class ComponentServiceASGIApplication(ConnectASGIApplication[ComponentService]):
+    def __init__(self, service: ComponentService | AsyncGenerator[ComponentService], *, interceptors: Iterable[Interceptor]=(), read_max_bytes: int | None = None) -> None:
+        super().__init__(
+            service=service,
+            endpoints=lambda svc: {
+                "/metalstack.infra.v2.ComponentService/Ping": Endpoint.unary(
+                    method=MethodInfo(
+                        name="Ping",
+                        service_name="metalstack.infra.v2.ComponentService",
+                        input=metalstack_dot_infra_dot_v2_dot_component__pb2.ComponentServicePingRequest,
+                        output=metalstack_dot_infra_dot_v2_dot_component__pb2.ComponentServicePingResponse,
+                        idempotency_level=IdempotencyLevel.UNKNOWN,
+                    ),
+                    function=svc.ping,
+                ),
+            },
+            interceptors=interceptors,
+            read_max_bytes=read_max_bytes,
+        )
+
+    @property
+    def path(self) -> str:
+        """Returns the URL path to mount the application to when serving multiple applications."""
+        return "/metalstack.infra.v2.ComponentService"
+
+
+class ComponentServiceClient(ConnectClient):
+    async def ping(
+        self,
+        request: metalstack_dot_infra_dot_v2_dot_component__pb2.ComponentServicePingRequest,
+        *,
+        headers: Headers | Mapping[str, str] | None = None,
+        timeout_ms: int | None = None,
+    ) -> metalstack_dot_infra_dot_v2_dot_component__pb2.ComponentServicePingResponse:
+        return await self.execute_unary(
+            request=request,
+            method=MethodInfo(
+                name="Ping",
+                service_name="metalstack.infra.v2.ComponentService",
+                input=metalstack_dot_infra_dot_v2_dot_component__pb2.ComponentServicePingRequest,
+                output=metalstack_dot_infra_dot_v2_dot_component__pb2.ComponentServicePingResponse,
+                idempotency_level=IdempotencyLevel.UNKNOWN,
+            ),
+            headers=headers,
+            timeout_ms=timeout_ms,
+        )
+
+
+class ComponentServiceSync(Protocol):
+    def ping(self, request: metalstack_dot_infra_dot_v2_dot_component__pb2.ComponentServicePingRequest, ctx: RequestContext) -> metalstack_dot_infra_dot_v2_dot_component__pb2.ComponentServicePingResponse:
+        raise ConnectError(Code.UNIMPLEMENTED, "Not implemented")
+
+
+class ComponentServiceWSGIApplication(ConnectWSGIApplication):
+    def __init__(self, service: ComponentServiceSync, interceptors: Iterable[InterceptorSync]=(), read_max_bytes: int | None = None) -> None:
+        super().__init__(
+            endpoints={
+                "/metalstack.infra.v2.ComponentService/Ping": EndpointSync.unary(
+                    method=MethodInfo(
+                        name="Ping",
+                        service_name="metalstack.infra.v2.ComponentService",
+                        input=metalstack_dot_infra_dot_v2_dot_component__pb2.ComponentServicePingRequest,
+                        output=metalstack_dot_infra_dot_v2_dot_component__pb2.ComponentServicePingResponse,
+                        idempotency_level=IdempotencyLevel.UNKNOWN,
+                    ),
+                    function=service.ping,
+                ),
+            },
+            interceptors=interceptors,
+            read_max_bytes=read_max_bytes,
+        )
+
+    @property
+    def path(self) -> str:
+        """Returns the URL path to mount the application to when serving multiple applications."""
+        return "/metalstack.infra.v2.ComponentService"
+
+
+class ComponentServiceClientSync(ConnectClientSync):
+    def ping(
+        self,
+        request: metalstack_dot_infra_dot_v2_dot_component__pb2.ComponentServicePingRequest,
+        *,
+        headers: Headers | Mapping[str, str] | None = None,
+        timeout_ms: int | None = None,
+    ) -> metalstack_dot_infra_dot_v2_dot_component__pb2.ComponentServicePingResponse:
+        return self.execute_unary(
+            request=request,
+            method=MethodInfo(
+                name="Ping",
+                service_name="metalstack.infra.v2.ComponentService",
+                input=metalstack_dot_infra_dot_v2_dot_component__pb2.ComponentServicePingRequest,
+                output=metalstack_dot_infra_dot_v2_dot_component__pb2.ComponentServicePingResponse,
+                idempotency_level=IdempotencyLevel.UNKNOWN,
+            ),
+            headers=headers,
+            timeout_ms=timeout_ms,
+        )
diff --git a/python/metalstack/infra/v2/component_pb2.py b/python/metalstack/infra/v2/component_pb2.py
new file mode 100644
index 00000000..c0583e16
--- /dev/null
+++ b/python/metalstack/infra/v2/component_pb2.py
@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: metalstack/infra/v2/component.proto
+# Protobuf Python Version: 6.33.5
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import runtime_version as _runtime_version
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+_runtime_version.ValidateProtobufRuntimeVersion(
+    _runtime_version.Domain.PUBLIC,
+    6,
+    33,
+    5,
+    '',
+    'metalstack/infra/v2/component.proto'
+)
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from buf.validate import validate_pb2 as buf_dot_validate_dot_validate__pb2
+from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2
+from metalstack.api.v2 import common_pb2 as metalstack_dot_api_dot_v2_dot_common__pb2
+from metalstack.api.v2 import predefined_rules_pb2 as metalstack_dot_api_dot_v2_dot_predefined__rules__pb2
+from metalstack.api.v2 import version_pb2 as metalstack_dot_api_dot_v2_dot_version__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n#metalstack/infra/v2/component.proto\x12\x13metalstack.infra.v2\x1a\x1b\x62uf/validate/validate.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1emetalstack/api/v2/common.proto\x1a(metalstack/api/v2/predefined_rules.proto\x1a\x1fmetalstack/api/v2/version.proto\"\x87\x02\n\x1b\x43omponentServicePingRequest\x12@\n\x04type\x18\x01 \x01(\x0e\x32\".metalstack.infra.v2.ComponentTypeB\x08\xbaH\x05\x82\x01\x02\x10\x01R\x04type\x12+\n\nidentifier\x18\x02 \x01(\tB\x0b\xbaH\x08r\x06\xc0\xb3\xae\xb1\x02\x01R\nidentifier\x12\x43\n\nstarted_at\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.TimestampB\x08\xbaH\x05\xb2\x01\x02\x38\x01R\tstartedAt\x12\x34\n\x07version\x18\x04 \x01(\x0b\x32\x1a.metalstack.api.v2.VersionR\x07version\"\x1e\n\x1c\x43omponentServicePingResponse*\x8c\x03\n\rComponentType\x12/\n\x1a\x43OMPONENT_TYPE_UNSPECIFIED\x10\x00\x1a\x0f\x82\xb2\x19\x0bunspecified\x12+\n\x18\x43OMPONENT_TYPE_PIXIECORE\x10\x01\x1a\r\x82\xb2\x19\tpixiecore\x12-\n\x19\x43OMPONENT_TYPE_METAL_CORE\x10\x02\x1a\x0e\x82\xb2\x19\nmetal-core\x12+\n\x18\x43OMPONENT_TYPE_METAL_BMC\x10\x03\x1a\r\x82\xb2\x19\tmetal-bmc\x12\x45\n%COMPONENT_TYPE_METAL_IMAGE_CACHE_SYNC\x10\x04\x1a\x1a\x82\xb2\x19\x16metal-image-cache-sync\x12\x33\n\x1c\x43OMPONENT_TYPE_METAL_CONSOLE\x10\x05\x1a\x11\x82\xb2\x19\rmetal-console\x12\x45\n%COMPONENT_TYPE_METAL_METRICS_EXPORTER\x10\x06\x1a\x1a\x82\xb2\x19\x16metal-metrics-exporter2\x8a\x01\n\x10\x43omponentService\x12v\n\x04Ping\x12\x30.metalstack.infra.v2.ComponentServicePingRequest\x1a\x31.metalstack.infra.v2.ComponentServicePingResponse\"\t\xe0\xf3\x18\x02\xea\xf3\x18\x01\x01\x42\xd2\x01\n\x17\x63om.metalstack.infra.v2B\x0e\x43omponentProtoP\x01Z9github.com/metal-stack/api/go/metalstack/infra/v2;infrav2\xa2\x02\x03MIX\xaa\x02\x13Metalstack.Infra.V2\xca\x02\x13Metalstack\\Infra\\V2\xe2\x02\x1fMetalstack\\Infra\\V2\\GPBMetadata\xea\x02\x15Metalstack::Infra::V2b\x06proto3')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'metalstack.infra.v2.component_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  _globals['DESCRIPTOR']._loaded_options = None
+  _globals['DESCRIPTOR']._serialized_options = b'\n\027com.metalstack.infra.v2B\016ComponentProtoP\001Z9github.com/metal-stack/api/go/metalstack/infra/v2;infrav2\242\002\003MIX\252\002\023Metalstack.Infra.V2\312\002\023Metalstack\\Infra\\V2\342\002\037Metalstack\\Infra\\V2\\GPBMetadata\352\002\025Metalstack::Infra::V2'
+  _globals['_COMPONENTTYPE'].values_by_name["COMPONENT_TYPE_UNSPECIFIED"]._loaded_options = None
+  _globals['_COMPONENTTYPE'].values_by_name["COMPONENT_TYPE_UNSPECIFIED"]._serialized_options = b'\202\262\031\013unspecified'
+  _globals['_COMPONENTTYPE'].values_by_name["COMPONENT_TYPE_PIXIECORE"]._loaded_options = None
+  _globals['_COMPONENTTYPE'].values_by_name["COMPONENT_TYPE_PIXIECORE"]._serialized_options = b'\202\262\031\tpixiecore'
+  _globals['_COMPONENTTYPE'].values_by_name["COMPONENT_TYPE_METAL_CORE"]._loaded_options = None
+  _globals['_COMPONENTTYPE'].values_by_name["COMPONENT_TYPE_METAL_CORE"]._serialized_options = b'\202\262\031\nmetal-core'
+  _globals['_COMPONENTTYPE'].values_by_name["COMPONENT_TYPE_METAL_BMC"]._loaded_options = None
+  _globals['_COMPONENTTYPE'].values_by_name["COMPONENT_TYPE_METAL_BMC"]._serialized_options = b'\202\262\031\tmetal-bmc'
+  _globals['_COMPONENTTYPE'].values_by_name["COMPONENT_TYPE_METAL_IMAGE_CACHE_SYNC"]._loaded_options = None
+  _globals['_COMPONENTTYPE'].values_by_name["COMPONENT_TYPE_METAL_IMAGE_CACHE_SYNC"]._serialized_options = b'\202\262\031\026metal-image-cache-sync'
+  _globals['_COMPONENTTYPE'].values_by_name["COMPONENT_TYPE_METAL_CONSOLE"]._loaded_options = None
+  _globals['_COMPONENTTYPE'].values_by_name["COMPONENT_TYPE_METAL_CONSOLE"]._serialized_options = b'\202\262\031\rmetal-console'
+  _globals['_COMPONENTTYPE'].values_by_name["COMPONENT_TYPE_METAL_METRICS_EXPORTER"]._loaded_options = None
+  _globals['_COMPONENTTYPE'].values_by_name["COMPONENT_TYPE_METAL_METRICS_EXPORTER"]._serialized_options = b'\202\262\031\026metal-metrics-exporter'
+  _globals['_COMPONENTSERVICEPINGREQUEST'].fields_by_name['type']._loaded_options = None
+  _globals['_COMPONENTSERVICEPINGREQUEST'].fields_by_name['type']._serialized_options = b'\272H\005\202\001\002\020\001'
+  _globals['_COMPONENTSERVICEPINGREQUEST'].fields_by_name['identifier']._loaded_options = None
+  _globals['_COMPONENTSERVICEPINGREQUEST'].fields_by_name['identifier']._serialized_options = b'\272H\010r\006\300\263\256\261\002\001'
+  _globals['_COMPONENTSERVICEPINGREQUEST'].fields_by_name['started_at']._loaded_options = None
+  _globals['_COMPONENTSERVICEPINGREQUEST'].fields_by_name['started_at']._serialized_options = b'\272H\005\262\001\0028\001'
+  _globals['_COMPONENTSERVICE'].methods_by_name['Ping']._loaded_options = None
+  _globals['_COMPONENTSERVICE'].methods_by_name['Ping']._serialized_options = b'\340\363\030\002\352\363\030\001\001'
+  _globals['_COMPONENTTYPE']._serialized_start=528
+  _globals['_COMPONENTTYPE']._serialized_end=924
+  _globals['_COMPONENTSERVICEPINGREQUEST']._serialized_start=230
+  _globals['_COMPONENTSERVICEPINGREQUEST']._serialized_end=493
+  _globals['_COMPONENTSERVICEPINGRESPONSE']._serialized_start=495
+  _globals['_COMPONENTSERVICEPINGRESPONSE']._serialized_end=525
+  _globals['_COMPONENTSERVICE']._serialized_start=927
+  _globals['_COMPONENTSERVICE']._serialized_end=1065
+# @@protoc_insertion_point(module_scope)
diff --git a/python/metalstack/infra/v2/component_pb2.pyi b/python/metalstack/infra/v2/component_pb2.pyi
new file mode 100644
index 00000000..b529e6d5
--- /dev/null
+++ b/python/metalstack/infra/v2/component_pb2.pyi
@@ -0,0 +1,47 @@
+import datetime
+
+from buf.validate import validate_pb2 as _validate_pb2
+from google.protobuf import timestamp_pb2 as _timestamp_pb2
+from metalstack.api.v2 import common_pb2 as _common_pb2
+from metalstack.api.v2 import predefined_rules_pb2 as _predefined_rules_pb2
+from metalstack.api.v2 import version_pb2 as _version_pb2
+from google.protobuf.internal import enum_type_wrapper as _enum_type_wrapper
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from collections.abc import Mapping as _Mapping
+from typing import ClassVar as _ClassVar, Optional as _Optional, Union as _Union
+
+DESCRIPTOR: _descriptor.FileDescriptor
+
+class ComponentType(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
+    __slots__ = ()
+    COMPONENT_TYPE_UNSPECIFIED: _ClassVar[ComponentType]
+    COMPONENT_TYPE_PIXIECORE: _ClassVar[ComponentType]
+    COMPONENT_TYPE_METAL_CORE: _ClassVar[ComponentType]
+    COMPONENT_TYPE_METAL_BMC: _ClassVar[ComponentType]
+    COMPONENT_TYPE_METAL_IMAGE_CACHE_SYNC: _ClassVar[ComponentType]
+    COMPONENT_TYPE_METAL_CONSOLE: _ClassVar[ComponentType]
+    COMPONENT_TYPE_METAL_METRICS_EXPORTER: _ClassVar[ComponentType]
+COMPONENT_TYPE_UNSPECIFIED: ComponentType
+COMPONENT_TYPE_PIXIECORE: ComponentType
+COMPONENT_TYPE_METAL_CORE: ComponentType
+COMPONENT_TYPE_METAL_BMC: ComponentType
+COMPONENT_TYPE_METAL_IMAGE_CACHE_SYNC: ComponentType
+COMPONENT_TYPE_METAL_CONSOLE: ComponentType
+COMPONENT_TYPE_METAL_METRICS_EXPORTER: ComponentType
+
+class ComponentServicePingRequest(_message.Message):
+    __slots__ = ("type", "identifier", "started_at", "version")
+    TYPE_FIELD_NUMBER: _ClassVar[int]
+    IDENTIFIER_FIELD_NUMBER: _ClassVar[int]
+    STARTED_AT_FIELD_NUMBER: _ClassVar[int]
+    VERSION_FIELD_NUMBER: _ClassVar[int]
+    type: ComponentType
+    identifier: str
+    started_at: _timestamp_pb2.Timestamp
+    version: _version_pb2.Version
+    def __init__(self, type: _Optional[_Union[ComponentType, str]] = ..., identifier: _Optional[str] = ..., started_at: _Optional[_Union[datetime.datetime, _timestamp_pb2.Timestamp, _Mapping]] = ..., version: _Optional[_Union[_version_pb2.Version, _Mapping]] = ...) -> None: ...
+
+class ComponentServicePingResponse(_message.Message):
+    __slots__ = ()
+    def __init__(self) -> None: ...