diff --git a/src/template.yml b/src/template.yml
index dfe735ca3..ee39a390e 100644
--- a/src/template.yml
+++ b/src/template.yml
@@ -670,12 +670,18 @@ Resources:
                     "CreateOrUpdateBaseStack": {
                         "Type": "Task",
                         "Resource": "${CrossAccountExecuteFunction.Arn}",
-                        "Next": "WaitUntilBootstrapComplete",
+                        "Retry": [{
+                            "ErrorEquals": ["InvalidTemplateError", "GenericAccountConfigureError"],
+                            "IntervalSeconds": 1,
+                            "BackoffRate": 1.1,
+                            "MaxAttempts": 45
+                        }],
                         "Catch": [{
                             "ErrorEquals": ["States.ALL"],
                             "Next": "ExecuteDeploymentAccountStateMachine",
                             "ResultPath": "$.error"
                         }],
+                        "Next": "WaitUntilBootstrapComplete",
                         "TimeoutSeconds": 600
                     },
                     "MovedToRootAction": {