diff --git a/.github/workflows/amplify_analytics_pinpoint_dart.yaml b/.github/workflows/amplify_analytics_pinpoint_dart.yaml
index e1a3209c72..3480ce5574 100644
--- a/.github/workflows/amplify_analytics_pinpoint_dart.yaml
+++ b/.github/workflows/amplify_analytics_pinpoint_dart.yaml
@@ -88,7 +88,6 @@ jobs:
     with:
       package-name: amplify_analytics_pinpoint_dart
       working-directory: packages/analytics/amplify_analytics_pinpoint_dart
-      has-goldens: false
   native_test:
     needs: test
     uses: ./.github/workflows/dart_native.yaml
diff --git a/.github/workflows/amplify_api_dart.yaml b/.github/workflows/amplify_api_dart.yaml
index 55d4bce1df..9b9d7f3058 100644
--- a/.github/workflows/amplify_api_dart.yaml
+++ b/.github/workflows/amplify_api_dart.yaml
@@ -64,7 +64,6 @@ jobs:
     with:
       package-name: amplify_api_dart
       working-directory: packages/api/amplify_api_dart
-      has-goldens: false
   native_test:
     needs: test
     uses: ./.github/workflows/dart_native.yaml
diff --git a/.github/workflows/amplify_auth_cognito_dart.yaml b/.github/workflows/amplify_auth_cognito_dart.yaml
index 212b071b59..89137d9c9a 100644
--- a/.github/workflows/amplify_auth_cognito_dart.yaml
+++ b/.github/workflows/amplify_auth_cognito_dart.yaml
@@ -90,7 +90,6 @@ jobs:
     with:
       package-name: amplify_auth_cognito_dart
       working-directory: packages/auth/amplify_auth_cognito_dart
-      has-goldens: false
   native_test:
     needs: test
     uses: ./.github/workflows/dart_native.yaml
diff --git a/.github/workflows/amplify_auth_cognito_test.yaml b/.github/workflows/amplify_auth_cognito_test.yaml
index f399121365..3fec4e570a 100644
--- a/.github/workflows/amplify_auth_cognito_test.yaml
+++ b/.github/workflows/amplify_auth_cognito_test.yaml
@@ -100,7 +100,6 @@ jobs:
     with:
       package-name: amplify_auth_cognito_test
       working-directory: packages/auth/amplify_auth_cognito_test
-      has-goldens: false
   native_test:
     needs: test
     uses: ./.github/workflows/dart_native.yaml
diff --git a/.github/workflows/amplify_core.yaml b/.github/workflows/amplify_core.yaml
index b43686026b..a8e4f66dca 100644
--- a/.github/workflows/amplify_core.yaml
+++ b/.github/workflows/amplify_core.yaml
@@ -60,7 +60,6 @@ jobs:
     with:
       package-name: amplify_core
       working-directory: packages/amplify_core
-      has-goldens: false
   native_test:
     needs: test
     uses: ./.github/workflows/dart_native.yaml
diff --git a/.github/workflows/amplify_db_common_dart.yaml b/.github/workflows/amplify_db_common_dart.yaml
index a62d8babdd..981de0c27c 100644
--- a/.github/workflows/amplify_db_common_dart.yaml
+++ b/.github/workflows/amplify_db_common_dart.yaml
@@ -64,7 +64,6 @@ jobs:
     with:
       package-name: amplify_db_common_dart
       working-directory: packages/common/amplify_db_common_dart
-      has-goldens: false
   native_test:
     needs: test
     uses: ./.github/workflows/dart_native.yaml
diff --git a/.github/workflows/amplify_lints.yaml b/.github/workflows/amplify_lints.yaml
index 02b17162af..d5cb9eeda0 100644
--- a/.github/workflows/amplify_lints.yaml
+++ b/.github/workflows/amplify_lints.yaml
@@ -40,4 +40,3 @@ jobs:
     with:
       package-name: amplify_lints
       working-directory: packages/amplify_lints
-      has-goldens: false
diff --git a/.github/workflows/amplify_secure_storage_dart.yaml b/.github/workflows/amplify_secure_storage_dart.yaml
index a824d0d497..90ade9795e 100644
--- a/.github/workflows/amplify_secure_storage_dart.yaml
+++ b/.github/workflows/amplify_secure_storage_dart.yaml
@@ -56,4 +56,3 @@ jobs:
     with:
       package-name: amplify_secure_storage_dart
       working-directory: packages/secure_storage/amplify_secure_storage_dart
-      has-goldens: false
diff --git a/.github/workflows/amplify_secure_storage_test.yaml b/.github/workflows/amplify_secure_storage_test.yaml
index b360bc592b..dc2ec5b64e 100644
--- a/.github/workflows/amplify_secure_storage_test.yaml
+++ b/.github/workflows/amplify_secure_storage_test.yaml
@@ -68,7 +68,6 @@ jobs:
     with:
       package-name: amplify_secure_storage_test
       working-directory: packages/secure_storage/amplify_secure_storage_test
-      has-goldens: false
   native_test:
     needs: test
     uses: ./.github/workflows/dart_native.yaml
diff --git a/.github/workflows/amplify_storage_s3_dart.yaml b/.github/workflows/amplify_storage_s3_dart.yaml
index 808dec1c5c..4123b19f92 100644
--- a/.github/workflows/amplify_storage_s3_dart.yaml
+++ b/.github/workflows/amplify_storage_s3_dart.yaml
@@ -70,7 +70,6 @@ jobs:
     with:
       package-name: amplify_storage_s3_dart
       working-directory: packages/storage/amplify_storage_s3_dart
-      has-goldens: false
   native_test:
     needs: test
     uses: ./.github/workflows/dart_native.yaml
diff --git a/.github/workflows/aws_common.yaml b/.github/workflows/aws_common.yaml
index bf6d488f5a..18f9138415 100644
--- a/.github/workflows/aws_common.yaml
+++ b/.github/workflows/aws_common.yaml
@@ -52,7 +52,6 @@ jobs:
     with:
       package-name: aws_common
       working-directory: packages/aws_common
-      has-goldens: false
   native_test:
     needs: test
     uses: ./.github/workflows/dart_native.yaml
diff --git a/.github/workflows/aws_json1_0_v1.yaml b/.github/workflows/aws_json1_0_v1.yaml
index 59afd697f9..f5d5778c5c 100644
--- a/.github/workflows/aws_json1_0_v1.yaml
+++ b/.github/workflows/aws_json1_0_v1.yaml
@@ -68,7 +68,6 @@ jobs:
     with:
       package-name: aws_json1_0_v1
       working-directory: packages/smithy/goldens/lib/awsJson1_0
-      has-goldens: false
   native_test:
     needs: test
     uses: ./.github/workflows/dart_native.yaml
diff --git a/.github/workflows/aws_json1_0_v2.yaml b/.github/workflows/aws_json1_0_v2.yaml
index 2d5b7ec711..5e06fd6429 100644
--- a/.github/workflows/aws_json1_0_v2.yaml
+++ b/.github/workflows/aws_json1_0_v2.yaml
@@ -68,7 +68,6 @@ jobs:
     with:
       package-name: aws_json1_0_v2
       working-directory: packages/smithy/goldens/lib2/awsJson1_0
-      has-goldens: false
   native_test:
     needs: test
     uses: ./.github/workflows/dart_native.yaml
diff --git a/.github/workflows/aws_json1_1_v1.yaml b/.github/workflows/aws_json1_1_v1.yaml
index 5c18acd377..590bd1e8a2 100644
--- a/.github/workflows/aws_json1_1_v1.yaml
+++ b/.github/workflows/aws_json1_1_v1.yaml
@@ -68,7 +68,6 @@ jobs:
     with:
       package-name: aws_json1_1_v1
       working-directory: packages/smithy/goldens/lib/awsJson1_1
-      has-goldens: false
   native_test:
     needs: test
     uses: ./.github/workflows/dart_native.yaml
diff --git a/.github/workflows/aws_json1_1_v2.yaml b/.github/workflows/aws_json1_1_v2.yaml
index 83bed97337..0f086e2201 100644
--- a/.github/workflows/aws_json1_1_v2.yaml
+++ b/.github/workflows/aws_json1_1_v2.yaml
@@ -68,7 +68,6 @@ jobs:
     with:
       package-name: aws_json1_1_v2
       working-directory: packages/smithy/goldens/lib2/awsJson1_1
-      has-goldens: false
   native_test:
     needs: test
     uses: ./.github/workflows/dart_native.yaml
diff --git a/.github/workflows/aws_query_v1.yaml b/.github/workflows/aws_query_v1.yaml
index 117aa616a9..bc14d9e187 100644
--- a/.github/workflows/aws_query_v1.yaml
+++ b/.github/workflows/aws_query_v1.yaml
@@ -68,7 +68,6 @@ jobs:
     with:
       package-name: aws_query_v1
       working-directory: packages/smithy/goldens/lib/awsQuery
-      has-goldens: false
   native_test:
     needs: test
     uses: ./.github/workflows/dart_native.yaml
diff --git a/.github/workflows/aws_query_v2.yaml b/.github/workflows/aws_query_v2.yaml
index 9c695ec588..b1f7089069 100644
--- a/.github/workflows/aws_query_v2.yaml
+++ b/.github/workflows/aws_query_v2.yaml
@@ -68,7 +68,6 @@ jobs:
     with:
       package-name: aws_query_v2
       working-directory: packages/smithy/goldens/lib2/awsQuery
-      has-goldens: false
   native_test:
     needs: test
     uses: ./.github/workflows/dart_native.yaml
diff --git a/.github/workflows/aws_signature_v4.yaml b/.github/workflows/aws_signature_v4.yaml
index 12c4aa3fcc..5f1cdade78 100644
--- a/.github/workflows/aws_signature_v4.yaml
+++ b/.github/workflows/aws_signature_v4.yaml
@@ -56,7 +56,6 @@ jobs:
     with:
       package-name: aws_signature_v4
       working-directory: packages/aws_signature_v4
-      has-goldens: false
   native_test:
     needs: test
     uses: ./.github/workflows/dart_native.yaml
diff --git a/.github/workflows/cognito_example.yaml b/.github/workflows/cognito_example.yaml
index 18e5f7807a..29cf98df7a 100644
--- a/.github/workflows/cognito_example.yaml
+++ b/.github/workflows/cognito_example.yaml
@@ -100,4 +100,3 @@ jobs:
     with:
       package-name: cognito_example
       working-directory: packages/auth/amplify_auth_cognito_dart/example
-      has-goldens: false
diff --git a/.github/workflows/custom_v2.yaml b/.github/workflows/custom_v2.yaml
index 0baf2ce18c..36bc87f3a8 100644
--- a/.github/workflows/custom_v2.yaml
+++ b/.github/workflows/custom_v2.yaml
@@ -68,7 +68,6 @@ jobs:
     with:
       package-name: custom_v2
       working-directory: packages/smithy/goldens/lib2/custom
-      has-goldens: false
   native_test:
     needs: test
     uses: ./.github/workflows/dart_native.yaml
diff --git a/.github/workflows/ec2_query_v1.yaml b/.github/workflows/ec2_query_v1.yaml
index 137988b16d..8144de3380 100644
--- a/.github/workflows/ec2_query_v1.yaml
+++ b/.github/workflows/ec2_query_v1.yaml
@@ -68,7 +68,6 @@ jobs:
     with:
       package-name: ec2_query_v1
       working-directory: packages/smithy/goldens/lib/ec2Query
-      has-goldens: false
   native_test:
     needs: test
     uses: ./.github/workflows/dart_native.yaml
diff --git a/.github/workflows/ec2_query_v2.yaml b/.github/workflows/ec2_query_v2.yaml
index 4af15bf50b..8eaa6d7d05 100644
--- a/.github/workflows/ec2_query_v2.yaml
+++ b/.github/workflows/ec2_query_v2.yaml
@@ -68,7 +68,6 @@ jobs:
     with:
       package-name: ec2_query_v2
       working-directory: packages/smithy/goldens/lib2/ec2Query
-      has-goldens: false
   native_test:
     needs: test
     uses: ./.github/workflows/dart_native.yaml
diff --git a/.github/workflows/pub_server.yaml b/.github/workflows/pub_server.yaml
index f231d8e2e4..4a12ac4e86 100644
--- a/.github/workflows/pub_server.yaml
+++ b/.github/workflows/pub_server.yaml
@@ -50,7 +50,6 @@ jobs:
     with:
       package-name: pub_server
       working-directory: packages/test/pub_server
-      has-goldens: false
   native_test:
     needs: test
     uses: ./.github/workflows/dart_native.yaml
diff --git a/.github/workflows/rest_json1_v1.yaml b/.github/workflows/rest_json1_v1.yaml
index 81c96292fe..1b17646353 100644
--- a/.github/workflows/rest_json1_v1.yaml
+++ b/.github/workflows/rest_json1_v1.yaml
@@ -68,7 +68,6 @@ jobs:
     with:
       package-name: rest_json1_v1
       working-directory: packages/smithy/goldens/lib/restJson1
-      has-goldens: false
   native_test:
     needs: test
     uses: ./.github/workflows/dart_native.yaml
diff --git a/.github/workflows/rest_json1_v2.yaml b/.github/workflows/rest_json1_v2.yaml
index d5abe8ab71..4ce851e137 100644
--- a/.github/workflows/rest_json1_v2.yaml
+++ b/.github/workflows/rest_json1_v2.yaml
@@ -68,7 +68,6 @@ jobs:
     with:
       package-name: rest_json1_v2
       working-directory: packages/smithy/goldens/lib2/restJson1
-      has-goldens: false
   native_test:
     needs: test
     uses: ./.github/workflows/dart_native.yaml
diff --git a/.github/workflows/rest_xml_v1.yaml b/.github/workflows/rest_xml_v1.yaml
index ae6476c5e5..519630f4bf 100644
--- a/.github/workflows/rest_xml_v1.yaml
+++ b/.github/workflows/rest_xml_v1.yaml
@@ -68,7 +68,6 @@ jobs:
     with:
       package-name: rest_xml_v1
       working-directory: packages/smithy/goldens/lib/restXml
-      has-goldens: false
   native_test:
     needs: test
     uses: ./.github/workflows/dart_native.yaml
diff --git a/.github/workflows/rest_xml_v2.yaml b/.github/workflows/rest_xml_v2.yaml
index d78b63cf5c..e40a8a1180 100644
--- a/.github/workflows/rest_xml_v2.yaml
+++ b/.github/workflows/rest_xml_v2.yaml
@@ -68,7 +68,6 @@ jobs:
     with:
       package-name: rest_xml_v2
       working-directory: packages/smithy/goldens/lib2/restXml
-      has-goldens: false
   native_test:
     needs: test
     uses: ./.github/workflows/dart_native.yaml
diff --git a/.github/workflows/rest_xml_with_namespace_v1.yaml b/.github/workflows/rest_xml_with_namespace_v1.yaml
index 89fc141726..34669835d0 100644
--- a/.github/workflows/rest_xml_with_namespace_v1.yaml
+++ b/.github/workflows/rest_xml_with_namespace_v1.yaml
@@ -68,7 +68,6 @@ jobs:
     with:
       package-name: rest_xml_with_namespace_v1
       working-directory: packages/smithy/goldens/lib/restXmlWithNamespace
-      has-goldens: false
   native_test:
     needs: test
     uses: ./.github/workflows/dart_native.yaml
diff --git a/.github/workflows/rest_xml_with_namespace_v2.yaml b/.github/workflows/rest_xml_with_namespace_v2.yaml
index 9923ebe9f2..458b906099 100644
--- a/.github/workflows/rest_xml_with_namespace_v2.yaml
+++ b/.github/workflows/rest_xml_with_namespace_v2.yaml
@@ -68,7 +68,6 @@ jobs:
     with:
       package-name: rest_xml_with_namespace_v2
       working-directory: packages/smithy/goldens/lib2/restXmlWithNamespace
-      has-goldens: false
   native_test:
     needs: test
     uses: ./.github/workflows/dart_native.yaml
diff --git a/.github/workflows/smithy.yaml b/.github/workflows/smithy.yaml
index a480d4fee5..6c59b60bd1 100644
--- a/.github/workflows/smithy.yaml
+++ b/.github/workflows/smithy.yaml
@@ -50,7 +50,6 @@ jobs:
     with:
       package-name: smithy
       working-directory: packages/smithy/smithy
-      has-goldens: false
   native_test:
     needs: test
     uses: ./.github/workflows/dart_native.yaml
diff --git a/.github/workflows/smithy_aws.yaml b/.github/workflows/smithy_aws.yaml
index 9bdf8be755..4dc69e1ab5 100644
--- a/.github/workflows/smithy_aws.yaml
+++ b/.github/workflows/smithy_aws.yaml
@@ -58,7 +58,6 @@ jobs:
     with:
       package-name: smithy_aws
       working-directory: packages/smithy/smithy_aws
-      has-goldens: false
   native_test:
     needs: test
     uses: ./.github/workflows/dart_native.yaml
diff --git a/.github/workflows/smithy_codegen.yaml b/.github/workflows/smithy_codegen.yaml
index c18e545e84..e3f4658140 100644
--- a/.github/workflows/smithy_codegen.yaml
+++ b/.github/workflows/smithy_codegen.yaml
@@ -62,7 +62,6 @@ jobs:
     with:
       package-name: smithy_codegen
       working-directory: packages/smithy/smithy_codegen
-      has-goldens: false
   native_test:
     needs: test
     uses: ./.github/workflows/dart_native.yaml
diff --git a/.github/workflows/storage_s3_example.yaml b/.github/workflows/storage_s3_example.yaml
index 9077e22d53..4b4aeaeb37 100644
--- a/.github/workflows/storage_s3_example.yaml
+++ b/.github/workflows/storage_s3_example.yaml
@@ -100,4 +100,3 @@ jobs:
     with:
       package-name: storage_s3_example
       working-directory: packages/storage/amplify_storage_s3_dart/example
-      has-goldens: false
diff --git a/.github/workflows/worker_bee.yaml b/.github/workflows/worker_bee.yaml
index 8e7ba912f1..9957980996 100644
--- a/.github/workflows/worker_bee.yaml
+++ b/.github/workflows/worker_bee.yaml
@@ -48,4 +48,3 @@ jobs:
     with:
       package-name: worker_bee
       working-directory: packages/worker_bee/worker_bee
-      has-goldens: false
diff --git a/.github/workflows/worker_bee_builder.yaml b/.github/workflows/worker_bee_builder.yaml
index 1669fcf719..dc89dc4061 100644
--- a/.github/workflows/worker_bee_builder.yaml
+++ b/.github/workflows/worker_bee_builder.yaml
@@ -52,4 +52,3 @@ jobs:
     with:
       package-name: worker_bee_builder
       working-directory: packages/worker_bee/worker_bee_builder
-      has-goldens: false
diff --git a/packages/aft/lib/src/commands/generate/generate_workflows_command.dart b/packages/aft/lib/src/commands/generate/generate_workflows_command.dart
index 8a532c2371..1363d5c6a6 100644
--- a/packages/aft/lib/src/commands/generate/generate_workflows_command.dart
+++ b/packages/aft/lib/src/commands/generate/generate_workflows_command.dart
@@ -316,9 +316,15 @@ jobs:
     with:
       package-name: ${package.name}
       working-directory: $repoRelativePath
-      has-goldens: $hasGoldens
 ''',
     );
+    if (!isDartPackage) {
+      workflowContents.write(
+        '''
+      has-goldens: $hasGoldens
+''',
+      );
+    }
 
     if (needsNativeTest) {
       workflowContents.write(