diff --git a/grafana/templates/ingress.yaml b/grafana/templates/ingress.yaml
deleted file mode 100644
index 46399c6..0000000
--- a/grafana/templates/ingress.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-apiVersion: traefik.containo.us/v1alpha1
-kind: IngressRoute
-metadata:
-  name: {{ .Release.Name }}-internal-tls
-  annotations:
-    kubernetes.io/ingress.class: traefik-internal
-spec:
-  entryPoints:
-    - websecure
-  tls:
-    certResolver: myresolver
-    domains:
-    - main: "*.ducoterra.net"
-  routes:
-  - match: Host(`grafana.ducoterra.net`)
-    kind: Rule
-    services:
-    - name: {{ .Release.Name }}
-      port: 3000
-
----
-
-apiVersion: traefik.containo.us/v1alpha1
-kind: IngressRoute
-metadata:
-  name: {{ .Release.Name }}-internal-web
-  annotations:
-    kubernetes.io/ingress.class: traefik-internal
-spec:
-  entryPoints:
-    - web
-  routes:
-  - match: Host(`grafana.ducoterra.net`)
-    kind: Rule
-    services:
-    - name: {{ .Release.Name }}
-      port: 3000
-    middlewares:
-      - name: httpsredirect
\ No newline at end of file
diff --git a/grafana/.helmignore b/helm/.helmignore
similarity index 100%
rename from grafana/.helmignore
rename to helm/.helmignore
diff --git a/grafana/Chart.yaml b/helm/Chart.yaml
similarity index 100%
rename from grafana/Chart.yaml
rename to helm/Chart.yaml
diff --git a/grafana/templates/deploy.yaml b/helm/templates/deploy.yaml
similarity index 77%
rename from grafana/templates/deploy.yaml
rename to helm/templates/deploy.yaml
index a78b9d7..85a7bfa 100644
--- a/grafana/templates/deploy.yaml
+++ b/helm/templates/deploy.yaml
@@ -14,14 +14,10 @@ spec:
     spec:
       containers:
       - name: {{ .Release.Name }}
-        image: grafana/grafana:7.1.1
+        image: grafana/grafana:7.3.7
         env:
           - name: GF_AUTH_ANONYMOUS_ENABLED
-            value: "true"
-          - name: GF_AUTH_ANONYMOUS_ORG
-            value: "Main Org."
-          - name: GF_AUTH_ANONYMOUS_ORG_ROLE
-            value: "Viewer"
+            value: "false"
         resources:
           requests:
             memory: 256Mi
diff --git a/helm/templates/ingress.yaml b/helm/templates/ingress.yaml
new file mode 100644
index 0000000..5efbd90
--- /dev/null
+++ b/helm/templates/ingress.yaml
@@ -0,0 +1,44 @@
+apiVersion: traefik.containo.us/v1alpha1
+kind: IngressRoute
+metadata:
+  name: {{ .Release.Name }}-tls
+  annotations:
+    kubernetes.io/ingress.class: traefik
+spec:
+  entryPoints:
+    - websecure
+  tls:
+    certResolver: duconet
+  routes:
+  - match: Host(`{{ .Release.Name }}.ducoterra.net`)
+    kind: Rule
+    services:
+    - name: {{ .Release.Name }}
+      port: 3000
+---
+apiVersion: traefik.containo.us/v1alpha1
+kind: IngressRoute
+metadata:
+  name: {{ .Release.Name }}
+  annotations:
+    kubernetes.io/ingress.class: traefik
+spec:
+  entryPoints:
+    - web
+  routes:
+  - match: Host(`{{ .Release.Name }}.ducoterra.net`)
+    kind: Rule
+    services:
+    - name: {{ .Release.Name }}
+      port: 3000
+    middlewares:
+      - name: httpsredirect-{{ .Release.Name }}
+---
+apiVersion: traefik.containo.us/v1alpha1
+kind: Middleware
+metadata:
+  name: httpsredirect-{{ .Release.Name }}
+spec:
+  redirectScheme:
+    scheme: https
+    permanent: true
diff --git a/grafana/templates/pvc.yaml b/helm/templates/pvc.yaml
similarity index 100%
rename from grafana/templates/pvc.yaml
rename to helm/templates/pvc.yaml
diff --git a/grafana/templates/service.yaml b/helm/templates/service.yaml
similarity index 100%
rename from grafana/templates/service.yaml
rename to helm/templates/service.yaml
diff --git a/grafana/values.yaml b/helm/values.yaml
similarity index 100%
rename from grafana/values.yaml
rename to helm/values.yaml