diff --git a/openapi.yaml b/openapi.yaml
index 9276854..20d2596 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -78,8 +78,6 @@ components:
           example: v1.2.3
     TenantId:
       type: object
-      required:
-        - id
       properties:
         id:
           $ref: '#/components/schemas/Id'
@@ -138,8 +136,6 @@ components:
         - $ref: '#/components/schemas/ClusterProperties'
     ClusterId:
       type: object
-      required:
-        - id
       properties:
         id:
           $ref: '#/components/schemas/Id'
diff --git a/pkg/api/openapi.go b/pkg/api/openapi.go
index fac8481..4bfe408 100644
--- a/pkg/api/openapi.go
+++ b/pkg/api/openapi.go
@@ -51,7 +51,7 @@ type ClusterFacts map[string]interface{}
 // ClusterId defines model for ClusterId.
 type ClusterId struct {
 	// Id A unique object identifier string. Automatically generated by the API on creation (in the form "<letter>-<adjective>-<noun>-<digits>" where all letters are lowercase, max 63 characters in total).
-	Id Id `json:"id"`
+	Id *Id `json:"id,omitempty"`
 }
 
 // ClusterProperties A cluster defition object.
@@ -161,7 +161,7 @@ type Tenant struct {
 // TenantId defines model for TenantId.
 type TenantId struct {
 	// Id A unique object identifier string. Automatically generated by the API on creation (in the form "<letter>-<adjective>-<noun>-<digits>" where all letters are lowercase, max 63 characters in total).
-	Id Id `json:"id"`
+	Id *Id `json:"id,omitempty"`
 }
 
 // TenantProperties A tenant definition object.
@@ -3278,67 +3278,67 @@ var swaggerSpec = []string{
 	"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",
-	"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",
-	"LFuUtn8/XD78XwAAAP//zGbqLLdJAAA=",
+	"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",
+	"/364fPi/AAAA//+2KOvJk0kAAA==",
 }
 
 // GetSwagger returns the content of the embedded swagger specification file
diff --git a/pkg/api/openapi_custom.go b/pkg/api/openapi_custom.go
index d45007f..549a5be 100644
--- a/pkg/api/openapi_custom.go
+++ b/pkg/api/openapi_custom.go
@@ -1,6 +1,9 @@
 package api
 
 // String returns the underlying string value of `Id`.
-func (id Id) String() string {
-	return string(id)
+func (id *Id) String() string {
+	if id == nil {
+		return ""
+	}
+	return string(*id)
 }
diff --git a/pkg/api/utils.go b/pkg/api/utils.go
index 007d36f..8fd1f51 100644
--- a/pkg/api/utils.go
+++ b/pkg/api/utils.go
@@ -31,7 +31,7 @@ var (
 func GenerateClusterID() (ClusterId, error) {
 	id, err := generateID(ClusterIDPrefix)
 	return ClusterId{
-		Id: id,
+		Id: &id,
 	}, err
 }
 
@@ -39,7 +39,7 @@ func GenerateClusterID() (ClusterId, error) {
 func GenerateTenantID() (TenantId, error) {
 	id, err := generateID(TenantIDPrefix)
 	return TenantId{
-		Id: id,
+		Id: &id,
 	}, err
 }
 
@@ -60,8 +60,9 @@ func generateID(prefix string) (Id, error) {
 
 // NewAPITenantFromCRD transforms a CRD tenant into the API representation
 func NewAPITenantFromCRD(tenant synv1alpha1.Tenant) *Tenant {
+	id := Id(tenant.Name)
 	apiTenant := &Tenant{
-		TenantId: TenantId{Id: Id(tenant.Name)},
+		TenantId: TenantId{Id: &id},
 		TenantProperties: TenantProperties{
 			GitRepo: &RevisionedGitRepo{},
 		},
@@ -107,14 +108,15 @@ func NewAPITenantFromCRD(tenant synv1alpha1.Tenant) *Tenant {
 // NewCRDFromAPITenant transforms an API tenant into the CRD representation
 func NewCRDFromAPITenant(apiTenant Tenant) (*synv1alpha1.Tenant, error) {
 	if !strings.HasPrefix(apiTenant.Id.String(), TenantIDPrefix) {
-		if apiTenant.Id == "" {
+		if apiTenant.Id.String() == "" {
 			id, err := GenerateTenantID()
 			if err != nil {
 				return nil, err
 			}
 			apiTenant.TenantId = id
 		} else {
-			apiTenant.Id = TenantIDPrefix + apiTenant.Id
+			id := TenantIDPrefix + *apiTenant.Id
+			apiTenant.Id = &id
 		}
 	}
 	if apiTenant.GitRepo == nil ||
@@ -131,7 +133,7 @@ func NewCRDFromAPITenant(apiTenant Tenant) (*synv1alpha1.Tenant, error) {
 	}
 
 	if apiTenant.GitRepo != nil {
-		tmpl, err := newGitRepoTemplate(&apiTenant.GitRepo.GitRepo, string(apiTenant.Id))
+		tmpl, err := newGitRepoTemplate(&apiTenant.GitRepo.GitRepo, apiTenant.Id.String())
 		if err != nil {
 			return nil, fmt.Errorf("failed to create git repo template: %w", err)
 		}
@@ -179,8 +181,9 @@ func SyncCRDFromAPITenant(source TenantProperties, target *synv1alpha1.Tenant) {
 
 // NewAPIClusterFromCRD transforms a CRD cluster into the API representation
 func NewAPIClusterFromCRD(cluster synv1alpha1.Cluster) *Cluster {
+	id := Id(cluster.Name)
 	apiCluster := &Cluster{
-		ClusterId: ClusterId{Id: Id(cluster.Name)},
+		ClusterId: ClusterId{Id: &id},
 		ClusterProperties: ClusterProperties{
 			GitRepo: &GitRepo{},
 		},
@@ -257,20 +260,21 @@ func unmarshalFact(fact string) interface{} {
 
 // NewCRDFromAPICluster transforms an API cluster into the CRD representation
 func NewCRDFromAPICluster(apiCluster Cluster) (*synv1alpha1.Cluster, error) {
-	if !strings.HasPrefix(string(apiCluster.Id), ClusterIDPrefix) {
-		if apiCluster.Id == "" {
+	if !strings.HasPrefix(apiCluster.Id.String(), ClusterIDPrefix) {
+		if apiCluster.Id.String() == "" {
 			id, err := GenerateClusterID()
 			if err != nil {
 				return nil, err
 			}
 			apiCluster.ClusterId = id
 		} else {
-			apiCluster.Id = ClusterIDPrefix + apiCluster.Id
+			id := Id(ClusterIDPrefix + apiCluster.Id.String())
+			apiCluster.Id = &id
 		}
 	}
 	cluster := &synv1alpha1.Cluster{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:        string(apiCluster.ClusterId.Id),
+			Name:        apiCluster.Id.String(),
 			Annotations: map[string]string{},
 		},
 		Spec: synv1alpha1.ClusterSpec{
@@ -280,7 +284,7 @@ func NewCRDFromAPICluster(apiCluster Cluster) (*synv1alpha1.Cluster, error) {
 		},
 	}
 
-	tmpl, err := newGitRepoTemplate(apiCluster.GitRepo, string(apiCluster.Id))
+	tmpl, err := newGitRepoTemplate(apiCluster.GitRepo, apiCluster.Id.String())
 	if err != nil {
 		return nil, fmt.Errorf("failed to create git repo template: %w", err)
 	}
diff --git a/pkg/api/utils_test.go b/pkg/api/utils_test.go
index 4c58ffc..1f863f5 100644
--- a/pkg/api/utils_test.go
+++ b/pkg/api/utils_test.go
@@ -80,7 +80,7 @@ func TestGenerateClusterID(t *testing.T) {
 	assertGeneratedID(t, ClusterIDPrefix, func() (s string) {
 		id, err := GenerateClusterID()
 		require.NoError(t, err)
-		return string(id.Id)
+		return id.Id.String()
 	})
 }
 
@@ -168,9 +168,10 @@ var tenantTests = map[string]struct {
 func TestNewCRDFromAPITenant(t *testing.T) {
 	for name, test := range tenantTests {
 		t.Run(name, func(t *testing.T) {
+			id := Id(fmt.Sprintf("t-%s", t.Name()))
 			apiTenant := Tenant{
 				TenantId{
-					Id: Id(fmt.Sprintf("t-%s", t.Name())),
+					Id: &id,
 				},
 				test.properties,
 			}
@@ -234,7 +235,7 @@ func TestNewCRDFromAPICluster(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			apiCluster := Cluster{
 				ClusterId{
-					Id: Id(fmt.Sprintf("c-%s", t.Name())),
+					Id: pointer.To(Id(fmt.Sprintf("c-%s", t.Name()))),
 				},
 				ClusterTenant{fmt.Sprintf("t-%s", t.Name())},
 				test.properties,
diff --git a/pkg/service/cluster.go b/pkg/service/cluster.go
index d1e6bda..f52b635 100644
--- a/pkg/service/cluster.go
+++ b/pkg/service/cluster.go
@@ -7,6 +7,7 @@ import (
 	"os"
 	"sort"
 
+	"github.com/AlekSi/pointer"
 	"github.com/labstack/echo/v4"
 	synv1alpha1 "github.com/projectsyn/lieutenant-operator/api/v1alpha1"
 	"k8s.io/apimachinery/pkg/api/errors"
@@ -70,7 +71,7 @@ func sortClustersBy(clusters []api.Cluster, by *api.ListClustersParamsSortBy) {
 
 			return di < dj
 		default:
-			return clusters[i].Id < clusters[j].Id
+			return clusters[i].Id.String() < clusters[j].Id.String()
 		}
 	})
 }
@@ -188,7 +189,7 @@ func (s *APIImpl) PutCluster(c echo.Context, clusterID api.ClusterIdParameter) e
 		return echo.NewHTTPError(http.StatusBadRequest, err)
 	}
 	apiCluster := api.Cluster(*body)
-	apiCluster.Id = api.Id(clusterID)
+	apiCluster.Id = pointer.To(api.Id(clusterID))
 
 	cluster, err := api.NewCRDFromAPICluster(apiCluster)
 	if err != nil {
diff --git a/pkg/service/cluster_test.go b/pkg/service/cluster_test.go
index 9ce7ebe..8fd73bf 100644
--- a/pkg/service/cluster_test.go
+++ b/pkg/service/cluster_test.go
@@ -104,7 +104,7 @@ func TestListCluster_Sort(t *testing.T) {
 			assert.NoError(t, err)
 			assert.Len(t, clusters, 3)
 			for i := range tc.order {
-				assert.Equal(t, tc.order[i], string(clusters[i].Id))
+				assert.Equal(t, tc.order[i], clusters[i].Id.String())
 			}
 		})
 	}
@@ -165,7 +165,7 @@ func TestCreateCluster(t *testing.T) {
 
 	assert.NoError(t, err)
 	assert.NotNil(t, cluster)
-	assert.Contains(t, cluster.Id, api.ClusterIDPrefix)
+	assert.Contains(t, cluster.Id.String(), api.ClusterIDPrefix)
 	assert.Equal(t, cluster.DisplayName, newCluster.DisplayName)
 	assert.Equal(t, newCluster.Facts, cluster.Facts)
 	assert.Equal(t, newCluster.DynamicFacts, cluster.DynamicFacts)
@@ -194,7 +194,7 @@ func TestCreateClusterWithId(t *testing.T) {
 
 			request := api.Cluster{
 				ClusterId: api.ClusterId{
-					Id: tt.request,
+					Id: pointer.To(tt.request),
 				},
 				ClusterProperties: api.ClusterProperties{
 					DisplayName: pointer.ToString("My test cluster"),
@@ -210,7 +210,7 @@ func TestCreateClusterWithId(t *testing.T) {
 			cluster := &api.Cluster{}
 			err := result.UnmarshalJsonToObject(cluster)
 			assert.NoError(t, err)
-			assert.Equal(t, tt.response, cluster.Id)
+			assert.Equal(t, tt.response.String(), cluster.Id.String())
 		})
 	}
 }
@@ -280,6 +280,7 @@ func TestCreateClusterNoTenant(t *testing.T) {
 	e, _ := setupTest(t)
 
 	createCluster := map[string]string{
+		"id":          "c-1234",
 		"displayName": "cluster-name",
 	}
 	result := testutil.NewRequest().
@@ -331,7 +332,7 @@ func TestClusterGet(t *testing.T) {
 	err := result.UnmarshalJsonToObject(cluster)
 	assert.NoError(t, err)
 	assert.NotNil(t, cluster)
-	assert.Equal(t, clusterA.Name, string(cluster.ClusterId.Id))
+	assert.Equal(t, clusterA.Name, cluster.Id.String())
 	assert.Equal(t, tenantA.Name, cluster.Tenant)
 	assert.Equal(t, clusterA.Spec.GitHostKeys, *cluster.GitRepo.HostKeys)
 	assert.True(t, strings.HasSuffix(*cluster.InstallURL, clusterA.Status.BootstrapToken.Token))
@@ -350,7 +351,7 @@ func TestClusterGetNoToken(t *testing.T) {
 	err := result.UnmarshalJsonToObject(cluster)
 	assert.NoError(t, err)
 	assert.NotNil(t, cluster)
-	assert.Equal(t, clusterB.Name, string(cluster.ClusterId.Id))
+	assert.Equal(t, clusterB.Name, cluster.Id.String())
 	assert.Equal(t, tenantB.Name, cluster.Tenant)
 	assert.Nil(t, cluster.InstallURL)
 }
@@ -504,7 +505,7 @@ func TestClusterUpdate(t *testing.T) {
 	err := result.UnmarshalJsonToObject(cluster)
 	require.NoError(t, err)
 	assert.NotNil(t, cluster)
-	assert.Equal(t, clusterB.Name, string(cluster.Id))
+	assert.Equal(t, clusterB.Name, cluster.Id.String())
 	assert.Equal(t, newDisplayName, *cluster.DisplayName)
 	assert.Equal(t, *updateCluster.GitRepo.DeployKey, *cluster.GitRepo.DeployKey)
 	assert.Empty(t, (*cluster.Annotations)["existing"])
@@ -576,7 +577,7 @@ var putClusterTestCases = map[string]struct {
 	"put new object": {
 		cluster: &api.Cluster{
 			ClusterId: api.ClusterId{
-				Id: "c-new-2379",
+				Id: pointer.To(api.Id("c-new-2379")),
 			},
 			ClusterProperties: api.ClusterProperties{
 				DisplayName: pointer.ToString("My new cluster"),
@@ -596,7 +597,7 @@ var putClusterTestCases = map[string]struct {
 		},
 		code: http.StatusCreated,
 		valid: func(t *testing.T, act *api.Cluster) bool {
-			assert.Contains(t, act.Id, api.ClusterIDPrefix)
+			assert.Contains(t, act.Id.String(), api.ClusterIDPrefix)
 			assert.Equal(t, pointer.ToString("My new cluster"), act.DisplayName)
 			return true
 		},
@@ -637,7 +638,7 @@ func TestClusterPutCreateNameMissmatch(t *testing.T) {
 	e, client := setupTest(t)
 	cluster := &api.Cluster{
 		ClusterId: api.ClusterId{
-			Id: "c-bar",
+			Id: pointer.To(api.Id("c-new-2379")),
 		},
 		ClusterProperties: api.ClusterProperties{
 			DisplayName: pointer.ToString("My new cluster"),
diff --git a/pkg/service/tenant.go b/pkg/service/tenant.go
index 9df0e23..09ab681 100644
--- a/pkg/service/tenant.go
+++ b/pkg/service/tenant.go
@@ -5,6 +5,7 @@ import (
 	"net/http"
 	"os"
 
+	"github.com/AlekSi/pointer"
 	"github.com/labstack/echo/v4"
 	synv1alpha1 "github.com/projectsyn/lieutenant-operator/api/v1alpha1"
 	"k8s.io/apimachinery/pkg/api/errors"
@@ -128,7 +129,7 @@ func (s *APIImpl) PutTenant(c echo.Context, tenantID api.TenantIdParameter) erro
 		return echo.NewHTTPError(http.StatusBadRequest, err)
 	}
 	apiTenant := api.Tenant(*newTenant)
-	apiTenant.Id = api.Id(tenantID)
+	apiTenant.Id = pointer.To(api.Id(tenantID))
 
 	tenant, err := api.NewCRDFromAPITenant(apiTenant)
 	if err != nil {
diff --git a/pkg/service/tenant_test.go b/pkg/service/tenant_test.go
index 94436de..1487745 100644
--- a/pkg/service/tenant_test.go
+++ b/pkg/service/tenant_test.go
@@ -63,7 +63,7 @@ func TestCreateTenant(t *testing.T) {
 	assert.NoError(t, err)
 	assert.NotNil(t, tenant)
 	assert.NotNil(t, tenant.GitRepo)
-	assert.Contains(t, tenant.Id, api.TenantIDPrefix)
+	assert.Contains(t, tenant.Id.String(), api.TenantIDPrefix)
 	assert.Equal(t, newTenant.DisplayName, tenant.DisplayName)
 	assert.Equal(t, newTenant.GitRepo.Url, tenant.GitRepo.Url)
 	assert.NotNil(t, tenant.GitRepo.Type)
@@ -73,7 +73,7 @@ func TestCreateTenant(t *testing.T) {
 
 	tenantCRD := &synv1alpha1.Tenant{}
 	err = client.Get(context.TODO(), types.NamespacedName{
-		Name:      string(tenant.Id),
+		Name:      tenant.Id.String(),
 		Namespace: "default",
 	}, tenantCRD)
 	assert.NoError(t, err)
@@ -101,7 +101,7 @@ func TestCreateTenantWithID(t *testing.T) {
 
 			requestBody := api.Tenant{
 				TenantId: api.TenantId{
-					Id: tt.request,
+					Id: &tt.request,
 				},
 				TenantProperties: api.TenantProperties{
 					DisplayName: pointer.ToString("Tenant with ID"),
@@ -119,7 +119,8 @@ func TestCreateTenantWithID(t *testing.T) {
 			assert.Equal(t, http.StatusCreated, response.Code())
 			tenant := &api.Tenant{}
 			assert.NoError(t, response.UnmarshalJsonToObject(tenant))
-			assert.Equal(t, tt.response, tenant.Id)
+			require.NotNil(t, tenant.Id)
+			assert.Equal(t, tt.response, *tenant.Id)
 		})
 	}
 }
@@ -195,7 +196,7 @@ func TestTenantGet(t *testing.T) {
 	tenant := &api.Tenant{}
 	err := result.UnmarshalJsonToObject(tenant)
 	assert.NoError(t, err)
-	assert.Equal(t, tenantA.Name, string(tenant.Id))
+	assert.Equal(t, tenantA.Name, tenant.Id.String())
 	assert.Equal(t, tenantA.Spec.DisplayName, *tenant.DisplayName)
 	assert.Equal(t, tenantA.Spec.GitRepoURL, *tenant.GitRepo.Url)
 	assert.Contains(t, *tenant.Annotations, "monitoring.syn.tools/sla")
@@ -265,7 +266,7 @@ func TestTenantUpdate(t *testing.T) {
 	err := result.UnmarshalJsonToObject(tenant)
 	assert.NoError(t, err)
 	assert.NotNil(t, tenant)
-	assert.Contains(t, string(tenant.Id), tenantB.Name)
+	assert.Contains(t, tenant.Id.String(), tenantB.Name)
 	assert.Equal(t, newDisplayName, *tenant.DisplayName)
 	assert.Contains(t, *tenant.Annotations, "some")
 	assert.Len(t, *tenant.Annotations, 1)
@@ -331,7 +332,7 @@ var putTenantTestCases = map[string]struct {
 	"put new object": {
 		tenant: &api.Tenant{
 			TenantId: api.TenantId{
-				Id: "t-buzz-24",
+				Id: pointer.To(api.Id("t-buzz-24")),
 			},
 			TenantProperties: api.TenantProperties{
 				DisplayName: pointer.ToString("My test Tenant"),