diff --git a/justfile b/justfile
index 27d1589a9b408ba015d3bac643a2320bd1301a48..ef02818a915ff07c0b54cdb066d780143d058cb1 100644
--- a/justfile
+++ b/justfile
@@ -41,6 +41,9 @@ helm-push a: helm-package
     # helm registry login registry-1.docker.io -u leahtgu
     cd helm/ && helm push {{ a }} oci://registry-1.docker.io/leahtgu
 
+helm *args:
+    helm --kube-context c4c -n mdata {{args}}
+
 helm-install:
     helm --kube-context c4c -n mdata install maed-exporter-app maed-exporter-app
 
diff --git a/maed-exporter-app/Chart.yaml b/maed-exporter-app/Chart.yaml
index 38d7b971aeb9b24e6203032e708abc0c260f4d7d..412fbe746765e692ec10a07aa1ab062d018984ca 100644
--- a/maed-exporter-app/Chart.yaml
+++ b/maed-exporter-app/Chart.yaml
@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
+version: 0.1.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.1.0"
+appVersion: "0.1.0"
\ No newline at end of file
diff --git a/maed-exporter-app/templates/app-config-map.yaml b/maed-exporter-app/templates/app-config-map.yaml
index 45196084ae0e1450c4a1a3b7016c85ee947c3353..a74c062d11cf1e2f69b2c9e6813e7261a28d1c7c 100644
--- a/maed-exporter-app/templates/app-config-map.yaml
+++ b/maed-exporter-app/templates/app-config-map.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: maed-exporter-env
+  namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: maed-exporter-app
     {{- include "maed-exporter-app.labels" . | nindent 4 }}
diff --git a/maed-exporter-app/templates/backend-deployment.yaml b/maed-exporter-app/templates/backend-deployment.yaml
index dc235585a918c88d03c0abf35b52b1fb7901cf61..fdc37bc8114846bb0084e2d14ee65cdce7e69956 100644
--- a/maed-exporter-app/templates/backend-deployment.yaml
+++ b/maed-exporter-app/templates/backend-deployment.yaml
@@ -2,9 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: maed-exporter-backend
-  {{- if .Values.namespace }}
-  namespace: {{.Values.namespace | quote }}
-  {{- end }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: maed-exporter-app
     app.kubernetes.io/component: backend
diff --git a/maed-exporter-app/templates/backend-svc.yaml b/maed-exporter-app/templates/backend-svc.yaml
index 98e8433407107dafc10b6d609af4d4e237a73841..923a9cd44fd387de981a8fe24c5be7fe5aee8081 100644
--- a/maed-exporter-app/templates/backend-svc.yaml
+++ b/maed-exporter-app/templates/backend-svc.yaml
@@ -2,9 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: maed-exporter-backend-svc
-  {{- if .Values.namespace }}
-  namespace: {{.Values.namespace | quote }}
-  {{- end }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: maed-exporter-app
     {{- include "maed-exporter-app.labels" . | nindent 4 }}
diff --git a/maed-exporter-app/templates/frontend-deployment.yaml b/maed-exporter-app/templates/frontend-deployment.yaml
index eb62aeaee94e5a2885c187c93d45b7535927af7c..83a298d157910ace5cc8b14112881b4a7744f191 100644
--- a/maed-exporter-app/templates/frontend-deployment.yaml
+++ b/maed-exporter-app/templates/frontend-deployment.yaml
@@ -2,9 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: maed-exporter-frontend
-  {{- if .Values.namespace }}
-  namespace: {{.Values.namespace | quote }}
-  {{- end }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: maed-exporter-app
     app.kubernetes.io/component: frontend
diff --git a/maed-exporter-app/templates/frontend-svc.yaml b/maed-exporter-app/templates/frontend-svc.yaml
index 6c67200942da091fb12415dadb5fb624c666618c..656bdd4e80fc5425bca5b596f74f910b647bef48 100644
--- a/maed-exporter-app/templates/frontend-svc.yaml
+++ b/maed-exporter-app/templates/frontend-svc.yaml
@@ -2,9 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: maed-exporter-frontend-svc
-  {{- if .Values.namespace }}
-  namespace: {{.Values.namespace | quote }}
-  {{- end }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: maed-exporter-app
     {{- include "maed-exporter-app.labels" . | nindent 4 }}
diff --git a/maed-exporter-app/templates/nginx-config-map.yaml b/maed-exporter-app/templates/nginx-config-map.yaml
index 686a25d20980f641976d8b73bcb365a9676c03e9..c38fddc311a840fdce47f5d1a2835624a030bdb5 100644
--- a/maed-exporter-app/templates/nginx-config-map.yaml
+++ b/maed-exporter-app/templates/nginx-config-map.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: nginx-cfg
+  namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: maed-exporter-app
     {{- include "maed-exporter-app.labels" . | nindent 4 }}