diff --git a/assets/akri/akri-0.10.4.tgz b/assets/akri/akri-0.10.4.tgz
index bcf80972..1f5e6905 100644
Binary files a/assets/akri/akri-0.10.4.tgz and b/assets/akri/akri-0.10.4.tgz differ
diff --git a/charts/akri/0.10.4/.helmignore b/charts/akri/0.10.4/.helmignore
new file mode 100644
index 00000000..0e8a0eb3
--- /dev/null
+++ b/charts/akri/0.10.4/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/charts/akri/0.10.4/templates/custom-discovery-handler.yaml b/charts/akri/0.10.4/templates/custom-discovery-handler.yaml
index ec5236ca..b3cf1f89 100644
--- a/charts/akri/0.10.4/templates/custom-discovery-handler.yaml
+++ b/charts/akri/0.10.4/templates/custom-discovery-handler.yaml
@@ -3,6 +3,10 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: {{ printf "%s-daemonset" .Values.custom.discovery.name }}
+  {{- if .Values.custom.discovery.discoveryHandlerName }}
+  annotations:
+    akri.sh/discoveryHandlerName: {{ .Values.custom.discovery.discoveryHandlerName }}
+  {{- end }}
 spec:
   selector:
     matchLabels:
diff --git a/charts/akri/0.10.4/templates/debug-echo-discovery-handler.yaml b/charts/akri/0.10.4/templates/debug-echo-discovery-handler.yaml
index c6c3ecea..6a24f01c 100644
--- a/charts/akri/0.10.4/templates/debug-echo-discovery-handler.yaml
+++ b/charts/akri/0.10.4/templates/debug-echo-discovery-handler.yaml
@@ -3,6 +3,8 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: akri-debug-echo-discovery-daemonset
+  annotations:
+    akri.sh/discoveryHandlerName: debugEcho
 spec:
   selector:
     matchLabels:
diff --git a/charts/akri/0.10.4/templates/onvif-discovery-handler.yaml b/charts/akri/0.10.4/templates/onvif-discovery-handler.yaml
index bf04069c..ea10ec08 100644
--- a/charts/akri/0.10.4/templates/onvif-discovery-handler.yaml
+++ b/charts/akri/0.10.4/templates/onvif-discovery-handler.yaml
@@ -3,6 +3,8 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: akri-onvif-discovery-daemonset
+  annotations:
+    akri.sh/discoveryHandlerName: onvif
 spec:
   selector:
     matchLabels:
diff --git a/charts/akri/0.10.4/templates/opcua-discovery-handler.yaml b/charts/akri/0.10.4/templates/opcua-discovery-handler.yaml
index 5b0ad33a..69d85592 100644
--- a/charts/akri/0.10.4/templates/opcua-discovery-handler.yaml
+++ b/charts/akri/0.10.4/templates/opcua-discovery-handler.yaml
@@ -3,6 +3,8 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: akri-opcua-discovery-daemonset
+  annotations:
+    akri.sh/discoveryHandlerName: opcua
 spec:
   selector:
     matchLabels:
diff --git a/charts/akri/0.10.4/templates/udev-discovery-handler.yaml b/charts/akri/0.10.4/templates/udev-discovery-handler.yaml
index 4921b032..e7b9acda 100644
--- a/charts/akri/0.10.4/templates/udev-discovery-handler.yaml
+++ b/charts/akri/0.10.4/templates/udev-discovery-handler.yaml
@@ -3,6 +3,8 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: akri-udev-discovery-daemonset
+  annotations:
+    akri.sh/discoveryHandlerName: udev
 spec:
   selector:
     matchLabels:
diff --git a/charts/akri/0.10.4/values.yaml b/charts/akri/0.10.4/values.yaml
index 1b2b3865..39f606e9 100644
--- a/charts/akri/0.10.4/values.yaml
+++ b/charts/akri/0.10.4/values.yaml
@@ -237,6 +237,8 @@ custom:
       protocol: TCP
   # discovery defines a set of values for a custom discovery handler DaemonSet
   discovery: 
+    # exposes discovery handler name as akri.sh/discoveryHandlerName annotation on the DaemonSet
+    discoveryHandlerName: ''
     # enabled defines whether discovery handler pods will be deployed in a slim Agent scenario
     enabled: false
     # name is the Kubernetes resource name that will be created for this
diff --git a/index.yaml b/index.yaml
index 457c1907..7c415451 100755
--- a/index.yaml
+++ b/index.yaml
@@ -5,9 +5,9 @@ entries:
       catalog.cattle.io/display-name: Akri
     apiVersion: v2
     appVersion: 0.10.4
-    created: "2023-10-17T12:11:17.567764+03:00"
+    created: "2023-11-15T12:03:33.8679+01:00"
     description: A Helm chart for Akri
-    digest: 9fe62e9e460526afbae804231d735eece837c5543bf5832a5b6553e6164b63ae
+    digest: 3b204151383d9a86d691eb6bb363f1509fa2d2c838982307ddb697ebfc0b0c4c
     name: akri
     type: application
     urls:
diff --git a/packages/akri/generated-changes/overlay/.helmignore b/packages/akri/generated-changes/overlay/.helmignore
new file mode 100644
index 00000000..0e8a0eb3
--- /dev/null
+++ b/packages/akri/generated-changes/overlay/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/packages/akri/generated-changes/patch/templates/custom-discovery-handler.yaml.patch b/packages/akri/generated-changes/patch/templates/custom-discovery-handler.yaml.patch
new file mode 100644
index 00000000..81d60014
--- /dev/null
+++ b/packages/akri/generated-changes/patch/templates/custom-discovery-handler.yaml.patch
@@ -0,0 +1,14 @@
+--- charts-original/templates/custom-discovery-handler.yaml
++++ charts/templates/custom-discovery-handler.yaml
+@@ -3,6 +3,10 @@
+ kind: DaemonSet
+ metadata:
+   name: {{ printf "%s-daemonset" .Values.custom.discovery.name }}
++  {{- if .Values.custom.discovery.discoveryHandlerName }}
++  annotations:
++    akri.sh/discoveryHandlerName: {{ .Values.custom.discovery.discoveryHandlerName }}
++  {{- end }}
+ spec:
+   selector:
+     matchLabels:
+\ No newline at end of file
diff --git a/packages/akri/generated-changes/patch/templates/debug-echo-discovery-handler.yaml.patch b/packages/akri/generated-changes/patch/templates/debug-echo-discovery-handler.yaml.patch
new file mode 100644
index 00000000..1913e122
--- /dev/null
+++ b/packages/akri/generated-changes/patch/templates/debug-echo-discovery-handler.yaml.patch
@@ -0,0 +1,12 @@
+--- charts-original/templates/debug-echo-discovery-handler.yaml
++++ charts/templates/debug-echo-discovery-handler.yaml
+@@ -3,6 +3,8 @@
+ kind: DaemonSet
+ metadata:
+   name: akri-debug-echo-discovery-daemonset
++  annotations:
++    akri.sh/discoveryHandlerName: debugEcho
+ spec:
+   selector:
+     matchLabels:
+\ No newline at end of file
diff --git a/packages/akri/generated-changes/patch/templates/onvif-discovery-handler.yaml.patch b/packages/akri/generated-changes/patch/templates/onvif-discovery-handler.yaml.patch
new file mode 100644
index 00000000..ffc8393c
--- /dev/null
+++ b/packages/akri/generated-changes/patch/templates/onvif-discovery-handler.yaml.patch
@@ -0,0 +1,12 @@
+--- charts-original/templates/onvif-discovery-handler.yaml
++++ charts/templates/onvif-discovery-handler.yaml
+@@ -3,6 +3,8 @@
+ kind: DaemonSet
+ metadata:
+   name: akri-onvif-discovery-daemonset
++  annotations:
++    akri.sh/discoveryHandlerName: onvif
+ spec:
+   selector:
+     matchLabels:
+\ No newline at end of file
diff --git a/packages/akri/generated-changes/patch/templates/opcua-discovery-handler.yaml.patch b/packages/akri/generated-changes/patch/templates/opcua-discovery-handler.yaml.patch
new file mode 100644
index 00000000..04494b2a
--- /dev/null
+++ b/packages/akri/generated-changes/patch/templates/opcua-discovery-handler.yaml.patch
@@ -0,0 +1,12 @@
+--- charts-original/templates/opcua-discovery-handler.yaml
++++ charts/templates/opcua-discovery-handler.yaml
+@@ -3,6 +3,8 @@
+ kind: DaemonSet
+ metadata:
+   name: akri-opcua-discovery-daemonset
++  annotations:
++    akri.sh/discoveryHandlerName: opcua
+ spec:
+   selector:
+     matchLabels:
+\ No newline at end of file
diff --git a/packages/akri/generated-changes/patch/templates/udev-discovery-handler.yaml.patch b/packages/akri/generated-changes/patch/templates/udev-discovery-handler.yaml.patch
new file mode 100644
index 00000000..48c47010
--- /dev/null
+++ b/packages/akri/generated-changes/patch/templates/udev-discovery-handler.yaml.patch
@@ -0,0 +1,12 @@
+--- charts-original/templates/udev-discovery-handler.yaml
++++ charts/templates/udev-discovery-handler.yaml
+@@ -3,6 +3,8 @@
+ kind: DaemonSet
+ metadata:
+   name: akri-udev-discovery-daemonset
++  annotations:
++    akri.sh/discoveryHandlerName: udev
+ spec:
+   selector:
+     matchLabels:
+\ No newline at end of file
diff --git a/packages/akri/generated-changes/patch/values.yaml.patch b/packages/akri/generated-changes/patch/values.yaml.patch
new file mode 100644
index 00000000..847d2355
--- /dev/null
+++ b/packages/akri/generated-changes/patch/values.yaml.patch
@@ -0,0 +1,11 @@
+--- charts-original/values.yaml
++++ charts/values.yaml
+@@ -237,6 +237,8 @@
+       protocol: TCP
+   # discovery defines a set of values for a custom discovery handler DaemonSet
+   discovery: 
++    # exposes discovery handler name as akri.sh/discoveryHandlerName annotation on the DaemonSet
++    discoveryHandlerName: ''
+     # enabled defines whether discovery handler pods will be deployed in a slim Agent scenario
+     enabled: false
+     # name is the Kubernetes resource name that will be created for this