diff --git a/src/services/data/serverless.yml b/src/services/data/serverless.yml
index 3f5a79188c..fb2b85a4e9 100644
--- a/src/services/data/serverless.yml
+++ b/src/services/data/serverless.yml
@@ -710,6 +710,7 @@ resources:
       Type: Custom::SetupIndex
       Properties:
         ServiceToken: !GetAtt SetupIndexCustomResourceLambdaFunction.Arn
+      DependsOn: MapRole # This lambda needs the roles mapped before setting up the index
   Outputs:
     OpenSearchDomainArn:
       Value: !GetAtt OpenSearch.Arn