diff --git a/CHANGELOG.md b/CHANGELOG.md
index dcf7504..d679c80 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ---
 
+## [1.13.1] - 2025-05-28
+
+### 1.13.1 Fixed
+
+- Fix issue with Download container build timing out
+
+---
+
 ## [1.13.0] - 2025-03-14
 
 ### 1.13.0 Update
diff --git a/infrastructure/cloudformation/batch-protein-folding-cfn-container.yaml b/infrastructure/cloudformation/batch-protein-folding-cfn-container.yaml
index 3a3328f..863cac6 100644
--- a/infrastructure/cloudformation/batch-protein-folding-cfn-container.yaml
+++ b/infrastructure/cloudformation/batch-protein-folding-cfn-container.yaml
@@ -373,7 +373,8 @@ Resources:
       ResourceAccessRole: !GetAtt CodeBuildRole.Arn
       ServiceRole: !GetAtt CodeBuildRole.Arn
       Source:
-        BuildSpec: infrastructure/docker/buildspec.yaml
+        # BuildSpec: infrastructure/docker/buildspec.yaml
+        BuildSpec: infrastructure/docker/download/buildspec_with_wait.yaml
         Location: !Sub "${CodeRepoS3BucketName}/main/batch-protein-folding.zip"
         Type: S3
       Tags: