diff --git a/roles/tackle/tasks/main.yml b/roles/tackle/tasks/main.yml
index a4a2ccb..01c38cd 100644
--- a/roles/tackle/tasks/main.yml
+++ b/roles/tackle/tasks/main.yml
@@ -392,6 +392,30 @@
     - feature_auth_required|bool
     - app_profile == "mta"
 
+# Create all the neccessary CR's before the hub deployment is created
+- name: "Remove Admin Addon CR"
+  k8s:
+    state: absent
+    kind: Addon
+    api_version: tackle.konveyor.io/v1alpha2
+    name: "{{ admin_name }}"
+    namespace: "{{ app_namespace }}"
+
+- name: "Create Windup Addon CR"
+  k8s:
+    state: present
+    definition: "{{ lookup('template', 'customresource-addon-analyzer.yml.j2') }}"
+
+- name: "Create Language Discovery Addon CR"
+  k8s:
+    state: present
+    definition: "{{ lookup('template', 'customresource-addon-language-discovery.yml.j2') }}"
+
+- name: "Create Tech Discovery Addon CR"
+  k8s:
+    state: present
+    definition: "{{ lookup('template', 'customresource-addon-tech-discovery.yml.j2') }}"
+
 - name: "Setup Hub API Service"
   k8s:
     state: present
@@ -458,21 +482,6 @@
     name: "{{ admin_name }}"
     namespace: "{{ app_namespace }}"
 
-- name: "Create Windup Addon CR"
-  k8s:
-    state: present
-    definition: "{{ lookup('template', 'customresource-addon-analyzer.yml.j2') }}"
-
-- name: "Create Language Discovery Addon CR"
-  k8s:
-    state: present
-    definition: "{{ lookup('template', 'customresource-addon-language-discovery.yml.j2') }}"
-
-- name: "Create Tech Discovery Addon CR"
-  k8s:
-    state: present
-    definition: "{{ lookup('template', 'customresource-addon-tech-discovery.yml.j2') }}"
-
 - name: "Create Network Policy"
   k8s:
     state: present