diff --git a/.github/actions/start-minikube/action.yml b/.github/actions/start-minikube/action.yml
index 2e5a0fca..2906d37c 100644
--- a/.github/actions/start-minikube/action.yml
+++ b/.github/actions/start-minikube/action.yml
@@ -36,7 +36,7 @@ runs:
       container-runtime: ${{ inputs.container-runtime }}
       kubernetes-version: ${{ inputs.kubernetes-version }}
       cpus: ${{ inputs.cpus }}
-      memory: ${{ inputs.memory }}
+      memory: 8000
       cni: ${{ inputs.cni }}
   # Don't pass minikube start ${ARGS} as they are handled in setup-minikube
   - name: Start minikube
diff --git a/roles/tackle/tasks/main.yml b/roles/tackle/tasks/main.yml
index 3f2de493..7fd6082c 100644
--- a/roles/tackle/tasks/main.yml
+++ b/roles/tackle/tasks/main.yml
@@ -458,6 +458,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
@@ -516,29 +540,6 @@
     name: "{{ app_name }}-maven-volume-claim"
     namespace: "{{ app_namespace }}"
 
-- 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: "Create Network Policy"
   k8s:
     state: present