diff --git a/charts/smarter-k3s-edge/Chart.yaml b/charts/smarter-k3s-edge/Chart.yaml
index 12d629a..db2d068 100644
--- a/charts/smarter-k3s-edge/Chart.yaml
+++ b/charts/smarter-k3s-edge/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: smarter-k3s-edge
-version: 0.0.5
+version: 0.0.6
 type: application
 appVersion: v1.25.3-k3s1
 description: K3s server on kubernetes
diff --git a/charts/smarter-k3s-edge/templates/common.yaml b/charts/smarter-k3s-edge/templates/common.yaml
index 6bc0ee1..4830279 100644
--- a/charts/smarter-k3s-edge/templates/common.yaml
+++ b/charts/smarter-k3s-edge/templates/common.yaml
@@ -126,6 +126,14 @@ data:
       --node-label smarter.nodemodel=unknown \
       --node-label smarter.type=edge \
       --node-taint smarter.type=edge:NoSchedule \
+      {{- if .Values.configuration.smarter_demo_labels }}
+      --node-label smarter-audio-client=enabled \
+      --node-label smarter-gstreamer=enabled \
+      --node-label smarter-image-detector=enabled \
+      --node-label smarter-pulseaudio=enabled \
+      --node-label smarter-inference=enabled \
+      --node-label smarter-fluent-bit=enabled \
+      {{- end }}
       --node-label smarter-build=user-installed 
   nginx-start.sh: |
     #!/bin/bash
diff --git a/charts/smarter-k3s-edge/values.yaml b/charts/smarter-k3s-edge/values.yaml
index 916fb6a..508ee9c 100644
--- a/charts/smarter-k3s-edge/values.yaml
+++ b/charts/smarter-k3s-edge/values.yaml
@@ -16,4 +16,5 @@ configuration:
   port: 6443
   # Comment to remove NGINX
   portHTTPS: 6453
-  # set id to paqssword
+  # Uncomment to enable labeling for smarter-demo
+  #smarter_demo_labels: true