diff --git a/AWS_FOR_FLUENT_BIT_VERSION b/AWS_FOR_FLUENT_BIT_VERSION
index ece754b63..9d8e3d767 100644
--- a/AWS_FOR_FLUENT_BIT_VERSION
+++ b/AWS_FOR_FLUENT_BIT_VERSION
@@ -1 +1 @@
-2.31.5
+2.31.6
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f7d1515c..08e281812 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.5` this release adds:
+* Bug - Fixed Log Loss can occur when log group creation or retention policy API calls fail [cloudwatch:314](https://github.com/aws/amazon-cloudwatch-logs-for-fluent-bit/issues/314)
+
+This release includes the same fixes and features that we are working on getting accepted upstream as [AWS for Fluent Bit 2.31.5](https://github.com/aws/aws-for-fluent-bit/releases/tag/v2.31.5).
+
+
 ### 2.31.5
 This release includes:
 * Fluent Bit [1.9.10](https://fluentbit.io/announcements/v1.9.10/)
diff --git a/linux.version b/linux.version
index c70bd5389..2c1fb110c 100644
--- a/linux.version
+++ b/linux.version
@@ -1,10 +1,10 @@
 {
   "linux": {
-    "version": "2.31.5",
+    "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.1"
+    "cloudwatch-plugin": "v1.9.2"
   }
 }
\ No newline at end of file
diff --git a/windows.versions b/windows.versions
index 60cd07d0e..2407e9914 100644
--- a/windows.versions
+++ b/windows.versions
@@ -1,5 +1,17 @@
 {
   "windows": [
+    {
+      "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": true,
+      "stable": false
+    },
     {
       "version": "2.31.5",
       "build": "1",
@@ -9,7 +21,7 @@
       "cloudwatch-plugin": "v1.9.1",
       "openssl": "3.0.7",
       "flexBison": "2.5.22",
-      "latest": true,
+      "latest": false,
       "stable": false
     },
     {