diff --git a/deployments/kai-scheduler/templates/binder-webhook.yaml b/deployments/kai-scheduler/templates/binder-webhook.yaml
index 745b2d4e4..0b2c5ac08 100644
--- a/deployments/kai-scheduler/templates/binder-webhook.yaml
+++ b/deployments/kai-scheduler/templates/binder-webhook.yaml
@@ -21,6 +21,7 @@ webhooks:
     - key: kubernetes.io/metadata.name
       operator: NotIn
       values:
+      - kube-system
       - '{{ .Release.Namespace }}'
   reinvocationPolicy: IfNeeded
   rules:
@@ -54,6 +55,7 @@ webhooks:
     - key: kubernetes.io/metadata.name
       operator: NotIn
       values:
+      - kube-system
       - '{{ .Release.Namespace }}'
   rules:
   - apiGroups:
diff --git a/deployments/kai-scheduler/templates/priorityclasses/build-preemptible.yaml b/deployments/kai-scheduler/templates/priorityclasses/build-preemptible.yaml
new file mode 100644
index 000000000..b5bd433aa
--- /dev/null
+++ b/deployments/kai-scheduler/templates/priorityclasses/build-preemptible.yaml
@@ -0,0 +1,8 @@
+# Copyright 2025 NVIDIA CORPORATION
+# SPDX-License-Identifier: Apache-2.0
+
+apiVersion: scheduling.k8s.io/v1
+kind: PriorityClass
+metadata:
+  name: build-preemptible
+value: 75
\ No newline at end of file
diff --git a/deployments/kai-scheduler/templates/priorityclasses/build.yaml b/deployments/kai-scheduler/templates/priorityclasses/build.yaml
new file mode 100644
index 000000000..28e4962c9
--- /dev/null
+++ b/deployments/kai-scheduler/templates/priorityclasses/build.yaml
@@ -0,0 +1,8 @@
+# Copyright 2025 NVIDIA CORPORATION
+# SPDX-License-Identifier: Apache-2.0
+
+apiVersion: scheduling.k8s.io/v1
+kind: PriorityClass
+metadata:
+  name: build
+value: 100
\ No newline at end of file
diff --git a/deployments/kai-scheduler/templates/priorityclasses/inference.yaml b/deployments/kai-scheduler/templates/priorityclasses/inference.yaml
new file mode 100644
index 000000000..17dd4b12a
--- /dev/null
+++ b/deployments/kai-scheduler/templates/priorityclasses/inference.yaml
@@ -0,0 +1,8 @@
+# Copyright 2025 NVIDIA CORPORATION
+# SPDX-License-Identifier: Apache-2.0
+
+apiVersion: scheduling.k8s.io/v1
+kind: PriorityClass
+metadata:
+  name: inference
+value: 125
\ No newline at end of file
diff --git a/deployments/kai-scheduler/templates/priorityclasses/train.yaml b/deployments/kai-scheduler/templates/priorityclasses/train.yaml
new file mode 100644
index 000000000..38dee5d59
--- /dev/null
+++ b/deployments/kai-scheduler/templates/priorityclasses/train.yaml
@@ -0,0 +1,8 @@
+# Copyright 2025 NVIDIA CORPORATION
+# SPDX-License-Identifier: Apache-2.0
+
+apiVersion: scheduling.k8s.io/v1
+kind: PriorityClass
+metadata:
+  name: train
+value: 50
\ No newline at end of file
diff --git a/deployments/kai-scheduler/templates/rbac/webhookmanager-binding.yaml b/deployments/kai-scheduler/templates/rbac/webhookmanager-binding.yaml
index 64df1f268..6157ef785 100644
--- a/deployments/kai-scheduler/templates/rbac/webhookmanager-binding.yaml
+++ b/deployments/kai-scheduler/templates/rbac/webhookmanager-binding.yaml
@@ -6,7 +6,7 @@ kind: ClusterRoleBinding
 metadata:
   name: webhookmanager
   annotations:
-    "helm.sh/hook": pre-install,post-install
+    "helm.sh/hook": pre-install,post-install,pre-upgrade,post-upgrade
     "helm.sh/hook-weight": "-1"
     "helm.sh/hook-delete-policy": hook-succeeded
 subjects:
diff --git a/deployments/kai-scheduler/templates/rbac/webhookmanager.yaml b/deployments/kai-scheduler/templates/rbac/webhookmanager.yaml
index 7e73579e5..44f3347b2 100644
--- a/deployments/kai-scheduler/templates/rbac/webhookmanager.yaml
+++ b/deployments/kai-scheduler/templates/rbac/webhookmanager.yaml
@@ -5,7 +5,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   annotations:
-    helm.sh/hook: pre-install,post-install
+    helm.sh/hook: pre-install,post-install,pre-upgrade,post-upgrade
     helm.sh/hook-delete-policy: hook-succeeded
     helm.sh/hook-weight: "-3"
   name: webhookmanager
diff --git a/deployments/kai-scheduler/templates/services/post-install-hook.yaml b/deployments/kai-scheduler/templates/services/post-install-hook.yaml
index 0877215ba..6dbc81a59 100644
--- a/deployments/kai-scheduler/templates/services/post-install-hook.yaml
+++ b/deployments/kai-scheduler/templates/services/post-install-hook.yaml
@@ -8,7 +8,7 @@ metadata:
   labels:
     app: post-install-hook
   annotations:
-    "helm.sh/hook": post-install
+    "helm.sh/hook": post-install,post-upgrade
     "helm.sh/hook-weight": "0"
     "helm.sh/hook-delete-policy": hook-succeeded
 spec:
diff --git a/deployments/kai-scheduler/templates/services/pre-install-hook.yaml b/deployments/kai-scheduler/templates/services/pre-install-hook.yaml
index 49dfc3b75..26e109417 100644
--- a/deployments/kai-scheduler/templates/services/pre-install-hook.yaml
+++ b/deployments/kai-scheduler/templates/services/pre-install-hook.yaml
@@ -8,7 +8,7 @@ metadata:
   labels:
     app: pre-install-hook
   annotations:
-    "helm.sh/hook": pre-install
+    "helm.sh/hook": pre-install,pre-upgrade
     "helm.sh/hook-weight": "0"
     "helm.sh/hook-delete-policy": hook-succeeded
 spec:
diff --git a/deployments/kai-scheduler/templates/services/webhookmanager-serviceacount.yaml b/deployments/kai-scheduler/templates/services/webhookmanager-serviceacount.yaml
index 9ad85306f..5c9c41d3b 100644
--- a/deployments/kai-scheduler/templates/services/webhookmanager-serviceacount.yaml
+++ b/deployments/kai-scheduler/templates/services/webhookmanager-serviceacount.yaml
@@ -6,6 +6,6 @@ kind: ServiceAccount
 metadata:
   name: webhookmanager
   annotations:
-    "helm.sh/hook": pre-install,post-install
+    "helm.sh/hook": pre-install,post-install,pre-upgrade,post-upgrade
     "helm.sh/hook-weight": "-2"
     "helm.sh/hook-delete-policy": hook-succeeded
\ No newline at end of file
diff --git a/deployments/kustomization/binder-webhook/mutating-webhook-patch.yaml b/deployments/kustomization/binder-webhook/mutating-webhook-patch.yaml
index 87c24d264..3f09b5c9d 100644
--- a/deployments/kustomization/binder-webhook/mutating-webhook-patch.yaml
+++ b/deployments/kustomization/binder-webhook/mutating-webhook-patch.yaml
@@ -17,4 +17,5 @@ webhooks:
         - key: kubernetes.io/metadata.name
           operator: NotIn
           values:
+            - kube-system
             - "{{ .Release.Namespace }}"
diff --git a/deployments/kustomization/binder-webhook/validating-webhook-patch.yaml b/deployments/kustomization/binder-webhook/validating-webhook-patch.yaml
index a1893eb59..d6387491e 100644
--- a/deployments/kustomization/binder-webhook/validating-webhook-patch.yaml
+++ b/deployments/kustomization/binder-webhook/validating-webhook-patch.yaml
@@ -17,4 +17,5 @@ webhooks:
         - key: kubernetes.io/metadata.name
           operator: NotIn
           values:
+            - kube-system
             - "{{ .Release.Namespace }}"
diff --git a/deployments/kustomization/webhookmanager-clusterrole/patch.yaml b/deployments/kustomization/webhookmanager-clusterrole/patch.yaml
index 94a590fef..ff27f5826 100644
--- a/deployments/kustomization/webhookmanager-clusterrole/patch.yaml
+++ b/deployments/kustomization/webhookmanager-clusterrole/patch.yaml
@@ -6,6 +6,6 @@ kind: ClusterRole
 metadata:
   name: webhookmanager
   annotations:
-    "helm.sh/hook": pre-install,post-install
+    "helm.sh/hook": pre-install,post-install,pre-upgrade,post-upgrade
     "helm.sh/hook-weight": "-3"
     "helm.sh/hook-delete-policy": hook-succeeded
\ No newline at end of file