diff --git a/.golangci.yml b/.golangci.yml
index 4967b99e..5e602f9d 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -29,5 +29,4 @@ linters-settings:
   revive:
     rules:
       - name: dot-imports
-        disabled: true # we allow for dot-imports
-        
\ No newline at end of file
+        disabled: true # we allow for dot-imports
\ No newline at end of file
diff --git a/PROJECT b/PROJECT
index 364ffd88..4293b235 100644
--- a/PROJECT
+++ b/PROJECT
@@ -1,5 +1,5 @@
 layout:
-- go.kubebuilder.io/v3
+- go.kubebuilder.io/v4
 plugins:
   manifests.sdk.operatorframework.io/v2: {}
   scorecard.sdk.operatorframework.io/v2: {}
diff --git a/main.go b/cmd/main.go
similarity index 100%
rename from main.go
rename to cmd/main.go
diff --git a/config/samples/kustomization.yaml b/config/samples/kustomization.yaml
index 1cdd1c69..bf9a621e 100644
--- a/config/samples/kustomization.yaml
+++ b/config/samples/kustomization.yaml
@@ -1,4 +1,5 @@
 ## Append samples you want in your CSV to this file as resources ##
 resources:
+- toolchain.dev.openshift.com_v1alpha1_useraccount.yaml
 #TODO
 #+kubebuilder:scaffold:manifestskustomizesamples
diff --git a/config/samples/toolchain.dev.openshift.com_v1alpha1_useraccount.yaml b/config/samples/toolchain.dev.openshift.com_v1alpha1_useraccount.yaml
new file mode 100644
index 00000000..13e017d1
--- /dev/null
+++ b/config/samples/toolchain.dev.openshift.com_v1alpha1_useraccount.yaml
@@ -0,0 +1,6 @@
+apiVersion: toolchain.dev.openshift.com/v1alpha1
+kind: UserAccount
+metadata:
+  name: useraccount-sample
+# spec:
+  # TODO
\ No newline at end of file
diff --git a/make/get-tool.mk b/make/get-tool.mk
index de5976d4..138710f6 100644
--- a/make/get-tool.mk
+++ b/make/get-tool.mk
@@ -1,6 +1,6 @@
 # see go.mod
-CONTROLLER_GEN_VERSION=v0.14.0
-KUSTOMIZE_VERSION=v5.0.1
+CONTROLLER_GEN_VERSION=v0.15.0
+KUSTOMIZE_VERSION=v5.4.2
 GO_BINDATA_VERSION=v3.1.2
 
 CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
diff --git a/make/go.mk b/make/go.mk
index 3b617368..47662754 100644
--- a/make/go.mk
+++ b/make/go.mk
@@ -16,7 +16,7 @@ $(OUT_DIR)/operator:
 		go build ${V_FLAG} \
 		-ldflags "-X ${GO_PACKAGE_PATH}/version.Commit=${GIT_COMMIT_ID} -X ${GO_PACKAGE_PATH}/version.BuildTime=${BUILD_TIME}" \
 		-o $(OUT_DIR)/bin/member-operator \
-		main.go
+		./cmd/main.go
 	$(Q)CGO_ENABLED=0 GOARCH=${goarch} GOOS=linux \
 		go build ${V_FLAG} \
 		-ldflags "-X ${GO_PACKAGE_PATH}/version.Commit=${GIT_COMMIT_ID} -X ${GO_PACKAGE_PATH}/version.BuildTime=${BUILD_TIME}" \