diff --git a/aws-flb-cloudwatch.yaml b/aws-flb-cloudwatch.yaml
new file mode 100644
index 00000000000..f7678dab862
--- /dev/null
+++ b/aws-flb-cloudwatch.yaml
@@ -0,0 +1,45 @@
+package:
+  name: aws-flb-cloudwatch
+  version: 1.9.4
+  epoch: 0
+  description: A Fluent Bit output plugin for CloudWatch Logs
+  copyright:
+    - license: Apache-2.0
+
+environment:
+  contents:
+    packages:
+      - wolfi-baselayout
+      - busybox
+      - build-base
+      - go
+      - ca-certificates-bundle
+
+pipeline:
+  - uses: git-checkout
+    with:
+      repository: https://github.com/aws/amazon-cloudwatch-logs-for-fluent-bit
+      tag: v${{package.version}}
+      expected-commit: 7b8dae0d6dedf942bc1e9feded197b8d1a9d261a
+
+  - runs: |
+      mkdir -p ${{targets.destdir}}/usr/bin
+      go build -buildmode c-shared -o ${{targets.destdir}}/usr/bin/cloudwatch.so ./
+
+subpackages:
+  - name: "aws-flb-cloudwatch-compat"
+    description: "Compatibility package to place binaries in the location expected by AWS for Fluent Bit"
+    pipeline:
+      - runs: |
+          # The AWS for Fluent Bit expects the .so libraries to be in /fluent-bit
+          mkdir -p "${{targets.subpkgdir}}"/fluent-bit
+          ln -sf /usr/bin/cloudwatch.so ${{targets.subpkgdir}}/fluent-bit/cloudwatch.so
+      - uses: strip
+
+update:
+  enabled: true
+  github:
+    identifier: aws/amazon-cloudwatch-logs-for-fluent-bit
+    strip-prefix: v
+    use-tag: true
+    tag-filter: v
diff --git a/aws-flb-firehose.yaml b/aws-flb-firehose.yaml
new file mode 100644
index 00000000000..c82672ad4e5
--- /dev/null
+++ b/aws-flb-firehose.yaml
@@ -0,0 +1,45 @@
+package:
+  name: aws-flb-firehose
+  version: 1.7.2
+  epoch: 0
+  description: A Fluent Bit output plugin for Amazon Kinesis Data Firehose
+  copyright:
+    - license: Apache-2.0
+
+environment:
+  contents:
+    packages:
+      - wolfi-baselayout
+      - busybox
+      - build-base
+      - go
+      - ca-certificates-bundle
+
+pipeline:
+  - uses: git-checkout
+    with:
+      repository: https://github.com/aws/amazon-kinesis-firehose-for-fluent-bit
+      tag: v${{package.version}}
+      expected-commit: dcbe1a0191abd6242182af55547ccf99ee650ce9
+
+  - runs: |
+      mkdir -p ${{targets.destdir}}/usr/bin
+      go build -buildmode c-shared -o ${{targets.destdir}}/usr/bin/firehose.so ./
+
+subpackages:
+  - name: "aws-flb-firehose-compat"
+    description: "Compatibility package to place binaries in the location expected by AWS for Fluent Bit"
+    pipeline:
+      - runs: |
+          # The AWS for Fluent Bit expects the .so libraries to be in /fluent-bit
+          mkdir -p "${{targets.subpkgdir}}"/fluent-bit
+          ln -sf /usr/bin/firehose.so ${{targets.subpkgdir}}/fluent-bit/firehose.so
+      - uses: strip
+
+update:
+  enabled: true
+  github:
+    identifier: aws/amazon-kinesis-firehose-for-fluent-bit
+    strip-prefix: v
+    use-tag: true
+    tag-filter: v
diff --git a/packages.txt b/packages.txt
index 890668e74ec..a7dced96e5b 100644
--- a/packages.txt
+++ b/packages.txt
@@ -668,6 +668,8 @@ keda
 vertical-pod-autoscaler
 cassandra
 s2n-tls
+aws-flb-firehose
+aws-flb-cloudwatch
 aws-c-common
 aws-c-sdkutils
 aws-checksums