diff --git a/Makefile b/Makefile
index e93be64e15..a6b8cec03f 100644
--- a/Makefile
+++ b/Makefile
@@ -206,13 +206,9 @@ manifests: CRD_OPTIONS ?= "crd:crdVersions=v1,ignoreUnexportedFields=true"
 manifests: fmt controller-gen ## Generate manifests e.g. CRD, RBAC etc.
 	controller-gen $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./pkg/api/..." output:crd:artifacts:config=config/crd/bases
 	@./scripts/split_roles_yaml.sh
-	@mkdir -p $(TIMESTAMPS_DIR) && touch $@
 
-$(TIMESTAMPS_DIR)/golangci-lint:
+golangci-lint:
 	go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION)
-	@mkdir -p $(TIMESTAMPS_DIR) && touch $@
-
-golangci-lint: $(TIMESTAMPS_DIR)/golangci-lint
 
 .PHONY: lint
 lint: golangci-lint
@@ -495,3 +491,8 @@ docker-sbom:
 gen-sdlc-checklist: envsubst docker-sbom ## Generate the SDLC checklist
 	@VERSION="$(VERSION)" AUTHORS="$(AUTHORS)" RELEASE_TYPE="$(RELEASE_TYPE)" \
 	./scripts/gen-sdlc-checklist.sh
+
+# TODO: avoid leaving leftovers in the first place
+.PHONY: clear-e2e-leftovers
+clear-e2e-leftovers: ## Clear the e2e test leftovers quickly
+	git restore bundle* config deploy
diff --git a/config/crd/bases/atlas.mongodb.com_atlasdatabaseusers.yaml b/config/crd/bases/atlas.mongodb.com_atlasdatabaseusers.yaml
index f1df6a2ab3..4058537375 100644
--- a/config/crd/bases/atlas.mongodb.com_atlasdatabaseusers.yaml
+++ b/config/crd/bases/atlas.mongodb.com_atlasdatabaseusers.yaml
@@ -181,8 +181,13 @@ spec:
                 maxLength: 1024
                 type: string
               x509Type:
+                default: NONE
                 description: X509Type is X.509 method by which the database authenticates
                   the provided username
+                enum:
+                - NONE
+                - MANAGED
+                - CUSTOMER
                 type: string
             required:
             - projectRef
diff --git a/pkg/api/v1/atlasdatabaseuser_types.go b/pkg/api/v1/atlasdatabaseuser_types.go
index fe4ba69ea6..017a814cd1 100644
--- a/pkg/api/v1/atlasdatabaseuser_types.go
+++ b/pkg/api/v1/atlasdatabaseuser_types.go
@@ -105,6 +105,9 @@ type AtlasDatabaseUserSpec struct {
 	AWSIAMType string `json:"awsIamType,omitempty"`
 
 	// X509Type is X.509 method by which the database authenticates the provided username
+	// +kubebuilder:default:=NONE
+	// +kubebuilder:validation:Enum:=NONE;MANAGED;CUSTOMER
+	// +optional
 	X509Type string `json:"x509Type,omitempty"`
 }