diff --git a/CMakeLists.txt b/CMakeLists.txt
index a6f46ffb5d7..41904bffd0f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,9 +6,9 @@ cmake_policy(SET CMP0069 NEW)
 set(CMAKE_POLICY_DEFAULT_CMP0069 NEW)
 
 # Fluent Bit Version
-set(FLB_VERSION_MAJOR  3)
-set(FLB_VERSION_MINOR  2)
-set(FLB_VERSION_PATCH  4)
+set(FLB_VERSION_MAJOR  4)
+set(FLB_VERSION_MINOR  0)
+set(FLB_VERSION_PATCH  0)
 set(FLB_VERSION_STR "${FLB_VERSION_MAJOR}.${FLB_VERSION_MINOR}.${FLB_VERSION_PATCH}")
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
diff --git a/fluent-bit-3.2.4.bb b/fluent-bit-4.0.0.bb
similarity index 99%
rename from fluent-bit-3.2.4.bb
rename to fluent-bit-4.0.0.bb
index e2a255671c4..14dc29ce339 100644
--- a/fluent-bit-3.2.4.bb
+++ b/fluent-bit-4.0.0.bb
@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
 SECTION = "net"
 
 PR = "r0"
-PV = "3.2.4"
+PV = "4.0.0"
 
 SRCREV = "v${PV}"
 SRC_URI = "git://github.com/fluent/fluent-bit.git;nobranch=1"
diff --git a/include/fluent-bit/flb_motd.h b/include/fluent-bit/flb_motd.h
index da5392e494e..82dd6e3acab 100644
--- a/include/fluent-bit/flb_motd.h
+++ b/include/fluent-bit/flb_motd.h
@@ -25,35 +25,35 @@ static unsigned char flb_motd_text[] = {
     0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
     0x20, 0x20, 0x5f, 0x20, 0x20, 0x20, 0x20, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
     0x5f, 0x20, 0x5f, 0x20, 0x5f, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-    0x20, 0x20, 0x20, 0x20, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x20, 0x20, 0x5f,
+    0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x5f, 0x5f, 0x5f, 0x20, 0x20, 0x5f,
     0x5f, 0x5f, 0x5f, 0x5f, 0x20, 0x0a, 0x7c, 0x20, 0x20, 0x5f, 0x5f, 0x5f,
     0x7c, 0x20, 0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
     0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x20, 0x7c, 0x20, 0x20,
     0x20, 0x7c, 0x20, 0x5f, 0x5f, 0x5f, 0x20, 0x28, 0x5f, 0x29, 0x20, 0x7c,
-    0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x5f, 0x5f,
-    0x5f, 0x5f, 0x20, 0x7c, 0x2f, 0x20, 0x5f, 0x5f, 0x20, 0x20, 0x5c, 0x0a,
+    0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x2f,
+    0x20, 0x20, 0x20, 0x7c, 0x7c, 0x20, 0x20, 0x5f, 0x20, 0x20, 0x7c, 0x0a,
     0x7c, 0x20, 0x7c, 0x5f, 0x20, 0x20, 0x7c, 0x20, 0x7c, 0x5f, 0x20, 0x20,
     0x20, 0x5f, 0x20, 0x20, 0x5f, 0x5f, 0x5f, 0x20, 0x5f, 0x20, 0x5f, 0x5f,
     0x20, 0x7c, 0x20, 0x7c, 0x5f, 0x20, 0x20, 0x7c, 0x20, 0x7c, 0x5f, 0x2f,
     0x20, 0x2f, 0x5f, 0x7c, 0x20, 0x7c, 0x5f, 0x20, 0x20, 0x5f, 0x5f, 0x20,
-    0x20, 0x20, 0x5f, 0x5f, 0x20, 0x20, 0x20, 0x2f, 0x20, 0x2f, 0x60, 0x27,
-    0x20, 0x2f, 0x20, 0x2f, 0x27, 0x0a, 0x7c, 0x20, 0x20, 0x5f, 0x7c, 0x20,
+    0x20, 0x20, 0x5f, 0x5f, 0x2f, 0x20, 0x2f, 0x7c, 0x20, 0x7c, 0x7c, 0x20,
+    0x7c, 0x2f, 0x27, 0x20, 0x7c, 0x0a, 0x7c, 0x20, 0x20, 0x5f, 0x7c, 0x20,
     0x7c, 0x20, 0x7c, 0x20, 0x7c, 0x20, 0x7c, 0x20, 0x7c, 0x2f, 0x20, 0x5f,
     0x20, 0x5c, 0x20, 0x27, 0x5f, 0x20, 0x5c, 0x7c, 0x20, 0x5f, 0x5f, 0x7c,
     0x20, 0x7c, 0x20, 0x5f, 0x5f, 0x5f, 0x20, 0x5c, 0x20, 0x7c, 0x20, 0x5f,
-    0x5f, 0x7c, 0x20, 0x5c, 0x20, 0x5c, 0x20, 0x2f, 0x20, 0x2f, 0x20, 0x20,
-    0x20, 0x5c, 0x20, 0x5c, 0x20, 0x20, 0x2f, 0x20, 0x2f, 0x20, 0x20, 0x0a,
+    0x5f, 0x7c, 0x20, 0x5c, 0x20, 0x5c, 0x20, 0x2f, 0x20, 0x2f, 0x20, 0x2f,
+    0x5f, 0x7c, 0x20, 0x7c, 0x7c, 0x20, 0x20, 0x2f, 0x7c, 0x20, 0x7c, 0x0a,
     0x7c, 0x20, 0x7c, 0x20, 0x20, 0x20, 0x7c, 0x20, 0x7c, 0x20, 0x7c, 0x5f,
     0x7c, 0x20, 0x7c, 0x20, 0x20, 0x5f, 0x5f, 0x2f, 0x20, 0x7c, 0x20, 0x7c,
     0x20, 0x7c, 0x20, 0x7c, 0x5f, 0x20, 0x20, 0x7c, 0x20, 0x7c, 0x5f, 0x2f,
     0x20, 0x2f, 0x20, 0x7c, 0x20, 0x7c, 0x5f, 0x20, 0x20, 0x20, 0x5c, 0x20,
-    0x56, 0x20, 0x2f, 0x2e, 0x5f, 0x5f, 0x5f, 0x2f, 0x20, 0x2f, 0x2e, 0x2f,
-    0x20, 0x2f, 0x5f, 0x5f, 0x5f, 0x0a, 0x5c, 0x5f, 0x7c, 0x20, 0x20, 0x20,
+    0x56, 0x20, 0x2f, 0x5c, 0x5f, 0x5f, 0x5f, 0x20, 0x20, 0x7c, 0x5c, 0x20,
+    0x7c, 0x5f, 0x2f, 0x20, 0x2f, 0x0a, 0x5c, 0x5f, 0x7c, 0x20, 0x20, 0x20,
     0x7c, 0x5f, 0x7c, 0x5c, 0x5f, 0x5f, 0x2c, 0x5f, 0x7c, 0x5c, 0x5f, 0x5f,
     0x5f, 0x7c, 0x5f, 0x7c, 0x20, 0x7c, 0x5f, 0x7c, 0x5c, 0x5f, 0x5f, 0x7c,
     0x20, 0x5c, 0x5f, 0x5f, 0x5f, 0x5f, 0x2f, 0x7c, 0x5f, 0x7c, 0x5c, 0x5f,
-    0x5f, 0x7c, 0x20, 0x20, 0x20, 0x5c, 0x5f, 0x2f, 0x20, 0x5c, 0x5f, 0x5f,
-    0x5f, 0x5f, 0x28, 0x5f, 0x29, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x2f, 0x0a,
+    0x5f, 0x7c, 0x20, 0x20, 0x20, 0x5c, 0x5f, 0x2f, 0x20, 0x20, 0x20, 0x20,
+    0x20, 0x7c, 0x5f, 0x28, 0x5f, 0x29, 0x5f, 0x5f, 0x5f, 0x2f, 0x20, 0x0a,
     0x0a, 0x0a, 0x00,
 };
 
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index fa14c50cce2..178efd1ca8f 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,6 +1,6 @@
 name: fluent-bit
 base: core18
-version: '3.2.4'
+version: '4.0.0'
 summary: High performance logs and stream processor
 description: |
   Fluent Bit is a high performance log processor and stream processor for Linux.