diff --git a/.gitmodules b/.gitmodules
index 46ec9476e..18e928980 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,4 @@
 [submodule "roles/k8s-kube-ui"]
 	path = roles/k8s-kube-ui
 	url = https://github.com/ansibl8s/k8s-kube-ui.git
+    branch = v1.0
diff --git a/roles/addons/defaults/main.yml b/roles/addons/defaults/main.yml
deleted file mode 100644
index e61f27957..000000000
--- a/roles/addons/defaults/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# defaults file for addons
diff --git a/roles/addons/files/es-rc.yaml b/roles/addons/files/es-rc.yaml
deleted file mode 100644
index 6631153a5..000000000
--- a/roles/addons/files/es-rc.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-apiVersion: v1
-kind: ReplicationController
-metadata:
-  name: elasticsearch-logging-v1
-  namespace: kube-system
-  labels:
-    k8s-app: elasticsearch-logging
-    version: v1
-    kubernetes.io/cluster-service: "true"
-spec:
-  replicas: 2
-  selector:
-    k8s-app: elasticsearch-logging
-    version: v1
-  template:
-    metadata:
-      labels:
-        k8s-app: elasticsearch-logging
-        version: v1
-        kubernetes.io/cluster-service: "true"
-    spec:
-      containers:
-      - image: gcr.io/google_containers/elasticsearch:1.7
-        name: elasticsearch-logging         
-        resources:
-          limits:
-            cpu: 100m
-        ports:
-        - containerPort: 9200
-          name: db
-          protocol: TCP
-        - containerPort: 9300
-          name: transport
-          protocol: TCP
-        volumeMounts:
-        - name: es-persistent-storage
-          mountPath: /data
-      volumes:
-      - name: es-persistent-storage
-        emptyDir: {}
diff --git a/roles/addons/files/es-svc.yaml b/roles/addons/files/es-svc.yaml
deleted file mode 100644
index abf1fd3f6..000000000
--- a/roles/addons/files/es-svc.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: elasticsearch-logging
-  namespace: kube-system
-  labels:
-    k8s-app: elasticsearch-logging
-    kubernetes.io/cluster-service: "true"
-    kubernetes.io/name: "Elasticsearch"
-spec:
-  ports:
-  - port: 9200
-    protocol: TCP
-    targetPort: db
-  selector:
-    k8s-app: elasticsearch-logging
diff --git a/roles/addons/files/fabric8-rc.yaml b/roles/addons/files/fabric8-rc.yaml
deleted file mode 100644
index f142f991b..000000000
--- a/roles/addons/files/fabric8-rc.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-apiVersion: "v1"
-kind: "ReplicationController"
-metadata: 
-  annotations: {}
-  labels: 
-    component: "console"
-    provider: "fabric8"
-  name: "fabric8"
-spec: 
-  replicas: 1
-  selector: 
-    component: "console"
-    provider: "fabric8"
-  template: 
-    metadata: 
-      annotations: {}
-      labels: 
-        component: "console"
-        provider: "fabric8"
-    spec: 
-      containers: 
-        - 
-          args: []
-          command: []
-          env: 
-            - 
-              name: "OAUTH_PROVIDER"
-              value: "basic"
-            - 
-              name: "OAUTH_AUTHORIZE_URI"
-              value: "https://vagrant.f8:8443/oauth/authorize"
-            - 
-              name: "GOOGLE_OAUTH_CLIENT_SECRET"
-              value: ""
-            - 
-              name: "GOOGLE_OAUTH_REDIRECT_URI"
-              value: "https://fabric8.vagrant.f8"
-            - 
-              name: "OAUTH_CLIENT_ID"
-              value: "fabric8"
-            - 
-              name: "GOOGLE_OAUTH_AUTHENTICATION_URI"
-              value: "https://accounts.google.com/o/oauth2/auth"
-            - 
-              name: "GOOGLE_OAUTH_TOKEN_URL"
-              value: "https://www.googleapis.com/oauth2/v3/token"
-            - 
-              name: "GOOGLE_OAUTH_CLIENT_ID"
-              value: ""
-            - 
-              name: "GOOGLE_OAUTH_SCOPE"
-              value: "profile"
-            - 
-              name: "KUBERNETES_NAMESPACE"
-              valueFrom: 
-                fieldRef: 
-                  fieldPath: "metadata.namespace"
-          image: "docker.io/fabric8/fabric8-console:v1.0.26"
-          name: "fabric8-container"
-          ports: 
-            - 
-              containerPort: 9090
-              name: "http"
-          securityContext: {}
-          volumeMounts: []
-      imagePullSecrets: []
-      nodeSelector: {}
-      volumes: []
diff --git a/roles/addons/files/fabric8-svc-accounts.yaml b/roles/addons/files/fabric8-svc-accounts.yaml
deleted file mode 100644
index bd86641e1..000000000
--- a/roles/addons/files/fabric8-svc-accounts.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-apiVersion: "v1"
-imagePullSecrets: []
-kind: "ServiceAccount"
-metadata: 
-  annotations: {}
-  labels: {}
-  name: "fabric8"
-secrets: []
diff --git a/roles/addons/files/fabric8-svc.yaml b/roles/addons/files/fabric8-svc.yaml
deleted file mode 100644
index 39bb0aa71..000000000
--- a/roles/addons/files/fabric8-svc.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-apiVersion: "v1"
-kind: "Service"
-metadata: 
-  annotations: {}
-  labels: 
-    component: "console"
-    provider: "fabric8"
-  name: "fabric8"
-spec: 
-  deprecatedPublicIPs: []
-  ports: 
-    - 
-      port: 80
-      protocol: "TCP"
-      targetPort: 9090
-  selector: 
-    component: "console"
-    provider: "fabric8"
diff --git a/roles/addons/files/fabric8-templates-rc.yaml b/roles/addons/files/fabric8-templates-rc.yaml
deleted file mode 100644
index 023adbe95..000000000
--- a/roles/addons/files/fabric8-templates-rc.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-apiVersion: "v1"
-kind: "ReplicationController"
-metadata: 
-  annotations: {}
-  labels: 
-    component: "templates"
-    provider: "fabric8"
-  name: "templates"
-spec: 
-  replicas: 1
-  selector: 
-    component: "templates"
-    provider: "fabric8"
-  template: 
-    metadata: 
-      annotations: {}
-      labels: 
-        component: "templates"
-        provider: "fabric8"
-    spec: 
-      containers: 
-        - 
-          args: []
-          command: []
-          env: 
-            - 
-              name: "DATA_DIR"
-              value: "/data/templates"
-            - 
-              name: "KUBERNETES_NAMESPACE"
-              valueFrom: 
-                fieldRef: 
-                  fieldPath: "metadata.namespace"
-          image: "docker.io/fabric8/templates:2.2.19"
-          name: "templates"
-          ports: 
-            - 
-              containerPort: 8080
-              name: "http"
-            - 
-              containerPort: 8778
-              name: "jolokia"
-          securityContext: {}
-          volumeMounts: 
-            - 
-              mountPath: "/data"
-              name: "template-data"
-              readOnly: false
-      imagePullSecrets: []
-      nodeSelector: {}
-      volumes: 
-        - 
-          gitRepo: 
-            repository: "https://github.com/fabric8io/templates.git"
-            revision: "master"
-          name: "template-data"
diff --git a/roles/addons/files/fabric8-templates-svc.yaml b/roles/addons/files/fabric8-templates-svc.yaml
deleted file mode 100644
index 4bbe5887d..000000000
--- a/roles/addons/files/fabric8-templates-svc.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-apiVersion: "v1"
-kind: "Service"
-metadata: 
-  annotations: {}
-  labels: 
-    component: "templates"
-    provider: "fabric8"
-  name: "templates"
-spec: 
-  deprecatedPublicIPs: []
-  ports: 
-    - 
-      port: 80
-      protocol: "TCP"
-      targetPort: 8080
-  selector: 
-    component: "templates"
-    provider: "fabric8"
diff --git a/roles/addons/files/grafana-service.yaml b/roles/addons/files/grafana-service.yaml
deleted file mode 100644
index 41b6b8804..000000000
--- a/roles/addons/files/grafana-service.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: monitoring-grafana
-  namespace: kube-system
-  labels: 
-    kubernetes.io/cluster-service: "true"
-    kubernetes.io/name: "Grafana"
-spec: 
-  type: NodePort
-  ports: 
-    - port: 80
-      targetPort: 8080
-  selector: 
-    k8s-app: influxGrafana
-
diff --git a/roles/addons/files/heapster-controller.yaml b/roles/addons/files/heapster-controller.yaml
deleted file mode 100644
index fbc3badfd..000000000
--- a/roles/addons/files/heapster-controller.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-apiVersion: v1
-kind: ReplicationController
-metadata:
-  name: monitoring-heapster-v8
-  namespace: kube-system
-  labels:
-    k8s-app: heapster
-    version: v8
-    kubernetes.io/cluster-service: "true"
-spec:
-  replicas: 1
-  selector:
-    k8s-app: heapster
-    version: v8
-  template:
-    metadata:
-      labels:
-        k8s-app: heapster
-        version: v8
-        kubernetes.io/cluster-service: "true"
-    spec:
-      containers:
-        - image: gcr.io/google_containers/heapster:v0.17.0
-          name: heapster
-          resources:
-            limits:
-              cpu: 100m
-              memory: 300Mi
-          command:
-            - /heapster
-            - --source=kubernetes:''
-            - --sink=influxdb:http://monitoring-influxdb:8086
diff --git a/roles/addons/files/heapster-service.yaml b/roles/addons/files/heapster-service.yaml
deleted file mode 100644
index 5ba0cadc4..000000000
--- a/roles/addons/files/heapster-service.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-kind: Service
-apiVersion: v1
-metadata:
-  name: monitoring-heapster
-  namespace: kube-system
-  labels:
-    kubernetes.io/cluster-service: "true"
-    kubernetes.io/name: "Heapster"
-spec: 
-  type: NodePort
-  ports: 
-    - port: 80
-      targetPort: 8082
-  selector: 
-    k8s-app: heapster
diff --git a/roles/addons/files/influxdb-grafana-controller.yaml b/roles/addons/files/influxdb-grafana-controller.yaml
deleted file mode 100644
index 8a2763063..000000000
--- a/roles/addons/files/influxdb-grafana-controller.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-apiVersion: v1
-kind: ReplicationController
-metadata:
-  name: monitoring-influx-grafana-v1
-  namespace: kube-system
-  labels: 
-    k8s-app: influxGrafana
-    version: v1
-    kubernetes.io/cluster-service: "true"
-spec: 
-  replicas: 1
-  selector: 
-    k8s-app: influxGrafana
-    version: v1
-  template: 
-    metadata: 
-      labels: 
-        k8s-app: influxGrafana
-        version: v1
-        kubernetes.io/cluster-service: "true"
-    spec: 
-      containers: 
-        - image: gcr.io/google_containers/heapster_influxdb:v0.3
-          name: influxdb
-          resources:
-            limits:
-              cpu: 100m
-              memory: 200Mi
-          ports: 
-            - containerPort: 8083
-              hostPort: 8083
-            - containerPort: 8086
-              hostPort: 8086
-          volumeMounts:
-          - name: influxdb-persistent-storage
-            mountPath: /data
-        - image: gcr.io/google_containers/heapster_grafana:v0.7
-          name: grafana
-          resources:
-            limits:
-              cpu: 100m
-              memory: 100Mi
-          env: 
-            - name: INFLUXDB_EXTERNAL_URL
-              value: /api/v1/proxy/namespaces/kube-system/services/monitoring-influxdb:api/db/
-            - name: INFLUXDB_HOST
-              value: monitoring-influxdb
-            - name: INFLUXDB_PORT
-              value: "8086"
-      volumes:
-      - name: influxdb-persistent-storage
-        emptyDir: {}
-
diff --git a/roles/addons/files/influxdb-service.yaml b/roles/addons/files/influxdb-service.yaml
deleted file mode 100644
index 066e05247..000000000
--- a/roles/addons/files/influxdb-service.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: monitoring-influxdb
-  namespace: kube-system
-  labels: 
-    kubernetes.io/cluster-service: "true"
-    kubernetes.io/name: "InfluxDB"
-spec: 
-  ports: 
-    - name: http
-      port: 8083
-      targetPort: 8083
-    - name: api
-      port: 8086
-      targetPort: 8086
-  selector: 
-    k8s-app: influxGrafana
-
diff --git a/roles/addons/files/kibana-rc.yaml b/roles/addons/files/kibana-rc.yaml
deleted file mode 100644
index 893608aef..000000000
--- a/roles/addons/files/kibana-rc.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-apiVersion: v1
-kind: ReplicationController
-metadata:
-  name: kibana-logging-v1
-  namespace: kube-system
-  labels:
-    k8s-app: kibana-logging
-    version: v1
-    kubernetes.io/cluster-service: "true"
-spec:
-  replicas: 1
-  selector:
-    k8s-app: kibana-logging
-    version: v1
-  template:
-    metadata:
-      labels:
-        k8s-app: kibana-logging
-        version: v1
-        kubernetes.io/cluster-service: "true"
-    spec:
-      containers:
-      - name: kibana-logging
-        image: gcr.io/google_containers/kibana:1.3
-        resources:
-          limits:
-            cpu: 100m
-        env:
-          - name: "ELASTICSEARCH_URL"
-            value: "http://elasticsearch-logging:9200"
-        ports:
-        - containerPort: 5601
-          name: ui
-          protocol: TCP
diff --git a/roles/addons/files/kibana-svc.yaml b/roles/addons/files/kibana-svc.yaml
deleted file mode 100644
index 20c4287d7..000000000
--- a/roles/addons/files/kibana-svc.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: kibana-logging
-  namespace: kube-system
-  labels:
-    k8s-app: kibana-logging
-    kubernetes.io/cluster-service: "true"
-    kubernetes.io/name: "Kibana"
-spec:
-  type: NodePort
-  ports:
-  - port: 5601
-    protocol: TCP
-    targetPort: ui
-  selector:
-    k8s-app: kibana-logging
diff --git a/roles/addons/files/kube-system.yaml b/roles/addons/files/kube-system.yaml
deleted file mode 100644
index 986f4b482..000000000
--- a/roles/addons/files/kube-system.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: kube-system
diff --git a/roles/addons/files/kube-ui-rc.yaml b/roles/addons/files/kube-ui-rc.yaml
deleted file mode 100644
index e853a2177..000000000
--- a/roles/addons/files/kube-ui-rc.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-apiVersion: v1
-kind: ReplicationController
-metadata:
-  name: kube-ui-v1
-  namespace: kube-system
-  labels:
-    k8s-app: kube-ui
-    version: v1
-    kubernetes.io/cluster-service: "true"
-spec:
-  replicas: 1
-  selector:
-    k8s-app: kube-ui
-    version: v1
-  template:
-    metadata:
-      labels:
-        k8s-app: kube-ui
-        version: v1
-        kubernetes.io/cluster-service: "true"
-    spec:
-      containers:
-      - name: kube-ui
-        image: gcr.io/google_containers/kube-ui:v1.1
-        resources:
-          limits:
-            cpu: 100m
-            memory: 50Mi
-        ports:
-        - containerPort: 8080
-        livenessProbe:
-          httpGet:
-            path: /
-            port: 8080
-          initialDelaySeconds: 30
-          timeoutSeconds: 5
diff --git a/roles/addons/files/kube-ui-svc.yaml b/roles/addons/files/kube-ui-svc.yaml
deleted file mode 100644
index aee0c97b8..000000000
--- a/roles/addons/files/kube-ui-svc.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: kube-ui
-  namespace: kube-system
-  labels:
-    k8s-app: kube-ui
-    kubernetes.io/cluster-service: "true"
-    kubernetes.io/name: "KubeUI"
-spec:
-  type: NodePort
-  selector:
-    k8s-app: kube-ui
-  ports:
-  - port: 80
-    targetPort: 8080
diff --git a/roles/addons/handlers/main.yml b/roles/addons/handlers/main.yml
deleted file mode 100644
index 706ac0f72..000000000
--- a/roles/addons/handlers/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# handlers file for addons
diff --git a/roles/addons/meta/main.yml b/roles/addons/meta/main.yml
deleted file mode 100644
index 5e306c8a4..000000000
--- a/roles/addons/meta/main.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-dependencies:
-  - { role: kubernetes/master }
-  - { role: kubernetes/common }
diff --git a/roles/addons/tasks/fabric8.yml b/roles/addons/tasks/fabric8.yml
deleted file mode 100644
index f50903128..000000000
--- a/roles/addons/tasks/fabric8.yml
+++ /dev/null
@@ -1,72 +0,0 @@
----
-- name: Fabric8 | Write service accounts file
-  copy:
-    src: fabric8-svc-accounts.yaml
-    dest: "{{ kube_manifest_dir }}/fabric8-svc-accounts.yaml"
-  register: fabric8_svcaccts_def
-
-- name: Fabric8 | Write service file
-  copy:
-    src: fabric8-svc.yaml
-    dest: "{{ kube_manifest_dir }}/fabric8-svc.yaml"
-  register: fabric8_svc_def
-
-- name: Fabric8 | templates | Write service file
-  copy:
-    src: fabric8-templates-svc.yaml
-    dest: "{{ kube_manifest_dir }}/fabric8-templates-svc.yaml"
-  register: fabric8_tmpl_svc_def
-
-- name: Fabric8 | Write controller file
-  copy:
-    src: fabric8-rc.yaml
-    dest: "{{ kube_manifest_dir }}/fabric8-rc.yaml"
-  register: fabric8_rc_def
-
-- name: Fabric8 | templates | Write controller file
-  copy:
-    src: fabric8-templates-rc.yaml
-    dest: "{{ kube_manifest_dir }}/fabric8-templates-rc.yaml"
-  register: fabric8_tmpl_rc_def
-
-
-- name: Fabric8 | Create/update service account
-  kube:
-    namespace: default
-    resource: serviceaccounts
-    name: fabric8
-    filename: "{{ kube_manifest_dir }}/fabric8-svc-accounts.yaml"
-    state: "{{ fabric8_svcaccts_def.changed | ternary('latest','present') }}"
-  ignore_errors: yes
-
-- name: Fabric8 | Create/update service
-  kube:
-    namespace: default
-    resource: svc
-    name: fabric8
-    filename: "{{ kube_manifest_dir }}/fabric8-svc.yaml"
-    state: "{{ fabric8_svc_def.changed | ternary('latest','present') }}"
-
-- name: Fabric8 | templates | Create/update service
-  kube:
-    namespace: default
-    resource: svc
-    name: templates
-    filename: "{{ kube_manifest_dir }}/fabric8-templates-svc.yaml"
-    state: "{{ fabric8_tmpl_svc_def.changed | ternary('latest','present') }}"
-
-- name: Fabric8 | Create/update replication controller
-  kube:
-    namespace: default
-    resource: rc
-    name: fabric8
-    filename: "{{ kube_manifest_dir }}/fabric8-rc.yaml"
-    state: "{{ fabric8_rc_def.changed | ternary('latest','present') }}"
-
-- name: Fabric8 | templates | Create/update replication controller
-  kube:
-    namespace: default
-    resource: rc
-    name: templates
-    filename: "{{ kube_manifest_dir }}/fabric8-templates-rc.yaml"
-    state: "{{ fabric8_tmpl_rc_def.changed | ternary('latest','present') }}"
diff --git a/roles/addons/tasks/kube-ui.yml b/roles/addons/tasks/kube-ui.yml
deleted file mode 100644
index 0f769dc6f..000000000
--- a/roles/addons/tasks/kube-ui.yml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-- name: Kube-UI | Write pod file
-  copy:
-    src: kube-ui-rc.yaml
-    dest: "{{ kube_manifest_dir }}/kube-ui-rc.yaml"
-  register: kube_ui_rc_def
-  when: enable_ui
-  tags:
-    - addons
-    - kube-ui
-
-- name: Kube-UI | Write service file
-  copy:
-    src: kube-ui-svc.yaml
-    dest: "{{ kube_manifest_dir }}/kube-ui-svc.yaml"
-  register: kube_ui_svc_def
-  when: enable_ui
-  tags:
-    - addons
-    - kube-ui
-
-- name: Kube-UI | Create or update replication controller
-  kube:
-    namespace: kube-system
-    resource: rc
-    name: kube-ui-v1
-    filename: "{{ kube_manifest_dir }}/kube-ui-rc.yaml"
-    state: "{{ kube_ui_rc_def.changed | ternary('latest','present') }}"
-  when: enable_ui
-  tags:
-    - addons
-    - kube-ui
-
-- name: Kube-UI | Create or update service
-  kube:
-    namespace: kube-system
-    resource: svc
-    name: kube-ui
-    filename: "{{ kube_manifest_dir }}/kube-ui-svc.yaml"
-    state: "{{ kube_ui_svc_def.changed | ternary('latest','present') }}"
-  when: enable_ui
-  tags:
-    - addons
-    - kube-ui
diff --git a/roles/addons/tasks/logging.yml b/roles/addons/tasks/logging.yml
deleted file mode 100644
index b0ecc67b0..000000000
--- a/roles/addons/tasks/logging.yml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-- name: Logging | Kibana | Write pod file
-  copy:
-    src: kibana-rc.yaml
-    dest: "{{ kube_manifest_dir }}/kibana-rc.yaml"
-  register: kibana_rc_def
-  when: enable_logging
-  tags:
-    - addons
-    - logging
-
-- name: Logging | Kibana | Write service file
-  copy:
-    src: kibana-svc.yaml
-    dest: "{{ kube_manifest_dir }}/kibana-svc.yaml"
-  register: kibana_svc_def
-  when: enable_logging
-  tags:
-    - addons
-    - logging
-
-- name: Logging | ES | Write pod file
-  copy:
-    src: es-rc.yaml
-    dest: "{{ kube_manifest_dir }}/es-rc.yaml"
-  register: es_rc_def
-  when: enable_logging
-  tags:
-    - addons
-    - logging
-
-- name: Logging | ES | Write service file
-  copy:
-    src: es-svc.yaml
-    dest: "{{ kube_manifest_dir }}/es-svc.yaml"
-  register: es_svc_def
-  when: enable_logging
-  tags:
-    - addons
-    - logging
-
-- name: Logging | ES | Create/update replication controller
-  kube:
-    namespace: kube-system
-    resource: rc
-    name: elasticsearch-logging-v1
-    filename: "{{ kube_manifest_dir }}/es-rc.yaml"
-    state: "{{ es_rc_def.changed | ternary('latest','present') }}"
-  when: enable_logging
-  tags:
-    - addons
-    - logging
-
-- name: Logging | ES | Create/update service
-  kube:
-    namespace: kube-system
-    resource: svc
-    name: elasticsearch-logging
-    filename: "{{ kube_manifest_dir }}/es-svc.yaml"
-    state: "{{ es_svc_def.changed | ternary('latest','present') }}"
-  when: enable_logging
-  tags:
-    - addons
-    - logging
-
-- name: Logging | Kibana | Create/update replication controller
-  kube:
-    namespace: kube-system
-    resource: rc
-    name: kibana-logging-v1
-    filename: "{{ kube_manifest_dir }}/kibana-rc.yaml"
-    state: "{{ kibana_rc_def.changed | ternary('latest','present') }}"
-  when: enable_logging
-  tags:
-    - addons
-    - logging
-
-- name: Logging | Kibana | Create/update service
-  kube:
-    namespace: kube-system
-    resource: svc
-    name: kibana-logging
-    filename: "{{ kube_manifest_dir }}/kibana-svc.yaml"
-    state: "{{ kibana_svc_def.changed | ternary('latest','present') }}"
-  when: enable_logging
-  tags:
-    - addons
-    - logging
diff --git a/roles/addons/tasks/main.yml b/roles/addons/tasks/main.yml
deleted file mode 100644
index 307599994..000000000
--- a/roles/addons/tasks/main.yml
+++ /dev/null
@@ -1,48 +0,0 @@
----
-- name: create manifests directory
-  file: path={{ kube_manifest_dir }} state=directory
-
-- name: Write kube-system namespace manifest
-  copy:
-    src=kube-system.yaml
-    dest={{ kube_manifest_dir }}/kube-system.yaml
-
-- name: Create kube-system namespace
-  kube:
-    resource: ns
-    name: kube-system
-    filename: "{{ kube_manifest_dir }}/kube-system.yaml"
-    state: present
-  tags:
-    - addons
-  ignore_errors: yes
-
-- name: Run kube-gen-token script to create {{ kube_token_dir }}/known_tokens.csv
-  command: "{{ kube_script_dir }}/kube-gen-token.sh {{ item }}"
-  environment:
-    TOKEN_DIR: "{{ kube_token_dir }}"
-  with_items:
-    - "system:dns"
-    - "system:monitoring"
-    - "system:logging"
-  register: gentoken
-  changed_when: "'Added' in gentoken.stdout"
-  notify:
-    - restart apiserver
-  tags:
-    - addons
-
-- include: skydns.yml
-  when: dns_setup
-
-- include: kube-ui.yml
-  when: enable_ui
-
-- include: logging.yml
-  when: enable_logging
-
-- include: monitoring.yml
-  when: enable_monitoring
-
-- include: fabric8.yml
-  when: enable_fabric8
diff --git a/roles/addons/tasks/monitoring.yml b/roles/addons/tasks/monitoring.yml
deleted file mode 100644
index f64c401fc..000000000
--- a/roles/addons/tasks/monitoring.yml
+++ /dev/null
@@ -1,111 +0,0 @@
----
-- name: Monitoring | Influxdb | Write controller file
-  copy:
-    src: influxdb-grafana-controller.yaml
-    dest: "{{ kube_manifest_dir }}/influxdb-grafana-controller.yaml"
-  register: influxdb_rc_def
-  when: enable_monitoring
-  tags:
-    - addons
-    - monitoring
-
-- name: Monitoring | Influxdb | Write service file
-  copy:
-    src: influxdb-service.yaml
-    dest: "{{ kube_manifest_dir }}/influxdb-service.yaml"
-  register: influxdb_svc_def
-  when: enable_monitoring
-  tags:
-    - addons
-    - monitoring
-
-- name: Monitoring | Grafana | Write service file
-  copy:
-    src: grafana-service.yaml
-    dest: "{{ kube_manifest_dir }}/grafana-service.yaml"
-  register: grafana_svc_def
-  when: enable_monitoring
-  tags:
-    - addons
-    - monitoring
-
-- name: Monitoring | Heapster | Write controller file
-  copy:
-    src: heapster-controller.yaml
-    dest: "{{ kube_manifest_dir }}/heapster-controller.yaml"
-  register: heapster_rc_def
-  when: enable_monitoring
-  tags:
-    - addons
-    - monitoring
-
-- name: Monitoring | Heapster | Write service file
-  copy:
-    src: heapster-service.yaml
-    dest: "{{ kube_manifest_dir }}/heapster-service.yaml"
-  register: heapster_svc_def
-  when: enable_monitoring
-  tags:
-    - addons
-    - monitoring
-
-- name: Monitoring | Influxdb | Create/update replication controller
-  kube:
-    namespace: kube-system
-    resource: rc
-    name: monitoring-influx-grafana-v1
-    filename: "{{ kube_manifest_dir }}/influxdb-grafana-controller.yaml"
-    state: "{{ influxdb_rc_def.changed | ternary('latest','present') }}"
-  when: enable_monitoring
-  tags:
-    - addons
-    - monitoring
-
-- name: Monitoring | Influxdb | Create/update service
-  kube:
-    namespace: kube-system
-    resource: svc
-    name: monitoring-influxdb
-    filename: "{{ kube_manifest_dir }}/influxdb-service.yaml"
-    state: "{{ influxdb_svc_def.changed | ternary('latest','present') }}"
-  when: enable_monitoring
-  tags:
-    - addons
-    - monitoring
-
-- name: Monitoring | Grafana | Create/update service
-  kube:
-    namespace: kube-system
-    resource: svc
-    name: monitoring-grafana
-    filename: "{{ kube_manifest_dir }}/grafana-service.yaml"
-    state: "{{ grafana_svc_def.changed | ternary('latest','present') }}"
-  when: enable_monitoring
-  tags:
-    - addons
-    - monitoring
-
-- name: Monitoring | Heapster | Create/update replication controller
-  kube:
-    namespace: kube-system
-    resource: rc
-    name: monitoring-heapster-v8
-    filename: "{{ kube_manifest_dir }}/heapster-controller.yaml"
-    state: "{{ heapster_rc_def.changed | ternary('latest','present') }}"
-  when: enable_monitoring
-  tags:
-    - addons
-    - monitoring
-
-- name: Monitoring | Heapster | Create/update service
-  kube:
-    namespace: kube-system
-    resource: svc
-    name: monitoring-heapster
-    filename: "{{ kube_manifest_dir }}/heapster-service.yaml"
-    state: "{{ heapster_svc_def.changed | ternary('latest','present') }}"
-  when: enable_monitoring
-  tags:
-    - addons
-    - monitoring
-
diff --git a/roles/addons/tasks/skydns.yml b/roles/addons/tasks/skydns.yml
deleted file mode 100644
index 8fb6d15fe..000000000
--- a/roles/addons/tasks/skydns.yml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-- name: SkyDNS | Write pod file
-  template:
-    src: skydns-rc.yaml.j2
-    dest: "{{ kube_manifest_dir }}/skydns-rc.yaml"
-  register: dns_rc_def
-  when: dns_setup
-  tags:
-    - addons
-    - skydns
-
-- name: SkyDNS | Write service file
-  template:
-    src: skydns-svc.yaml.j2
-    dest: "{{ kube_manifest_dir }}/skydns-svc.yaml"
-  register: dns_svc_def
-  when: dns_setup
-  tags:
-    - addons
-    - skydns
-
-- name: SkyDNS | Create or update replication controller
-  kube:
-    namespace: kube-system
-    resource: rc
-    name: kube-dns-v8
-    filename: "{{ kube_manifest_dir }}/skydns-rc.yaml"
-    state: "{{ dns_rc_def.changed | ternary('latest','present') }}"
-  when: dns_setup
-  tags:
-    - addons
-    - skydns
-
-- name: SkyDNS | Create or update service
-  kube:
-    namespace: kube-system
-    resource: svc
-    name: kube-dns
-    filename: "{{ kube_manifest_dir }}/skydns-svc.yaml"
-    state: "{{ dns_svc_def.changed | ternary('latest','present') }}"
-  when: dns_setup
-  tags:
-    - addons
-    - skydns
diff --git a/roles/addons/templates/skydns-rc.yaml.j2 b/roles/addons/templates/skydns-rc.yaml.j2
deleted file mode 100644
index 0aba304bb..000000000
--- a/roles/addons/templates/skydns-rc.yaml.j2
+++ /dev/null
@@ -1,91 +0,0 @@
-apiVersion: v1
-kind: ReplicationController
-metadata:
-  name: kube-dns-v8
-  namespace: kube-system
-  labels:
-    k8s-app: kube-dns
-    version: v8
-    kubernetes.io/cluster-service: "true"
-spec:
-  replicas: {{ dns_replicas }}
-  selector:
-    k8s-app: kube-dns
-    version: v8
-  template:
-    metadata:
-      labels:
-        k8s-app: kube-dns
-        version: v8
-        kubernetes.io/cluster-service: "true"
-    spec:
-      containers:
-      - name: etcd
-        image: gcr.io/google_containers/etcd:2.0.9
-        resources:
-          limits:
-            cpu: 100m
-            memory: 50Mi
-        command:
-        - /usr/local/bin/etcd
-        - -data-dir
-        - /var/etcd/data
-        - -listen-client-urls
-        - http://127.0.0.1:2379,http://127.0.0.1:4001
-        - -advertise-client-urls
-        - http://127.0.0.1:2379,http://127.0.0.1:4001
-        - -initial-cluster-token
-        - skydns-etcd
-        volumeMounts:
-        - name: etcd-storage
-          mountPath: /var/etcd/data
-      - name: kube2sky
-        image: gcr.io/google_containers/kube2sky:1.11
-        resources:
-          limits:
-            cpu: 100m
-            memory: 50Mi
-        args:
-        # command = "/kube2sky"
-        - -domain={{ dns_domain }}
-      - name: skydns
-        image: gcr.io/google_containers/skydns:2015-03-11-001
-        resources:
-          limits:
-            cpu: 100m
-            memory: 50Mi
-        args:
-        # command = "/skydns"
-        - -machines=http://localhost:4001
-        - -addr=0.0.0.0:53
-        - -domain={{ dns_domain }}.
-        ports:
-        - containerPort: 53
-          name: dns
-          protocol: UDP
-        - containerPort: 53
-          name: dns-tcp
-          protocol: TCP
-        livenessProbe:
-          httpGet:
-            path: /healthz
-            port: 8080
-            scheme: HTTP
-          initialDelaySeconds: 30
-          timeoutSeconds: 5
-      - name: healthz
-        image: gcr.io/google_containers/exechealthz:1.0
-        resources:
-          limits:
-            cpu: 10m
-            memory: 20Mi
-        args:
-        - -cmd=nslookup kubernetes.default.svc.{{ dns_domain }} localhost >/dev/null
-        - -port=8080
-        ports:
-        - containerPort: 8080
-          protocol: TCP
-      volumes:
-      - name: etcd-storage
-        emptyDir: {}
-      dnsPolicy: Default  # Don't use cluster DNS.
\ No newline at end of file
diff --git a/roles/addons/templates/skydns-svc.yaml.j2 b/roles/addons/templates/skydns-svc.yaml.j2
deleted file mode 100644
index 7efcfcf9d..000000000
--- a/roles/addons/templates/skydns-svc.yaml.j2
+++ /dev/null
@@ -1,20 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: kube-dns
-  namespace: kube-system
-  labels:
-    k8s-app: kube-dns
-    kubernetes.io/cluster-service: "true"
-    kubernetes.io/name: "KubeDNS"
-spec:
-  selector:
-    k8s-app: kube-dns
-  clusterIP:  {{ kube_dns_server }}
-  ports:
-  - name: dns
-    port: 53
-    protocol: UDP
-  - name: dns-tcp
-    port: 53
-    protocol: TCP
diff --git a/roles/k8s-kube-ui b/roles/k8s-kube-ui
index d17ee2ec3..40e56462f 160000
--- a/roles/k8s-kube-ui
+++ b/roles/k8s-kube-ui
@@ -1 +1 @@
-Subproject commit d17ee2ec32eea4431c0634797ae149b96d136c2f
+Subproject commit 40e56462f5860d8d63cc9b6a0ded0519f7659010