diff --git a/charts/app/Chart.yaml b/charts/app/Chart.yaml
index 6d85af7..d4a6f44 100644
--- a/charts/app/Chart.yaml
+++ b/charts/app/Chart.yaml
@@ -3,7 +3,7 @@ name: app
 description: A Helm chart for Kubernetes Deployment
 type: application
 
-version: 0.13.5
+version: 0.13.6
 
 keywords:
   - deployment
diff --git a/charts/argo-applications/Chart.yaml b/charts/argo-applications/Chart.yaml
index d7b98e1..5c4cdfc 100644
--- a/charts/argo-applications/Chart.yaml
+++ b/charts/argo-applications/Chart.yaml
@@ -3,7 +3,7 @@ name: argo-applications
 description: A Helm chart for Kubernetes argo applications
 type: application
 
-version: 0.13.5
+version: 0.13.6
 
 keywords:
   - argocd
diff --git a/charts/base/Chart.yaml b/charts/base/Chart.yaml
index a1c255a..0ad3274 100644
--- a/charts/base/Chart.yaml
+++ b/charts/base/Chart.yaml
@@ -3,7 +3,7 @@ name: base
 description: A Helm chart for Kubernetes with helm named templates
 type: library
 
-version: 0.13.5
+version: 0.13.6
 
 keywords:
   - deployment
diff --git a/charts/base/templates/_service.tpl b/charts/base/templates/_service.tpl
index 5ad9d4b..22dab81 100644
--- a/charts/base/templates/_service.tpl
+++ b/charts/base/templates/_service.tpl
@@ -13,6 +13,9 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ $serviceName }}
+  {{- if $serviceValues.namespace }}
+  namespace: {{ $serviceValues.namespace }}
+  {{- end }}
   labels:
     {{- include "base.labels" $root | trim | nindent 4 }}
     {{- with $serviceValues.labels }}
diff --git a/charts/cronjob/Chart.yaml b/charts/cronjob/Chart.yaml
index d3f4cb1..0cd3338 100644
--- a/charts/cronjob/Chart.yaml
+++ b/charts/cronjob/Chart.yaml
@@ -3,7 +3,7 @@ name: cronjob
 description: A Helm chart for Kubernetes cronjob
 type: application
 
-version: 0.13.5
+version: 0.13.6
 
 keywords:
   - cronjob
diff --git a/charts/default-base/Chart.yaml b/charts/default-base/Chart.yaml
index f8e182d..2fc3035 100644
--- a/charts/default-base/Chart.yaml
+++ b/charts/default-base/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: default-base
 description: A Helm chart for Kubernetes - default-base for namespaces
 
-version: 0.13.5
+version: 0.13.6
 
 keywords:
   - BackendConfig
diff --git a/charts/ingress/Chart.yaml b/charts/ingress/Chart.yaml
index ebb1a67..20888bd 100644
--- a/charts/ingress/Chart.yaml
+++ b/charts/ingress/Chart.yaml
@@ -3,7 +3,7 @@ name: ingress
 description: A Helm chart for Kubernetes ingress
 type: application
 
-version: 0.13.5
+version: 0.13.6
 
 keywords:
   - ingress
diff --git a/charts/job/Chart.yaml b/charts/job/Chart.yaml
index b252b91..6094dc7 100644
--- a/charts/job/Chart.yaml
+++ b/charts/job/Chart.yaml
@@ -3,7 +3,7 @@ name: job
 description: A Helm chart for Kubernetes job
 type: application
 
-version: 0.13.5
+version: 0.13.6
 
 keywords:
   - job
diff --git a/charts/prometheus-rules/Chart.yaml b/charts/prometheus-rules/Chart.yaml
index 9d0f166..bcf5381 100644
--- a/charts/prometheus-rules/Chart.yaml
+++ b/charts/prometheus-rules/Chart.yaml
@@ -3,7 +3,7 @@ name: prometheus-rules
 description: A Helm chart for Prometheus Rules
 type: application
 
-version: 0.13.5
+version: 0.13.6
 
 keywords:
   - job
diff --git a/charts/rbac/Chart.yaml b/charts/rbac/Chart.yaml
index df1967e..312d9c6 100644
--- a/charts/rbac/Chart.yaml
+++ b/charts/rbac/Chart.yaml
@@ -3,7 +3,7 @@ name: rbac
 description: A Helm chart for Kubernetes rbac
 type: application
 
-version: 0.13.5
+version: 0.13.6
 
 keywords:
   - rbac
diff --git a/charts/service/Chart.yaml b/charts/service/Chart.yaml
index 665e948..1f656e7 100644
--- a/charts/service/Chart.yaml
+++ b/charts/service/Chart.yaml
@@ -3,7 +3,7 @@ name: service
 description: A Helm chart for Kubernetes service
 type: application
 
-version: 0.13.5
+version: 0.13.6
 
 keywords:
   - service