diff --git a/charts/icinga-stack/charts/icingaweb2/values.yaml b/charts/icinga-stack/charts/icingaweb2/values.yaml
index 1b0519d..b8b1882 100644
--- a/charts/icinga-stack/charts/icingaweb2/values.yaml
+++ b/charts/icinga-stack/charts/icingaweb2/values.yaml
@@ -92,6 +92,9 @@ modules:
     jobs: {}  # TODO: Add this
     sni: {}  # TODO: Add this
 
+  kubernetes:
+    enabled: true
+
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little
diff --git a/charts/icinga-stack/tests/icingaweb2_deployment_test.yaml b/charts/icinga-stack/tests/icingaweb2_deployment_test.yaml
index 0d72d7d..c1d0027 100644
--- a/charts/icinga-stack/tests/icingaweb2_deployment_test.yaml
+++ b/charts/icinga-stack/tests/icingaweb2_deployment_test.yaml
@@ -18,7 +18,7 @@ tests:
           path: spec.template.spec.containers[0].env
           content:
             name: icingaweb.enabledModules
-            value: director,icingadb,incubator,
+            value: director,icingadb,incubator,kubernetes,
           any: true
       - contains:
           path: spec.template.spec.containers[0].env
@@ -50,7 +50,7 @@ tests:
           path: spec.template.spec.containers[0].env
           content:
             name: icingaweb.enabledModules
-            value: director,icingadb,incubator,x509,
+            value: director,icingadb,incubator,kubernetes,x509,
           any: true
   
   - it: deploys an Icinga Web deployment with minimal configuration using secrets
@@ -69,7 +69,7 @@ tests:
           path: spec.template.spec.containers[0].env
           content:
             name: icingaweb.enabledModules
-            value: director,icingadb,incubator,
+            value: director,icingadb,incubator,kubernetes,
           any: true
       - contains:
           path: spec.template.spec.containers[0].env
@@ -104,7 +104,7 @@ tests:
           path: spec.template.spec.containers[0].env
           content:
             name: icingaweb.enabledModules
-            value: director,graphite,icingadb,incubator,
+            value: director,graphite,icingadb,incubator,kubernetes,
           any: true
 
   - it: deploys an Icinga Web deployment with graphite, user/password from value
diff --git a/charts/icinga-stack/values.yaml b/charts/icinga-stack/values.yaml
index 1f35613..316c7a6 100644
--- a/charts/icinga-stack/values.yaml
+++ b/charts/icinga-stack/values.yaml
@@ -454,6 +454,9 @@ icingaweb2:
       jobs: {}  # TODO: Add this
       sni: {}  # TODO: Add this
 
+    kubernetes:
+      enabled: true
+
   resources: {}
     # We usually recommend not to specify default resources and to leave this as a conscious
     # choice for the user. This also increases chances charts run on environments with little