diff --git a/defaults/main.yml b/defaults/main.yml
index 59ff3ce..02eb919 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,5 +1,5 @@
 my_context: kubernetes
-traefik_version: "2.7.1"
+traefik_version: "2.7.0"
 cluster_domain: "local"
 traefik_namespace: "traefik"
 traefik_service_type: LoadBalancer
diff --git a/tasks/main.yml b/tasks/main.yml
index 7dbcfa9..1d2a398 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -102,6 +102,7 @@
     kubernetes.core.helm_repository:
       name: traefik
       repo_url: "https://helm.traefik.io/traefik"
+    tags: traefik
   - name: Deploy latest version of Traefik
     kubernetes.core.helm:
       context: "{{ my_context }}"
@@ -128,21 +129,4 @@
 #      - traefik-svc.yml.j2
 #      - traefik-defaultbackend.yml.j2
 
-  - name: Defined traefik-hub repository
-    kubernetes.core.helm_repository:
-      name: traefik-hub
-      repo_url: "https://helm.traefik.io/hub"
-    when:
-      - traefik_hub_token is defined
-  - name: Deploy latest version of Traefik-hub
-    kubernetes.core.helm:
-      context: "{{ my_context }}"
-      name: hub-agent
-      chart_ref: traefik-hub/hub-agent
-      release_namespace: "{{ traefik_namespace }}"
-      values:
-        token: "{{ traefik_hub_token }}"
-    when:
-      - traefik_hub_token is defined
-
   tags: traefik
diff --git a/templates/traefik-cm.yml.j2 b/templates/traefik-cm.yml.j2
index 947afae..7e4773b 100644
--- a/templates/traefik-cm.yml.j2
+++ b/templates/traefik-cm.yml.j2
@@ -35,14 +35,6 @@ data:
     #        - crowdsec-bouncer@file
       traefik:
         address: ":9000/tcp"
-      metrics:
-        address: ":9100/tcp"
-{% if traefik_hub_token is defined %}
-      traefikhub-api:
-        address: ":9900"
-      traefikhub-tunl:
-        address: ":9901"
-{% endif%}
 {% for traefik_entrypoint in traefik_entrypoints %}
       {{ traefik_entrypoint.name }}:
         address: :{{ traefik_entrypoint.port }}
@@ -70,18 +62,14 @@ data:
         watch: true
     metrics:
       prometheus:
-        entryPoint: metrics
-        addRoutersLabels: true
+        entryPoint: traefik
     ping:
       entryPoint: traefik
     api:
       dashboard: true
-{% if traefik_hub_token is defined %}
-    hub: {}
-{% endif %}
     log:
-      level: ERROR
-    #  format: json
+      level: WARN
+      format: json
     accessLog: {}
     #accessLog:
     #  filePath: "/var/log/traefik/access.log"
@@ -93,9 +81,3 @@ data:
     ##      BackendName: keep
     ##      BackendURL: keep
     ##      FrontendName: keep
-    experimental:
-    #  kubernetesGateway: true
-      http3: true
-{% if traefik_hub_token is defined %}
-      hub: true
-{% endif %}
diff --git a/templates/traefik-helm-value.yaml.j2 b/templates/traefik-helm-value.yaml.j2
index 050187b..6207b3f 100644
--- a/templates/traefik-helm-value.yaml.j2
+++ b/templates/traefik-helm-value.yaml.j2
@@ -1,7 +1,6 @@
 # https://github.com/traefik/traefik-helm-chart/blob/master/traefik/values.yaml
 #image:
 #  tag: "{{ traefik_version }}"
-#fullnameOverride: "{{ my_context }}"
 additionalArguments:
   - --configFile=/etc/traefik/traefik.yaml
 #podSecurityPolicy:
@@ -36,9 +35,8 @@ autoscaling:
       resource:
         name: memory
         targetAverageUtilization: 60
-{% if traefik_service_type == "NodePort" or traefik_hub_token is defined %}
-ports:
 {% if traefik_service_type == "NodePort" and false %}
+ports:
   web:
 #    redirectTo: websecure
 #    hostPort: 80
@@ -50,14 +48,6 @@ ports:
 #      enabled: true
 #      options: default
 {% endif %}
-{% if traefik_hub_token is defined %}
-  traefikhub-tunl:
-    port: 9901
-    expose: true
-    exposedPort: 9901
-    protocol: "TCP"
-{% endif %}
-{% endif %}
 volumes:
   - mountPath: /etc/traefik
     name: traefik-conf
@@ -71,7 +61,7 @@ volumes:
 deployment:
   replicas: 1
   podAnnotations: 
-    prometheus.io/port: '9100'
+    prometheus.io/port: '9000'
     prometheus.io/scrape: 'true'
 experimental:
   http3:
@@ -80,7 +70,3 @@ experimental:
     enabled: true
   kubernetesGateway:
     enabled: false
-{% if traefik_hub_token is defined %}
-  hub:
-    enabled: true
-{% endif %}