diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/athena/integ.start-query-execution.js.snapshot/aws-stepfunctions-tasks-athena-start-query-execution-integ.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/athena/integ.start-query-execution.js.snapshot/aws-stepfunctions-tasks-athena-start-query-execution-integ.assets.json
index 36f0b46f269d3..edd08de11d7f9 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/athena/integ.start-query-execution.js.snapshot/aws-stepfunctions-tasks-athena-start-query-execution-integ.assets.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/athena/integ.start-query-execution.js.snapshot/aws-stepfunctions-tasks-athena-start-query-execution-integ.assets.json
@@ -1,7 +1,7 @@
 {
-  "version": "30.0.0",
+  "version": "32.0.0",
   "files": {
-    "4c057537867d65c4b98525bdce151c8a8c2babbe4117b04526bf194d8c82d40f": {
+    "d5b0852cda8e09b47bbf34672fc71a205e9a3e7dcd0ce808bb607ce6714fab1a": {
       "source": {
         "path": "aws-stepfunctions-tasks-athena-start-query-execution-integ.template.json",
         "packaging": "file"
@@ -9,7 +9,7 @@
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "4c057537867d65c4b98525bdce151c8a8c2babbe4117b04526bf194d8c82d40f.json",
+          "objectKey": "d5b0852cda8e09b47bbf34672fc71a205e9a3e7dcd0ce808bb607ce6714fab1a.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/athena/integ.start-query-execution.js.snapshot/aws-stepfunctions-tasks-athena-start-query-execution-integ.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/athena/integ.start-query-execution.js.snapshot/aws-stepfunctions-tasks-athena-start-query-execution-integ.template.json
index 398dfa71cd6e5..22315b3749901 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/athena/integ.start-query-execution.js.snapshot/aws-stepfunctions-tasks-athena-start-query-execution-integ.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/athena/integ.start-query-execution.js.snapshot/aws-stepfunctions-tasks-athena-start-query-execution-integ.template.json
@@ -1,295 +1,295 @@
 {
- "Resources": {
-  "StateMachineRoleB840431D": {
-   "Type": "AWS::IAM::Role",
-   "Properties": {
-    "AssumeRolePolicyDocument": {
-     "Statement": [
-      {
-       "Action": "sts:AssumeRole",
-       "Effect": "Allow",
-       "Principal": {
-        "Service": "states.amazonaws.com"
+    "Resources": {
+     "StateMachineRoleB840431D": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+       "AssumeRolePolicyDocument": {
+        "Statement": [
+         {
+          "Action": "sts:AssumeRole",
+          "Effect": "Allow",
+          "Principal": {
+           "Service": "states.amazonaws.com"
+          }
+         }
+        ],
+        "Version": "2012-10-17"
        }
       }
-     ],
-     "Version": "2012-10-17"
-    }
-   }
-  },
-  "StateMachineRoleDefaultPolicyDF1E6607": {
-   "Type": "AWS::IAM::Policy",
-   "Properties": {
-    "PolicyDocument": {
-     "Statement": [
-      {
-       "Action": [
-        "athena:getDataCatalog",
-        "athena:getQueryExecution",
-        "athena:startQueryExecution"
-       ],
-       "Effect": "Allow",
-       "Resource": [
-        {
-         "Fn::Join": [
-          "",
-          [
-           "arn:",
-           {
-            "Ref": "AWS::Partition"
-           },
-           ":athena:",
+     },
+     "StateMachineRoleDefaultPolicyDF1E6607": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+       "PolicyDocument": {
+        "Statement": [
+         {
+          "Action": [
+           "athena:getDataCatalog",
+           "athena:getQueryExecution",
+           "athena:startQueryExecution"
+          ],
+          "Effect": "Allow",
+          "Resource": [
            {
-            "Ref": "AWS::Region"
+            "Fn::Join": [
+             "",
+             [
+              "arn:",
+              {
+               "Ref": "AWS::Partition"
+              },
+              ":athena:",
+              {
+               "Ref": "AWS::Region"
+              },
+              ":",
+              {
+               "Ref": "AWS::AccountId"
+              },
+              ":datacatalog/AwsDataCatalog"
+             ]
+            ]
            },
-           ":",
            {
-            "Ref": "AWS::AccountId"
-           },
-           ":datacatalog/AwsDataCatalog"
+            "Fn::Join": [
+             "",
+             [
+              "arn:",
+              {
+               "Ref": "AWS::Partition"
+              },
+              ":athena:",
+              {
+               "Ref": "AWS::Region"
+              },
+              ":",
+              {
+               "Ref": "AWS::AccountId"
+              },
+              ":workgroup/primary"
+             ]
+            ]
+           }
           ]
-         ]
-        },
-        {
-         "Fn::Join": [
-          "",
-          [
-           "arn:",
+         },
+         {
+          "Action": [
+           "lakeformation:GetDataAccess",
+           "s3:CreateBucket",
+           "s3:GetBucketLocation",
+           "s3:GetObject",
+           "s3:ListBucket"
+          ],
+          "Effect": "Allow",
+          "Resource": "*"
+         },
+         {
+          "Action": [
+           "s3:AbortMultipartUpload",
+           "s3:ListBucketMultipartUploads",
+           "s3:ListMultipartUploadParts",
+           "s3:PutObject"
+          ],
+          "Effect": "Allow",
+          "Resource": {
+           "Fn::Join": [
+            "",
+            [
+             "arn:",
+             {
+              "Ref": "AWS::Partition"
+             },
+             ":s3:::query-results-bucket/folder/*"
+            ]
+           ]
+          }
+         },
+         {
+          "Action": [
+           "glue:BatchCreatePartition",
+           "glue:BatchDeletePartition",
+           "glue:BatchDeleteTable",
+           "glue:BatchGetPartition",
+           "glue:CreateDatabase",
+           "glue:CreatePartition",
+           "glue:CreateTable",
+           "glue:DeleteDatabase",
+           "glue:DeletePartition",
+           "glue:DeleteTable",
+           "glue:GetDatabase",
+           "glue:GetDatabases",
+           "glue:GetPartition",
+           "glue:GetPartitions",
+           "glue:GetTable",
+           "glue:GetTables",
+           "glue:UpdateDatabase",
+           "glue:UpdatePartition",
+           "glue:UpdateTable"
+          ],
+          "Effect": "Allow",
+          "Resource": [
            {
-            "Ref": "AWS::Partition"
+            "Fn::Join": [
+             "",
+             [
+              "arn:",
+              {
+               "Ref": "AWS::Partition"
+              },
+              ":glue:",
+              {
+               "Ref": "AWS::Region"
+              },
+              ":",
+              {
+               "Ref": "AWS::AccountId"
+              },
+              ":catalog"
+             ]
+            ]
            },
-           ":athena:",
            {
-            "Ref": "AWS::Region"
+            "Fn::Join": [
+             "",
+             [
+              "arn:",
+              {
+               "Ref": "AWS::Partition"
+              },
+              ":glue:",
+              {
+               "Ref": "AWS::Region"
+              },
+              ":",
+              {
+               "Ref": "AWS::AccountId"
+              },
+              ":database/mydatabase"
+             ]
+            ]
            },
-           ":",
            {
-            "Ref": "AWS::AccountId"
+            "Fn::Join": [
+             "",
+             [
+              "arn:",
+              {
+               "Ref": "AWS::Partition"
+              },
+              ":glue:",
+              {
+               "Ref": "AWS::Region"
+              },
+              ":",
+              {
+               "Ref": "AWS::AccountId"
+              },
+              ":table/mydatabase/*"
+             ]
+            ]
            },
-           ":workgroup/primary"
+           {
+            "Fn::Join": [
+             "",
+             [
+              "arn:",
+              {
+               "Ref": "AWS::Partition"
+              },
+              ":glue:",
+              {
+               "Ref": "AWS::Region"
+              },
+              ":",
+              {
+               "Ref": "AWS::AccountId"
+              },
+              ":userDefinedFunction/mydatabase/*"
+             ]
+            ]
+           }
           ]
-         ]
+         }
+        ],
+        "Version": "2012-10-17"
+       },
+       "PolicyName": "StateMachineRoleDefaultPolicyDF1E6607",
+       "Roles": [
+        {
+         "Ref": "StateMachineRoleB840431D"
         }
        ]
-      },
-      {
-       "Action": [
-        "lakeformation:GetDataAccess",
-        "s3:CreateBucket",
-        "s3:GetBucketLocation",
-        "s3:GetObject",
-        "s3:ListBucket"
-       ],
-       "Effect": "Allow",
-       "Resource": "*"
-      },
-      {
-       "Action": [
-        "s3:AbortMultipartUpload",
-        "s3:ListBucketMultipartUploads",
-        "s3:ListMultipartUploadParts",
-        "s3:PutObject"
-       ],
-       "Effect": "Allow",
-       "Resource": {
+      }
+     },
+     "StateMachine2E01A3A5": {
+      "Type": "AWS::StepFunctions::StateMachine",
+      "Properties": {
+       "RoleArn": {
+        "Fn::GetAtt": [
+         "StateMachineRoleB840431D",
+         "Arn"
+        ]
+       },
+       "DefinitionString": {
         "Fn::Join": [
          "",
          [
-          "arn:",
+          "{\"StartAt\":\"Start Athena Query\",\"States\":{\"Start Athena Query\":{\"End\":true,\"Type\":\"Task\",\"Resource\":\"arn:",
           {
            "Ref": "AWS::Partition"
           },
-          ":s3:::query-results-bucket/folder"
+          ":states:::athena:startQueryExecution\",\"Parameters\":{\"QueryString.$\":\"$.queryString\",\"QueryExecutionContext\":{\"Database\":\"mydatabase\"},\"ResultConfiguration\":{\"EncryptionConfiguration\":{\"EncryptionOption\":\"SSE_S3\"},\"OutputLocation\":\"s3://query-results-bucket/folder/\"}}}},\"TimeoutSeconds\":30}"
          ]
         ]
        }
       },
-      {
-       "Action": [
-        "glue:BatchCreatePartition",
-        "glue:BatchDeletePartition",
-        "glue:BatchDeleteTable",
-        "glue:BatchGetPartition",
-        "glue:CreateDatabase",
-        "glue:CreatePartition",
-        "glue:CreateTable",
-        "glue:DeleteDatabase",
-        "glue:DeletePartition",
-        "glue:DeleteTable",
-        "glue:GetDatabase",
-        "glue:GetDatabases",
-        "glue:GetPartition",
-        "glue:GetPartitions",
-        "glue:GetTable",
-        "glue:GetTables",
-        "glue:UpdateDatabase",
-        "glue:UpdatePartition",
-        "glue:UpdateTable"
-       ],
-       "Effect": "Allow",
-       "Resource": [
-        {
-         "Fn::Join": [
-          "",
-          [
-           "arn:",
-           {
-            "Ref": "AWS::Partition"
-           },
-           ":glue:",
-           {
-            "Ref": "AWS::Region"
-           },
-           ":",
-           {
-            "Ref": "AWS::AccountId"
-           },
-           ":catalog"
-          ]
-         ]
-        },
-        {
-         "Fn::Join": [
-          "",
-          [
-           "arn:",
-           {
-            "Ref": "AWS::Partition"
-           },
-           ":glue:",
-           {
-            "Ref": "AWS::Region"
-           },
-           ":",
-           {
-            "Ref": "AWS::AccountId"
-           },
-           ":database/mydatabase"
-          ]
-         ]
-        },
-        {
-         "Fn::Join": [
-          "",
-          [
-           "arn:",
-           {
-            "Ref": "AWS::Partition"
-           },
-           ":glue:",
-           {
-            "Ref": "AWS::Region"
-           },
-           ":",
-           {
-            "Ref": "AWS::AccountId"
-           },
-           ":table/mydatabase/*"
-          ]
-         ]
-        },
-        {
-         "Fn::Join": [
-          "",
-          [
-           "arn:",
-           {
-            "Ref": "AWS::Partition"
-           },
-           ":glue:",
-           {
-            "Ref": "AWS::Region"
-           },
-           ":",
-           {
-            "Ref": "AWS::AccountId"
-           },
-           ":userDefinedFunction/mydatabase/*"
-          ]
-         ]
-        }
-       ]
+      "DependsOn": [
+       "StateMachineRoleDefaultPolicyDF1E6607",
+       "StateMachineRoleB840431D"
+      ],
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete"
+     }
+    },
+    "Outputs": {
+     "stateMachineArn": {
+      "Value": {
+       "Ref": "StateMachine2E01A3A5"
       }
-     ],
-     "Version": "2012-10-17"
+     }
     },
-    "PolicyName": "StateMachineRoleDefaultPolicyDF1E6607",
-    "Roles": [
-     {
-      "Ref": "StateMachineRoleB840431D"
+    "Parameters": {
+     "BootstrapVersion": {
+      "Type": "AWS::SSM::Parameter::Value<String>",
+      "Default": "/cdk-bootstrap/hnb659fds/version",
+      "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
      }
-    ]
-   }
-  },
-  "StateMachine2E01A3A5": {
-   "Type": "AWS::StepFunctions::StateMachine",
-   "Properties": {
-    "RoleArn": {
-     "Fn::GetAtt": [
-      "StateMachineRoleB840431D",
-      "Arn"
-     ]
     },
-    "DefinitionString": {
-     "Fn::Join": [
-      "",
-      [
-       "{\"StartAt\":\"Start Athena Query\",\"States\":{\"Start Athena Query\":{\"End\":true,\"Type\":\"Task\",\"Resource\":\"arn:",
-       {
-        "Ref": "AWS::Partition"
-       },
-       ":states:::athena:startQueryExecution\",\"Parameters\":{\"QueryString.$\":\"$.queryString\",\"QueryExecutionContext\":{\"Database\":\"mydatabase\"},\"ResultConfiguration\":{\"EncryptionConfiguration\":{\"EncryptionOption\":\"SSE_S3\"},\"OutputLocation\":\"s3://query-results-bucket/folder/\"}}}},\"TimeoutSeconds\":30}"
-      ]
-     ]
-    }
-   },
-   "DependsOn": [
-    "StateMachineRoleDefaultPolicyDF1E6607",
-    "StateMachineRoleB840431D"
-   ],
-   "UpdateReplacePolicy": "Delete",
-   "DeletionPolicy": "Delete"
-  }
- },
- "Outputs": {
-  "stateMachineArn": {
-   "Value": {
-    "Ref": "StateMachine2E01A3A5"
-   }
-  }
- },
- "Parameters": {
-  "BootstrapVersion": {
-   "Type": "AWS::SSM::Parameter::Value<String>",
-   "Default": "/cdk-bootstrap/hnb659fds/version",
-   "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
-  }
- },
- "Rules": {
-  "CheckBootstrapVersion": {
-   "Assertions": [
-    {
-     "Assert": {
-      "Fn::Not": [
+    "Rules": {
+     "CheckBootstrapVersion": {
+      "Assertions": [
        {
-        "Fn::Contains": [
-         [
-          "1",
-          "2",
-          "3",
-          "4",
-          "5"
-         ],
-         {
-          "Ref": "BootstrapVersion"
-         }
-        ]
+        "Assert": {
+         "Fn::Not": [
+          {
+           "Fn::Contains": [
+            [
+             "1",
+             "2",
+             "3",
+             "4",
+             "5"
+            ],
+            {
+             "Ref": "BootstrapVersion"
+            }
+           ]
+          }
+         ]
+        },
+        "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
        }
       ]
-     },
-     "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
+     }
     }
-   ]
-  }
- }
-}
\ No newline at end of file
+   }
\ No newline at end of file
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/athena/integ.start-query-execution.js.snapshot/cdk.out b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/athena/integ.start-query-execution.js.snapshot/cdk.out
index ae4b03c54e770..f0b901e7c06e5 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/athena/integ.start-query-execution.js.snapshot/cdk.out
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/athena/integ.start-query-execution.js.snapshot/cdk.out
@@ -1 +1 @@
-{"version":"30.0.0"}
\ No newline at end of file
+{"version":"32.0.0"}
\ No newline at end of file
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/athena/integ.start-query-execution.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/athena/integ.start-query-execution.js.snapshot/integ.json
index 56cccf8b1cf53..41c6be68e645c 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/athena/integ.start-query-execution.js.snapshot/integ.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/athena/integ.start-query-execution.js.snapshot/integ.json
@@ -1,5 +1,5 @@
 {
-  "version": "30.0.0",
+  "version": "32.0.0",
   "testCases": {
     "integ.start-query-execution": {
       "stacks": [
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/athena/integ.start-query-execution.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/athena/integ.start-query-execution.js.snapshot/manifest.json
index c0a51b9c3df8c..4eccb39ef5dda 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/athena/integ.start-query-execution.js.snapshot/manifest.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/athena/integ.start-query-execution.js.snapshot/manifest.json
@@ -1,5 +1,5 @@
 {
-  "version": "30.0.0",
+  "version": "32.0.0",
   "artifacts": {
     "aws-stepfunctions-tasks-athena-start-query-execution-integ.assets": {
       "type": "cdk:asset-manifest",
@@ -17,7 +17,7 @@
         "validateOnSynth": false,
         "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
         "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
-        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/4c057537867d65c4b98525bdce151c8a8c2babbe4117b04526bf194d8c82d40f.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/d5b0852cda8e09b47bbf34672fc71a205e9a3e7dcd0ce808bb607ce6714fab1a.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/athena/integ.start-query-execution.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/athena/integ.start-query-execution.js.snapshot/tree.json
index 194ba0c904a64..88e0ef6559fff 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/athena/integ.start-query-execution.js.snapshot/tree.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/athena/integ.start-query-execution.js.snapshot/tree.json
@@ -12,7 +12,7 @@
             "id": "Start Athena Query",
             "path": "aws-stepfunctions-tasks-athena-start-query-execution-integ/Start Athena Query",
             "constructInfo": {
-              "fqn": "@aws-cdk/aws-stepfunctions-tasks.AthenaStartQueryExecution",
+              "fqn": "aws-cdk-lib.aws_stepfunctions_tasks.AthenaStartQueryExecution",
               "version": "0.0.0"
             }
           },
@@ -28,7 +28,7 @@
                     "id": "ImportRole",
                     "path": "aws-stepfunctions-tasks-athena-start-query-execution-integ/StateMachine/Role/ImportRole",
                     "constructInfo": {
-                      "fqn": "@aws-cdk/core.Resource",
+                      "fqn": "aws-cdk-lib.Resource",
                       "version": "0.0.0"
                     }
                   },
@@ -53,7 +53,7 @@
                       }
                     },
                     "constructInfo": {
-                      "fqn": "@aws-cdk/aws-iam.CfnRole",
+                      "fqn": "aws-cdk-lib.aws_iam.CfnRole",
                       "version": "0.0.0"
                     }
                   },
@@ -146,7 +146,7 @@
                                         {
                                           "Ref": "AWS::Partition"
                                         },
-                                        ":s3:::query-results-bucket/folder"
+                                        ":s3:::query-results-bucket/folder/*"
                                       ]
                                     ]
                                   }
@@ -269,19 +269,19 @@
                           }
                         },
                         "constructInfo": {
-                          "fqn": "@aws-cdk/aws-iam.CfnPolicy",
+                          "fqn": "aws-cdk-lib.aws_iam.CfnPolicy",
                           "version": "0.0.0"
                         }
                       }
                     },
                     "constructInfo": {
-                      "fqn": "@aws-cdk/aws-iam.Policy",
+                      "fqn": "aws-cdk-lib.aws_iam.Policy",
                       "version": "0.0.0"
                     }
                   }
                 },
                 "constructInfo": {
-                  "fqn": "@aws-cdk/aws-iam.Role",
+                  "fqn": "aws-cdk-lib.aws_iam.Role",
                   "version": "0.0.0"
                 }
               },
@@ -312,13 +312,13 @@
                   }
                 },
                 "constructInfo": {
-                  "fqn": "@aws-cdk/aws-stepfunctions.CfnStateMachine",
+                  "fqn": "aws-cdk-lib.aws_stepfunctions.CfnStateMachine",
                   "version": "0.0.0"
                 }
               }
             },
             "constructInfo": {
-              "fqn": "@aws-cdk/aws-stepfunctions.StateMachine",
+              "fqn": "aws-cdk-lib.aws_stepfunctions.StateMachine",
               "version": "0.0.0"
             }
           },
@@ -326,7 +326,7 @@
             "id": "stateMachineArn",
             "path": "aws-stepfunctions-tasks-athena-start-query-execution-integ/stateMachineArn",
             "constructInfo": {
-              "fqn": "@aws-cdk/core.CfnOutput",
+              "fqn": "aws-cdk-lib.CfnOutput",
               "version": "0.0.0"
             }
           },
@@ -334,7 +334,7 @@
             "id": "BootstrapVersion",
             "path": "aws-stepfunctions-tasks-athena-start-query-execution-integ/BootstrapVersion",
             "constructInfo": {
-              "fqn": "@aws-cdk/core.CfnParameter",
+              "fqn": "aws-cdk-lib.CfnParameter",
               "version": "0.0.0"
             }
           },
@@ -342,13 +342,13 @@
             "id": "CheckBootstrapVersion",
             "path": "aws-stepfunctions-tasks-athena-start-query-execution-integ/CheckBootstrapVersion",
             "constructInfo": {
-              "fqn": "@aws-cdk/core.CfnRule",
+              "fqn": "aws-cdk-lib.CfnRule",
               "version": "0.0.0"
             }
           }
         },
         "constructInfo": {
-          "fqn": "@aws-cdk/core.Stack",
+          "fqn": "aws-cdk-lib.Stack",
           "version": "0.0.0"
         }
       },
@@ -357,12 +357,12 @@
         "path": "Tree",
         "constructInfo": {
           "fqn": "constructs.Construct",
-          "version": "10.1.237"
+          "version": "10.2.26"
         }
       }
     },
     "constructInfo": {
-      "fqn": "@aws-cdk/core.App",
+      "fqn": "aws-cdk-lib.App",
       "version": "0.0.0"
     }
   }
diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/athena/start-query-execution.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/athena/start-query-execution.ts
index df129c2fd1bdd..f25df300a9c58 100644
--- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/athena/start-query-execution.ts
+++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/athena/start-query-execution.ts
@@ -115,7 +115,7 @@ export class AthenaStartQueryExecution extends sfn.TaskStateBase {
               account: '',
               service: 's3',
               resource: this.props.resultConfiguration?.outputLocation?.bucketName,
-              resourceName: this.props.resultConfiguration?.outputLocation?.objectKey,
+              resourceName: `${this.props.resultConfiguration?.outputLocation?.objectKey}/*`,
             })
             : '*',
         ],
diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/athena/start-query-execution.test.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/athena/start-query-execution.test.ts
index 22e5316ee9985..753d547a9ef86 100644
--- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/athena/start-query-execution.test.ts
+++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/athena/start-query-execution.test.ts
@@ -215,7 +215,7 @@ describe('Start Query Execution', () => {
                   {
                     Ref: 'AWS::Partition',
                   },
-                  ':s3:::query-results-bucket/folder',
+                  ':s3:::query-results-bucket/folder/*',
                 ],
               ],
             },