diff --git a/AWS_FLB_CHERRY_PICKS b/AWS_FLB_CHERRY_PICKS
index daa146e9c..f5ea4ba36 100644
--- a/AWS_FLB_CHERRY_PICKS
+++ b/AWS_FLB_CHERRY_PICKS
@@ -45,3 +45,6 @@ https://github.com/PettitWesley/fluent-bit.git chunk-append-context 8fc357c6f245
 # in_tail file name context for inotify events
 https://github.com/PettitWesley/fluent-bit.git tail-modify-debug-context-immutable-cherry-pick ab11d1d7438f5254d04eba8dfc2f10b78cc2244d
 
+# S3 tag corruption fix
+https://github.com/PettitWesley/fluent-bit.git s3-str-fixes 38303131e049265277881c0d79935ad31fdd3e13
+
diff --git a/AWS_FOR_FLUENT_BIT_VERSION b/AWS_FOR_FLUENT_BIT_VERSION
index 9d8e3d767..660d942e0 100644
--- a/AWS_FOR_FLUENT_BIT_VERSION
+++ b/AWS_FOR_FLUENT_BIT_VERSION
@@ -1 +1 @@
-2.31.6
\ No newline at end of file
+2.31.7
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08e281812..293c933ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+### 2.31.6
+This release includes:
+* Fluent Bit [1.9.10](https://fluentbit.io/announcements/v1.9.10/)
+* Amazon CloudWatch Logs for Fluent Bit 1.9.1
+* Amazon Kinesis Streams for Fluent Bit 1.10.1
+* Amazon Kinesis Firehose for Fluent Bit 1.7.1
+
+Compared to `2.23.6` this release adds:
+* Bug - Fixed S3 Key Tag Corruption with `preserve_data_ordering` option [aws-for-fluent-bit:541](https://github.com/aws/aws-for-fluent-bit/issues/541) [fluent-bit:6933](https://github.com/fluent/fluent-bit/issues/6933)
+
+This release includes the same fixes and features that we are working on getting accepted upstream as [AWS for Fluent Bit 2.31.6](https://github.com/aws/aws-for-fluent-bit/releases/tag/v2.31.6).
+
+
 ### 2.31.6
 This release includes:
 * Fluent Bit [1.9.10](https://fluentbit.io/announcements/v1.9.10/)
diff --git a/linux.version b/linux.version
index 2c1fb110c..ee3b75eec 100644
--- a/linux.version
+++ b/linux.version
@@ -1,6 +1,6 @@
 {
   "linux": {
-    "version": "2.31.6",
+    "version": "2.31.7",
     "build": "1",
     "fluent-bit": "1.9.10",
     "kinesis-plugin": "v1.10.1",
diff --git a/windows.versions b/windows.versions
index 2407e9914..078fd17b2 100644
--- a/windows.versions
+++ b/windows.versions
@@ -1,7 +1,7 @@
 {
   "windows": [
     {
-      "version": "2.31.6",
+      "version": "2.31.7",
       "build": "1",
       "fluent-bit": "1.9.10",
       "kinesis-plugin": "v1.10.1",
@@ -12,6 +12,18 @@
       "latest": true,
       "stable": false
     },
+    {
+      "version": "2.31.6",
+      "build": "1",
+      "fluent-bit": "1.9.10",
+      "kinesis-plugin": "v1.10.1",
+      "firehose-plugin": "v1.7.1",
+      "cloudwatch-plugin": "v1.9.2",
+      "openssl": "3.0.7",
+      "flexBison": "2.5.22",
+      "latest": false,
+      "stable": false
+    },
     {
       "version": "2.31.5",
       "build": "1",