diff --git a/.autover/changes/721a3463-3ad9-413d-b2b6-11efb7575fac.json b/.autover/changes/721a3463-3ad9-413d-b2b6-11efb7575fac.json
new file mode 100644
index 00000000..dd6c6fea
--- /dev/null
+++ b/.autover/changes/721a3463-3ad9-413d-b2b6-11efb7575fac.json
@@ -0,0 +1,11 @@
+{
+  "Projects": [
+    {
+      "Name": "AWS.Deploy.CLI",
+      "Type": "Patch",
+      "ChangelogMessages": [
+        "Update beanstalk platform resolution logic to additionally use 'Deprecated' versions in order to continue supporting .NET 6."
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/AWS.Deploy.Orchestration/CDK/CDKBootstrapTemplate.yaml b/src/AWS.Deploy.Orchestration/CDK/CDKBootstrapTemplate.yaml
index 205243a2..f5a5db52 100644
--- a/src/AWS.Deploy.Orchestration/CDK/CDKBootstrapTemplate.yaml
+++ b/src/AWS.Deploy.Orchestration/CDK/CDKBootstrapTemplate.yaml
@@ -203,7 +203,11 @@ Resources:
           - Id: CleanupOldVersions
             Status: Enabled
             NoncurrentVersionExpiration:
-              NoncurrentDays: 365
+              NoncurrentDays: 30
+          - Id: AbortIncompleteMultipartUploads
+            Status: Enabled
+            AbortIncompleteMultipartUpload:
+              DaysAfterInitiation: 1
     UpdateReplacePolicy: Delete
     DeletionPolicy: Delete
   StagingBucketPolicy:
@@ -611,7 +615,7 @@ Resources:
       Type: String
       Name:
         Fn::Sub: /cdk-bootstrap/${Qualifier}/version
-      Value: "23"
+      Value: "25"
 Outputs:
   BucketName:
     Description: The name of the S3 bucket owned by the CDK toolkit stack
diff --git a/src/AWS.Deploy.Orchestration/Data/AWSResourceQueryer.cs b/src/AWS.Deploy.Orchestration/Data/AWSResourceQueryer.cs
index ea9fdf6d..7445cb4f 100644
--- a/src/AWS.Deploy.Orchestration/Data/AWSResourceQueryer.cs
+++ b/src/AWS.Deploy.Orchestration/Data/AWSResourceQueryer.cs
@@ -574,7 +574,7 @@ public async Task<List<PlatformSummary>> GetElasticBeanstalkPlatformArns(string?
                 if (string.IsNullOrEmpty(version.PlatformCategory) || string.IsNullOrEmpty(version.PlatformBranchLifecycleState))
                     continue;
 
-                if (!version.PlatformBranchLifecycleState.Equals("Supported"))
+                if (!(version.PlatformBranchLifecycleState.Equals("Supported") || version.PlatformBranchLifecycleState.Equals("Deprecated")))
                     continue;
 
                 platformVersions.Add(version);