diff --git a/deploy/addons-s390x/addon-manager.yaml b/deploy/addons-s390x/addon-manager.yaml
deleted file mode 100644
index d3f0ec1e577c..000000000000
--- a/deploy/addons-s390x/addon-manager.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2016 The Kubernetes Authors All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-kind: Pod
-metadata:
-  name: kube-addon-manager
-  namespace: kube-system
-  labels:
-    component: kube-addon-manager
-    version: v8.6
-    kubernetes.io/minikube-addons: addon-manager
-spec:
-  hostNetwork: true
-  containers:
-  - name: kube-addon-manager
-    image: k8s.gcr.io/kube-addon-manager-s390x:v8.6
-    env:
-    - name: KUBECONFIG
-      value: /var/lib/localkube/kubeconfig
-    imagePullPolicy: IfNotPresent
-    resources:
-      requests:
-        cpu: 5m
-        memory: 50Mi
-    volumeMounts:
-    - mountPath: /etc/kubernetes/
-      name: addons
-      readOnly: true
-    - mountPath: /var/lib/localkube/
-      name: kubeconfig
-      readOnly: true
-  volumes:
-  - hostPath:
-      path: /etc/kubernetes/
-    name: addons
-  - hostPath:
-      path: /var/lib/localkube/
-    name: kubeconfig
diff --git a/deploy/addons-s390x/coredns/coreDNS-clusterrole.yaml b/deploy/addons-s390x/coredns/coreDNS-clusterrole.yaml
deleted file mode 100644
index e40e3926b1bc..000000000000
--- a/deploy/addons-s390x/coredns/coreDNS-clusterrole.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  labels:
-    kubernetes.io/bootstrapping: rbac-defaults
-    addonmanager.kubernetes.io/mode: Reconcile
-  name: system:coredns
-rules:
-- apiGroups:
-  - ""
-  resources:
-  - endpoints
-  - services
-  - pods
-  - namespaces
-  verbs:
-  - list
-  - watch
diff --git a/deploy/addons-s390x/coredns/coreDNS-configmap.yaml b/deploy/addons-s390x/coredns/coreDNS-configmap.yaml
deleted file mode 100644
index c29ab8a46926..000000000000
--- a/deploy/addons-s390x/coredns/coreDNS-configmap.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: coredns
-  namespace: kube-system
-  labels:
-    addonmanager.kubernetes.io/mode: EnsureExists
-data:
-  Corefile: |
-    .:53 {
-        errors
-        log
-        health
-        kubernetes cluster.local in-addr.arpa ip6.arpa {
-            pods insecure
-            upstream
-            fallthrough in-addr.arpa ip6.arpa
-        }
-        prometheus :9153
-        proxy . /etc/resolv.conf
-        cache 30
-        reload
-    }
diff --git a/deploy/addons-s390x/coredns/coreDNS-controller.yaml b/deploy/addons-s390x/coredns/coreDNS-controller.yaml
deleted file mode 100644
index 5b76bd70aee7..000000000000
--- a/deploy/addons-s390x/coredns/coreDNS-controller.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: coredns
-  namespace: kube-system
-  labels:
-    k8s-app: kube-dns
-    kubernetes.io/name: "CoreDNS"
-    addonmanager.kubernetes.io/mode: Reconcile
-spec:
-  replicas: 1
-  strategy:
-    type: RollingUpdate
-    rollingUpdate:
-      maxUnavailable: 1
-  selector:
-    matchLabels:
-      k8s-app: kube-dns
-  template:
-    metadata:
-      labels:
-        k8s-app: kube-dns
-    spec:
-      serviceAccountName: coredns
-      tolerations:
-      - key: CriticalAddonsOnly
-        operator: Exists
-      - key: node-role.kubernetes.io/master
-        effect: NoSchedule
-      containers:
-      - name: coredns
-        image: k8s.gcr.io/coredns:1.1.3
-        imagePullPolicy: IfNotPresent
-        resources:
-          limits:
-            memory: 170Mi
-          requests:
-            cpu: 100m
-            memory: 70Mi
-        args: [ "-conf", "/etc/coredns/Corefile" ]
-        volumeMounts:
-        - name: config-volume
-          mountPath: /etc/coredns
-        ports:
-        - containerPort: 53
-          name: dns
-          protocol: UDP
-        - containerPort: 53
-          name: dns-tcp
-          protocol: TCP
-        - containerPort: 9153
-          name: metrics
-          protocol: TCP
-        livenessProbe:
-          httpGet:
-            path: /health
-            port: 8080
-            scheme: HTTP
-          initialDelaySeconds: 60
-          timeoutSeconds: 5
-          successThreshold: 1
-          failureThreshold: 5
-      dnsPolicy: Default
-      volumes:
-        - name: config-volume
-          configMap:
-            name: coredns
-            items:
-            - key: Corefile
-              path: Corefile
diff --git a/deploy/addons-s390x/coredns/coreDNS-crbinding.yaml b/deploy/addons-s390x/coredns/coreDNS-crbinding.yaml
deleted file mode 100644
index 5b8258ddfa8e..000000000000
--- a/deploy/addons-s390x/coredns/coreDNS-crbinding.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  labels:
-    kubernetes.io/bootstrapping: rbac-defaults
-    addonmanager.kubernetes.io/mode: EnsureExists
-  name: system:coredns
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: system:coredns
-subjects:
-- kind: ServiceAccount
-  name: coredns
-  namespace: kube-system
diff --git a/deploy/addons-s390x/coredns/coreDNS-sa.yaml b/deploy/addons-s390x/coredns/coreDNS-sa.yaml
deleted file mode 100644
index 3b61f44af497..000000000000
--- a/deploy/addons-s390x/coredns/coreDNS-sa.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: coredns
-  namespace: kube-system
-  labels:
-    addonmanager.kubernetes.io/mode: Reconcile
diff --git a/deploy/addons-s390x/coredns/coreDNS-svc.yaml b/deploy/addons-s390x/coredns/coreDNS-svc.yaml
deleted file mode 100644
index 187a28b09e61..000000000000
--- a/deploy/addons-s390x/coredns/coreDNS-svc.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: kube-dns
-  namespace: kube-system
-  annotations:
-    prometheus.io/scrape: "true"
-  labels:
-    k8s-app: kube-dns
-    addonmanager.kubernetes.io/mode: Reconcile
-    kubernetes.io/name: "CoreDNS"
-spec:
-  selector:
-    k8s-app: kube-dns
-  clusterIP: 10.96.0.10
-  ports:
-  - name: dns
-    port: 53
-    protocol: UDP
-  - name: dns-tcp
-    port: 53
-    protocol: TCP
diff --git a/deploy/addons-s390x/dashboard/dashboard-dp.yaml b/deploy/addons-s390x/dashboard/dashboard-dp.yaml
deleted file mode 100644
index c64e44af153e..000000000000
--- a/deploy/addons-s390x/dashboard/dashboard-dp.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2016 The Kubernetes Authors All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: kubernetes-dashboard
-  namespace: kube-system
-  labels:
-    version: v1.8.1
-    addonmanager.kubernetes.io/mode: Reconcile
-    kubernetes.io/minikube-addons: dashboard
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: kubernetes-dashboard
-      version: v1.8.1
-      addonmanager.kubernetes.io/mode: Reconcile
-  template:
-    metadata:
-      labels:
-        app: kubernetes-dashboard
-        version: v1.8.1
-        addonmanager.kubernetes.io/mode: Reconcile
-    spec:
-      containers:
-      - name: kubernetes-dashboard
-        image: k8s.gcr.io/kubernetes-dashboard-s390x:v1.8.1
-        imagePullPolicy: IfNotPresent
-        ports:
-        - containerPort: 9090
-          protocol: TCP
-        livenessProbe:
-          httpGet:
-            path: /
-            port: 9090
-          initialDelaySeconds: 30
-          timeoutSeconds: 30
diff --git a/deploy/addons-s390x/dashboard/dashboard-svc.yaml b/deploy/addons-s390x/dashboard/dashboard-svc.yaml
deleted file mode 100644
index b39a8001cb68..000000000000
--- a/deploy/addons-s390x/dashboard/dashboard-svc.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-# Copyright 2016 The Kubernetes Authors All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-kind: Service
-apiVersion: v1
-metadata:
-  name: kubernetes-dashboard
-  namespace: kube-system
-  labels:
-    app: kubernetes-dashboard
-    addonmanager.kubernetes.io/mode: Reconcile
-    kubernetes.io/minikube-addons: dashboard
-    kubernetes.io/minikube-addons-endpoint: dashboard
-spec:
-  type: NodePort
-  ports:
-  - port: 80
-    targetPort: 9090
-    nodePort: 30000
-  selector:
-    app: kubernetes-dashboard
diff --git a/deploy/addons-s390x/efk/elasticsearch-rc.yaml b/deploy/addons-s390x/efk/elasticsearch-rc.yaml
deleted file mode 100644
index e3923d05a16b..000000000000
--- a/deploy/addons-s390x/efk/elasticsearch-rc.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 2017 The Kubernetes Authors All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-kind: ReplicationController
-metadata:
-  name: elasticsearch-logging
-  namespace: kube-system
-  labels:
-    k8s-app: elasticsearch-logging
-    kubernetes.io/minikube-addons: efk
-    addonmanager.kubernetes.io/mode: Reconcile
-spec:
-  replicas: 1
-  selector:
-    k8s-app: elasticsearch-logging
-    addonmanager.kubernetes.io/mode: Reconcile
-  template:
-    metadata:
-      labels:
-        k8s-app: elasticsearch-logging
-        addonmanager.kubernetes.io/mode: Reconcile
-    spec:
-      containers:
-      - name: elasticsearch-logging
-        image: k8s.gcr.io/elasticsearch:v5.6.2
-        resources:
-          limits:
-            cpu: 500m
-            memory: 2400Mi
-          requests:
-            cpu: 100m
-            memory: 2350Mi
-        ports:
-        - containerPort: 9200
-          name: db
-          protocol: TCP
-        - containerPort: 9300
-          name: transport
-          protocol: TCP
-        volumeMounts:
-        - name: elasticsearch-logging
-          mountPath: /data
-        env:
-        - name: "NAMESPACE"
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
-        - name: MINIMUM_MASTER_NODES
-          value: "1"
-      initContainers:
-      - image: s390x/alpine:3.6
-        command: ["/sbin/sysctl", "-w", "vm.max_map_count=262144"]
-        name: elasticsearch-logging-init
-        securityContext:
-          privileged: true
-      volumes:
-      - name: elasticsearch-logging
-        emptyDir: {}
diff --git a/deploy/addons-s390x/efk/elasticsearch-svc.yaml b/deploy/addons-s390x/efk/elasticsearch-svc.yaml
deleted file mode 100644
index f016778e6e3d..000000000000
--- a/deploy/addons-s390x/efk/elasticsearch-svc.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2017 The Kubernetes Authors All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: elasticsearch-logging
-  namespace: kube-system
-  labels:
-    k8s-app: elasticsearch-logging
-    kubernetes.io/minikube-addons: efk
-    addonmanager.kubernetes.io/mode: Reconcile
-spec:
-  ports:
-  - port: 9200
-    protocol: TCP
-    targetPort: db
-  selector:
-    k8s-app: elasticsearch-logging
diff --git a/deploy/addons-s390x/efk/fluentd-es-configmap.yaml b/deploy/addons-s390x/efk/fluentd-es-configmap.yaml
deleted file mode 100644
index 9f03814c8767..000000000000
--- a/deploy/addons-s390x/efk/fluentd-es-configmap.yaml
+++ /dev/null
@@ -1,293 +0,0 @@
-# Copyright 2017 The Kubernetes Authors All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: fluentd-es-config
-  namespace: kube-system
-  labels:
-    k8s-app: fluentd-es
-    kubernetes.io/minikube-addons: efk
-    addonmanager.kubernetes.io/mode: Reconcile
-data:
-  containers.input.conf: |-
-    # CRI Log Example:
-    # 2016-02-17T00:04:05.931087621Z stdout [info:2016-02-16T16:04:05.930-08:00] Some log text here
-    <source>
-      type tail
-      path /var/log/containers/*.log
-      pos_file /var/log/es-containers.log.pos
-      time_format %Y-%m-%dT%H:%M:%S.%NZ
-      tag kubernetes.*
-      read_from_head true
-      format multi_format
-      <pattern>
-        format json
-        time_key time
-        time_format %Y-%m-%dT%H:%M:%S.%NZ
-      </pattern>
-      <pattern>
-        format /^(?<time>.+)\b(?<stream>stdout|stderr)\b(?<log>.*)$/
-        time_format %Y-%m-%dT%H:%M:%S.%N%:z
-      </pattern>
-    </source>
-  system.input.conf: |-
-    # Example:
-    # 2015-12-21 23:17:22,066 [salt.state       ][INFO    ] Completed state [net.ipv4.ip_forward] at time 23:17:22.066081
-    <source>
-      type tail
-      format /^(?<time>[^ ]* [^ ,]*)[^\[]*\[[^\]]*\]\[(?<severity>[^ \]]*) *\] (?<message>.*)$/
-      time_format %Y-%m-%d %H:%M:%S
-      path /var/log/salt/minion
-      pos_file /var/log/es-salt.pos
-      tag salt
-    </source>
-
-    # Example:
-    # Dec 21 23:17:22 gke-foo-1-1-4b5cbd14-node-4eoj startupscript: Finished running startup script /var/run/google.startup.script
-    <source>
-      type tail
-      format syslog
-      path /var/log/startupscript.log
-      pos_file /var/log/es-startupscript.log.pos
-      tag startupscript
-    </source>
-
-    # Examples:
-    # time="2016-02-04T06:51:03.053580605Z" level=info msg="GET /containers/json"
-    # time="2016-02-04T07:53:57.505612354Z" level=error msg="HTTP Error" err="No such image: -f" statusCode=404
-    <source>
-      type tail
-      format /^time="(?<time>[^)]*)" level=(?<severity>[^ ]*) msg="(?<message>[^"]*)"( err="(?<error>[^"]*)")?( statusCode=($<status_code>\d+))?/
-      path /var/log/docker.log
-      pos_file /var/log/es-docker.log.pos
-      tag docker
-    </source>
-
-    # Example:
-    # 2016/02/04 06:52:38 filePurge: successfully removed file /var/etcd/data/member/wal/00000000000006d0-00000000010a23d1.wal
-    <source>
-      type tail
-      # Not parsing this, because it doesn't have anything particularly useful to
-      # parse out of it (like severities).
-      format none
-      path /var/log/etcd.log
-      pos_file /var/log/es-etcd.log.pos
-      tag etcd
-    </source>
-
-    # Multi-line parsing is required for all the kube logs because very large log
-    # statements, such as those that include entire object bodies, get split into
-    # multiple lines by glog.
-
-    # Example:
-    # I0204 07:32:30.020537    3368 server.go:1048] POST /stats/container/: (13.972191ms) 200 [[Go-http-client/1.1] 10.244.1.3:40537]
-    <source>
-      type tail
-      format multiline
-      multiline_flush_interval 5s
-      format_firstline /^\w\d{4}/
-      format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/
-      time_format %m%d %H:%M:%S.%N
-      path /var/log/kubelet.log
-      pos_file /var/log/es-kubelet.log.pos
-      tag kubelet
-    </source>
-
-    # Example:
-    # I1118 21:26:53.975789       6 proxier.go:1096] Port "nodePort for kube-system/default-http-backend:http" (:31429/tcp) was open before and is still needed
-    <source>
-      type tail
-      format multiline
-      multiline_flush_interval 5s
-      format_firstline /^\w\d{4}/
-      format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/
-      time_format %m%d %H:%M:%S.%N
-      path /var/log/kube-proxy.log
-      pos_file /var/log/es-kube-proxy.log.pos
-      tag kube-proxy
-    </source>
-
-    # Example:
-    # I0204 07:00:19.604280       5 handlers.go:131] GET /api/v1/nodes: (1.624207ms) 200 [[kube-controller-manager/v1.1.3 (linux/amd64) kubernetes/6a81b50] 127.0.0.1:38266]
-    <source>
-      type tail
-      format multiline
-      multiline_flush_interval 5s
-      format_firstline /^\w\d{4}/
-      format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/
-      time_format %m%d %H:%M:%S.%N
-      path /var/log/kube-apiserver.log
-      pos_file /var/log/es-kube-apiserver.log.pos
-      tag kube-apiserver
-    </source>
-
-    # Example:
-    # I0204 06:55:31.872680       5 servicecontroller.go:277] LB already exists and doesn't need update for service kube-system/kube-ui
-    <source>
-      type tail
-      format multiline
-      multiline_flush_interval 5s
-      format_firstline /^\w\d{4}/
-      format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/
-      time_format %m%d %H:%M:%S.%N
-      path /var/log/kube-controller-manager.log
-      pos_file /var/log/es-kube-controller-manager.log.pos
-      tag kube-controller-manager
-    </source>
-
-    # Example:
-    # W0204 06:49:18.239674       7 reflector.go:245] pkg/scheduler/factory/factory.go:193: watch of *api.Service ended with: 401: The event in requested index is outdated and cleared (the requested history has been cleared [2578313/2577886]) [2579312]
-    <source>
-      type tail
-      format multiline
-      multiline_flush_interval 5s
-      format_firstline /^\w\d{4}/
-      format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/
-      time_format %m%d %H:%M:%S.%N
-      path /var/log/kube-scheduler.log
-      pos_file /var/log/es-kube-scheduler.log.pos
-      tag kube-scheduler
-    </source>
-
-    # Example:
-    # I1104 10:36:20.242766       5 rescheduler.go:73] Running Rescheduler
-    <source>
-      type tail
-      format multiline
-      multiline_flush_interval 5s
-      format_firstline /^\w\d{4}/
-      format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/
-      time_format %m%d %H:%M:%S.%N
-      path /var/log/rescheduler.log
-      pos_file /var/log/es-rescheduler.log.pos
-      tag rescheduler
-    </source>
-
-    # Example:
-    # I0603 15:31:05.793605       6 cluster_manager.go:230] Reading config from path /etc/gce.conf
-    <source>
-      type tail
-      format multiline
-      multiline_flush_interval 5s
-      format_firstline /^\w\d{4}/
-      format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/
-      time_format %m%d %H:%M:%S.%N
-      path /var/log/glbc.log
-      pos_file /var/log/es-glbc.log.pos
-      tag glbc
-    </source>
-
-    # Example:
-    # I0603 15:31:05.793605       6 cluster_manager.go:230] Reading config from path /etc/gce.conf
-    <source>
-      type tail
-      format multiline
-      multiline_flush_interval 5s
-      format_firstline /^\w\d{4}/
-      format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/
-      time_format %m%d %H:%M:%S.%N
-      path /var/log/cluster-autoscaler.log
-      pos_file /var/log/es-cluster-autoscaler.log.pos
-      tag cluster-autoscaler
-    </source>
-
-    # Logs from systemd-journal for interesting services.
-    <source>
-      type systemd
-      filters [{ "_SYSTEMD_UNIT": "docker.service" }]
-      pos_file /var/log/gcp-journald-docker.pos
-      read_from_head true
-      tag docker
-    </source>
-
-    <source>
-      type systemd
-      filters [{ "_SYSTEMD_UNIT": "kubelet.service" }]
-      pos_file /var/log/gcp-journald-kubelet.pos
-      read_from_head true
-      tag kubelet
-    </source>
-
-    <source>
-      type systemd
-      filters [{ "_SYSTEMD_UNIT": "node-problem-detector.service" }]
-      pos_file /var/log/gcp-journald-node-problem-detector.pos
-      read_from_head true
-      tag node-problem-detector
-    </source>
-  forward.input.conf: |-
-    # Takes the messages sent over TCP
-    <source>
-      type forward
-    </source>
-  monitoring.conf: |-
-    # Prometheus Exporter Plugin
-    # input plugin that exports metrics
-    <source>
-      @type prometheus
-    </source>
-
-    <source>
-      @type monitor_agent
-    </source>
-
-    # input plugin that collects metrics from MonitorAgent
-    <source>
-      @type prometheus_monitor
-      <labels>
-        host ${hostname}
-      </labels>
-    </source>
-
-    # input plugin that collects metrics for output plugin
-    <source>
-      @type prometheus_output_monitor
-      <labels>
-        host ${hostname}
-      </labels>
-    </source>
-
-    # input plugin that collects metrics for in_tail plugin
-    <source>
-      @type prometheus_tail_monitor
-      <labels>
-        host ${hostname}
-      </labels>
-    </source>
-  output.conf: |-
-    # Enriches records with Kubernetes metadata
-    <filter kubernetes.**>
-      type kubernetes_metadata
-    </filter>
-
-    <match **>
-       type elasticsearch
-       log_level info
-       include_tag_key true
-       host elasticsearch-logging
-       port 9200
-       logstash_format true
-       # Set the chunk limits.
-       buffer_chunk_limit 2M
-       buffer_queue_limit 8
-       flush_interval 5s
-       # Never wait longer than 5 minutes between retries.
-       max_retry_wait 30
-       # Disable the limit on the number of retries (retry forever).
-       disable_retry_limit
-       # Use multiple threads for processing.
-       num_threads 2
-    </match>
diff --git a/deploy/addons-s390x/efk/fluentd-es-rc.yaml b/deploy/addons-s390x/efk/fluentd-es-rc.yaml
deleted file mode 100644
index 0c5e3581ebf5..000000000000
--- a/deploy/addons-s390x/efk/fluentd-es-rc.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2017 The Kubernetes Authors All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-kind: ReplicationController
-metadata:
-  name: fluentd-es
-  namespace: kube-system
-  labels:
-    k8s-app: fluentd-es
-    kubernetes.io/minikube-addons: efk
-    addonmanager.kubernetes.io/mode: Reconcile
-spec:
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        k8s-app: fluentd-es
-        addonmanager.kubernetes.io/mode: Reconcile
-    spec:
-      containers:
-      - name: fluentd-es
-        image: k8s.gcr.io/fluentd-elasticsearch:v2.0.2
-        env:
-        - name: FLUENTD_ARGS
-          value: --no-supervisor -q
-        resources:
-          limits:
-            memory: 500Mi
-          requests:
-            cpu: 100m
-            memory: 200Mi
-        volumeMounts:
-        - name: varlog
-          mountPath: /var/log
-        - name: varlibdockercontainers
-          mountPath: /var/lib/docker/containers
-          readOnly: true
-        - name: libsystemddir
-          mountPath: /host/lib
-          readOnly: true
-        - name: config-volume
-          mountPath: /etc/fluent/config.d
-      terminationGracePeriodSeconds: 30
-      volumes:
-      - name: varlog
-        hostPath:
-          path: /var/log
-      - name: varlibdockercontainers
-        hostPath:
-          path: /var/lib/docker/containers
-      # It is needed to copy systemd library to decompress journals
-      - name: libsystemddir
-        hostPath:
-          path: /usr/lib64
-      - name: config-volume
-        configMap:
-          name: fluentd-es-config
diff --git a/deploy/addons-s390x/efk/kibana-rc.yaml b/deploy/addons-s390x/efk/kibana-rc.yaml
deleted file mode 100644
index 7ad1b5a74c9d..000000000000
--- a/deploy/addons-s390x/efk/kibana-rc.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2017 The Kubernetes Authors All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-kind: ReplicationController
-metadata:
-  name: kibana-logging
-  namespace: kube-system
-  labels:
-    k8s-app: kibana-logging
-    kubernetes.io/minikube-addons: efk
-    addonmanager.kubernetes.io/mode: Reconcile
-spec:
-  replicas: 1
-  selector:
-      k8s-app: kibana-logging
-      addonmanager.kubernetes.io/mode: Reconcile
-  template:
-    metadata:
-      labels:
-        k8s-app: kibana-logging
-        addonmanager.kubernetes.io/mode: Reconcile
-    spec:
-      containers:
-      - name: kibana-logging
-        image: docker.elastic.co/kibana/kibana:5.6.2
-        resources:
-          limits:
-            cpu: 500m
-          requests:
-            cpu: 100m
-        env:
-          - name: ELASTICSEARCH_URL
-            value: http://elasticsearch-logging:9200
-          - name: XPACK_MONITORING_ENABLED
-            value: "false"
-          - name: XPACK_SECURITY_ENABLED
-            value: "false"
-        ports:
-        - containerPort: 5601
-          name: ui
-          protocol: TCP
diff --git a/deploy/addons-s390x/efk/kibana-svc.yaml b/deploy/addons-s390x/efk/kibana-svc.yaml
deleted file mode 100644
index 15e129b4d2a3..000000000000
--- a/deploy/addons-s390x/efk/kibana-svc.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2017 The Kubernetes Authors All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: kibana-logging
-  namespace: kube-system
-  labels:
-    k8s-app: kibana-logging
-    kubernetes.io/minikube-addons: efk
-    kubernetes.io/minikube-addons-endpoint: efk
-    addonmanager.kubernetes.io/mode: Reconcile
-spec:
-  type: NodePort
-  ports:
-  - port: 5601
-    nodePort: 30003
-    protocol: TCP
-    targetPort: ui
-  selector:
-    k8s-app: kibana-logging
diff --git a/deploy/addons-s390x/freshpod/freshpod-rc.yaml b/deploy/addons-s390x/freshpod/freshpod-rc.yaml
deleted file mode 100644
index 71680c7cf139..000000000000
--- a/deploy/addons-s390x/freshpod/freshpod-rc.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2018 The Kubernetes Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-kind: ReplicationController
-metadata:
-  name: freshpod
-  namespace: kube-system
-  labels:
-    k8s-app: freshpod
-    kubernetes.io/minikube-addons: freshpod
-    addonmanager.kubernetes.io/mode: Reconcile
-spec:
-  replicas: 1
-  selector:
-    k8s-app: freshpod
-    addonmanager.kubernetes.io/mode: Reconcile
-  template:
-    metadata:
-      labels:
-        k8s-app: freshpod
-        addonmanager.kubernetes.io/mode: Reconcile
-    spec:
-      containers:
-      - name: freshpod
-        image: gcr.io/google-samples/freshpod:v0.0.1
-        imagePullPolicy: IfNotPresent
-        volumeMounts:
-        - name: docker
-          mountPath: /var/run/docker.sock
-      volumes:
-      - name: docker
-        hostPath:
-          type: Socket
-          path: /var/run/docker.sock
-      terminationGracePeriodSeconds: 1
diff --git a/deploy/addons-s390x/heapster/grafana-svc.yaml b/deploy/addons-s390x/heapster/grafana-svc.yaml
deleted file mode 100644
index 61341604ab11..000000000000
--- a/deploy/addons-s390x/heapster/grafana-svc.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2017 The Kubernetes Authors All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    kubernetes.io/name: monitoring-grafana
-    kubernetes.io/minikube-addons: heapster
-    kubernetes.io/minikube-addons-endpoint: heapster
-    addonmanager.kubernetes.io/mode: Reconcile
-  name: monitoring-grafana
-  namespace: kube-system
-spec:
-  type: NodePort
-  ports:
-  - port: 80
-    nodePort: 30002
-    protocol: TCP
-    targetPort: ui
-  selector:
-    addonmanager.kubernetes.io/mode: Reconcile
-    k8s-app: influx-grafana
diff --git a/deploy/addons-s390x/heapster/heapster-rc.yaml b/deploy/addons-s390x/heapster/heapster-rc.yaml
deleted file mode 100644
index 3f1d545cb3ab..000000000000
--- a/deploy/addons-s390x/heapster/heapster-rc.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2017 The Kubernetes Authors All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-kind: ReplicationController
-metadata:
-  labels:
-    k8s-app: heapster
-    kubernetes.io/minikube-addons: heapster
-    addonmanager.kubernetes.io/mode: Reconcile
-    version: v1.5.3
-  name: heapster
-  namespace: kube-system
-spec:
-  replicas: 1
-  selector:
-    k8s-app: heapster
-    version: v1.5.3
-    addonmanager.kubernetes.io/mode: Reconcile
-  template:
-    metadata:
-      labels:
-        k8s-app: heapster
-        version: v1.5.3
-        addonmanager.kubernetes.io/mode: Reconcile
-    spec:
-      containers:
-      - name: heapster
-        image: k8s.gcr.io/heapster-s390x:v1.5.3
-        imagePullPolicy: IfNotPresent
-        command:
-        - /heapster
-        - --source=kubernetes.summary_api:''
-        - --sink=influxdb:http://monitoring-influxdb:8086
-        - --metric_resolution=60s
-        volumeMounts:
-        - name: ssl-certs
-          mountPath: /etc/ssl/certs
-          readOnly: true
-      volumes:
-      - name: ssl-certs
-        hostPath:
-          path: /etc/ssl/certs
diff --git a/deploy/addons-s390x/heapster/heapster-svc.yaml b/deploy/addons-s390x/heapster/heapster-svc.yaml
deleted file mode 100644
index 3db54f62aaff..000000000000
--- a/deploy/addons-s390x/heapster/heapster-svc.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2017 The Kubernetes Authors All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    kubernetes.io/name: heapster
-    kubernetes.io/minikube-addons: heapster
-    addonmanager.kubernetes.io/mode: Reconcile
-  name: heapster
-  namespace: kube-system
-spec:
-  ports:
-  - port: 80
-    targetPort: 8082
-  selector:
-    addonmanager.kubernetes.io/mode: Reconcile
-    k8s-app: heapster
diff --git a/deploy/addons-s390x/heapster/influxdb-svc.yaml b/deploy/addons-s390x/heapster/influxdb-svc.yaml
deleted file mode 100644
index 701bfee282c5..000000000000
--- a/deploy/addons-s390x/heapster/influxdb-svc.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2017 The Kubernetes Authors All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    kubernetes.io/name: monitoring-influxdb
-    kubernetes.io/minikube-addons: heapster
-    addonmanager.kubernetes.io/mode: Reconcile
-  name: monitoring-influxdb
-  namespace: kube-system
-spec:
-  ports:
-  - name: http
-    port: 8083
-    targetPort: 8083
-  - name: api
-    port: 8086
-    targetPort: 8086
-  selector:
-    addonmanager.kubernetes.io/mode: Reconcile
-    k8s-app: influx-grafana
diff --git a/deploy/addons-s390x/ingress/ingress-configmap.yaml b/deploy/addons-s390x/ingress/ingress-configmap.yaml
deleted file mode 100644
index 6cadddb9a96d..000000000000
--- a/deploy/addons-s390x/ingress/ingress-configmap.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2016 The Kubernetes Authors All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-data:
-  # see https://github.com/kubernetes/ingress-nginx/blob/master/docs/user-guide/nginx-configuration/configmap.md for all possible options and their description
-  map-hash-bucket-size: "128"
-  hsts: "false"
-kind: ConfigMap
-metadata:
-  name: nginx-load-balancer-conf
-  namespace: kube-system
-  labels:
-    addonmanager.kubernetes.io/mode: EnsureExists
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: tcp-services
-  namespace: kube-system
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: udp-services
-  namespace: kube-system
diff --git a/deploy/addons-s390x/ingress/ingress-dp.yaml b/deploy/addons-s390x/ingress/ingress-dp.yaml
deleted file mode 100644
index 552ff2c74521..000000000000
--- a/deploy/addons-s390x/ingress/ingress-dp.yaml
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 2016 The Kubernetes Authors All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: default-http-backend
-  namespace: kube-system
-  labels:
-    addonmanager.kubernetes.io/mode: Reconcile
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: default-http-backend
-      addonmanager.kubernetes.io/mode: Reconcile
-  template:
-    metadata:
-      labels:
-        app: default-http-backend
-        addonmanager.kubernetes.io/mode: Reconcile
-    spec:
-      terminationGracePeriodSeconds: 60
-      containers:
-      - name: default-http-backend
-        # Any image is permissible as long as:
-        # 1. It serves a 404 page at /
-        # 2. It serves 200 on a /healthz endpoint
-        image: k8s.gcr.io/defaultbackend-s390x:1.4
-        imagePullPolicy: IfNotPresent
-        livenessProbe:
-          httpGet:
-            path: /healthz
-            port: 8080
-            scheme: HTTP
-          initialDelaySeconds: 30
-          timeoutSeconds: 5
-        ports:
-        - containerPort: 8080
-        resources:
-          limits:
-            cpu: 10m
-            memory: 20Mi
-          requests:
-            cpu: 10m
-            memory: 20Mi
----
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: nginx-ingress-controller
-  namespace: kube-system
-  labels:
-    app: nginx-ingress-controller
-    addonmanager.kubernetes.io/mode: Reconcile
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: nginx-ingress-controller
-      addonmanager.kubernetes.io/mode: Reconcile
-  template:
-    metadata:
-      labels:
-        app: nginx-ingress-controller
-        name: nginx-ingress-controller
-        addonmanager.kubernetes.io/mode: Reconcile
-    spec:
-      terminationGracePeriodSeconds: 60
-      containers:
-      - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller-s390x:0.14.0
-        name: nginx-ingress-controller
-        imagePullPolicy: IfNotPresent
-        readinessProbe:
-          httpGet:
-            path: /healthz
-            port: 10254
-            scheme: HTTP
-        livenessProbe:
-          httpGet:
-            path: /healthz
-            port: 10254
-            scheme: HTTP
-          initialDelaySeconds: 10
-          timeoutSeconds: 1
-        env:
-          - name: POD_NAME
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.name
-          - name: POD_NAMESPACE
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.namespace
-        ports:
-        - containerPort: 80
-          hostPort: 80
-        - containerPort: 443
-          hostPort: 443
-        # we expose 18080 to access nginx stats in url /nginx-status
-        # this is optional
-        - containerPort: 18080
-          hostPort: 18080
-        args:
-        - /nginx-ingress-controller
-        - --default-backend-service=$(POD_NAMESPACE)/default-http-backend
-        - --configmap=$(POD_NAMESPACE)/nginx-load-balancer-conf
-        - --tcp-services-configmap=$(POD_NAMESPACE)/tcp-services
-        - --udp-services-configmap=$(POD_NAMESPACE)/udp-services
-        # use minikube IP address in ingress status field
-        - --report-node-internal-ip-address
diff --git a/deploy/addons-s390x/ingress/ingress-svc.yaml b/deploy/addons-s390x/ingress/ingress-svc.yaml
deleted file mode 100644
index 61c7518d60ec..000000000000
--- a/deploy/addons-s390x/ingress/ingress-svc.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2016 The Kubernetes Authors All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: default-http-backend
-  namespace: kube-system
-  labels:
-    app: default-http-backend
-    kubernetes.io/minikube-addons: ingress
-    kubernetes.io/minikube-addons-endpoint: ingress
-    addonmanager.kubernetes.io/mode: Reconcile
-spec:
-  type: NodePort
-  ports:
-  - port: 80
-    targetPort: 8080
-    nodePort: 30001
-  selector:
-    app: default-http-backend
diff --git a/deploy/addons-s390x/kube-dns/kube-dns-cm.yaml b/deploy/addons-s390x/kube-dns/kube-dns-cm.yaml
deleted file mode 100644
index 057857527a71..000000000000
--- a/deploy/addons-s390x/kube-dns/kube-dns-cm.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2016 The Kubernetes Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: kube-dns
-  namespace: kube-system
-  labels:
-    addonmanager.kubernetes.io/mode: EnsureExists
diff --git a/deploy/addons-s390x/kube-dns/kube-dns-controller.yaml b/deploy/addons-s390x/kube-dns/kube-dns-controller.yaml
deleted file mode 100644
index 73115417fdc6..000000000000
--- a/deploy/addons-s390x/kube-dns/kube-dns-controller.yaml
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 2016 The Kubernetes Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: kube-dns
-  namespace: kube-system
-  labels:
-    k8s-app: kube-dns
-    version: v20
-    addonmanager.kubernetes.io/mode: Reconcile
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      k8s-app: kube-dns
-  template:
-    metadata:
-      labels:
-        k8s-app: kube-dns
-      annotations:
-        scheduler.alpha.kubernetes.io/critical-pod: ''
-    spec:
-      tolerations:
-      - key: "CriticalAddonsOnly"
-        operator: "Exists"
-      volumes:
-      - name: kube-dns-config
-        configMap:
-          name: kube-dns
-          optional: true
-      containers:
-      - name: kubedns
-        image: k8s.gcr.io/k8s-dns-kube-dns-s390x:1.14.5
-        imagePullPolicy: IfNotPresent
-        resources:
-          # TODO: Set memory limits when we've profiled the container for large
-          # clusters, then set request = limit to keep this container in
-          # guaranteed class. Currently, this container falls into the
-          # "burstable" category so the kubelet doesn't backoff from restarting it.
-          limits:
-            memory: 170Mi
-          requests:
-            cpu: 100m
-            memory: 70Mi
-        livenessProbe:
-          httpGet:
-            path: /healthcheck/kubedns
-            port: 10054
-            scheme: HTTP
-          initialDelaySeconds: 60
-          timeoutSeconds: 5
-          successThreshold: 1
-          failureThreshold: 5
-        readinessProbe:
-          httpGet:
-            path: /readiness
-            port: 8081
-            scheme: HTTP
-          # we poll on pod startup for the Kubernetes master service and
-          # only setup the /readiness HTTP server once that's available.
-          initialDelaySeconds: 3
-          timeoutSeconds: 5
-        args:
-        - --domain=cluster.local.
-        - --dns-port=10053
-        - --config-map=kube-dns
-        - --v=2
-        env:
-        - name: PROMETHEUS_PORT
-          value: "10055"
-        ports:
-        - containerPort: 10053
-          name: dns-local
-          protocol: UDP
-        - containerPort: 10053
-          name: dns-tcp-local
-          protocol: TCP
-        - containerPort: 10055
-          name: metrics
-          protocol: TCP
-        volumeMounts:
-        - name: kube-dns-config
-          mountPath: /kube-dns-config
-      - name: dnsmasq
-        image: k8s.gcr.io/k8s-dns-dnsmasq-nanny-s390x:1.14.5
-        imagePullPolicy: IfNotPresent
-        livenessProbe:
-          httpGet:
-            path: /healthcheck/dnsmasq
-            port: 10054
-            scheme: HTTP
-          initialDelaySeconds: 60
-          timeoutSeconds: 5
-          successThreshold: 1
-          failureThreshold: 5
-        args:
-        - -v=2
-        - -logtostderr
-        - -configDir=/etc/k8s/dns/dnsmasq-nanny
-        - -restartDnsmasq=true
-        - --
-        - -k
-        - --cache-size=1000
-        - --log-facility=-
-        - --server=/cluster.local/127.0.0.1#10053
-        - --server=/in-addr.arpa/127.0.0.1#10053
-        - --server=/ip6.arpa/127.0.0.1#10053
-        ports:
-        - containerPort: 53
-          name: dns
-          protocol: UDP
-        - containerPort: 53
-          name: dns-tcp
-          protocol: TCP
-        # see: https://github.com/kubernetes/kubernetes/issues/29055 for details
-        resources:
-          requests:
-            cpu: 150m
-            memory: 20Mi
-        volumeMounts:
-        - name: kube-dns-config
-          mountPath: /etc/k8s/dns/dnsmasq-nanny
-      - name: sidecar
-        image: k8s.gcr.io/k8s-dns-sidecar-s390x:1.14.5
-        imagePullPolicy: IfNotPresent
-        livenessProbe:
-          httpGet:
-            path: /metrics
-            port: 10054
-            scheme: HTTP
-          initialDelaySeconds: 60
-          timeoutSeconds: 5
-          successThreshold: 1
-          failureThreshold: 5
-        args:
-        - --v=2
-        - --logtostderr
-        - --probe=kubedns,127.0.0.1:10053,kubernetes.default.svc.cluster.local.,5,A
-        - --probe=dnsmasq,127.0.0.1:53,kubernetes.default.svc.cluster.local.,5,A
-        ports:
-        - containerPort: 10054
-          name: metrics
-          protocol: TCP
-        resources:
-          requests:
-            memory: 20Mi
-            cpu: 10m
-      dnsPolicy: Default  # Don't use cluster DNS.
diff --git a/deploy/addons-s390x/kube-dns/kube-dns-svc.yaml b/deploy/addons-s390x/kube-dns/kube-dns-svc.yaml
deleted file mode 100644
index 03ea5c491a55..000000000000
--- a/deploy/addons-s390x/kube-dns/kube-dns-svc.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Kubernetes Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: kube-dns
-  namespace: kube-system
-  labels:
-    k8s-app: kube-dns
-    addonmanager.kubernetes.io/mode: Reconcile
-    kubernetes.io/name: "KubeDNS"
-spec:
-  selector:
-    k8s-app: kube-dns
-  clusterIP: 10.96.0.10
-  ports:
-  - name: dns
-    port: 53
-    protocol: UDP
-  - name: dns-tcp
-    port: 53
-    protocol: TCP
diff --git a/deploy/addons-s390x/metrics-server/metrics-apiservice.yaml b/deploy/addons-s390x/metrics-server/metrics-apiservice.yaml
deleted file mode 100644
index a644200fa526..000000000000
--- a/deploy/addons-s390x/metrics-server/metrics-apiservice.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-apiVersion: apiregistration.k8s.io/v1beta1
-kind: APIService
-metadata:
-  name: v1beta1.metrics.k8s.io
-  labels:
-    kubernetes.io/minikube-addons: metrics-server
-    addonmanager.kubernetes.io/mode: Reconcile
-spec:
-  service:
-    name: metrics-server
-    namespace: kube-system
-  group: metrics.k8s.io
-  version: v1beta1
-  insecureSkipTLSVerify: true
-  groupPriorityMinimum: 100
-  versionPriority: 100
diff --git a/deploy/addons-s390x/metrics-server/metrics-server-service.yaml b/deploy/addons-s390x/metrics-server/metrics-server-service.yaml
deleted file mode 100644
index e3766c9e8de5..000000000000
--- a/deploy/addons-s390x/metrics-server/metrics-server-service.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: metrics-server
-  namespace: kube-system
-  labels:
-    kubernetes.io/name: "Metrics-server"
-    kubernetes.io/minikube-addons: metrics-server
-    kubernetes.io/minikube-addons-endpoint: metrics-server
-    addonmanager.kubernetes.io/mode: Reconcile
-spec:
-  selector:
-    k8s-app: metrics-server
-  ports:
-  - port: 443
-    protocol: TCP
-    targetPort: 443
diff --git a/deploy/addons-s390x/registry-creds/registry-creds-rc.yaml b/deploy/addons-s390x/registry-creds/registry-creds-rc.yaml
deleted file mode 100644
index 2dbc0b4e821b..000000000000
--- a/deploy/addons-s390x/registry-creds/registry-creds-rc.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
-apiVersion: v1
-kind: ReplicationController
-metadata:
-  name: registry-creds
-  namespace: kube-system
-  labels:
-    version: v1.9
-    addonmanager.kubernetes.io/mode: Reconcile
-    kubernetes.io/minikube-addons: registry-creds
-spec:
-  replicas: 1
-  selector:
-    name: registry-creds
-    version: v1.9
-    addonmanager.kubernetes.io/mode: Reconcile
-  template:
-    metadata:
-      labels:
-        name: registry-creds
-        version: v1.9
-        addonmanager.kubernetes.io/mode: Reconcile
-    spec:
-      containers:
-      - image: registry.hub.docker.com/upmcenterprises/registry-creds:1.9
-        name: registry-creds
-        imagePullPolicy: Always
-        env:
-          - name: AWS_ACCESS_KEY_ID
-            valueFrom:
-              secretKeyRef:
-                name: registry-creds-ecr
-                key: AWS_ACCESS_KEY_ID
-          - name: AWS_SECRET_ACCESS_KEY
-            valueFrom:
-              secretKeyRef:
-                name: registry-creds-ecr
-                key: AWS_SECRET_ACCESS_KEY
-          - name: AWS_SESSION_TOKEN
-            valueFrom:
-              secretKeyRef:
-                name: registry-creds-ecr
-                key: AWS_SESSION_TOKEN
-          - name: awsregion
-            valueFrom:
-              secretKeyRef:
-                name: registry-creds-ecr
-                key: aws-region
-          - name: awsaccount
-            valueFrom:
-              secretKeyRef:
-                name: registry-creds-ecr
-                key: aws-account
-          - name: aws_assume_role
-            valueFrom:
-              secretKeyRef:
-                name: registry-creds-ecr
-                key: aws-assume-role
-          - name: awsregion
-            valueFrom:
-              secretKeyRef:
-                name: registry-creds-ecr
-                key: aws-region
-          - name: DOCKER_PRIVATE_REGISTRY_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: registry-creds-dpr
-                key: DOCKER_PRIVATE_REGISTRY_PASSWORD
-          - name: DOCKER_PRIVATE_REGISTRY_SERVER
-            valueFrom:
-              secretKeyRef:
-                name: registry-creds-dpr
-                key: DOCKER_PRIVATE_REGISTRY_SERVER
-          - name: DOCKER_PRIVATE_REGISTRY_USER
-            valueFrom:
-              secretKeyRef:
-                name: registry-creds-dpr
-                key: DOCKER_PRIVATE_REGISTRY_USER
-          - name: gcrurl
-            valueFrom:
-              secretKeyRef:
-                name: registry-creds-gcr
-                key: gcrurl
-        volumeMounts:
-        - name: gcr-creds
-          mountPath: "/root/.config/gcloud"
-          readOnly: true
-      volumes:
-      - name: gcr-creds
-        secret:
-          secretName: registry-creds-gcr
-          items:
-            - key: "application_default_credentials.json"
-              path: "application_default_credentials.json"
-
diff --git a/deploy/addons-s390x/registry/registry-rc.yaml b/deploy/addons-s390x/registry/registry-rc.yaml
deleted file mode 100644
index aa0a59ee7ace..000000000000
--- a/deploy/addons-s390x/registry/registry-rc.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-apiVersion: v1
-kind: ReplicationController
-metadata:
-  labels:
-    kubernetes.io/minikube-addons: registry
-    addonmanager.kubernetes.io/mode: Reconcile
-  name: registry
-  namespace: kube-system
-spec:
-  replicas: 1
-  selector:
-    kubernetes.io/minikube-addons: registry
-  template:
-    metadata:
-      labels:
-        kubernetes.io/minikube-addons: registry
-        addonmanager.kubernetes.io/mode: Reconcile
-    spec:
-      containers:
-      - image: registry.hub.docker.com/library/registry:2.6.1
-        imagePullPolicy: IfNotPresent
-        name: registry
-        ports:
-        - containerPort: 5000
-          protocol: TCP
diff --git a/deploy/addons-s390x/registry/registry-svc.yaml b/deploy/addons-s390x/registry/registry-svc.yaml
deleted file mode 100644
index e9f618ae256d..000000000000
--- a/deploy/addons-s390x/registry/registry-svc.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    kubernetes.io/minikube-addons: registry
-    addonmanager.kubernetes.io/mode: Reconcile
-  name: registry
-  namespace: kube-system
-spec:
-  type: ClusterIP
-  ports:
-  - port: 80
-    targetPort: 5000
-  selector:
-    kubernetes.io/minikube-addons: registry
diff --git a/deploy/addons-s390x/storage-provisioner/storage-provisioner.yaml b/deploy/addons-s390x/storage-provisioner/storage-provisioner.yaml
deleted file mode 100644
index 44610d4103a8..000000000000
--- a/deploy/addons-s390x/storage-provisioner/storage-provisioner.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2016 The Kubernetes Authors All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: storage-provisioner
-  namespace: kube-system
-  labels:
-    addonmanager.kubernetes.io/mode: Reconcile
-
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: storage-provisioner
-  labels:
-    addonmanager.kubernetes.io/mode: EnsureExists
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: system:persistent-volume-provisioner
-subjects:
-  - kind: ServiceAccount
-    name: storage-provisioner
-    namespace: kube-system
-
----
-apiVersion: v1
-kind: Pod
-metadata:
-  name: storage-provisioner
-  namespace: kube-system
-  labels:
-    integration-test: storage-provisioner
-    addonmanager.kubernetes.io/mode: Reconcile
-spec:
-  serviceAccountName: storage-provisioner
-  hostNetwork: true
-  containers:
-  - name: storage-provisioner
-    image: gcr.io/k8s-minikube/storage-provisioner-s390x:v1.8.1
-    command: ["/storage-provisioner"]
-    imagePullPolicy: IfNotPresent
-    volumeMounts:
-    - mountPath: /tmp
-      name: tmp
-  volumes:
-  - name: tmp
-    hostPath:
-      path: /tmp
-      type: Directory
diff --git a/deploy/addons-s390x/storageclass/storageclass.yaml b/deploy/addons-s390x/storageclass/storageclass.yaml
deleted file mode 100644
index acc218276e04..000000000000
--- a/deploy/addons-s390x/storageclass/storageclass.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-kind: StorageClass
-apiVersion: storage.k8s.io/v1
-metadata:
-  namespace: kube-system
-  name: standard
-  annotations:
-    storageclass.beta.kubernetes.io/is-default-class: "true"
-  labels:
-    addonmanager.kubernetes.io/mode: Reconcile
-
-provisioner: k8s.io/minikube-hostpath
diff --git a/deploy/addons-s390x/heapster/influx-grafana-rc.yaml b/deploy/addons/heapster/influx-grafana-rc.tmp~HEAD
similarity index 95%
rename from deploy/addons-s390x/heapster/influx-grafana-rc.yaml
rename to deploy/addons/heapster/influx-grafana-rc.tmp~HEAD
index 6cabe39b5311..a2b2cc24a599 100644
--- a/deploy/addons-s390x/heapster/influx-grafana-rc.yaml
+++ b/deploy/addons/heapster/influx-grafana-rc.tmp~HEAD
@@ -34,7 +34,7 @@ spec:
     spec:
       containers:
       - name: influxdb
-        image: k8s.gcr.io/heapster-influxdb-s390x:v1.3.3
+        image: k8s.gcr.io/heapster-influxdb-IMAGETAG:v1.3.3
         imagePullPolicy: IfNotPresent
         ports:
         - name: http
@@ -45,7 +45,7 @@ spec:
         - mountPath: /data
           name: influxdb-storage
       - name: grafana
-        image: k8s.gcr.io/heapster-grafana-s390x:v4.4.3
+        image: k8s.gcr.io/heapster-grafana-IMAGETAG:v4.4.3
         imagePullPolicy: IfNotPresent
         env:
           - name: INFLUXDB_SERVICE_URL
diff --git a/deploy/addons/heapster/influx-grafana-rc.tmp~up_multiarch-templatize b/deploy/addons/heapster/influx-grafana-rc.tmp~up_multiarch-templatize
new file mode 100644
index 000000000000..a2b2cc24a599
--- /dev/null
+++ b/deploy/addons/heapster/influx-grafana-rc.tmp~up_multiarch-templatize
@@ -0,0 +1,75 @@
+# Copyright 2017 The Kubernetes Authors All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: v1
+kind: ReplicationController
+metadata:
+  name: influxdb-grafana
+  labels:
+    k8s-app: influx-grafana
+    kubernetes.io/minikube-addons: heapster
+    addonmanager.kubernetes.io/mode: Reconcile
+  namespace: kube-system
+spec:
+  replicas: 1
+  selector:
+    k8s-app: influx-grafana
+    addonmanager.kubernetes.io/mode: Reconcile
+  template:
+    metadata:
+      labels:
+        k8s-app: influx-grafana
+        addonmanager.kubernetes.io/mode: Reconcile
+    spec:
+      containers:
+      - name: influxdb
+        image: k8s.gcr.io/heapster-influxdb-IMAGETAG:v1.3.3
+        imagePullPolicy: IfNotPresent
+        ports:
+        - name: http
+          containerPort: 8083
+        - name: api
+          containerPort: 8086
+        volumeMounts:
+        - mountPath: /data
+          name: influxdb-storage
+      - name: grafana
+        image: k8s.gcr.io/heapster-grafana-IMAGETAG:v4.4.3
+        imagePullPolicy: IfNotPresent
+        env:
+          - name: INFLUXDB_SERVICE_URL
+            value: http://localhost:8086
+            # The following env variables are required to make Grafana accessible via
+            # the kubernetes api-server proxy. On production clusters, we recommend
+            # removing these env variables, setup auth for grafana, and expose the grafana
+            # service using a LoadBalancer or a public IP.
+          - name: GF_AUTH_BASIC_ENABLED
+            value: "false"
+          - name: GF_AUTH_ANONYMOUS_ENABLED
+            value: "true"
+          - name: GF_AUTH_ANONYMOUS_ORG_ROLE
+            value: Admin
+          - name: GF_SERVER_ROOT_URL
+            value: /
+        ports:
+        - name: ui
+          containerPort: 3000
+        volumeMounts:
+        - mountPath: /var
+          name: grafana-storage
+      volumes:
+      - name: influxdb-storage
+        emptyDir: {}
+      - name: grafana-storage
+        emptyDir: {}
diff --git a/deploy/addons-s390x/metrics-server/metrics-server-deployment.yaml b/deploy/addons/metrics-server/metrics-server-deployment.tmp~HEAD
similarity index 91%
rename from deploy/addons-s390x/metrics-server/metrics-server-deployment.yaml
rename to deploy/addons/metrics-server/metrics-server-deployment.tmp~HEAD
index bee582bd9560..e69c42039e6c 100644
--- a/deploy/addons-s390x/metrics-server/metrics-server-deployment.yaml
+++ b/deploy/addons/metrics-server/metrics-server-deployment.tmp~HEAD
@@ -19,7 +19,7 @@ spec:
     spec:
       containers:
       - name: metrics-server
-        image: k8s.gcr.io/metrics-server-s390x:v0.2.1
+        image: k8s.gcr.io/metrics-server-IMAGETAG:v0.2.1
         imagePullPolicy: Always
         command:
         - /metrics-server
diff --git a/deploy/addons/metrics-server/metrics-server-deployment.tmp~up_multiarch-templatize b/deploy/addons/metrics-server/metrics-server-deployment.tmp~up_multiarch-templatize
new file mode 100644
index 000000000000..e69c42039e6c
--- /dev/null
+++ b/deploy/addons/metrics-server/metrics-server-deployment.tmp~up_multiarch-templatize
@@ -0,0 +1,26 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: metrics-server
+  namespace: kube-system
+  labels:
+    k8s-app: metrics-server
+    kubernetes.io/minikube-addons: metrics-server
+    addonmanager.kubernetes.io/mode: Reconcile
+spec:
+  selector:
+    matchLabels:
+      k8s-app: metrics-server
+  template:
+    metadata:
+      name: metrics-server
+      labels:
+        k8s-app: metrics-server
+    spec:
+      containers:
+      - name: metrics-server
+        image: k8s.gcr.io/metrics-server-IMAGETAG:v0.2.1
+        imagePullPolicy: Always
+        command:
+        - /metrics-server
+        - --source=kubernetes.summary_api:''