diff --git a/tasks/k3s/configure.yaml b/tasks/k3s/configure.yaml
index abe54a8..bd7e490 100644
--- a/tasks/k3s/configure.yaml
+++ b/tasks/k3s/configure.yaml
@@ -1,38 +1,5 @@
 ---
 
-- name: Local Container Registry
-  ansible.builtin.copy:
-    content: |
-      #
-      # Private Container Registries for Kubernetes
-      #
-      # Managed By ansible/role/nfc_kubernetes
-      #
-      # Dont edit this file directly as it will be overwritten.
-      #
-
-      {% set registries = kubernetes_private_container_registry | default([]) -%}
-
-      {% if registries | length > 0 %}mirrors:
-        {% for entry in registries %}
-
-        {{ entry.name }}:
-          endpoint:
-            - "{{ entry.url }}"
-
-        {%- endfor %}
-      {% endif %}
-    dest: /etc/rancher/k3s/registries.yaml
-    owner: root
-    mode: '700'
-  # notify: "restart ContainerD"
-  # with_items: "{{ containerd.repositories }}"
-  # when:
-  #   ansible_os_family == 'Debian'
-  #    and
-  #  Kubernetes_private_container_registry | default([]) | length > 0
-
-
 - name: Additional config files
   ansible.builtin.copy:
     content: |
@@ -55,8 +22,6 @@
   loop: "{{ templates_to_apply }}"
   vars:
     templates_to_apply:
-      - src: "calico.yaml.j2"
-        dest: /var/lib/rancher/k3s/server/manifests/calico.yaml
 
       - src: kubernetes-manifest-rbac.yaml.j2
         dest: /var/lib/rancher/k3s/server/manifests/rbac-authorization-common.yaml
@@ -65,10 +30,3 @@
         dest: "/etc/iptables.rules.d/iptables-kubernetes.rules"
         notify: firewall_reloader
 
-      - src: k3s-registries.yaml.j2
-        dest: /etc/rancher/k3s/registries.yaml
-        notify: kubernetes_restart
-
-      - src: k3s-config.yaml.j2
-        dest: /etc/rancher/k3s/config.yaml
-        notify: kubernetes_restart
diff --git a/tasks/k3s/install.yaml b/tasks/k3s/install.yaml
index 073c381..78142fe 100644
--- a/tasks/k3s/install.yaml
+++ b/tasks/k3s/install.yaml
@@ -134,6 +134,11 @@
       - src: k3s-config.yaml.j2
         dest: /etc/rancher/k3s/config.yaml
         notify: kubernetes_restart
+      - src: "calico.yaml.j2"
+        dest: /var/lib/rancher/k3s/server/manifests/calico.yaml
+      - src: k3s-registries.yaml.j2
+        dest: /etc/rancher/k3s/registries.yaml
+        notify: kubernetes_restart
   when: >
     kubernetes_config.cluster.prime.name == inventory_hostname