diff --git a/api/go.mod b/api/go.mod
index af31426ae..d493ae230 100644
--- a/api/go.mod
+++ b/api/go.mod
@@ -72,8 +72,8 @@ require (
 // must consistent within modules and service operators
 replace github.com/openshift/api => github.com/openshift/api v0.0.0-20230414143018-3367bc7e6ac7 //allow-merging
 
-replace github.com/openstack-k8s-operators/lib-common/modules/common => github.com/stuggi/lib-common/modules/common v0.0.0-20230801084758-6169f85dea1d
+replace github.com/openstack-k8s-operators/lib-common/modules/common => github.com/stuggi/lib-common/modules/common v0.0.0-20230802080814-d622f3777836
 
 //replace github.com/openstack-k8s-operators/lib-common/modules/common => /home/mschuppe/src/github.com/openstack-k8s-operators/lib-common/modules/common
 
-replace github.com/openstack-k8s-operators/lib-common/modules/openstack => github.com/stuggi/lib-common/modules/openstack v0.0.0-20230801084758-6169f85dea1d
+replace github.com/openstack-k8s-operators/lib-common/modules/openstack => github.com/stuggi/lib-common/modules/openstack v0.0.0-20230802080814-d622f3777836
diff --git a/api/go.sum b/api/go.sum
index ea6d7c3ba..50cfd8a15 100644
--- a/api/go.sum
+++ b/api/go.sum
@@ -278,10 +278,10 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stuggi/lib-common/modules/common v0.0.0-20230801084758-6169f85dea1d h1:7yXrIPpHM0hYy6YQxbv6UHO7GUm36QE/DW2Hg4abSv4=
-github.com/stuggi/lib-common/modules/common v0.0.0-20230801084758-6169f85dea1d/go.mod h1:2fZFojsJsTA4MfGy50JEwbXaIP7Hr7h7x8hbhlMBedY=
-github.com/stuggi/lib-common/modules/openstack v0.0.0-20230801084758-6169f85dea1d h1:scLr9WuF+HF0OuADtXPcR0afzIjD2M8YxtdxiXcds5Q=
-github.com/stuggi/lib-common/modules/openstack v0.0.0-20230801084758-6169f85dea1d/go.mod h1:xe/pl0p06/pdhDWCplbMaW21Ggz34zWZBLDOTGXJpzI=
+github.com/stuggi/lib-common/modules/common v0.0.0-20230802080814-d622f3777836 h1:j9Xo7v+Zuv3Pb89pFVOmVMJoPvtXH0WpvVRZChiGBlM=
+github.com/stuggi/lib-common/modules/common v0.0.0-20230802080814-d622f3777836/go.mod h1:2fZFojsJsTA4MfGy50JEwbXaIP7Hr7h7x8hbhlMBedY=
+github.com/stuggi/lib-common/modules/openstack v0.0.0-20230802080814-d622f3777836 h1:U3MiUBQ0EuJibEtBg/8/CL5pPIulSmTHh3+lbAKw6Eg=
+github.com/stuggi/lib-common/modules/openstack v0.0.0-20230802080814-d622f3777836/go.mod h1:xe/pl0p06/pdhDWCplbMaW21Ggz34zWZBLDOTGXJpzI=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
 github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
diff --git a/controllers/keystoneservice_controller.go b/controllers/keystoneservice_controller.go
index 99ff5eb93..fcc6c2661 100644
--- a/controllers/keystoneservice_controller.go
+++ b/controllers/keystoneservice_controller.go
@@ -263,7 +263,9 @@ func (r *KeystoneServiceReconciler) reconcileDelete(
 		// Delete User
 		err := os.DeleteUser(
 			l,
-			instance.Spec.ServiceUser)
+			instance.Spec.ServiceUser,
+			"default",
+		)
 		if err != nil {
 			return ctrl.Result{}, err
 		}
@@ -456,6 +458,7 @@ func (r *KeystoneServiceReconciler) reconcileUser(
 		openstack.Project{
 			Name:        "service",
 			Description: "service",
+			DomainID:    "default",
 		})
 	if err != nil {
 		return ctrl.Result{}, err
@@ -470,6 +473,7 @@ func (r *KeystoneServiceReconciler) reconcileUser(
 			Name:      instance.Spec.ServiceUser,
 			Password:  password,
 			ProjectID: serviceProjectID,
+			DomainID:  "default",
 		})
 	if err != nil {
 		return ctrl.Result{}, err
diff --git a/go.mod b/go.mod
index 7aa3bfdf4..d5e34229c 100644
--- a/go.mod
+++ b/go.mod
@@ -95,6 +95,6 @@ replace github.com/openshift/api => github.com/openshift/api v0.0.0-202304141430
 
 //replace github.com/openstack-k8s-operators/lib-common/modules/common => /home/mschuppe/src/github.com/openstack-k8s-operators/lib-common/modules/common
 
-replace github.com/openstack-k8s-operators/lib-common/modules/common => github.com/stuggi/lib-common/modules/common v0.0.0-20230801084758-6169f85dea1d
+replace github.com/openstack-k8s-operators/lib-common/modules/common => github.com/stuggi/lib-common/modules/common v0.0.0-20230802080814-d622f3777836
 
-replace github.com/openstack-k8s-operators/lib-common/modules/openstack => github.com/stuggi/lib-common/modules/openstack v0.0.0-20230801084758-6169f85dea1d
+replace github.com/openstack-k8s-operators/lib-common/modules/openstack => github.com/stuggi/lib-common/modules/openstack v0.0.0-20230802080814-d622f3777836
diff --git a/go.sum b/go.sum
index 231d4b4ca..dea94a9a7 100644
--- a/go.sum
+++ b/go.sum
@@ -299,10 +299,10 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stuggi/lib-common/modules/common v0.0.0-20230801084758-6169f85dea1d h1:7yXrIPpHM0hYy6YQxbv6UHO7GUm36QE/DW2Hg4abSv4=
-github.com/stuggi/lib-common/modules/common v0.0.0-20230801084758-6169f85dea1d/go.mod h1:2fZFojsJsTA4MfGy50JEwbXaIP7Hr7h7x8hbhlMBedY=
-github.com/stuggi/lib-common/modules/openstack v0.0.0-20230801084758-6169f85dea1d h1:scLr9WuF+HF0OuADtXPcR0afzIjD2M8YxtdxiXcds5Q=
-github.com/stuggi/lib-common/modules/openstack v0.0.0-20230801084758-6169f85dea1d/go.mod h1:xe/pl0p06/pdhDWCplbMaW21Ggz34zWZBLDOTGXJpzI=
+github.com/stuggi/lib-common/modules/common v0.0.0-20230802080814-d622f3777836 h1:j9Xo7v+Zuv3Pb89pFVOmVMJoPvtXH0WpvVRZChiGBlM=
+github.com/stuggi/lib-common/modules/common v0.0.0-20230802080814-d622f3777836/go.mod h1:2fZFojsJsTA4MfGy50JEwbXaIP7Hr7h7x8hbhlMBedY=
+github.com/stuggi/lib-common/modules/openstack v0.0.0-20230802080814-d622f3777836 h1:U3MiUBQ0EuJibEtBg/8/CL5pPIulSmTHh3+lbAKw6Eg=
+github.com/stuggi/lib-common/modules/openstack v0.0.0-20230802080814-d622f3777836/go.mod h1:xe/pl0p06/pdhDWCplbMaW21Ggz34zWZBLDOTGXJpzI=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
 github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=