diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
index a3fbd84..b994e98 100644
--- a/config/default/kustomization.yaml
+++ b/config/default/kustomization.yaml
@@ -1,12 +1,12 @@
 # Adds namespace to all resources.
-namespace: uptime-robot-operator-system
+namespace: uptime-robot-system
 
 # Value of this field is prepended to the
 # names of all resources, e.g. a deployment named
 # "wordpress" becomes "alices-wordpress".
 # Note that it should also match with the prefix (text before '-') of the namespace
 # field above.
-namePrefix: uptime-robot-operator-
+namePrefix: uptime-robot-
 
 # Labels to add to all resources and selectors.
 #labels:
diff --git a/internal/controller/account_controller.go b/internal/controller/account_controller.go
index 617826d..b4837db 100644
--- a/internal/controller/account_controller.go
+++ b/internal/controller/account_controller.go
@@ -34,7 +34,7 @@ import (
 	uptimerobotv1 "github.com/clevyr/uptime-robot-operator/api/v1"
 )
 
-var ClusterResourceNamespace = "uptime-robot-operator-system"
+var ClusterResourceNamespace = "uptime-robot-system"
 
 // AccountReconciler reconciles a Account object
 type AccountReconciler struct {
diff --git a/internal/controller/account_controller_test.go b/internal/controller/account_controller_test.go
index 4a1f8c0..6827063 100644
--- a/internal/controller/account_controller_test.go
+++ b/internal/controller/account_controller_test.go
@@ -64,7 +64,7 @@ func CreateAccount(ctx context.Context) (*uptimerobotv1.Account, *corev1.Secret)
 	secret := &corev1.Secret{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      "uptime-robot",
-			Namespace: "uptime-robot-operator-system",
+			Namespace: ClusterResourceNamespace,
 		},
 		Data: map[string][]byte{
 			"apiKey": []byte("1234"),
diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
index bdf6c4a..fde98e9 100644
--- a/test/e2e/e2e_test.go
+++ b/test/e2e/e2e_test.go
@@ -27,7 +27,7 @@ import (
 	"github.com/clevyr/uptime-robot-operator/test/utils"
 )
 
-const namespace = "uptime-robot-operator-system"
+const namespace = "uptime-robot-system"
 
 var _ = Describe("controller", Ordered, func() {
 	BeforeAll(func() {