diff --git a/tasks/main.yml b/tasks/main.yml
index def16fe..2f4a0bc 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -84,7 +84,45 @@
       name: traefik
       chart_ref: traefik/traefik
       release_namespace: "{{ traefik_namespace }}"
-      values: "{{ lookup('template', 'traefik-helm-value.yaml.j2') | from_yaml }}"
+      values:
+        image:
+          tag: "{{ traefik_version }}"
+        additionalArguments:
+          - --configFile=/etc/traefik/traefik.yaml
+#        podSecurityPolicy:
+#          enabled: true
+        service:
+          enabled: false
+        ingressRoute:
+          dashboard:
+            enabled: false
+        ingressClass:
+          enabled: true
+          isDefaultClass: true
+#        ports:
+#          web:
+#            redirectTo: websecure
+#            hostPort: 80
+#          websecure:
+#            hostPort: 443
+#            tls:
+#              enabled: true
+#              options: default
+        volumes:
+          - mountPath: /etc/traefik
+            name: traefik-conf
+            type: configMap
+          - mountPath: /etc/traefik/file
+            name: traefik-files
+            type: configMap
+          - mountPath: /etc/traefik/basic-auth
+            name: basic-auth
+            type: secret
+        deployment:
+          replicas: 1
+          podAnnotations: 
+            prometheus.io/port: '9000'
+            prometheus.io/scrape: 'true'
 
   - name: Install traefik configuration
     k8s:
@@ -101,6 +139,6 @@
       - traefik-files.yml.j2
 #      - traefik-sa.yml.j2
       - traefik-ingressroute.yml.j2
-#      - traefik-svc.yml.j2
+      - traefik-svc.yml.j2
 
   tags: traefik
diff --git a/templates/traefik-certificate.yml.j2 b/templates/traefik-certificate.yml.j2
index 5fa7feb..3042d55 100644
--- a/templates/traefik-certificate.yml.j2
+++ b/templates/traefik-certificate.yml.j2
@@ -1,5 +1,5 @@
 ---
-apiVersion: cert-manager.io/v1
+apiVersion: cert-manager.io/v1alpha2
 kind: Certificate
 metadata:
   name: traefik.{{ traefik_domain }}
diff --git a/templates/traefik-cm.yml.j2 b/templates/traefik-cm.yml.j2
index a4d50ad..9d831ce 100644
--- a/templates/traefik-cm.yml.j2
+++ b/templates/traefik-cm.yml.j2
@@ -15,9 +15,9 @@ data:
       web:
         address: ":8000/tcp"
         http:
-    #      middlewares:
-    #        - auth@file
-    #        - secure_headers@file
+#          middlewares:
+#            - auth@file
+#            - secure_headers@file
           redirections:
             entryPoint:
               to: websecure
diff --git a/templates/traefik-helm-value.yaml.j2 b/templates/traefik-helm-value.yaml.j2
deleted file mode 100644
index f430e44..0000000
--- a/templates/traefik-helm-value.yaml.j2
+++ /dev/null
@@ -1,62 +0,0 @@
-image:
-  tag: "{{ traefik_version }}"
-additionalArguments:
-  - --configFile=/etc/traefik/traefik.yaml
-#podSecurityPolicy:
-#  enabled: true
-service:
-{% if traefik_external_ips is defined %}
-  type: ClusterIP
-  externalIPs:
-{% for external_ip in traefik_external_ips %}
-    - {{ external_ip }}
-{% endfor %}
-{% elseif %}
-  type: LoadBalancer
-{% endif %}
-ingressRoute:
-  dashboard:
-    enabled: false
-podDisruptionBudget:
-  enabled: true
-  minAvailable: 1
-ingressClass:
-  enabled: true
-  isDefaultClass: true
-autoscaling:
-  enabled: true
-  minReplicas: 1
-  maxReplicas: 10
-  metrics:
-    - type: Resource
-      resource:
-        name: cpu
-        targetAverageUtilization: 60
-    - type: Resource
-      resource:
-        name: memory
-        targetAverageUtilization: 60
-#ports:
-#  web:
-#    redirectTo: websecure
-#    hostPort: 80
-#  websecure:
-#    hostPort: 443
-#    tls:
-#      enabled: true
-#      options: default
-volumes:
-  - mountPath: /etc/traefik
-    name: traefik-conf
-    type: configMap
-  - mountPath: /etc/traefik/file
-    name: traefik-files
-    type: configMap
-  - mountPath: /etc/traefik/basic-auth
-    name: basic-auth
-    type: secret
-deployment:
-  replicas: 1
-  podAnnotations: 
-    prometheus.io/port: '9000'
-    prometheus.io/scrape: 'true'
\ No newline at end of file