diff --git a/include/audit_handler.h b/include/audit_handler.h
index 4d8485d..d327f7a 100644
--- a/include/audit_handler.h
+++ b/include/audit_handler.h
@@ -448,7 +448,7 @@ static inline const CHARSET_INFO * pfs_connect_attrs_cs(const void * pfs)
 	}
 
 	if (   ( major == 5  && ( (minor == 6 && patch >= 15) || minor >= 7) ) || (major == 8)	// MySQL
-	    || ( major == 10 && ( (minor == 0 && patch >= 11) || minor >= 1) ) )	// MariaDB
+	    || ( major == 10 && ( (minor == 0 && patch >= 11) || minor >= 1) ) || (major >= 11) ) // MariaDB
 	{
 		uint cs_number = *(uint *) (((unsigned char *) pfs) + Audit_formatter::thd_offsets.pfs_connect_attrs_cs);
 		if (!cs_number)
diff --git a/src/audit_offsets.cc b/src/audit_offsets.cc
index 4892c4d..0a66df5 100644
--- a/src/audit_offsets.cc
+++ b/src/audit_offsets.cc
@@ -81,12 +81,18 @@ const ThdOffsets thd_offsets_arr[] =
 const ThdOffsets thd_offsets_arr[] =
 {
 	/* +++ MYSQL 64 OFFSETS GO HERE +++ */
-	//offsets for: mysqld (8.0.37-commercial)
-	{"8.0.37-commercial","ad11041390174d8d5445686ef2183816", 9456, 9496, 4960, 6396, 1288, 0, 0, 32, 64, 160, 1376, 9596, 6016, 4248, 4256, 4260, 7680, 1576, 32, 8640, 8680, 8664, 12840, 140, 668, 320},
+	    //offsets for: mysqld (8.0.41)
+        {"8.0.41","e818c531909ed2f1bf78b7c125da947c", 9440, 9480, 4952, 6380, 1280, 0, 0, 32, 64, 160, 1368, 9580, 6000, 4248, 4256, 4260, 7664, 1576, 32, 8624, 8664, 8648, 12824, 140, 668, 320},
+		//offsets for: /usr/sbin/mysqld (8.0.40-commercial)
+        {"8.0.40-commercial","f5276b320d427d6fe806890834484722", 9440, 9480, 4952, 6380, 1280, 0, 0, 32, 64, 160, 1368, 9580, 6000, 4248, 4256, 4260, 7664, 1576, 32, 8624, 8664, 8648, 12824, 140, 668, 320},
+        //offsets for: mysqld (8.0.39-commercial)
+        {"8.0.39-commercial","67adafe314eabdfd8e559d82afd39680", 9440, 9480, 4952, 6380, 1280, 0, 0, 32, 64, 160, 1368, 9580, 6000, 4248, 4256, 4260, 7664, 1576, 32, 8624, 8664, 8648, 12824, 140, 668, 320},
+        //offsets for: mysqld (8.0.37-commercial)
+        {"8.0.37-commercial","ad11041390174d8d5445686ef2183816", 9456, 9496, 4960, 6396, 1288, 0, 0, 32, 64, 160, 1376, 9596, 6016, 4248, 4256, 4260, 7680, 1576, 32, 8640, 8680, 8664, 12840, 140, 668, 320},
         //offsets for: /usr/sbin/mysqld (8.0.36)
         {"8.0.36","9ba2568aeceed956bc047f4913f8285a", 9448, 9488, 4952, 6388, 1288, 0, 0, 32, 64, 160, 1376, 9588, 6008, 4248, 4256, 4260, 7672, 1576, 32, 8632, 8672, 8656, 12832, 140, 668, 320},
-         //offsets for: /usr/sbin/mysqld (8.0.35)
-         {"8.0.35","465a40519e83cab54735ba515ba596bc", 9496, 9536, 4952, 6436, 1288, 0, 0, 32, 64, 160, 1376, 9636, 6056, 4248, 4256, 4260, 7720, 1576, 32, 8680, 8720, 8704, 12880, 140, 664, 320},
+        //offsets for: /usr/sbin/mysqld (8.0.35)
+        {"8.0.35","465a40519e83cab54735ba515ba596bc", 9496, 9536, 4952, 6436, 1288, 0, 0, 32, 64, 160, 1376, 9636, 6056, 4248, 4256, 4260, 7720, 1576, 32, 8680, 8720, 8704, 12880, 140, 664, 320},
 	//offsets for: /usr/sbin/mysqld (8.0.34)
 	{"8.0.34","2bf7588f074ff87a28dcc5fdc781d6e4", 9496, 9536, 4952, 6436, 1288, 0, 0, 32, 64, 160, 1376, 9636, 6056, 4248, 4256, 4260, 7720, 1576, 32, 8680, 8720, 8704, 12880, 140, 664, 320},
 	//offsets for: /usr/sbin/mysqld (8.0.33)
@@ -470,6 +476,14 @@ const ThdOffsets thd_offsets_arr[] =
 const ThdOffsets thd_offsets_arr[] =
 {
 	/* +++ MARIADB 64 OFFSETS GO HERE +++ */
+	//offsets for: /usr/sbin/mariadbd (11.5.2-MariaDB)
+    {"11.5.2-MariaDB","f25184aea1490c0c91f77dc71c6fdfd6", 16208, 16392, 8200, 10416, 88, 3672, 8, 0, 16, 24, 160, 16524, 10000, 5712, 5720, 5724, 696, 0, 0, 15448, 15472, 15456, 25312, 564, 8, 0}, 
+	//offsets for: /usr/sbin/mariadbd (11.4.2-MariaDB)
+	{"11.4.2-MariaDB","9fb9133fd7e2f68d76150ebc17b69812", 16104, 16280, 8104, 10312, 88, 3672, 8, 0, 16, 24, 160, 16412, 9896, 5704, 5712, 5716, 696, 0, 0, 15344, 15368, 15352, 25200, 564, 8, 0},  
+	//offsets for: /usr/sbin/mariadbd (11.3.2-MariaDB)
+	{"11.3.2-MariaDB","cfe74e02e490d5ce0e8aea46c921a1be", 16104, 16280, 8104, 10312, 88, 3672, 8, 0, 16, 24, 160, 16412, 9896, 5704, 5712, 5716, 696, 0, 0, 15344, 15368, 15352, 25192, 564, 8, 0},
+    //offsets for: /usr/sbin/mariadbd (11.2.2-MariaDB)
+    {"11.2.2-MariaDB","e92cae4589408753743ece17bbdae5fb", 16080, 16256, 8096, 10304, 88, 0, 8, 0, 16, 24, 160, 16388, 9888, 5704, 5712, 5716, 696, 0, 0, 15336, 15360, 15344, 0, 0, 0, 440},
 	//offsets for: mariadbd (10.11.7-MariaDB)
 	{"10.11.7-MariaDB","d84a65522e255859aa02332b1464e20c", 15936, 16112, 7952, 10160, 88, 3656, 8, 0, 16, 24, 160, 16244, 9744, 5688, 5696, 5700, 696, 0, 0, 15192, 15216, 15200, 25160, 564, 8, 0},
 	//offsets for: mariadbd (10.11.6-MariaDB)
@@ -1975,4 +1989,4 @@ const ThdOffsets thd_offsets_arr[] =
 #endif // end 32bit offsets
 
 //the size of the offsets arr
-const size_t thd_offsets_arr_size = array_elements(thd_offsets_arr);
\ No newline at end of file
+const size_t thd_offsets_arr_size = array_elements(thd_offsets_arr);