diff --git a/roles/kubernetes-apps/ansible/tasks/etcd_metrics.yml b/roles/kubernetes-apps/ansible/tasks/etcd_metrics.yml
deleted file mode 100644
index 580ab66db..000000000
--- a/roles/kubernetes-apps/ansible/tasks/etcd_metrics.yml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-- name: Kubernetes Apps | Lay down etcd_metrics templates
-  template:
-    src: "{{ item.file }}.j2"
-    dest: "{{ kube_config_dir }}/{{ item.file }}"
-    mode: "0644"
-  with_items:
-    - { file: etcd_metrics-endpoints.yml, type: endpoints, name: etcd-metrics }
-    - { file: etcd_metrics-service.yml, type: service, name: etcd-metrics }
-  register: manifests
-  when: inventory_hostname == groups['kube_control_plane'][0]
-
-- name: Kubernetes Apps | Start etcd_metrics
-  kube:
-    name: "{{ item.item.name }}"
-    namespace: kube-system
-    kubectl: "{{ bin_dir }}/kubectl"
-    resource: "{{ item.item.type }}"
-    filename: "{{ kube_config_dir }}/{{ item.item.file }}"
-    state: "latest"
-  with_items: "{{ manifests.results }}"
-  when: inventory_hostname == groups['kube_control_plane'][0]
diff --git a/roles/kubernetes-apps/ansible/tasks/main.yml b/roles/kubernetes-apps/ansible/tasks/main.yml
index b88b8d897..75df86a25 100644
--- a/roles/kubernetes-apps/ansible/tasks/main.yml
+++ b/roles/kubernetes-apps/ansible/tasks/main.yml
@@ -55,7 +55,14 @@
     label: "{{ item.item.file }}"
 
 - name: Kubernetes Apps | Etcd metrics endpoints
-  import_tasks: etcd_metrics.yml
+  command:
+    cmd: "{{ kubectl_apply_stdin }}"
+    stdin: "{{ lookup('template', item) }}"
+  delegate_to: "{{ groups['kube_control_plane'][0] }}"
+  run_once: true
+  loop:
+    - etcd_metrics-endpoints.yml.j2
+    - etcd_metrics-service.yml.j2
   when: etcd_metrics_port is defined and etcd_metrics_service_labels is defined
   tags:
     - etcd_metrics