diff --git a/charts/clabernetes/templates/deployment.yaml b/charts/clabernetes/templates/deployment.yaml
index 76e8736..eec923d 100644
--- a/charts/clabernetes/templates/deployment.yaml
+++ b/charts/clabernetes/templates/deployment.yaml
@@ -27,6 +27,7 @@ spec:
     matchLabels:
       clabernetes/app: {{ .Values.appName }}
       release: {{ .Release.Name }}
+      clabernetes/component: manager
   replicas: {{ .Values.manager.replicaCount }}
   strategy:
     rollingUpdate:
@@ -169,6 +170,7 @@ spec:
     matchLabels:
       clabernetes/app: {{ $.Values.appName }}
       release: {{ .Release.Name }}
+      clabernetes/component: ui
   replicas: {{ $.Values.ui.replicaCount }}
   strategy:
     rollingUpdate:
@@ -244,6 +246,9 @@ spec:
             limits:
               {{ toYaml $.Values.ui.resources.limits | indent 14 }}
             {{- end }}
+          env:
+            - name: HOSTNAME
+              value: "0.0.0.0"
           ports:
             - name: http
               containerPort: 3000
diff --git a/charts/clabernetes/tests/clicker_enabled/test-fixtures/golden/deployment.yaml b/charts/clabernetes/tests/clicker_enabled/test-fixtures/golden/deployment.yaml
index 160fdbf..ed501a1 100755
--- a/charts/clabernetes/tests/clicker_enabled/test-fixtures/golden/deployment.yaml
+++ b/charts/clabernetes/tests/clicker_enabled/test-fixtures/golden/deployment.yaml
@@ -24,6 +24,7 @@ spec:
     matchLabels:
       clabernetes/app: clabernetes-plus-clicker
       release: release-name
+      clabernetes/component: manager
   replicas: 3
   strategy:
     rollingUpdate:
@@ -162,6 +163,7 @@ spec:
     matchLabels:
       clabernetes/app: clabernetes-plus-clicker
       release: release-name
+      clabernetes/component: ui
   replicas: 3
   strategy:
     rollingUpdate:
@@ -214,6 +216,9 @@ spec:
             requests:
               memory: 128Mi
               cpu: 50m
+          env:
+            - name: HOSTNAME
+              value: "0.0.0.0"
           ports:
             - name: http
               containerPort: 3000
diff --git a/charts/clabernetes/tests/customized_values/test-fixtures/golden/deployment.yaml b/charts/clabernetes/tests/customized_values/test-fixtures/golden/deployment.yaml
index 4377b5a..0b258b0 100755
--- a/charts/clabernetes/tests/customized_values/test-fixtures/golden/deployment.yaml
+++ b/charts/clabernetes/tests/customized_values/test-fixtures/golden/deployment.yaml
@@ -19,6 +19,7 @@ spec:
     matchLabels:
       clabernetes/app: clabernetes
       release: release-name
+      clabernetes/component: manager
   replicas: 3
   strategy:
     rollingUpdate:
@@ -153,6 +154,7 @@ spec:
     matchLabels:
       clabernetes/app: clabernetes
       release: release-name
+      clabernetes/component: ui
   replicas: 3
   strategy:
     rollingUpdate:
@@ -200,6 +202,9 @@ spec:
             requests:
               memory: 128Mi
               cpu: 50m
+          env:
+            - name: HOSTNAME
+              value: "0.0.0.0"
           ports:
             - name: http
               containerPort: 3000
diff --git a/charts/clabernetes/tests/default_values/test-fixtures/golden/deployment.yaml b/charts/clabernetes/tests/default_values/test-fixtures/golden/deployment.yaml
index 8874733..6bd8093 100755
--- a/charts/clabernetes/tests/default_values/test-fixtures/golden/deployment.yaml
+++ b/charts/clabernetes/tests/default_values/test-fixtures/golden/deployment.yaml
@@ -19,6 +19,7 @@ spec:
     matchLabels:
       clabernetes/app: clabernetes
       release: release-name
+      clabernetes/component: manager
   replicas: 3
   strategy:
     rollingUpdate:
@@ -147,6 +148,7 @@ spec:
     matchLabels:
       clabernetes/app: clabernetes
       release: release-name
+      clabernetes/component: ui
   replicas: 3
   strategy:
     rollingUpdate:
@@ -194,6 +196,9 @@ spec:
             requests:
               memory: 128Mi
               cpu: 50m
+          env:
+            - name: HOSTNAME
+              value: "0.0.0.0"
           ports:
             - name: http
               containerPort: 3000