diff --git a/cmd/client/client.go b/cmd/client/client.go
index 8b3cb403..d531d698 100644
--- a/cmd/client/client.go
+++ b/cmd/client/client.go
@@ -14,7 +14,9 @@ package main
 
 import (
 	"flag"
+	"k8s.io/client-go/tools/leaderelection/resourcelock"
 	"os"
+	"sigs.k8s.io/controller-runtime/pkg/cache"
 
 	"github.com/adobe/cluster-registry/pkg/client/controllers"
 	"github.com/adobe/cluster-registry/pkg/config"
@@ -86,13 +88,15 @@ func main() {
 		},
 	}
 	options := ctrl.Options{
-		Scheme:                 scheme,
-		Namespace:              namespace,
-		MetricsBindAddress:     metricsAddr,
-		Port:                   9443,
-		HealthProbeBindAddress: probeAddr,
-		LeaderElection:         enableLeaderElection,
-		LeaderElectionID:       "0c4967d2.registry.ethos.adobe.com",
+		Scheme: scheme,
+		Cache: cache.Options{
+			Namespaces: []string{namespace},
+		},
+		MetricsBindAddress:         metricsAddr,
+		HealthProbeBindAddress:     probeAddr,
+		LeaderElection:             enableLeaderElection,
+		LeaderElectionID:           "1d5078e3.registry.ethos.adobe.com",
+		LeaderElectionResourceLock: resourcelock.LeasesResourceLock,
 	}
 
 	if configFile != "" {
diff --git a/config/manager/controller_manager_config.yaml b/config/manager/controller_manager_config.yaml
index c9ec3922..f3924cb4 100644
--- a/config/manager/controller_manager_config.yaml
+++ b/config/manager/controller_manager_config.yaml
@@ -9,13 +9,14 @@ webhook:
 leaderElection:
   leaderElect: true
   resourceNamespace: cluster-registry
-  resourceName: 0c4967d2.registry.ethos.adobe.com
+  resourceName: 1d5078e3.registry.ethos.adobe.com
+  resourceLock: leases
 namespace: cluster-registry
 alertmanagerWebhook:
   bindAddress: 127.0.0.1:9092
   alertMap:
     - alertName: ClusterCapacityWarning
-      onFiring: 
+      onFiring:
         onboarding: "off"
       onResolved:
         onboarding: "on"
diff --git a/local/client/client-config-cm.yaml b/local/client/client-config-cm.yaml
index f8a8c39d..5e5db4bb 100644
--- a/local/client/client-config-cm.yaml
+++ b/local/client/client-config-cm.yaml
@@ -16,7 +16,8 @@ data:
     leaderElection:
       leaderElect: true
       resourceNamespace: cluster-registry
-      resourceName: 0c4967d2.registry.ethos.adobe.com
+      resourceName: 1d5078e3.registry.ethos.adobe.com
+      resourceLock: leases
     namespace: cluster-registry
     alertmanagerWebhook:
       bindAddress: 0.0.0.0:9092
diff --git a/local/client/client-config.yaml b/local/client/client-config.yaml
index 3fd75af1..4aeba1d3 100644
--- a/local/client/client-config.yaml
+++ b/local/client/client-config.yaml
@@ -9,7 +9,8 @@ webhook:
 leaderElection:
   leaderElect: true
   resourceNamespace: cluster-registry
-  resourceName: 0c4967d2.registry.ethos.adobe.com
+  resourceName: 1d5078e3.registry.ethos.adobe.com
+  resourceLock: leases
 namespace: cluster-registry
 alertmanagerWebhook:
   bindAddress: 0.0.0.0:9092