diff --git a/addons/kommander/1.163.x/kommander-1.yaml b/addons/kommander/1.163.x/kommander-1.yaml
deleted file mode 100644
index bf335a3b..00000000
--- a/addons/kommander/1.163.x/kommander-1.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
----
-apiVersion: kubeaddons.mesosphere.io/v1beta1
-kind: ClusterAddon
-metadata:
-  name: kommander
-  labels:
-    kubeaddons.mesosphere.io/name: kommander
-  annotations:
-    catalog.kubeaddons.mesosphere.io/addon-revision: "1.163.2-1"
-    appversion.kubeaddons.mesosphere.io/kommander: "1.163.2"
-    endpoint.kubeaddons.mesosphere.io/kommander: /ops/portal/kommander
-    appversion.kubeaddons.mesosphere.io/thanos: 0.3.9
-    appversion.kubeaddons.mesosphere.io/karma: 1.4.0
-    endpoint.kubeaddons.mesosphere.io/thanos: /kommander/monitoring/query
-    endpoint.kubeaddons.mesosphere.io/karma: /kommander/monitoring/karma
-    docs.kubeaddons.mesosphere.io/thanos: "https://thanos.io/getting-started.md/"
-    docs.kubeaddons.mesosphere.io/karma: "https://github.com/prymitive/karma"
-    values.chart.helm.kubeaddons.mesosphere.io/kommander: "https://raw.githubusercontent.com/mesosphere/charts/master/stable/kommander/values.yaml"
-    helmv2.kubeaddons.mesosphere.io/upgrade-strategy: "[{\"upgradeFrom\": \"<=0.1.22\", \"strategy\": \"delete\"}]"
-spec:
-  namespace: kommander
-  kubernetes:
-    minSupportedVersion: v1.15.6
-  requires:
-    - matchLabels:
-        kubeaddons.mesosphere.io/name: cert-manager
-  cloudProvider:
-    - name: aws
-      enabled: true
-    - name: azure
-      enabled: true
-    - name: docker
-      enabled: true
-    - name: none
-      enabled: true
-  chartReference:
-    chart: kommander
-    repo: https://mesosphere.github.io/charts/stable
-    version: 0.3.3
-    values: |
-      ---
-      ingress:
-        extraAnnotations:
-          traefik.ingress.kubernetes.io/priority: "2"
-
-      kommander-cluster-lifecycle:
-        certificates:
-          issuer:
-            name: kubernetes-ca
-            kind: ClusterIssuer
-        konvoy:
-          allowUnofficialReleases: true
-
-      kommander-karma:
-        karma:
-          deployment:
-            annotations:
-              configmap.reloader.stakater.com/reload: kommander-kubeaddons-config
-
-      federate:
-        kubeaddons:
-          image:
-            repository: "mesosphere/kubeaddons"
-            tag: "v0.5.3"
-            pullPolicy: IfNotPresent
-
-      kubeaddons-catalog:
-        image:
-          repository: mesosphere/kubeaddons-catalog
-          tag: "v0.5.3"
-          pullPolicy: IfNotPresent
diff --git a/addons/kommander/1.173.x/kommander-1.yaml b/addons/kommander/1.173.x/kommander-1.yaml
deleted file mode 100644
index 9feac2dc..00000000
--- a/addons/kommander/1.173.x/kommander-1.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-apiVersion: kubeaddons.mesosphere.io/v1beta1
-kind: ClusterAddon
-metadata:
-  name: kommander
-  labels:
-    kubeaddons.mesosphere.io/name: kommander
-  annotations:
-    catalog.kubeaddons.mesosphere.io/addon-revision: "1.173.2-1"
-    appversion.kubeaddons.mesosphere.io/kommander: "1.173.2"
-    endpoint.kubeaddons.mesosphere.io/kommander: /ops/portal/kommander
-    values.chart.helm.kubeaddons.mesosphere.io/kommander: "https://raw.githubusercontent.com/mesosphere/charts/master/stable/kommander/values.yaml"
-    helmv2.kubeaddons.mesosphere.io/upgrade-strategy: '[{"upgradeFrom": "<=0.1.22", "strategy": "delete"}]'
-spec:
-  namespace: kommander
-  kubernetes:
-    minSupportedVersion: v1.15.6
-  requires:
-    - matchLabels:
-        kubeaddons.mesosphere.io/name: cert-manager
-  cloudProvider:
-    - name: aws
-      enabled: true
-    - name: azure
-      enabled: true
-    - name: docker
-      enabled: true
-    - name: none
-      enabled: true
-  chartReference:
-    chart: kommander
-    repo: https://mesosphere.github.io/charts/stable
-    version: 0.3.9
-    values: |
-      ---
-      ingress:
-        extraAnnotations:
-          traefik.ingress.kubernetes.io/priority: "2"
-
-      kommander-cluster-lifecycle:
-        certificates:
-          issuer:
-            name: kubernetes-ca
-            kind: ClusterIssuer
-        konvoy:
-          allowUnofficialReleases: true
-
-      kommander-karma:
-        karma:
-          deployment:
-            annotations:
-              configmap.reloader.stakater.com/reload: kommander-kubeaddons-config
-
-      federate:
-        kubeaddons:
-          image:
-            repository: "mesosphere/kubeaddons"
-            tag: "v0.5.3"
-            pullPolicy: IfNotPresent
-
-      kubeaddons-catalog:
-        image:
-          repository: mesosphere/kubeaddons-catalog
-          tag: "v0.5.3"
-          pullPolicy: IfNotPresent
diff --git a/addons/kommander/1.184.x/kommander-1.yaml b/addons/kommander/1.x/kommander-1.yaml
similarity index 94%
rename from addons/kommander/1.184.x/kommander-1.yaml
rename to addons/kommander/1.x/kommander-1.yaml
index 51e5df2d..3f46d625 100644
--- a/addons/kommander/1.184.x/kommander-1.yaml
+++ b/addons/kommander/1.x/kommander-1.yaml
@@ -6,8 +6,8 @@ metadata:
   labels:
     kubeaddons.mesosphere.io/name: kommander
   annotations:
-    catalog.kubeaddons.mesosphere.io/addon-revision: "1.184.0-1"
-    appversion.kubeaddons.mesosphere.io/kommander: "1.184.0"
+    catalog.kubeaddons.mesosphere.io/addon-revision: "1.0.0-1"
+    appversion.kubeaddons.mesosphere.io/kommander: "1.0.0"
     endpoint.kubeaddons.mesosphere.io/kommander: /ops/portal/kommander/ui
     appversion.kubeaddons.mesosphere.io/thanos: 0.3.9
     appversion.kubeaddons.mesosphere.io/karma: 1.4.0