diff --git a/deployment/base/maas-controller/manager/manager.yaml b/deployment/base/maas-controller/manager/manager.yaml
index cb576396b..74e0152c1 100644
--- a/deployment/base/maas-controller/manager/manager.yaml
+++ b/deployment/base/maas-controller/manager/manager.yaml
@@ -33,8 +33,8 @@ spec:
           - --maas-api-namespace=$(MAAS_API_NAMESPACE)
           - --maas-subscription-namespace=$(MAAS_SUBSCRIPTION_NAMESPACE)
           - --cluster-audience=$(CLUSTER_AUDIENCE)
-          - --metadata-cache-ttl=$(METADATA_CACHE_TTL)
-          - --authz-cache-ttl=$(AUTHZ_CACHE_TTL)
+          - --metadata-cache-ttl=60
+          - --authz-cache-ttl=60
         env:
           - name: GATEWAY_NAME
             value: "maas-default-gateway"
@@ -48,10 +48,6 @@ spec:
             value: "models-as-a-service"
           - name: CLUSTER_AUDIENCE
             value: "https://kubernetes.default.svc"
-          - name: METADATA_CACHE_TTL
-            value: "60"
-          - name: AUTHZ_CACHE_TTL
-            value: "60"
         image: maas-controller
         name: manager
         imagePullPolicy: Always
diff --git a/deployment/overlays/odh/kustomization.yaml b/deployment/overlays/odh/kustomization.yaml
index c464a03fb..f4f43ab35 100644
--- a/deployment/overlays/odh/kustomization.yaml
+++ b/deployment/overlays/odh/kustomization.yaml
@@ -61,19 +61,29 @@ patches:
         spec:
           containers:
           - name: manager
+            args:
+            - --leader-elect
+            - --health-probe-bind-address=:8081
+            - --gateway-name=$(GATEWAY_NAME)
+            - --gateway-namespace=$(GATEWAY_NAMESPACE)
+            - --maas-api-namespace=$(MAAS_API_NAMESPACE)
+            - --maas-subscription-namespace=$(MAAS_SUBSCRIPTION_NAMESPACE)
+            - --cluster-audience=$(CLUSTER_AUDIENCE)
+            - --metadata-cache-ttl=$(METADATA_CACHE_TTL)
+            - --authz-cache-ttl=$(AUTHZ_CACHE_TTL)
             env:
             - name: METADATA_CACHE_TTL
               valueFrom:
                 configMapKeyRef:
                   key: metadata-cache-ttl
                   name: maas-parameters
-                  optional: true
+                  optional: false
             - name: AUTHZ_CACHE_TTL
               valueFrom:
                 configMapKeyRef:
                   key: authz-cache-ttl
                   name: maas-parameters
-                  optional: true
+                  optional: false
   target:
     kind: Deployment
     name: maas-controller