diff --git a/compositions/upbound-aws-provider/cloudwatch-logs/subscriptionfilter.yaml b/compositions/upbound-aws-provider/cloudwatch-logs/subscriptionfilter.yaml
index 5c0fd463..4dbd9578 100644
--- a/compositions/upbound-aws-provider/cloudwatch-logs/subscriptionfilter.yaml
+++ b/compositions/upbound-aws-provider/cloudwatch-logs/subscriptionfilter.yaml
@@ -31,7 +31,7 @@ spec:
           toFieldPath: spec.forProvider.tags
           policy:
             mergeOptions:
-              appendSlice: true
+              keepMapValues: true
         - type: FromCompositeFieldPath
           fromFieldPath: spec.resourceConfig.name
           toFieldPath: metadata.annotations[crossplane.io/external-name]
diff --git a/compositions/upbound-aws-provider/event-source-mapping/sqs.yaml b/compositions/upbound-aws-provider/event-source-mapping/sqs.yaml
index 691a6c8b..84505509 100644
--- a/compositions/upbound-aws-provider/event-source-mapping/sqs.yaml
+++ b/compositions/upbound-aws-provider/event-source-mapping/sqs.yaml
@@ -25,7 +25,7 @@ spec:
           toFieldPath: spec.forProvider.tags
           policy:
             mergeOptions:
-              appendSlice: true
+              keepMapValues: true
         - fromFieldPath: "metadata.name"
           toFieldPath: "metadata.name"
           transforms:
diff --git a/compositions/upbound-aws-provider/kinesis-data-firehose-app/log-forwarder.yaml b/compositions/upbound-aws-provider/kinesis-data-firehose-app/log-forwarder.yaml
index c27fc0ab..ed6ee105 100644
--- a/compositions/upbound-aws-provider/kinesis-data-firehose-app/log-forwarder.yaml
+++ b/compositions/upbound-aws-provider/kinesis-data-firehose-app/log-forwarder.yaml
@@ -36,7 +36,7 @@ spec:
           toFieldPath: spec.forProvider.tags
           policy:
             mergeOptions:
-              appendSlice: true
+              keepMapValues: true
         - fromFieldPath: "metadata.name"
           toFieldPath: "metadata.name"
   environment:
diff --git a/compositions/upbound-aws-provider/kinesis-data-firehose/kinesis-data-firehose.yaml b/compositions/upbound-aws-provider/kinesis-data-firehose/kinesis-data-firehose.yaml
index 078b57ea..1e62dbc9 100644
--- a/compositions/upbound-aws-provider/kinesis-data-firehose/kinesis-data-firehose.yaml
+++ b/compositions/upbound-aws-provider/kinesis-data-firehose/kinesis-data-firehose.yaml
@@ -30,7 +30,7 @@ spec:
           toFieldPath: spec.forProvider.tags
           policy:
             mergeOptions:
-              appendSlice: true
+              keepMapValues: true
         - type: FromCompositeFieldPath
           fromFieldPath: spec.resourceConfig.name
           toFieldPath: metadata.annotations[crossplane.io/external-name]
diff --git a/compositions/upbound-aws-provider/kms/kms.yaml b/compositions/upbound-aws-provider/kms/kms.yaml
index f8f7434d..ed8570b5 100644
--- a/compositions/upbound-aws-provider/kms/kms.yaml
+++ b/compositions/upbound-aws-provider/kms/kms.yaml
@@ -29,7 +29,7 @@ spec:
           toFieldPath: spec.forProvider.tags
           policy:
             mergeOptions:
-              appendSlice: true
+              keepMapValues: true
   resources:
     - name: key
       base:
diff --git a/compositions/upbound-aws-provider/lambda/container.yaml b/compositions/upbound-aws-provider/lambda/container.yaml
index f78c2ba2..4836bcc4 100644
--- a/compositions/upbound-aws-provider/lambda/container.yaml
+++ b/compositions/upbound-aws-provider/lambda/container.yaml
@@ -27,7 +27,7 @@ spec:
           toFieldPath: spec.forProvider.tags
           policy:
             mergeOptions:
-              appendSlice: true
+              keepMapValues: true
         - fromFieldPath: "metadata.name"
           toFieldPath: "metadata.name"
   resources:
diff --git a/compositions/upbound-aws-provider/lambda/zip.yaml b/compositions/upbound-aws-provider/lambda/zip.yaml
index f4623750..62218ddb 100644
--- a/compositions/upbound-aws-provider/lambda/zip.yaml
+++ b/compositions/upbound-aws-provider/lambda/zip.yaml
@@ -27,7 +27,7 @@ spec:
           toFieldPath: spec.forProvider.tags
           policy:
             mergeOptions:
-              appendSlice: true
+              keepMapValues: true
         - fromFieldPath: "metadata.name"
           toFieldPath: "metadata.name"
   resources:
diff --git a/compositions/upbound-aws-provider/s3/definition.yaml b/compositions/upbound-aws-provider/s3/definition.yaml
index f8dfa9f0..a70b16ac 100644
--- a/compositions/upbound-aws-provider/s3/definition.yaml
+++ b/compositions/upbound-aws-provider/s3/definition.yaml
@@ -42,17 +42,9 @@ spec:
                     region:
                       type: string
                     tags:
-                      items:
-                        properties:
-                          key:
-                            type: string
-                          value:
-                            type: string
-                        required:
-                        - key
-                        - value
-                        type: object
-                      type: array
+                      additionalProperties:
+                        type: string
+                      type: object
                   required:
                   - providerConfigName
                   - region
diff --git a/compositions/upbound-aws-provider/s3/general-purpose.yaml b/compositions/upbound-aws-provider/s3/general-purpose.yaml
index eac15fd3..3cc5fad2 100644
--- a/compositions/upbound-aws-provider/s3/general-purpose.yaml
+++ b/compositions/upbound-aws-provider/s3/general-purpose.yaml
@@ -30,7 +30,7 @@ spec:
           toFieldPath: spec.forProvider.tags
           policy:
             mergeOptions:
-              appendSlice: true
+              keepMapValues: true
         - type: FromCompositeFieldPath
           fromFieldPath: spec.resourceConfig.name
           toFieldPath: metadata.annotations[crossplane.io/external-name]
diff --git a/compositions/upbound-aws-provider/sns-sqs/sns-sqs.yaml b/compositions/upbound-aws-provider/sns-sqs/sns-sqs.yaml
index 0c865aee..916d6b9e 100644
--- a/compositions/upbound-aws-provider/sns-sqs/sns-sqs.yaml
+++ b/compositions/upbound-aws-provider/sns-sqs/sns-sqs.yaml
@@ -40,7 +40,7 @@ spec:
           toFieldPath: spec.forProvider.tags
           policy:
             mergeOptions:
-              appendSlice: true
+              keepMapValues: true
         - type: FromCompositeFieldPath
           fromFieldPath: spec.resourceConfig.name
           toFieldPath: metadata.annotations[crossplane.io/external-name]
diff --git a/compositions/upbound-aws-provider/sns/sns.yaml b/compositions/upbound-aws-provider/sns/sns.yaml
index 6de65751..c5afd243 100644
--- a/compositions/upbound-aws-provider/sns/sns.yaml
+++ b/compositions/upbound-aws-provider/sns/sns.yaml
@@ -31,7 +31,7 @@ spec:
           toFieldPath: spec.forProvider.tags
           policy:
             mergeOptions:
-              appendSlice: true
+              keepMapValues: true
         - type: FromCompositeFieldPath
           fromFieldPath: spec.resourceConfig.name
           toFieldPath: metadata.annotations[crossplane.io/external-name]
diff --git a/compositions/upbound-aws-provider/sqs/sqs.yaml b/compositions/upbound-aws-provider/sqs/sqs.yaml
index 557448da..6ed7c5fe 100644
--- a/compositions/upbound-aws-provider/sqs/sqs.yaml
+++ b/compositions/upbound-aws-provider/sqs/sqs.yaml
@@ -29,7 +29,7 @@ spec:
           toFieldPath: spec.forProvider.tags
           policy:
             mergeOptions:
-              appendSlice: true
+              keepMapValues: true
         - type: FromCompositeFieldPath
           fromFieldPath: spec.resourceConfig.name
           toFieldPath: metadata.annotations[crossplane.io/external-name]