diff --git a/ADDING_TRANSLATIONS.md b/ADDING_TRANSLATIONS.md
new file mode 100644
index 000000000000..e4a26f9fefb1
--- /dev/null
+++ b/ADDING_TRANSLATIONS.md
@@ -0,0 +1,314 @@
+# Adding Translations to AsyncAPI Website <!-- omit in toc -->
+
+We appreciate your valuable contributions to the AsyncAPI website, whether it's adding or improving existing translations.
+
+## Table of contents <!-- omit in toc -->
+- [Improving existing translations:](#improving-existing-translations)
+- [Adding translations to a partially localized page:](#adding-translations-to-a-partially-localized-page)
+- [Adding translations to a new page:](#adding-translations-to-a-new-page)
+- [Adding a new locale:](#adding-a-new-locale)
+
+## Improving existing translations
+
+To modify or improve existing translations, simply navigate to the `locales` folder and edit the appropriate `JSON` files for your preferred language.
+
+Here is an example directory structure for the `locales` folder. It contains sub-folders named after different languages, each of which contains `JSON` files with key-value pairs for translations.
+
+The file `common.json` contains common translation keys such as buttons and CTAs. The other JSON files are specific to certain pages on the website. For instance, `tools.json` includes translations for all the tools-related pages on the website.
+
+```
+📦locales
+ ┣ 📂de
+ ┃ ┣ 📜common.json
+ ┃ ┣ 📜landing-page.json
+ ┃ ┗ 📜tools.json
+ ┃ ┗ 📜....json
+ ┗ 📂en
+ ┃ ┣ 📜common.json
+ ┃ ┣ 📜landing-page.json
+ ┃ ┗ 📜tools.json
+ ┃ ┗ 📜....json
+```
+
+To modify a `Landing Page`'s heading:
+- Navigate to the `locales` folder.
+- Select a language, e.g. `de` (German) - go to the `de` folder.
+- Open `landing-page.json`.
+- Change the values according to your needs.
+- Create a pull request with the changes.
+
+## Adding translations to a partially localized page
+
+The text on any given page may not have a translation available in your language.
+
+Use the translation hook with the key specified in the `locales` folder.
+
+Suppose the Landing Page has a button that is still in English when the language is set to German:
+- Navigate to the file where the component is defined.
+- Import the `useTranslation` hook from `lib/i18n`.
+- Extract the translation function from the hook `const { t } = useTranslation();`.
+- Use it to pass the key of the required translation value. Make sure to add the required key to the `locales` folder according to the page's scope. In this example, we are adding translation for a button, since all translation keys related to buttons need to be specified in `common.json`.
+
+Example:
+
+`ICSFileButton.js`
+```diff
+...
++ import { useTranslation } from '../../lib/i18n';
+
+export default function ICSFButton({
+- text = 'Download ICS File',
++ text = 'icsFileBtn',
+  ...
+}) {
+
++  const { t } = useTranslation('common');
+
+  return (
+    <Button
+-     text={text}
++     text={t(text)}
+      ...
+    />
+  )
+}
+```
+
+`en/common.json`
+```diff
+{
++    "icsFileBtn": "Download ICS File",
+}
+```
+
+`de/common.json`
+```diff
+{
++    "icsFileBtn": "ICS-Datei herunterladen",
+}
+```
+
+Ensure consistent naming in all `locales/[lang]/[file].json` files, and add a translation for all the locales present in the `locales` folder.
+
+> **NOTE**: You may also need to fix the cypress tests after adding a new translation key.
+
+## Adding translations to a new page
+
+The process for adding translations to a page that is not yet available in any existing locale is different from adding translations to a specific part of the page that is partially translated.
+
+**1. Create new JSON Files**
+  - Navigate to the `locales` folder.
+  - Create new `JSON` files with the same name in each of the `locales` folder. You may not need to create new `JSON` files in case there already exists a file with the same scope as your page. For example, all pages under the `tools/*` use the translation keys defined in `locales/[lang]/tools.json`.
+  - Skip to `Step 3` in case you haven't created new `JSON` files.
+
+**2. Modify the i18n configuration**
+  - Navigate to the `next-i18next-static-site.config.js` file in the root of the project folder.
+  - Add the name of the newly added `JSON` file to the `namespaces` array.
+
+**3. Add the static site functions**
+  - Copy the page(s) that you want to be localized to the `pages/[lang]/` folder according to the appropriate directory structure.
+  - Add the following functions at the bottom of the file for `i18n` to work.
+    ```js
+    export async function getStaticPaths() {
+        const paths = getAllLanguageSlugs();
+        return {
+            paths,
+            fallback: false,
+        };
+    }
+
+    export async function getStaticProps({ params }) {
+        const language = getLanguage(params.lang);
+        return {
+            props: {
+                language,
+            },
+        };
+    }
+    ```
+    
+  - Follow the [Adding Translations guide](#adding-translations) to start translating the components
+
+**4. Configure i18n routing**
+After adding a new internationalized page, test it to sure the page is being served on the website when someone visits it.
+  - Replace the `next/link` component with the `LinkComponent` from `components/link.js` in the files where the page's `href` is being referenced.
+  - Make sure to add the exact same `href` to the `lib/i18nPaths.js` in the respective locales which support that `href`.
+
+  For example, if you want to translate the `pages/newsletter/index.js` page, so that if someone visits `asyncapi.com/de/newsletter`, it shows the page in the `German` locale.
+
+  - Add new `JSON` files to the `locales/en` and `locales/de` folder.
+
+  `locales` folder directory structure
+  ```diff
+    locales
+     ┣ de
+     ┃ ┣ common.json
+     ┃ ┣ landing-page.json
+  +  ┃ ┣ newsletter.json
+     ┃ ┗ tools.json
+     ┗ en
+     ┃ ┣ common.json
+     ┃ ┣ landing-page.json
+  +  ┃ ┣ newsletter.json
+     ┃ ┗ tools.json
+    ```
+
+  - Modify the `i18n` config to include the `newsletter` namespace.
+
+  ```diff
+  module.exports = {
+      i18n: {
+          languages: ["en", "de"],
+          defaultLanguage: "en",
+  -       namespaces: ["landing-page", "common", "tools"],
+  +       namespaces: ["landing-page", "common", "tools", "newsletter"],
+          defaultNamespace: "landing-page",
+      },
+  };
+  ```
+
+  - Copy and add static site functions to the `newsletter/index.js` page.
+
+  `pages` folder directory structure
+  ```diff
+    [lang]
+  +  ┣ newsletter
+  +  ┃ ┗ index.js
+     ┣ tools
+     ┃ ┗ cli.js
+     ┗ index.js
+  ```
+
+  `newsletter/index.js`
+  ```diff
+  ...
+  + import {
+  +   getAllLanguageSlugs,
+  +   getLanguage,
+  +   useTranslation
+  + } from "../../lib/i18n";
+
+  export default function NewsletterIndexPage() {
+
+  +  const { t } = useTranslation('newsletter');
+
+    return (
+      ...
+    );
+  }
+
+  + export async function getStaticPaths() {
+  +   const paths = getAllLanguageSlugs();
+  +   return {
+  +     paths,
+  +    fallback: false,
+  +  };
+  + }
+  + 
+  + export async function getStaticProps({ params }) {
+  +   const language = getLanguage(params.lang);
+  +   return {
+  +     props: {
+  +      language,
+  +    },
+  +   };
+  + }
+  ```
+
+  - Add custom route `LinkComponent` wherever the `next/link` is used for routing to the `/newsletter` href.
+
+  `lib/i18nPaths.js`
+  ```diff
+  const i18nPaths = {
+      en: [
+          "/tools/cli"
+  +       "/newsletter"
+      ],
+      de: [
+          "/tools/cli"
+  +       "/newsletter"
+      ]
+  };
+
+  export default i18nPaths;
+  ```
+
+You are now done with adding the localization to the `newsletter` page.
+
+> **Note**: Make sure to fix the Cypress tests after using the `useTranslation()` hook inside any component that Cypress is testing.
+
+## Adding a new locale
+
+AsyncAPI welcomes people from all over the world.
+
+There exist a few locales like `en` (English) and `de` (German) which have available localizations present.
+
+If you want to add a new locale like `fr` to serve pages in the French locale on the AsyncAPI website, follow these steps.
+
+**1. Create new JSON Files**
+  - Navigate to the `locales` folder.
+  - Create a new folder with the name of the locale you want to introduce.
+  - Create new `JSON` files with the same name as present in each of the other `locales` folders.
+  - Copy the existing `JSON` files present in the `en` folder. Change the values of those translation keys according to the new localization.
+
+**2. Modify i18n configuration**
+  - Navigate to the `next-i18next-static-site.config.js` file in the root of the project folder.
+  - Add the name of the newly added `locale` to the `languages` array.
+
+**3. Configure i18n routing**
+After adding a new internationalized page, ensure it is being served on the website when someone visits.
+  - Make sure to add the same `href` to the `lib/i18nPaths.js` in the respective locales supporting that `href`.
+
+If you have added the 'fr' locale and translated the 'tools/cli' page, clicking 'Tools -> CLI' in the navigation menu will redirect the user to 'asyncapi.com/fr/tools/cli'.
+
+`locales` folder structure
+```diff
+  locales
+   ┣ de
+   ┃ ┣ common.json
+   ┃ ┣ landing-page.json
+   ┃ ┗ tools.json
+   ┣ en
+   ┃ ┣ common.json
+   ┃ ┣ landing-page.json
+   ┃ ┗ tools.json
++  ┗ fr
++  ┃ ┣ common.json
++  ┃ ┣ landing-page.json
++  ┃ ┗ tools.json
+```
+
+- Change the `next-i18next-static-site.config.js` config.
+
+`next-i18next-static-site.config.js`
+```diff
+module.exports = {
+    i18n: {
+-       languages: ["en", "de"],
++       languages: ["en", "de", "fr"],
+        defaultLanguage: "en",
+        namespaces: ["landing-page", "common", "tools"],
+        defaultNamespace: "landing-page",
+    },
+};
+```
+ - Add new locale routing.
+
+`lib/i18nPaths.js`
+```diff
+const i18nPaths = {
+    en: [
+        "/tools/cli"
+    ],
+    de: [
+        "/tools/cli"
+    ],
++   fr: [
++       "/tools/cli"
++   ]
+};
+
+export default i18nPaths;
+```
+
+You are now done with adding a new locale. Congrats 🚀
diff --git a/components/FinancialSummary/BarChartComponent.js b/components/FinancialSummary/BarChartComponent.js
index 92e18a6c4453..e4b0232dee29 100644
--- a/components/FinancialSummary/BarChartComponent.js
+++ b/components/FinancialSummary/BarChartComponent.js
@@ -1,7 +1,7 @@
 import React, { useState, useEffect, useRef } from 'react';
 import { BarChart, Bar, XAxis, YAxis, CartesianGrid, Tooltip, Legend } from 'recharts';
-import ExpensesLink from '../../config/finance/json-data/2023/ExpensesLink.json';
-import Expenses from '../../config/finance/json-data/2023/Expenses.json';
+import ExpensesLink from '../../config/finance/json-data/2024/ExpensesLink.json';
+import Expenses from '../../config/finance/json-data/2024/Expenses.json';
 import { getUniqueCategories } from '../../lib/getUniqueCategories';
 /**
  * CustomTooltip component for the bar chart. Displays additional information on hover.
diff --git a/components/languageSelector/LanguageSelect.js b/components/languageSelector/LanguageSelect.js
index b8d931a7d6f2..99d8a68babaf 100644
--- a/components/languageSelector/LanguageSelect.js
+++ b/components/languageSelector/LanguageSelect.js
@@ -8,11 +8,11 @@ export default function LanguageSelect({
     return (
         <select data-testid="Select-form"
             onChange={(ev) => onChange(ev.target.value)}
-            className={twMerge(`form-select h-full py-0 px-3 pr-7 inline-flex justify-center rounded-md border border-gray-300 shadow-sm py-2 bg-white text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-indigo-500 ${className}`)}
+            className={twMerge(`form-select h-full py-0 px-3 pr-7 inline-flex justify-center rounded-md border border-gray-300 shadow-sm py-2 bg-white text-sm font-medium text-gray-700 hover:bg-gray-50 focus:border-gray-500 focus:outline-none focus:ring-0 focus:ring-black ${className}`)}
             value={selected}
         >
             {options.map((option, index) => (
-                <option key={index} selected={option.value === selected} value={option.value} data-testid="Option-form">
+                <option key={index} value={option.value} data-testid="Option-form">
                     {option.text}
                 </option>
             ))}
diff --git a/components/link.js b/components/link.js
index de49d3b1895d..053277db8c98 100644
--- a/components/link.js
+++ b/components/link.js
@@ -1,22 +1,47 @@
 import Link from "next/link";
 import { useRouter } from "next/router";
 import { defaultLanguage, languages } from "../lib/i18n";
+import i18nPaths from "../lib/i18nPaths";
 
 const LinkComponent = ({ children, locale, ...props }) => {
   const router = useRouter();
+
+  // If there is no router available (e.g., during server-side rendering & cypress tests), render a standard Link
+  if (!router) {
+    return (
+      <Link href={props.href} passHref>
+        {children}
+      </Link>
+    );
+  }
+
   const { pathname, query, asPath } = router;
 
-  // Detect current language
+  // Detect current language based on the path or query parameter
   const slug = asPath.split("/")[1];
   const langSlug = languages.includes(slug) && slug;
   const language = query.lang || langSlug || defaultLanguage;
 
   let href = props.href || pathname;
 
+  /* 
+  If explicit href is provided, and the language-specific paths for the current language do not include the href, or if the href starts with "http", render a standard Link 
+  */
+  if ((props.href && i18nPaths[language] && !i18nPaths[language].includes(href)) || href.includes("http", 0)) {
+    return (
+      <Link href={href} passHref>
+        {children}
+      </Link>
+    );
+  }
+
+  // If a locale is provided, update the href with the locale
   if (locale) {
     if (props.href) {
       href = `/${locale}${href}`;
     } else {
+      // If the current path starts with "/404", update href to be the root path with the locale
+      // Otherwise, replace "[lang]" placeholder with the locale
       if (pathname.startsWith("/404")) {
         href = `/${locale}`;
       } else {
@@ -24,6 +49,7 @@ const LinkComponent = ({ children, locale, ...props }) => {
       }
     }
   } else {
+    // If no locale is provided, update the href with the current language or keep it as is
     if (language) {
       href = `/${language}${href}`;
     } else {
diff --git a/components/navigation/MenuBlocks.js b/components/navigation/MenuBlocks.js
index 6feae5ce56d3..f9caa326820a 100644
--- a/components/navigation/MenuBlocks.js
+++ b/components/navigation/MenuBlocks.js
@@ -1,6 +1,6 @@
+import LinkComponent from '../link';
 import Paragraph from '../typography/Paragraph';
 import Label from './Label'
-import Link from 'next/link'
 import { useRouter } from 'next/router';
 
 
@@ -14,7 +14,7 @@ export default function MenuBlocks ({
         items.map((item, index) => {
           const isExternalHref = item.href && item.href.startsWith('http');
           return (
-            <Link href={item.comingSoon ? '' : item.href} key={index}>
+            <LinkComponent href={item.comingSoon ? '' : item.href} key={index}>
               <a data-testid="MenuBlocks-Link"
                                 className={`flex items-start p-3 -m-3 space-x-4 transition duration-150 ease-in-out rounded-lg  ${router.asPath === item.href ? 'bg-secondary-100 shadow-sm': 'hover:bg-gray-50'}`}
                 target={isExternalHref ? "_blank" : undefined} 
@@ -32,7 +32,7 @@ export default function MenuBlocks ({
                   </Paragraph>
                 </div>
               </a>
-            </Link>
+            </LinkComponent>
           )
         })
       }
diff --git a/components/navigation/NavBar.js b/components/navigation/NavBar.js
index fa5f55f59b93..bf7079f845f6 100644
--- a/components/navigation/NavBar.js
+++ b/components/navigation/NavBar.js
@@ -20,12 +20,9 @@ import {
   useTranslation,
 } from "../../lib/i18n";
 import browserLanguageDetector from "../../lib/browserLanguageDetector";
+import i18nPaths from "../../lib/i18nPaths";
 
 const isMobile = isMobileDevice();
-const uniqueLangs = [...new Set(["EN", "DE"])].map((repo) => ({
-  key: repo,
-  text: repo,
-}));
 
 export default function NavBar({
   className = '',
@@ -37,10 +34,46 @@ export default function NavBar({
   const [mobileMenuOpen, setMobileMenuOpen] = useState();
   const { i18n } = useTranslation();
 
+  /**
+ * Retrieves unique language options based on the current path and i18nPaths configuration.
+ *
+ * @returns {string[]} - An array of unique language options in uppercase.
+ */
+  const getUniqueLangs = () => {
+    let pathnameWithoutLocale = pathname;
+
+    // Check if the pathname includes "/[lang]", if so, replace it with an empty string
+    if (pathname && pathname.includes("/[lang]")) {
+      pathnameWithoutLocale = pathname.replace("/[lang]", "");
+    }
+
+    // Filter unique languages based on i18nPaths that include the modified pathnameWithoutLocale
+    let uniqueLangs = Object.keys(i18nPaths).filter(lang => i18nPaths[lang].includes(pathnameWithoutLocale)).map(lang => lang.toUpperCase());
+
+    // If no unique languages are found, default to ["EN"]
+    return uniqueLangs.length === 0 ? ["EN"] : uniqueLangs;
+  }
+
+  const uniqueLangs = getUniqueLangs().map((lang) => ({
+    key: lang,
+    text: lang,
+    value: lang
+  }));
+
+  /**
+ * Changes the language and updates the URL accordingly.
+ *
+ * @async
+ * @param {string} locale - The new locale/language to set.
+ * @param {boolean} langPicker - Indicates whether the change is from the language picker.
+ *                              If true, stores the language in local storage.
+ * @returns {Promise<void>} - A promise representing the completion of the language change.
+ * @throws {Error} - If an error occurs during the language change process.
+ */
   const changeLanguage = async (locale, langPicker) => {
 
     // Verifies if the language change is from langPicker or the browser-api
-    if(langPicker){
+    if (langPicker) {
       localStorage.setItem('i18nLang', locale);
     }
 
@@ -71,11 +104,6 @@ export default function NavBar({
     router.push(href);
   };
 
-  // To be enabled on the last PR
-  // useEffect(() => {
-  //   changeLanguage(browserLanguageDetector(), false);
-  // }, []);
-
   function outsideClick(menu) {
     if (open !== menu) return;
     setOpen(null);
@@ -179,14 +207,14 @@ export default function NavBar({
             </SearchButton>
 
             {/* // Language Picker Component */}
-            {/* <LanguageSelect
+            <LanguageSelect
               options={uniqueLangs}
               onChange={(value) => {
                 changeLanguage(value.toLowerCase(), true);
               }}
               className=""
-              selected={i18n.language.toLocaleUpperCase()}
-            /> */}
+              selected={i18n.language ? i18n.language.toUpperCase() : "EN"}
+            />
 
             <GithubButton text="Star on GitHub" href="https://github.com/asyncapi/spec" className="py-2 ml-2" inNav="true" />
           </div>
diff --git a/config/MAINTAINERS.json b/config/MAINTAINERS.json
index db069c10599d..bbb2c8d4c14d 100644
--- a/config/MAINTAINERS.json
+++ b/config/MAINTAINERS.json
@@ -697,5 +697,17 @@
         "repos": [
             "modelina"
         ]
+    },
+    {
+        "name": "Sambhav Gupta",
+        "github": "sambhavgupta0705",
+        "linkedin": "sambhavgupta0705",
+        "twitter": "sambhavgupta75",
+        "slack": "U04630DU3N3",
+        "availableForHire": true,
+        "isTscMember": true,
+        "repos": [
+            "website"
+        ]
     }
 ]
\ No newline at end of file
diff --git a/config/all-tags.json b/config/all-tags.json
index bcbe78efc37c..1635fcdbb37c 100644
--- a/config/all-tags.json
+++ b/config/all-tags.json
@@ -1 +1 @@
-{"languages":[{"name":"Go/Golang","color":"bg-[#8ECFDF]","borderColor":"border-[#00AFD9]"},{"name":"Java","color":"bg-[#ECA2A4]","borderColor":"border-[#EC2125]"},{"name":"JavaScript","color":"bg-[#F2F1C7]","borderColor":"border-[#BFBE86]"},{"name":"HTML","color":"bg-[#E2A291]","borderColor":"border-[#E44D26]"},{"name":"C/C++","color":"bg-[#93CDEF]","borderColor":"border-[#0080CC]"},{"name":"C#","color":"bg-[#E3AFE0]","borderColor":"border-[#9B4F96]"},{"name":"Python","color":"bg-[#A8D0EF]","borderColor":"border-[#3878AB]"},{"name":"TypeScript","color":"bg-[#7DBCFE]","borderColor":"border-[#2C78C7]"},{"name":"Kotlin","color":"bg-[#B1ACDF]","borderColor":"border-[#756BD9]"},{"name":"Scala","color":"bg-[#FFA299]","borderColor":"border-[#DF301F]"},{"name":"Markdown","color":"bg-[#BABEBF]","borderColor":"border-[#445B64]"},{"name":"YAML","color":"bg-[#FFB764]","borderColor":"border-[#F1901F]"},{"name":"R","color":"bg-[#84B5ED]","borderColor":"border-[#246BBE]"},{"name":"Ruby","color":"bg-[#FF8289]","borderColor":"border-[#FF000F]"},{"name":"Rust","color":"bg-[#FFB8AA]","borderColor":"border-[#E43716]"},{"name":"Shell","color":"bg-[#87D4FF]","borderColor":"border-[#389ED7]"},{"name":"Groovy","color":"bg-[#B6D5E5]","borderColor":"border-[#609DBC]"}],"technologies":[{"name":"Node.js","color":"bg-[#BDFF67]","borderColor":"border-[#84CE24]"},{"name":"Hermes","color":"bg-[#8AEEBD]","borderColor":"border-[#2AB672]"},{"name":"React JS","color":"bg-[#9FECFA]","borderColor":"border-[#08D8FE]"},{"name":".NET","color":"bg-[#A184FF]","borderColor":"border-[#5026D4]"},{"name":"ASP.NET","color":"bg-[#71C2FB]","borderColor":"border-[#1577BC]"},{"name":"Springboot","color":"bg-[#98E279]","borderColor":"border-[#68BC44]"},{"name":"AWS","color":"bg-[#FF9F59]","borderColor":"border-[#EF6703]"},{"name":"Docker","color":"bg-[#B8E0FF]","borderColor":"border-[#2596ED]"},{"name":"Node-RED","color":"bg-[#FF7474]","borderColor":"border-[#8F0101]"},{"name":"Maven","color":"bg-[#FF6B80]","borderColor":"border-[#CA1A33]"},{"name":"Saas","color":"bg-[#6AB8EC]","borderColor":"border-[#2275AD]"},{"name":"Kubernetes-native","color":"bg-[#D7C7F2]","borderColor":"border-[#A387D2]"},{"name":"Scala","color":"bg-[#D7C7F2]","borderColor":"border-[#A387D2]"},{"name":"Azure","color":"bg-[#4B93FF]","borderColor":"border-[#015ADF]"},{"name":"Jenkins","color":"bg-[#D7C7F2]","borderColor":"border-[#A387D2]"},{"name":"Flask","color":"bg-[#D7C7F2]","borderColor":"border-[#A387D2]"},{"name":"Nest Js","color":"bg-[#E1224E]","borderColor":"border-[#B9012b]"},{"name":"TypeScript","color":"bg-[#61d0f2]","borderColor":"border-[#40ccf7]"},{"name":"Socket.IO","color":"bg-[#61d0f2]","borderColor":"border-[#40ccf7]"},{"name":"Liquid","color":"bg-[#61d0f2]","borderColor":"border-[#40ccf7]"},{"name":"Kotlin","color":"bg-[#61d0f2]","borderColor":"border-[#40ccf7]"},{"name":"Gradle","color":"bg-[#61d0f2]","borderColor":"border-[#40ccf7]"},{"name":"Spring Cloud Streams","color":"bg-[#61d0f2]","borderColor":"border-[#40ccf7]"},{"name":"JHipster JDL","color":"bg-[#61d0f2]","borderColor":"border-[#40ccf7]"},{"name":"Groovy","color":"bg-[#61d0f2]","borderColor":"border-[#40ccf7]"},{"name":"Markdown","color":"bg-[#61d0f2]","borderColor":"border-[#40ccf7]"},{"name":"Shell","color":"bg-[#61d0f2]","borderColor":"border-[#40ccf7]"},{"name":"WebComponents","color":"bg-[#61d0f2]","borderColor":"border-[#40ccf7]"},{"name":"Babel","color":"bg-[#61d0f2]","borderColor":"border-[#40ccf7]"},{"name":"Storybook","color":"bg-[#61d0f2]","borderColor":"border-[#40ccf7]"},{"name":"AsyncAPI Generator","color":"bg-[#61d0f2]","borderColor":"border-[#40ccf7]"},{"name":"VSCode","color":"bg-[#61d0f2]","borderColor":"border-[#40ccf7]"},{"name":"SmartPaste","color":"bg-[#61d0f2]","borderColor":"border-[#40ccf7]"},{"name":"JetBrains","color":"bg-[#61d0f2]","borderColor":"border-[#40ccf7]"},{"name":"IntelliJ IDEA","color":"bg-[#61d0f2]","borderColor":"border-[#40ccf7]"},{"name":"Java","color":"bg-[#61d0f2]","borderColor":"border-[#40ccf7]"},{"name":"HTML","color":"bg-[#61d0f2]","borderColor":"border-[#40ccf7]"}]}
\ No newline at end of file
+{"languages":[{"name":"Go/Golang","color":"bg-[#8ECFDF]","borderColor":"border-[#00AFD9]"},{"name":"Java","color":"bg-[#ECA2A4]","borderColor":"border-[#EC2125]"},{"name":"JavaScript","color":"bg-[#F2F1C7]","borderColor":"border-[#BFBE86]"},{"name":"HTML","color":"bg-[#E2A291]","borderColor":"border-[#E44D26]"},{"name":"C/C++","color":"bg-[#93CDEF]","borderColor":"border-[#0080CC]"},{"name":"C#","color":"bg-[#E3AFE0]","borderColor":"border-[#9B4F96]"},{"name":"Python","color":"bg-[#A8D0EF]","borderColor":"border-[#3878AB]"},{"name":"TypeScript","color":"bg-[#7DBCFE]","borderColor":"border-[#2C78C7]"},{"name":"Kotlin","color":"bg-[#B1ACDF]","borderColor":"border-[#756BD9]"},{"name":"Scala","color":"bg-[#FFA299]","borderColor":"border-[#DF301F]"},{"name":"Markdown","color":"bg-[#BABEBF]","borderColor":"border-[#445B64]"},{"name":"YAML","color":"bg-[#FFB764]","borderColor":"border-[#F1901F]"},{"name":"R","color":"bg-[#84B5ED]","borderColor":"border-[#246BBE]"},{"name":"Ruby","color":"bg-[#FF8289]","borderColor":"border-[#FF000F]"},{"name":"Rust","color":"bg-[#FFB8AA]","borderColor":"border-[#E43716]"},{"name":"Shell","color":"bg-[#87D4FF]","borderColor":"border-[#389ED7]"},{"name":"Groovy","color":"bg-[#B6D5E5]","borderColor":"border-[#609DBC]"}],"technologies":[{"name":"Node.js","color":"bg-[#BDFF67]","borderColor":"border-[#84CE24]"},{"name":"Hermes","color":"bg-[#8AEEBD]","borderColor":"border-[#2AB672]"},{"name":"React JS","color":"bg-[#9FECFA]","borderColor":"border-[#08D8FE]"},{"name":".NET","color":"bg-[#A184FF]","borderColor":"border-[#5026D4]"},{"name":"ASP.NET","color":"bg-[#71C2FB]","borderColor":"border-[#1577BC]"},{"name":"Springboot","color":"bg-[#98E279]","borderColor":"border-[#68BC44]"},{"name":"AWS","color":"bg-[#FF9F59]","borderColor":"border-[#EF6703]"},{"name":"Docker","color":"bg-[#B8E0FF]","borderColor":"border-[#2596ED]"},{"name":"Node-RED","color":"bg-[#FF7474]","borderColor":"border-[#8F0101]"},{"name":"Maven","color":"bg-[#FF6B80]","borderColor":"border-[#CA1A33]"},{"name":"Saas","color":"bg-[#6AB8EC]","borderColor":"border-[#2275AD]"},{"name":"Kubernetes-native","color":"bg-[#D7C7F2]","borderColor":"border-[#A387D2]"},{"name":"Scala","color":"bg-[#D7C7F2]","borderColor":"border-[#A387D2]"},{"name":"Azure","color":"bg-[#4B93FF]","borderColor":"border-[#015ADF]"},{"name":"Jenkins","color":"bg-[#D7C7F2]","borderColor":"border-[#A387D2]"},{"name":"Flask","color":"bg-[#D7C7F2]","borderColor":"border-[#A387D2]"},{"name":"Nest Js","color":"bg-[#E1224E]","borderColor":"border-[#B9012b]"},{"name":"Socket.IO","color":"bg-[#61d0f2]","borderColor":"border-[#40ccf7]"},{"name":"TypeScript","color":"bg-[#61d0f2]","borderColor":"border-[#40ccf7]"},{"name":"Liquid","color":"bg-[#61d0f2]","borderColor":"border-[#40ccf7]"},{"name":"Kotlin","color":"bg-[#61d0f2]","borderColor":"border-[#40ccf7]"},{"name":"Gradle","color":"bg-[#61d0f2]","borderColor":"border-[#40ccf7]"},{"name":"Spring Cloud Streams","color":"bg-[#61d0f2]","borderColor":"border-[#40ccf7]"},{"name":"JHipster JDL","color":"bg-[#61d0f2]","borderColor":"border-[#40ccf7]"},{"name":"Groovy","color":"bg-[#61d0f2]","borderColor":"border-[#40ccf7]"},{"name":"Markdown","color":"bg-[#61d0f2]","borderColor":"border-[#40ccf7]"},{"name":"Shell","color":"bg-[#61d0f2]","borderColor":"border-[#40ccf7]"},{"name":"WebComponents","color":"bg-[#61d0f2]","borderColor":"border-[#40ccf7]"},{"name":"Babel","color":"bg-[#61d0f2]","borderColor":"border-[#40ccf7]"},{"name":"Storybook","color":"bg-[#61d0f2]","borderColor":"border-[#40ccf7]"},{"name":"AsyncAPI Generator","color":"bg-[#61d0f2]","borderColor":"border-[#40ccf7]"},{"name":"JetBrains","color":"bg-[#61d0f2]","borderColor":"border-[#40ccf7]"},{"name":"IntelliJ IDEA","color":"bg-[#61d0f2]","borderColor":"border-[#40ccf7]"},{"name":"VSCode","color":"bg-[#61d0f2]","borderColor":"border-[#40ccf7]"},{"name":"SmartPaste","color":"bg-[#61d0f2]","borderColor":"border-[#40ccf7]"},{"name":"Java","color":"bg-[#61d0f2]","borderColor":"border-[#40ccf7]"},{"name":"HTML","color":"bg-[#61d0f2]","borderColor":"border-[#40ccf7]"}]}
\ No newline at end of file
diff --git a/config/finance/2023/Expenses.yml b/config/finance/2023/Expenses.yml
index 4e29a14c1c39..f3810dc4d702 100644
--- a/config/finance/2023/Expenses.yml
+++ b/config/finance/2023/Expenses.yml
@@ -104,4 +104,4 @@ December:
   - Category: Swag Store
     Amount: '1415.90'
   - Category: Bounty Program
-    Amount: '201.10'
\ No newline at end of file
+    Amount: '813.10'
\ No newline at end of file
diff --git a/config/finance/2024/Expenses.yml b/config/finance/2024/Expenses.yml
new file mode 100644
index 000000000000..ee2c9f5d49e7
--- /dev/null
+++ b/config/finance/2024/Expenses.yml
@@ -0,0 +1,14 @@
+January:
+  - Category: JSON Schema Sponsorship
+    Amount: '250.00'
+  - Category: Swag Store
+    Amount: '678.26'
+  - Category: Bounty Program
+    Amount: '1800.00'
+  - Category: Community Manager
+    Amount: '2000.00'
+  - Category: AsyncAPI Conf on Tour 2023
+    Amount: '318.98'
+February:
+  - Category: JSON Schema Sponsorship
+    Amount: '250.00'
\ No newline at end of file
diff --git a/config/finance/2024/ExpensesLink.yml b/config/finance/2024/ExpensesLink.yml
new file mode 100644
index 000000000000..449c60ded4b8
--- /dev/null
+++ b/config/finance/2024/ExpensesLink.yml
@@ -0,0 +1,29 @@
+- category: "Ambassador Program"
+  link: "https://github.com/orgs/asyncapi/discussions/425"
+
+- category: "Google Season of Docs 2023"
+  link: "https://github.com/orgs/asyncapi/discussions/961"
+
+- category: "Swag Store"
+  link: "https://github.com/orgs/asyncapi/discussions/710"
+
+- category: "Bounty Program"
+  link: "https://github.com/orgs/asyncapi/discussions/541"
+
+- category: "3rd Party Services"
+  link: "https://github.com/orgs/asyncapi/discussions/295"
+
+- category: "Community Manager"
+  link: "https://github.com/orgs/asyncapi/discussions/515"
+
+- category: "AsyncAPI Conf on Tour 2023"
+  link: "https://github.com/orgs/asyncapi/discussions/598"
+
+- category: "AsyncAPI Conf on Tour 2024"
+  link: "https://github.com/orgs/asyncapi/discussions/1018"
+
+- category: "Mentorship Program 2023"
+  link: "https://github.com/orgs/asyncapi/discussions/689"
+ 
+- category: "JSON Schema Sponsorship"
+  link: "https://github.com/orgs/asyncapi/discussions/1017"
\ No newline at end of file
diff --git a/config/meetings.json b/config/meetings.json
index 50c8b51f6f25..0a9305eb6f7d 100644
--- a/config/meetings.json
+++ b/config/meetings.json
@@ -1,18 +1,4 @@
 [
-  {
-    "title": "Community Meeting",
-    "calLink": "https://www.google.com/calendar/event?eid=ZGk3ZHJybXZhNmM3aWJzNWdzZWdtNTZjMHMgY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
-    "url": "https://github.com/asyncapi/community/issues/916",
-    "banner": "https://user-images.githubusercontent.com/40604284/277314120-f03a06ea-0820-462a-85af-18b1706ea5c6.png",
-    "date": "2023-10-31T16:00:00.000Z"
-  },
-  {
-    "title": "Community Meeting",
-    "calLink": "https://www.google.com/calendar/event?eid=b3BvZGhqN2xwZXFiMmtvOTQ1M2cwNGRlZTAgY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
-    "url": "https://github.com/asyncapi/community/issues/917",
-    "banner": "https://user-images.githubusercontent.com/40604284/277314352-f62224d8-03a9-46b2-94bf-13bfae6f973b.png",
-    "date": "2023-11-14T08:00:00.000Z"
-  },
   {
     "title": "Community Meeting",
     "calLink": "https://www.google.com/calendar/event?eid=ODNjM2h0bGQ4dGhwcWd2Mmw2MWhkcGcycGcgY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
@@ -66,5 +52,33 @@
     "url": "https://github.com/asyncapi/community/issues/1019",
     "banner": "",
     "date": "2024-02-08T15:00:00.000Z"
+  },
+  {
+    "title": "AACoT'24 Community Meeting",
+    "calLink": "https://www.google.com/calendar/event?eid=YjY3Z3BxdGMzdmRlZmxmNzJpMmQ3MzQwMm8gY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
+    "url": "https://github.com/asyncapi/community/issues/1041",
+    "banner": "https://user-images.githubusercontent.com/66913810/300802575-5ace2c11-9b6d-4904-b22a-5507ee381360.png",
+    "date": "2024-02-07T14:00:00.000Z"
+  },
+  {
+    "title": "Community Meeting",
+    "calLink": "https://www.google.com/calendar/event?eid=YnMwYjNoaDVpamYwdjlpcTkwOXRjcmxqODggY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
+    "url": "https://github.com/asyncapi/community/issues/1042",
+    "banner": "https://github.com/asyncapi/community/assets/40604284/01c2b8de-fa5c-44dd-81a5-70cb96df4813",
+    "date": "2024-02-06T08:00:00.000Z"
+  },
+  {
+    "title": "Community Meeting",
+    "calLink": "https://www.google.com/calendar/event?eid=ZzZ0OG1iNmkyZW5lbnF2bnE5ZnY5ZW9ua28gY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
+    "url": "https://github.com/asyncapi/community/issues/1067",
+    "banner": "https://github.com/asyncapi/community/assets/40604284/897e0278-8da4-41dc-b2b2-b5add9370d6f",
+    "date": "2024-02-20T16:00:00.000Z"
+  },
+  {
+    "title": "Community Meeting",
+    "calLink": "https://www.google.com/calendar/event?eid=dHJ1dGxncm81b3VvZjI0ZjE1MDkxY25lcjggY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
+    "url": "https://github.com/asyncapi/community/issues/1068",
+    "banner": "https://github.com/asyncapi/community/assets/40604284/70eff71e-5de5-4c99-bc89-86a1b9b81e81",
+    "date": "2024-03-05T08:00:00.000Z"
   }
 ]
\ No newline at end of file
diff --git a/config/newsroom_videos.json b/config/newsroom_videos.json
index 4dd9bfc15fdd..a486fa201431 100644
--- a/config/newsroom_videos.json
+++ b/config/newsroom_videos.json
@@ -1,8 +1,26 @@
 [
+  {
+    "image_url": "https://i.ytimg.com/vi/ZovE6evW8s8/hqdefault.jpg",
+    "title": "Community Meeting(20th of Feb, 2024)",
+    "description": "https://github.com/asyncapi/community/issues/1067.",
+    "videoId": "ZovE6evW8s8"
+  },
+  {
+    "image_url": "https://i.ytimg.com/vi/4t4nAmDekDA/hqdefault.jpg",
+    "title": "AACoT&#39;24 Community Meeting, Wednesday February 7th 2024",
+    "description": "https://github.com/asyncapi/community/issues/1041.",
+    "videoId": "4t4nAmDekDA"
+  },
+  {
+    "image_url": "https://i.ytimg.com/vi/8xiLLyIpFpw/hqdefault.jpg",
+    "title": "Community Meeting, February 6th 2024",
+    "description": "https://github.com/asyncapi/community/issues/1042.",
+    "videoId": "8xiLLyIpFpw"
+  },
   {
     "image_url": "https://i.ytimg.com/vi/cb7lrq5hxuE/hqdefault.jpg",
     "title": "Community Meeting, January 23rd 2024",
-    "description": "Join us for an insightful stream diving deep into the latest advancements of AsyncAPI v3! We'll explore this cutting-edge ...",
+    "description": "",
     "videoId": "cb7lrq5hxuE"
   },
   {
@@ -10,23 +28,5 @@
     "title": "Overview of AsyncAPI v3",
     "description": "Join us for an insightful stream diving deep into the latest advancements of AsyncAPI v3! We'll explore this cutting-edge ...",
     "videoId": "prFgD14u7T0"
-  },
-  {
-    "image_url": "https://i.ytimg.com/vi/-OsMet9h_dg/hqdefault.jpg",
-    "title": "3 Request/Reply Use Cases",
-    "description": "Explain Request/Reply use cases to me like I'm a 5 year old.",
-    "videoId": "-OsMet9h_dg"
-  },
-  {
-    "image_url": "https://i.ytimg.com/vi/yOc_fI-i9C8/hqdefault.jpg",
-    "title": "Community Meeting(12th December)",
-    "description": "https://github.com/asyncapi/community/issues/979.",
-    "videoId": "yOc_fI-i9C8"
-  },
-  {
-    "image_url": "https://i.ytimg.com/vi/g6CPg77Lf5Q/hqdefault.jpg",
-    "title": "AsyncAPI Conf on Tour 2023 in Bangalore, India",
-    "description": "AACoT'23 Bangalore Edition live from Postman Offices in India.",
-    "videoId": "g6CPg77Lf5Q"
   }
 ]
\ No newline at end of file
diff --git a/config/tools-automated.json b/config/tools-automated.json
index 781cd8aed50e..3e7bcbe8fab0 100644
--- a/config/tools-automated.json
+++ b/config/tools-automated.json
@@ -3,45 +3,45 @@
     "description": "The following is a list of APIs that expose functionality related to AsyncAPI.",
     "toolsList": [
       {
-        "title": "AsyncAPI Server API",
-        "description": "Server API providing official AsyncAPI tools",
+        "title": "SIO-AsyncAPI",
+        "description": "This is code-first approach to generate AsyncAPI specification from Socket.IO server.",
         "links": {
-          "websiteUrl": "https://api.asyncapi.com/v1",
-          "docsUrl": "https://api.asyncapi.com/v1/docs",
-          "repoUrl": "https://github.com/asyncapi/server-api"
+          "websiteUrl": "https://github.com/daler-rahimov/sio-asyncapi",
+          "docsUrl": "https://github.com/daler-rahimov/sio-asyncapi",
+          "repoUrl": "https://github.com/daler-rahimov/sio-asyncapi"
         },
         "filters": {
+          "language": "Python",
           "technology": [
-            "Node.js",
-            "TypeScript"
+            "Socket.IO",
+            "Flask"
           ],
           "categories": [
+            "code-first",
             "api"
           ],
           "hasCommercial": false,
-          "isAsyncAPIOwner": true
+          "isAsyncAPIOwner": false
         }
       },
       {
-        "title": "SIO-AsyncAPI",
-        "description": "This is code-first approach to generate AsyncAPI specification from Socket.IO server.",
+        "title": "AsyncAPI Server API",
+        "description": "Server API providing official AsyncAPI tools",
         "links": {
-          "websiteUrl": "https://github.com/daler-rahimov/sio-asyncapi",
-          "docsUrl": "https://github.com/daler-rahimov/sio-asyncapi",
-          "repoUrl": "https://github.com/daler-rahimov/sio-asyncapi"
+          "websiteUrl": "https://api.asyncapi.com/v1",
+          "docsUrl": "https://api.asyncapi.com/v1/docs",
+          "repoUrl": "https://github.com/asyncapi/server-api"
         },
         "filters": {
-          "language": "Python",
           "technology": [
-            "Socket.IO",
-            "Flask"
+            "Node.js",
+            "TypeScript"
           ],
           "categories": [
-            "code-first",
             "api"
           ],
           "hasCommercial": false,
-          "isAsyncAPIOwner": false
+          "isAsyncAPIOwner": true
         }
       }
     ]
@@ -132,27 +132,6 @@
           "isAsyncAPIOwner": false
         }
       },
-      {
-        "title": "AsyncAPI Modelina",
-        "description": "Generate payload models into Java, TypeScript, Go, etc, you name it, from AsyncAPI documents. This tool gives you full control over the models through high customization",
-        "links": {
-          "websiteUrl": "https://modelina.org",
-          "docsUrl": "https://github.com/asyncapi/modelina/tree/master/docs",
-          "repoUrl": "https://github.com/asyncapi/modelina"
-        },
-        "filters": {
-          "language": "TypeScript",
-          "technology": [
-            "React JS",
-            "Docker"
-          ],
-          "categories": [
-            "code-generator"
-          ],
-          "hasCommercial": false,
-          "isAsyncAPIOwner": true
-        }
-      },
       {
         "title": "ZenWave SDK",
         "description": "DDD and API-First for Event-Driven Microservices",
@@ -178,6 +157,27 @@
           "hasCommercial": false,
           "isAsyncAPIOwner": false
         }
+      },
+      {
+        "title": "AsyncAPI Modelina",
+        "description": "Generate payload models into Java, TypeScript, Go, etc, you name it, from AsyncAPI documents. This tool gives you full control over the models through high customization",
+        "links": {
+          "websiteUrl": "https://modelina.org",
+          "docsUrl": "https://github.com/asyncapi/modelina/tree/master/docs",
+          "repoUrl": "https://github.com/asyncapi/modelina"
+        },
+        "filters": {
+          "language": "TypeScript",
+          "technology": [
+            "React JS",
+            "Docker"
+          ],
+          "categories": [
+            "code-generator"
+          ],
+          "hasCommercial": false,
+          "isAsyncAPIOwner": true
+        }
       }
     ]
   },
@@ -573,15 +573,18 @@
     "description": "The following is a list of extensions for different IDEs like VSCode, IntelliJ IDEA and others",
     "toolsList": [
       {
-        "title": "asyncapi-preview",
-        "description": "VSCode extension that enables you to:\n  - Preview documentation generated using you AsyncAPI document. It uses AsyncAPI React component under the hood,\n  - Create AsyncAPI documents faster using SmartPaste functionality\n",
+        "title": "jAsyncAPI - IDEA plugin",
+        "description": "Idea plugin for the java-asyncapi - Helps to edit and validate AsyncAPI schemas.",
         "links": {
-          "repoUrl": "https://github.com/asyncapi/vs-asyncapi-preview"
+          "websiteUrl": "https://plugins.jetbrains.com/plugin/15673-asyncapi",
+          "docsUrl": "https://github.com/asyncapi/jasyncapi-idea-plugin#usage",
+          "repoUrl": "https://github.com/asyncapi/jasyncapi-idea-plugin"
         },
         "filters": {
+          "language": "Kotlin",
           "technology": [
-            "VSCode",
-            "SmartPaste"
+            "JetBrains",
+            "IntelliJ IDEA"
           ],
           "categories": [
             "ide-extension"
@@ -591,18 +594,15 @@
         }
       },
       {
-        "title": "jAsyncAPI - IDEA plugin",
-        "description": "Idea plugin for the java-asyncapi - Helps to edit and validate AsyncAPI schemas.",
+        "title": "asyncapi-preview",
+        "description": "VSCode extension that enables you to:\n  - Preview documentation generated using you AsyncAPI document. It uses AsyncAPI React component under the hood,\n  - Create AsyncAPI documents faster using SmartPaste functionality\n",
         "links": {
-          "websiteUrl": "https://plugins.jetbrains.com/plugin/15673-asyncapi",
-          "docsUrl": "https://github.com/asyncapi/jasyncapi-idea-plugin#usage",
-          "repoUrl": "https://github.com/asyncapi/jasyncapi-idea-plugin"
+          "repoUrl": "https://github.com/asyncapi/vs-asyncapi-preview"
         },
         "filters": {
-          "language": "Kotlin",
           "technology": [
-            "JetBrains",
-            "IntelliJ IDEA"
+            "VSCode",
+            "SmartPaste"
           ],
           "categories": [
             "ide-extension"
@@ -635,15 +635,17 @@
     "description": "The following is a list of templates compatible with AsyncAPI Generator. You can use them to generate apps, clients or documentation from your AsyncAPI documents.",
     "toolsList": [
       {
-        "title": "Node.js Multiprotocol Template",
-        "description": "This template generates a server using your AsyncAPI document. It supports multiple different protocols, like Kafka or MQTT.  It is designed in the way that generated code is a library and with it's API you can start the server, send messages or register a middleware for listening incoming messages. Runtime message validation included.",
+        "title": "Java Template",
+        "description": "Java template for the AsyncAPI Generator",
         "links": {
-          "repoUrl": "https://github.com/asyncapi/nodejs-template"
+          "repoUrl": "https://github.com/asyncapi/java-template"
         },
         "filters": {
-          "language": "javascript",
+          "language": [
+            "javascript"
+          ],
           "technology": [
-            "Node.js"
+            "Java"
           ],
           "categories": [
             "generator-template"
@@ -653,19 +655,15 @@
         }
       },
       {
-        "title": "Java Spring Template",
-        "description": "Java Spring template for the AsyncAPI Generator",
+        "title": "Node.js Websockets Template",
+        "description": "Node.js WebSockets template for the AsyncAPI Generator. It showcases how from a single AsyncAPI document you can generate a server and a client at the same time.",
         "links": {
-          "repoUrl": "https://github.com/asyncapi/java-spring-template"
+          "repoUrl": "https://github.com/asyncapi/nodejs-ws-template"
         },
         "filters": {
-          "language": [
-            "javascript"
-          ],
+          "language": "javascript",
           "technology": [
-            "Springboot",
-            "Maven",
-            "Gradle"
+            "Node.js"
           ],
           "categories": [
             "generator-template"
@@ -675,17 +673,15 @@
         }
       },
       {
-        "title": "Java Template",
-        "description": "Java template for the AsyncAPI Generator",
+        "title": "HTML Template",
+        "description": "HTML template for AsyncAPI Generator. Use it to generate a static docs. It is using AsyncAPI React component under the hood.",
         "links": {
-          "repoUrl": "https://github.com/asyncapi/java-template"
+          "repoUrl": "https://github.com/asyncapi/html-template"
         },
         "filters": {
-          "language": [
-            "javascript"
-          ],
+          "language": "javascript",
           "technology": [
-            "Java"
+            "HTML"
           ],
           "categories": [
             "generator-template"
@@ -695,15 +691,19 @@
         }
       },
       {
-        "title": "Node.js Websockets Template",
-        "description": "Node.js WebSockets template for the AsyncAPI Generator. It showcases how from a single AsyncAPI document you can generate a server and a client at the same time.",
+        "title": "Java Spring Template",
+        "description": "Java Spring template for the AsyncAPI Generator",
         "links": {
-          "repoUrl": "https://github.com/asyncapi/nodejs-ws-template"
+          "repoUrl": "https://github.com/asyncapi/java-spring-template"
         },
         "filters": {
-          "language": "javascript",
+          "language": [
+            "javascript"
+          ],
           "technology": [
-            "Node.js"
+            "Springboot",
+            "Maven",
+            "Gradle"
           ],
           "categories": [
             "generator-template"
@@ -713,15 +713,15 @@
         }
       },
       {
-        "title": "HTML Template",
-        "description": "HTML template for AsyncAPI Generator. Use it to generate a static docs. It is using AsyncAPI React component under the hood.",
+        "title": "Node.js Multiprotocol Template",
+        "description": "This template generates a server using your AsyncAPI document. It supports multiple different protocols, like Kafka or MQTT.  It is designed in the way that generated code is a library and with it's API you can start the server, send messages or register a middleware for listening incoming messages. Runtime message validation included.",
         "links": {
-          "repoUrl": "https://github.com/asyncapi/html-template"
+          "repoUrl": "https://github.com/asyncapi/nodejs-template"
         },
         "filters": {
           "language": "javascript",
           "technology": [
-            "HTML"
+            "Node.js"
           ],
           "categories": [
             "generator-template"
diff --git a/cypress/test/pages/community/index.cy.js b/cypress/test/pages/community/index.cy.js
index 7eb0b28b3ffe..c5a3e5ecd58a 100644
--- a/cypress/test/pages/community/index.cy.js
+++ b/cypress/test/pages/community/index.cy.js
@@ -44,9 +44,7 @@ describe('CommunityIndexPage', () => {
 
   it('should display other cards correctly', () => {
     cy.get('[data-testid="CommunityCards-Goals"]').should('exist');
-    cy.get('[href="https://github.com/asyncapi/community/discussions/513"]').should('exist');
-    cy.get('[data-testid="CommunityCards-Contributors"]').should('exist');
-    cy.get('[href="https://github.com/orgs/asyncapi/discussions/593"]').should('exist');
+    cy.get('[href="https://github.com/orgs/asyncapi/discussions/948"]').should('exist');
     cy.get('[data-testid="CommunityCards-TSC"]').should('exist');
     cy.get('[href="/community/tsc"]').should('exist');
   });
diff --git a/dashboard.json b/dashboard.json
index c3ab1b59eb9f..e2b5bdc07d80 100644
--- a/dashboard.json
+++ b/dashboard.json
@@ -1,46 +1,57 @@
 {
   "hotDiscussions": [
     {
-      "id": "PR_kwDOFLhIt85bqKL8",
+      "id": "PR_kwDOBW5R_c5f0CJh",
       "isPR": true,
       "isAssigned": false,
-      "title": "docs: add Bounty Program Rules",
-      "author": "aeworxet",
-      "resourcePath": "/asyncapi/community/pull/897",
-      "repo": "asyncapi/community",
+      "title": "docs: tutorial for managing schemas with Schema Registry",
+      "author": "Arya-Gupta",
+      "resourcePath": "/asyncapi/website/pull/2331",
+      "repo": "asyncapi/website",
       "labels": [],
-      "score": 20.102221212448114
+      "score": 26.707236753681066
     },
     {
-      "id": "I_kwDODou01c5AqLB8",
+      "id": "PR_kwDOBW5R_c5fbyLb",
+      "isPR": true,
+      "isAssigned": false,
+      "title": "docs: tutorial for bindings with Kafka",
+      "author": "CynthiaPeter",
+      "resourcePath": "/asyncapi/website/pull/2318",
+      "repo": "asyncapi/website",
+      "labels": [],
+      "score": 22.112443333692923
+    },
+    {
+      "id": "I_kwDOBW5R_c5J6qNe",
       "isPR": false,
       "isAssigned": false,
-      "title": "\"Open with Studio\" button for Markdown files.",
-      "author": "smoya",
-      "resourcePath": "/asyncapi/studio/issues/218",
-      "repo": "asyncapi/studio",
+      "title": "Measuring AsyncAPI spec adoption",
+      "author": "derberg",
+      "resourcePath": "/asyncapi/website/issues/780",
+      "repo": "asyncapi/website",
       "labels": [
         {
           "name": "enhancement",
-          "color": "a2eeef"
+          "color": "84b6eb"
         },
         {
-          "name": "keep-open",
-          "color": "f9dd4b"
+          "name": "stale",
+          "color": "ededed"
         }
       ],
-      "score": 19.527872034949596
+      "score": 20.102221212448114
     },
     {
-      "id": "PR_kwDOFDnrNc5f0Nm0",
+      "id": "PR_kwDOFLhIt85bqKL8",
       "isPR": true,
       "isAssigned": false,
-      "title": "feat: improve glee command",
-      "author": "ayushnau",
-      "resourcePath": "/asyncapi/cli/pull/890",
-      "repo": "asyncapi/cli",
+      "title": "docs: add Bounty Program Rules",
+      "author": "aeworxet",
+      "resourcePath": "/asyncapi/community/pull/897",
+      "repo": "asyncapi/community",
       "labels": [],
-      "score": 18.953522857451077
+      "score": 20.102221212448114
     },
     {
       "id": "I_kwDOFDnrNc51TZDT",
@@ -64,164 +75,128 @@
           "color": "0e8a16"
         }
       ],
-      "score": 17.804824502454043
+      "score": 18.091999091203302
     },
     {
-      "id": "I_kwDODou01c5E_LV0",
-      "isPR": false,
-      "isAssigned": false,
-      "title": "Create onboarding for features of Studio",
-      "author": "mcturco",
-      "resourcePath": "/asyncapi/studio/issues/284",
-      "repo": "asyncapi/studio",
-      "labels": [
-        {
-          "name": "enhancement",
-          "color": "a2eeef"
-        }
-      ],
-      "score": 16.08177696995849
-    },
-    {
-      "id": "PR_kwDOBW5R_c5jw3SL",
+      "id": "PR_kwDOFLhIt85js7KX",
       "isPR": true,
-      "isAssigned": true,
-      "title": "chore(blog): annual review",
-      "author": "thulieblack",
-      "resourcePath": "/asyncapi/website/pull/2549",
-      "repo": "asyncapi/website",
+      "isAssigned": false,
+      "title": "chore: add documents CoC Committee and Incident Resolution Procedures",
+      "author": "Barbanio",
+      "resourcePath": "/asyncapi/community/pull/1013",
+      "repo": "asyncapi/community",
       "labels": [],
-      "score": 15.794602381209232
+      "score": 18.091999091203302
     },
     {
-      "id": "I_kwDOFDnrNc5rjrK-",
+      "id": "I_kwDOBW5R_c580Z0o",
       "isPR": false,
-      "isAssigned": true,
-      "title": "Improve `new glee` command",
-      "author": "KhudaDad414",
-      "resourcePath": "/asyncapi/cli/issues/683",
-      "repo": "asyncapi/cli",
+      "isAssigned": false,
+      "title": "New Contributor Guide and Maintenance Setup",
+      "author": "derberg",
+      "resourcePath": "/asyncapi/website/issues/2586",
+      "repo": "asyncapi/website",
       "labels": [
         {
           "name": "enhancement",
-          "color": "a2eeef"
-        },
-        {
-          "name": "bounty",
-          "color": "0e8a16"
-        },
-        {
-          "name": "level/medium",
-          "color": "0e8a16"
-        },
-        {
-          "name": "bounty/2023-Q4",
-          "color": "0e8a16"
+          "color": "84b6eb"
         }
       ],
-      "score": 15.220253203710714
+      "score": 16.08177696995849
     },
     {
-      "id": "PR_kwDOB5hCo85iLvXV",
+      "id": "PR_kwDODou01c5Iv4zR",
       "isPR": true,
       "isAssigned": false,
-      "title": "ci: added code linting",
-      "author": "Min2who",
-      "resourcePath": "/asyncapi/spec-json-schemas/pull/473",
-      "repo": "asyncapi/spec-json-schemas",
+      "title": "docs: added table of contents and introduction document for Studio tool",
+      "author": "Jagrutiti",
+      "resourcePath": "/asyncapi/studio/pull/553",
+      "repo": "asyncapi/studio",
       "labels": [],
       "score": 14.933078614961456
     },
     {
-      "id": "PR_kwDOBW5R_c5fbyLb",
+      "id": "PR_kwDOKp3ICM5g9w8f",
       "isPR": true,
       "isAssigned": false,
-      "title": "docs: tutorial for bindings with Kafka",
-      "author": "CynthiaPeter",
-      "resourcePath": "/asyncapi/website/pull/2318",
-      "repo": "asyncapi/website",
+      "title": "docs: adding content for module 3",
+      "author": "TRohit20",
+      "resourcePath": "/asyncapi/learning-paths/pull/9",
+      "repo": "asyncapi/learning-paths",
       "labels": [],
-      "score": 14.645904026212197
+      "score": 14.358729437462937
     },
     {
-      "id": "PR_kwDOBW5R_c5dT1NT",
+      "id": "PR_kwDODou01c5YJ7kV",
       "isPR": true,
       "isAssigned": false,
-      "title": "docs: using AsyncAPI with Kafka",
-      "author": "J0SAL",
-      "resourcePath": "/asyncapi/website/pull/2252",
-      "repo": "asyncapi/website",
-      "labels": [],
-      "score": 14.645904026212197
+      "title": "Add Form component",
+      "author": "KhudaDad414",
+      "resourcePath": "/asyncapi/studio/pull/773",
+      "repo": "asyncapi/studio",
+      "labels": [
+        {
+          "name": "autoupdate",
+          "color": "ededed"
+        }
+      ],
+      "score": 13.78438025996442
     },
     {
-      "id": "PR_kwDOBW5R_c5dJ7hJ",
-      "isPR": true,
+      "id": "I_kwDOFLhIt85bebeO",
+      "isPR": false,
       "isAssigned": false,
-      "title": "docs: tutorial for WebSockets with AsyncAPI",
-      "author": "VaishnaviNandakumar",
-      "resourcePath": "/asyncapi/website/pull/2245",
-      "repo": "asyncapi/website",
+      "title": "Meeting Banners Storage",
+      "author": "AceTheCreator",
+      "resourcePath": "/asyncapi/community/issues/568",
+      "repo": "asyncapi/community",
       "labels": [],
-      "score": 14.358729437462937
+      "score": 12.635681904967385
     },
     {
-      "id": "I_kwDOFi_gUM5hpuWl",
-      "isPR": false,
-      "isAssigned": true,
-      "title": "Improve kafka adapter",
-      "author": "KhudaDad414",
-      "resourcePath": "/asyncapi/glee/issues/411",
-      "repo": "asyncapi/glee",
-      "labels": [
-        {
-          "name": "enhancement",
-          "color": "a2eeef"
-        },
-        {
-          "name": "good first issue",
-          "color": "7057ff"
-        },
-        {
-          "name": "area/typescript",
-          "color": "007acc"
-        }
-      ],
-      "score": 13.210031082465903
+      "id": "PR_kwDOFDnrNc5dgyM7",
+      "isPR": true,
+      "isAssigned": false,
+      "title": "feat: add POC for measuring adoption",
+      "author": "smoya",
+      "resourcePath": "/asyncapi/cli/pull/859",
+      "repo": "asyncapi/cli",
+      "labels": [],
+      "score": 12.635681904967385
     }
   ],
   "goodFirstIssues": [
     {
-      "id": "I_kwDOE8Qh3859IP7G",
-      "title": "Add example and documentation for TS mapType",
+      "id": "I_kwDOE8Qh385_rNaC",
+      "title": "Create a one for all input document for runtime to test all functionality",
       "isAssigned": false,
-      "resourcePath": "/asyncapi/modelina/issues/1755",
+      "resourcePath": "/asyncapi/modelina/issues/1825",
       "repo": "asyncapi/modelina",
       "author": "jonaslagoni",
-      "area": "typescript",
+      "area": "Unknown",
       "labels": [
         {
           "name": "enhancement",
           "color": "a2eeef"
-        },
-        {
-          "name": "TS generator",
-          "color": "33943E"
         }
       ]
     },
     {
-      "id": "I_kwDOBW5R_c58jyBx",
-      "title": "Inconsistnecy in finance cards",
+      "id": "I_kwDOE8Qh385-gvCP",
+      "title": "Add \"generated-code\" XmlDoc and `[GeneratedCode]` attribute to C# models.",
       "isAssigned": false,
-      "resourcePath": "/asyncapi/website/issues/2574",
-      "repo": "asyncapi/website",
-      "author": "sambhavgupta0705",
-      "area": "javascript",
+      "resourcePath": "/asyncapi/modelina/issues/1784",
+      "repo": "asyncapi/modelina",
+      "author": "RowlandBanks",
+      "area": "typescript",
       "labels": [
         {
-          "name": "bug",
-          "color": "ee0701"
+          "name": "enhancement",
+          "color": "a2eeef"
+        },
+        {
+          "name": "C# generator",
+          "color": "c5def5"
         }
       ]
     },
@@ -357,16 +332,6 @@
         }
       ]
     },
-    {
-      "id": "I_kwDOB5hCo857l5pC",
-      "title": "Reduce cognitive complexity in `validate-schemas.js`",
-      "isAssigned": false,
-      "resourcePath": "/asyncapi/spec-json-schemas/issues/482",
-      "repo": "asyncapi/spec-json-schemas",
-      "author": "AnimeshKumar923",
-      "area": "javascript",
-      "labels": []
-    },
     {
       "id": "I_kwDOE8Qh3857Kllp",
       "title": "Add loading animation for when playground generate models ",
@@ -389,7 +354,7 @@
     {
       "id": "I_kwDOE8Qh3857KkLT",
       "title": "Introduce Modelina CLI that can be extended by AsyncAPI CLI",
-      "isAssigned": false,
+      "isAssigned": true,
       "resourcePath": "/asyncapi/modelina/issues/1724",
       "repo": "asyncapi/modelina",
       "author": "jonaslagoni",
@@ -439,44 +404,6 @@
         }
       ]
     },
-    {
-      "id": "I_kwDOE8Qh3856iLHJ",
-      "title": "Add Scala generator to playground",
-      "isAssigned": false,
-      "resourcePath": "/asyncapi/modelina/issues/1690",
-      "repo": "asyncapi/modelina",
-      "author": "jonaslagoni",
-      "area": "Unknown",
-      "labels": [
-        {
-          "name": "enhancement",
-          "color": "a2eeef"
-        },
-        {
-          "name": "website",
-          "color": "57A793"
-        },
-        {
-          "name": "Scala Generator",
-          "color": "A25F2B"
-        }
-      ]
-    },
-    {
-      "id": "I_kwDOB5hCo855VB2E",
-      "title": "Add code linting (eslint) as part of CI script",
-      "isAssigned": false,
-      "resourcePath": "/asyncapi/spec-json-schemas/issues/467",
-      "repo": "asyncapi/spec-json-schemas",
-      "author": "smoya",
-      "area": "ci-cd",
-      "labels": [
-        {
-          "name": "enhancement",
-          "color": "a2eeef"
-        }
-      ]
-    },
     {
       "id": "I_kwDODyzcIc54mr9C",
       "title": "Fix wrong format for Co-authored automerged commits + pagination",
@@ -536,21 +463,6 @@
       "area": "typescript",
       "labels": []
     },
-    {
-      "id": "I_kwDOBGu-1853mU6h",
-      "title": "Fix description of Operation Trait object",
-      "isAssigned": false,
-      "resourcePath": "/asyncapi/spec/issues/994",
-      "repo": "asyncapi/spec",
-      "author": "smoya",
-      "area": "Unknown",
-      "labels": [
-        {
-          "name": "🤷‍♀️ Ambiguity",
-          "color": "286AFC"
-        }
-      ]
-    },
     {
       "id": "I_kwDOCoBobc5zovn3",
       "title": "Parser do not validate if channel that is referenced in reply with location has `null` in address",
@@ -581,25 +493,6 @@
         }
       ]
     },
-    {
-      "id": "I_kwDOE8Qh385yzOft",
-      "title": "TypeScript include documentation for properties instead of getters",
-      "isAssigned": false,
-      "resourcePath": "/asyncapi/modelina/issues/1548",
-      "repo": "asyncapi/modelina",
-      "author": "jonaslagoni",
-      "area": "Unknown",
-      "labels": [
-        {
-          "name": "enhancement",
-          "color": "a2eeef"
-        },
-        {
-          "name": "TS generator",
-          "color": "33943E"
-        }
-      ]
-    },
     {
       "id": "I_kwDODwv8N85yh95N",
       "title": "would be nice if venue from past events is grayed out",
@@ -616,6 +509,10 @@
         {
           "name": "Hacktoberfest",
           "color": "FF8AE2"
+        },
+        {
+          "name": "stale",
+          "color": "ededed"
         }
       ]
     },
@@ -650,6 +547,10 @@
         {
           "name": "Hacktoberfest",
           "color": "FF8AE2"
+        },
+        {
+          "name": "stale",
+          "color": "ededed"
         }
       ]
     },
@@ -834,25 +735,6 @@
         }
       ]
     },
-    {
-      "id": "I_kwDOBW5R_c5lGICH",
-      "title": "Make group dropdown for each section in Navbar",
-      "isAssigned": false,
-      "resourcePath": "/asyncapi/website/issues/1625",
-      "repo": "asyncapi/website",
-      "author": "akshatnema",
-      "area": "Unknown",
-      "labels": [
-        {
-          "name": "enhancement",
-          "color": "84b6eb"
-        },
-        {
-          "name": "Hacktoberfest",
-          "color": "FF8AE2"
-        }
-      ]
-    },
     {
       "id": "I_kwDOBW5R_c5jJLzD",
       "title": "[📑 Docs]: new fragment for contributor questions section",
@@ -887,21 +769,6 @@
         }
       ]
     },
-    {
-      "id": "I_kwDOB5hCo85hBDME",
-      "title": "Enable reusability of schemas between versions",
-      "isAssigned": false,
-      "resourcePath": "/asyncapi/spec-json-schemas/issues/364",
-      "repo": "asyncapi/spec-json-schemas",
-      "author": "jonaslagoni",
-      "area": "javascript",
-      "labels": [
-        {
-          "name": "enhancement",
-          "color": "a2eeef"
-        }
-      ]
-    },
     {
       "id": "I_kwDOBW5R_c5eFaBF",
       "title": "Add proper dropdowns to the Filters Select Menu",
diff --git a/lib/getUniqueCategories.js b/lib/getUniqueCategories.js
index 6b40890658b7..2c6e9500c7b9 100644
--- a/lib/getUniqueCategories.js
+++ b/lib/getUniqueCategories.js
@@ -5,7 +5,7 @@
  * @returns {string[]} An array of unique expense categories.
  */
 
-import Expenses from '../config/finance/json-data/2023/Expenses.json';
+import Expenses from '../config/finance/json-data/2024/Expenses.json';
 
 export const getUniqueCategories = () => {
     const allCategories = [];
diff --git a/lib/i18nPaths.js b/lib/i18nPaths.js
new file mode 100644
index 000000000000..138b598cea6f
--- /dev/null
+++ b/lib/i18nPaths.js
@@ -0,0 +1,12 @@
+const i18nPaths = {
+    en: [
+        "", //Homepage Route
+        "/tools/cli"
+    ],
+    de: [
+        "", //Homepage Route
+        "/tools/cli"
+    ]
+};
+
+export default i18nPaths;
\ No newline at end of file
diff --git a/pages/community/index.js b/pages/community/index.js
index 1c16bd147dc9..0b93eb60f989 100644
--- a/pages/community/index.js
+++ b/pages/community/index.js
@@ -135,42 +135,24 @@ function CommunityIndexPage() {
           </ul>
         </div>
       </div>
-      <div className="md:flex md:justify-between w-full mt-20" >
-        <div className="md:w-[45%] flex flex-col justify-between mt-10 md:mt-0">
-          <div data-testid="CommunityCards-Goals">
-            <Card
-              type="small"
-              tagline="Goals"
-              icon="🎯"
-              heading="Community Goals 2023"
-              description="Look into the AsyncAPI community building/maintenance goals for
-              2023 and help us improve."
-              link="https://github.com/asyncapi/community/discussions/513"
-            />
-          </div>
-          <div className="mt-10 md:mt-0" data-testid="CommunityCards-Contributors">
-            <Card
-              type="small"
-              taglineBg=""
-              tagline="Contributors"
-              icon="🏅"
-              heading="Recognize AsyncAPI OSS contributors"
-              description="Recognize the people who inspire and contribute to our OSS
-                    project and community."
-              bg="bg-primary-200"
-              link="https://github.com/orgs/asyncapi/discussions/593"
-            />
-          </div>
+      <div className="flex sm:flex-row flex-col mt-10">
+        <div className="m-5" data-testid="CommunityCards-Goals">
+          <Card
+            type="small"
+            tagline="Goals"
+            icon="🎯"
+            heading="2024 AsyncAPI Community Goals"
+            description="Help us improve our 2024 AsyncAPI community building and maintenance goals."
+            link="https://github.com/orgs/asyncapi/discussions/948"
+          />
         </div>
-        <div className="md:w-[50%] mt-10 md:mt-0" data-testid="CommunityCards-TSC">
+        <div className="m-5" data-testid="CommunityCards-TSC">
           <Card
-            taglineBg="bg-primary-200"
-            heading="Meet Folks Redefining the Initiative"
-            description="Learn how to become a Technical Steering Committee (TSC) member and see our current members."
+            type="small"
             tagline="TSC"
             icon="🚀"
-            btnText="Meet all TSC members"
-            btnBg="fill-primary-500 text-primary-500"
+            heading="Meet Folks Redefining the Initiative"
+            description="Learn how to become a Technical Steering Committee (TSC) member and see our current members."
             link="/community/tsc"
           />
         </div>
@@ -188,6 +170,29 @@ function CommunityIndexPage() {
           className="bg-channelCover"
         />
       </div>
+      <div className="flex sm:flex-row flex-col mt-10">
+        <div className="m-5">
+          <Card
+            type="small"
+            tagline="Finance"
+            icon="💰"
+            heading="Track Initiative Spending with Budget Analysis"
+            description="Explore our transparent finance section for a detailed analysis of our project's budget. See how we track expenses and gain insights into funds allocation."
+            link="/finance"
+          />
+        </div>
+        <div className="m-5">
+          <Card
+            type="small"
+            tagline="Store"
+            icon="🛒"
+            heading="Swags and Goodies"
+            description="Explore our swag collection of AsyncAPI-themed t-shirts and goodies."
+            link="https://www.store.asyncapi.com/"
+            bg="bg-primary-200"
+          />
+        </div>
+      </div>
       <div className="bg-dark py-12 mt-8 md:mt-20 rounded-lg" data-testid="CommunityCard-subscribe">
         <NewsletterSubscribe dark />
       </div>
diff --git a/pages/docs/reference/specification/v3.0.0.md b/pages/docs/reference/specification/v3.0.0.md
index f4153ad73e5e..9221b67d0fa2 100644
--- a/pages/docs/reference/specification/v3.0.0.md
+++ b/pages/docs/reference/specification/v3.0.0.md
@@ -1,10 +1,10 @@
 # AsyncAPI Specification
 
-#### Attribution
+## Attribution
 
 Part of this content has been taken from the great work done by the folks at the [OpenAPI Initiative](https://openapis.org).
 
-#### Version 3.0.0
+### Version 3.0.0
 
 The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this document are to be interpreted as described in [RFC 2119](https://www.ietf.org/rfc/rfc2119.txt).
 
@@ -63,28 +63,36 @@ Aside from the issues mentioned above, there may also be infrastructure configur
 ## <a name="definitions"></a>Definitions
 
 ### <a name="definitionsServer"></a>Server
+
 A server MAY be a message broker that is capable of sending and/or receiving between a [sender](#definitionsSender) and [receiver](#definitionsReceiver). A server MAY be a service with WebSocket API that enables message-driven communication between browser-to-server or server-to-server.
 
 ### <a name="definitionsApplication"></a>Application
-An application is any kind of computer program or a group of them. It MUST be a [sender](#definitionsSender), a [receiver](#definitionsReceiver), or both. An application MAY be a microservice, IoT device (sensor), mainframe process, message broker, etc. An application MAY be written in any number of different programming languages as long as they support the selected [protocol](#definitionsProtocol). An application MUST also use a protocol supported by the [server](#definitionsServer) in order to connect and exchange [messages](#definitionsMessage). 
+
+An application is any kind of computer program or a group of them. It MUST be a [sender](#definitionsSender), a [receiver](#definitionsReceiver), or both. An application MAY be a microservice, IoT device (sensor), mainframe process, message broker, etc. An application MAY be written in any number of different programming languages as long as they support the selected [protocol](#definitionsProtocol). An application MUST also use a protocol supported by the [server](#definitionsServer) in order to connect and exchange [messages](#definitionsMessage).
 
 ### <a name="definitionsSender"></a>Sender
+
 A sender is a type of application, that is sending [messages](#definitionsMessage) to [channels](#definitionsChannel). A sender MAY send to multiple channels depending on the [server](#definitionsServer), protocol, and use-case pattern.
 
 ### <a name="definitionsReceiver"></a>Receiver
+
 A receiver is a type of application that is receiving [messages](#definitionsMessage) from [channels](#definitionsChannel). A receiver MAY receive from multiple channels depending on the [server](#definitionsServer), protocol, and the use-case pattern. A receiver MAY forward a received message further without changing it. A receiver MAY act as a consumer and react to the message. A receiver MAY act as a processor that, for example, aggregates multiple messages in one and forwards them.
 
 ### <a name="definitionsMessage"></a>Message
-A message is the mechanism by which information is exchanged via a channel between [servers](#definitionsServer) and applications. A message MAY contain a payload and MAY also contain headers. The headers MAY be subdivided into [protocol](#definitionsProtocol)-defined headers and header properties defined by the application which can act as supporting metadata. The payload contains the data, defined by the application, which MUST be serialized into a format (JSON, XML, Avro, binary, etc.). Since a message is a generic mechanism, it can support multiple interaction patterns such as event, command, request, or response. 
+
+A message is the mechanism by which information is exchanged via a channel between [servers](#definitionsServer) and applications. A message MAY contain a payload and MAY also contain headers. The headers MAY be subdivided into [protocol](#definitionsProtocol)-defined headers and header properties defined by the application which can act as supporting metadata. The payload contains the data, defined by the application, which MUST be serialized into a format (JSON, XML, Avro, binary, etc.). Since a message is a generic mechanism, it can support multiple interaction patterns such as event, command, request, or response.
 
 ### <a name="definitionsChannel"></a>Channel
+
 A channel is an addressable component, made available by the [server](#definitionsServer), for the organization of [messages](#definitionsMessage). [Sender](#definitionsSender) applications send messages to channels and [receiver](#definitionsReceiver) applications receive messages from channels. [Servers](#definitionsServer) MAY support many channel instances, allowing messages with different content to be addressed to different channels. Depending on the [server](#definitionsServer) implementation, the channel MAY be included in the message via protocol-defined headers.
 
 ### <a name="definitionsProtocol"></a>Protocol
+
 A protocol is the mechanism (wireline protocol or API) by which [messages](#definitionsMessage) are exchanged between the application and the [channel](#definitionsChannel). Example protocols include, but are not limited to, AMQP, HTTP, JMS, Kafka, Anypoint MQ, MQTT, Solace, STOMP, Mercure, WebSocket, Google Pub/Sub, Pulsar.  
 
 ### <a name="definitionsBindings"></a>Bindings
-A "binding" (or "protocol binding") is a mechanism to define protocol-specific information. Therefore, a protocol binding MUST define protocol-specific information only. 
+
+A "binding" (or "protocol binding") is a mechanism to define protocol-specific information. Therefore, a protocol binding MUST define protocol-specific information only.
 
 ## <a name="specification"></a>Specification
 
@@ -165,7 +173,7 @@ This field represents a unique universal identifier of the [application](#defini
 
 It is RECOMMENDED to use a [URN](https://tools.ietf.org/html/rfc8141) to globally and uniquely identify the application during long periods of time, even after it becomes unavailable or ceases to exist.
 
-###### Examples
+##### Examples
 
 ```json
 {
@@ -207,7 +215,7 @@ Field Name | Type | Description
 
 This object MAY be extended with [Specification Extensions](#specificationExtensions).
 
-##### Info Object Example:
+##### Info Object Example
 
 ```json
 {
@@ -269,7 +277,7 @@ Field Name | Type | Description
 
 This object MAY be extended with [Specification Extensions](#specificationExtensions).
 
-##### Contact Object Example:
+##### Contact Object Example
 
 ```json
 {
@@ -298,7 +306,7 @@ Field Name | Type | Description
 
 This object MAY be extended with [Specification Extensions](#specificationExtensions).
 
-##### License Object Example:
+##### License Object Example
 
 ```json
 {
@@ -392,7 +400,6 @@ production:
       description: "This environment is the live environment available for final users."
 ```
 
-
 #### <a name="serverObject"></a>Server Object
 
 An object representing a message broker, a server or any other kind of computer program capable of sending and/or receiving data. This object is used to capture details such as URIs, protocols and security configuration. Variable substitution can be used so that some details, for example usernames and passwords, can be injected by code generation tools.
@@ -500,7 +507,6 @@ variables:
       - staging
 ```
 
-
 #### <a name="defaultContentTypeString"></a>Default Content Type
 
 A string representing the default content type to use when encoding/decoding a message's payload. The value MUST be a specific media type (e.g. `application/json`). This value MUST be used by schema parsers when the [contentType](#messageObjectContentType) property is omitted.
@@ -519,11 +525,6 @@ In case a message can't be encoded/decoded using this value, schema parsers MUST
 defaultContentType: application/json
 ```
 
-
-
-
-
-
 #### <a name="channelsObject"></a>Channels Object
 
 An object containing all the [Channel Object](#channelObject) definitions the [Application](#definitionsApplication) MUST use during runtime.
@@ -557,9 +558,6 @@ userSignedUp:
       $ref: '#/components/messages/userSignedUp'
 ```
 
-
-
-
 #### <a name="channelObject"></a>Channel Object
 
 Describes a shared communication channel.
@@ -579,7 +577,6 @@ Field Name | Type | Description
 <a name="channelObjectExternalDocs"></a>externalDocs | [External Documentation Object](#externalDocumentationObject) \| [Reference Object](#referenceObject) | Additional external documentation for this channel.
 <a name="channelObjectBindings"></a>bindings | [Channel Bindings Object](#channelBindingsObject) \| [Reference Object](#referenceObject) | A map where the keys describe the name of the protocol and the values describe protocol-specific definitions for the channel.
 
-
 This object MAY be extended with [Specification Extensions](#specificationExtensions).
 
 ##### Channel Object Example
@@ -653,20 +650,12 @@ externalDocs:
   url: 'https://example.com'
 ```
 
-
-
-
-
 #### <a name="channelAddressExpressions"></a>Channel Address Expressions
 
 Channel addresses MAY contain expressions that can be used to define dynamic values.
 
 Expressions MUST be composed by a name enclosed in curly braces (`{` and `}`). E.g., `{userId}`.
 
-
-
-
-
 #### <a name="messagesObject"></a>Messages Object
 
 Describes a map of messages included in a channel.
@@ -697,8 +686,6 @@ userCompletedOrder:
   $ref: '#/components/messages/userCompletedOrder'
 ```
 
-
-
 #### <a name="operationsObject"></a>Operations Object
 
 Holds a dictionary with all the [operations](#operationObject) this application MUST implement.
@@ -759,7 +746,6 @@ onUserSignUp:
     - $ref: '#/components/operationTraits/kafka'
 ```
 
-
 #### <a name="operationObject"></a>Operation Object
 
 Describes a specific operation.
@@ -863,12 +849,9 @@ reply:
     - $ref: '#/components/messages/userSignedUpReply'
 ```
 
-
-
-
 #### <a name="operationTraitObject"></a>Operation Trait Object
 
-Describes a trait that MAY be applied to an [Operation Object](#operationObject). This object MAY contain any property from the [Operation Object](#operationObject), except the `action`, `channel` and `traits` ones.
+Describes a trait that MAY be applied to an [Operation Object](#operationObject). This object MAY contain any property from the [Operation Object](#operationObject), except the `action`, `channel`, `messages` and `traits` ones.
 
 If you're looking to apply traits to a message, see the [Message Trait Object](#messageTraitObject).
 
@@ -904,9 +887,6 @@ bindings:
     ack: false
 ```
 
-
-
-
 #### <a name="operationReplyObject"></a>Operation Reply Object
 
 Describes the reply part that MAY be applied to an Operation Object. If an operation implements the request/reply pattern, the reply object represents the response message.
@@ -923,11 +903,10 @@ This object MAY be extended with [Specification Extensions](#specificationExtens
 
 #### <a name="operationReplyAddressObject"></a>Operation Reply Address Object
 
-An object that specifies where an operation has to send the reply. 
+An object that specifies where an operation has to send the reply.
 
 For specifying and computing the location of a reply address, a [runtime expression](#runtimeExpression) is used.
 
-
 ##### Fixed Fields
 
 Field Name | Type | Description
@@ -951,7 +930,6 @@ description: Consumer Inbox
 location: $message.header#/replyTo
 ```
 
-
 #### <a name="parametersObject"></a>Parameters Object
 
 Describes a map of parameters included in a channel address.
@@ -984,10 +962,6 @@ parameters:
     description: Id of the user.
 ```
 
-
-
-
-
 #### <a name="parameterObject"></a>Parameter Object
 
 Describes a parameter included in a channel address.
@@ -1026,9 +1000,6 @@ parameters:
     location: $message.payload#/user/id
 ```
 
-
-
-
 #### <a name="serverBindingsObject"></a>Server Bindings Object
 
 Map describing protocol-specific definitions for a server.
@@ -1059,8 +1030,6 @@ Field Name | Type | Description
 
 This object MAY be extended with [Specification Extensions](#specificationExtensions).
 
-
-
 #### <a name="channelBindingsObject"></a>Channel Bindings Object
 
 Map describing protocol-specific definitions for a channel.
@@ -1091,8 +1060,6 @@ Field Name | Type | Description
 
 This object MAY be extended with [Specification Extensions](#specificationExtensions).
 
-
-
 #### <a name="operationBindingsObject"></a>Operation Bindings Object
 
 Map describing protocol-specific definitions for an operation.
@@ -1123,9 +1090,6 @@ Field Name | Type | Description
 
 This object MAY be extended with [Specification Extensions](#specificationExtensions).
 
-
-
-
 #### <a name="messageBindingsObject"></a>Message Bindings Object
 
 Map describing protocol-specific definitions for a message.
@@ -1156,12 +1120,6 @@ Field Name | Type | Description
 
 This object MAY be extended with [Specification Extensions](#specificationExtensions).
 
-
-
-
-
-
-
 #### <a name="messageObject"></a>Message Object
 
 Describes a message received on a given channel and operation.
@@ -1171,7 +1129,7 @@ Describes a message received on a given channel and operation.
 Field Name | Type | Description
 ---|:---:|---
 <a name="messageObjectHeaders"></a>headers | [Multi Format Schema Object](#multiFormatSchemaObject) &#124; [Schema Object](#schemaObject) &#124; [Reference Object](#referenceObject) | Schema definition of the application headers. Schema MUST be a map of key-value pairs. It **MUST NOT** define the protocol headers. If this is a [Schema Object](#schemaObject), then the `schemaFormat` will be assumed to be "application/vnd.aai.asyncapi+json;version=`asyncapi`" where the version is equal to the [AsyncAPI Version String](#A2SVersionString).
-<a name="messageObjectPayload"></a>payload | [Multi Format Schema Object](#multiFormatSchemaObject) &#124; [Schema Object](#schemaObject) &#124; [Reference Object](#referenceObject) | Definition of the message payload. If this is a [Schema Object](#schemaObject), then the `schemaFormat` will be assumed to be "application/vnd.aai.asyncapi+json;version=`asyncapi`" where the version is equal to the [AsyncAPI Version String](#A2SVersionString). 
+<a name="messageObjectPayload"></a>payload | [Multi Format Schema Object](#multiFormatSchemaObject) &#124; [Schema Object](#schemaObject) &#124; [Reference Object](#referenceObject) | Definition of the message payload. If this is a [Schema Object](#schemaObject), then the `schemaFormat` will be assumed to be "application/vnd.aai.asyncapi+json;version=`asyncapi`" where the version is equal to the [AsyncAPI Version String](#A2SVersionString).
 <a name="messageObjectCorrelationId"></a>correlationId | [Correlation ID Object](#correlationIdObject) &#124; [Reference Object](#referenceObject) | Definition of the correlation ID used for message tracing or matching.
 <a name="messageObjectContentType"></a>contentType | `string` | The content type to use when encoding/decoding a message's payload. The value MUST be a specific media type (e.g. `application/json`). When omitted, the value MUST be the one specified on the [defaultContentType](#defaultContentTypeString) field.
 <a name="messageObjectName"></a>name | `string` | A machine-friendly name for the message.
@@ -1333,12 +1291,6 @@ payload:
     $ref: 'path/to/user-create.avsc/#UserCreate'
 ```
 
-
-
-
-
-
-
 #### <a name="messageTraitObject"></a>Message Trait Object
 
 Describes a trait that MAY be applied to a [Message Object](#messageObject). This object MAY contain any property from the [Message Object](#messageObject), except `payload` and `traits`.
@@ -1377,13 +1329,13 @@ contentType: application/json
 
 #### <a name="messageExampleObject"></a> Message Example Object
 
-Message Example Object represents an example of a [Message Object](#messageObject) and MUST contain either **headers** and/or **payload** fields. 
+Message Example Object represents an example of a [Message Object](#messageObject) and MUST contain either **headers** and/or **payload** fields.
 
 ##### Fixed Fields
 
 Field Name | Type | Description
 ---|:---:|---
-<a name="messageExampleObjectHeaders"></a>headers | `Map[string, any]` | The value of this field MUST validate against the [Message Object's headers](#messageObjectHeaders) field. 
+<a name="messageExampleObjectHeaders"></a>headers | `Map[string, any]` | The value of this field MUST validate against the [Message Object's headers](#messageObjectHeaders) field.
 <a name="messageExampleObjectPayload"></a>payload | `Map[string, any]` | The value of this field MUST validate against the [Message Object's payload](#messageObjectPayload) field.
 <a name="messageExampleObjectName"></a>name | `string` | A machine-friendly name.
 <a name="messageExampleObjectSummary"></a>summary | `string` |  A short summary of what the example is about.
@@ -1433,6 +1385,7 @@ A Tags object is a list of [Tag Objects](#tagObject). An [Tag Object](#tagObject
 Allows adding meta data to a single tag.
 
 ##### Fixed Fields
+
 Field Name | Type | Description
 ---|:---:|---
 <a name="tagObjectName"></a>name | `string` | **REQUIRED.** The name of the tag.
@@ -1445,8 +1398,8 @@ This object MAY be extended with [Specification Extensions](#specificationExtens
 
 ```json
 {
-	"name": "user",
-	"description": "User-related messages"
+ "name": "user",
+ "description": "User-related messages"
 }
 ```
 
@@ -1455,12 +1408,6 @@ name: user
 description: User-related messages
 ```
 
-
-
-
-
-
-
 #### <a name="externalDocumentationObject"></a>External Documentation Object
 
 Allows referencing an external resource for extended documentation.
@@ -1488,7 +1435,6 @@ description: Find more info here
 url: https://example.com
 ```
 
-
 #### <a name="referenceObject"></a>Reference Object
 
 A simple object to allow referencing other components in the specification, internally and externally.
@@ -1498,6 +1444,7 @@ The Reference Object is defined by [JSON Reference](https://tools.ietf.org/html/
 For this specification, reference resolution is done as defined by the JSON Reference specification and not by the JSON Schema specification.
 
 ##### Fixed Fields
+
 Field Name | Type | Description
 ---|:---:|---
 <a name="referenceRef"></a>$ref | `string` | **REQUIRED.** The reference string.
@@ -1524,14 +1471,14 @@ All objects defined within the components object will have no effect on the API
 ##### Fixed Fields
 
 Field Name | Type | Description
----|:---|--- 
+---|:---|---
 <a name="componentsSchemas"></a> schemas | Map[`string`, [Multi Format Schema Object](#multiFormatSchemaObject) \| [Schema Object](#schemaObject) \| [Reference Object](#referenceObject)] | An object to hold reusable [Schema Object](#schemaObject). If this is a [Schema Object](#schemaObject), then the `schemaFormat` will be assumed to be "application/vnd.aai.asyncapi+json;version=`asyncapi`" where the version is equal to the [AsyncAPI Version String](#A2SVersionString).
 <a name="componentsServers"></a> servers | Map[`string`, [Server Object](#serverObject) \| [Reference Object](#referenceObject)] | An object to hold reusable [Server Objects](#serverObject).
 <a name="componentsChannels"></a> channels | Map[`string`, [Channel Object](#channelObject) \| [Reference Object](#referenceObject)] | An object to hold reusable [Channel Objects](#channelObject).
 <a name="componentsOperations"></a> operations | Map[`string`, [Operation Object](#operationObject) \| [Reference Object](#referenceObject)] | An object to hold reusable [Operation Objects](#operationObject).
 <a name="componentsMessages"></a> messages | Map[`string`, [Message Object](#messageObject) \| [Reference Object](#referenceObject)] | An object to hold reusable [Message Objects](#messageObject).
 <a name="componentsSecuritySchemes"></a> securitySchemes| Map[`string`, [Security Scheme Object](#securitySchemeObject) \| [Reference Object](#referenceObject)] | An object to hold reusable [Security Scheme Objects](#securitySchemeObject).
-<a name="componentsServerVariables"></a> serverVariables | Map[`string`, [Server Variable Object](#serverVariableObject) \| [Reference Object](#referenceObject)] | An object to hold reusable [Server Variable Objects](#serverVariableObject). 
+<a name="componentsServerVariables"></a> serverVariables | Map[`string`, [Server Variable Object](#serverVariableObject) \| [Reference Object](#referenceObject)] | An object to hold reusable [Server Variable Objects](#serverVariableObject).
 <a name="componentsParameters"></a> parameters | Map[`string`, [Parameter Object](#parameterObject) \| [Reference Object](#referenceObject)] | An object to hold reusable [Parameter Objects](#parameterObject).
 <a name="componentsCorrelationIDs"></a> correlationIds | Map[`string`, [Correlation ID Object](#correlationIdObject) \| [Reference Object](#referenceObject)] | An object to hold reusable [Correlation ID Objects](#correlationIdObject).
 <a name="componentsReplies"></a>replies | Map[`string`, [Operation Reply Object](#operationReplyObject) \| [Reference Object](#referenceObject)] | An object to hold reusable [Operation Reply Objects](#operationReplyObject).
@@ -1551,7 +1498,7 @@ All the fixed fields declared above are objects that MUST use keys that match th
 
 Field Name Examples:
 
-```
+```text
 User
 User_1
 User_Name
@@ -1800,17 +1747,39 @@ The following table contains a set of values that every implementation MUST supp
 Name | Allowed values | Notes
 ---|:---:|---
 [AsyncAPI 3.0.0 Schema Object](#schemaObject) | `application/vnd.aai.asyncapi;version=3.0.0`, `application/vnd.aai.asyncapi+json;version=3.0.0`, `application/vnd.aai.asyncapi+yaml;version=3.0.0` | This is the default when a `schemaFormat` is not provided.
-[JSON Schema Draft 07](https://json-schema.org/specification-links.html#draft-7) | `application/schema+json;version=draft-07`, `application/schema+yaml;version=draft-07` | 
+[JSON Schema Draft 07](https://json-schema.org/specification-links.html#draft-7) | `application/schema+json;version=draft-07`, `application/schema+yaml;version=draft-07` |
 
 The following table contains a set of values that every implementation is RECOMMENDED to support.
 
 Name | Allowed values | Notes
 ---|:---:|---
 [Avro 1.9.0 schema](https://avro.apache.org/docs/1.9.0/spec.html#schemas) | `application/vnd.apache.avro;version=1.9.0`, `application/vnd.apache.avro+json;version=1.9.0`, `application/vnd.apache.avro+yaml;version=1.9.0` |
-[OpenAPI 3.0.0 Schema Object](https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#schemaObject) | `application/vnd.oai.openapi;version=3.0.0`, `application/vnd.oai.openapi+json;version=3.0.0`, `application/vnd.oai.openapi+yaml;version=3.0.0` | 
+[OpenAPI 3.0.0 Schema Object](https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#schemaObject) | `application/vnd.oai.openapi;version=3.0.0`, `application/vnd.oai.openapi+json;version=3.0.0`, `application/vnd.oai.openapi+yaml;version=3.0.0` |
 [RAML 1.0 data type](https://github.com/raml-org/raml-spec/blob/master/versions/raml-10/raml-10.md/) | `application/raml+yaml;version=1.0` |
-[Protocol Buffers](https://protobuf.dev/) | `application/vnd.google.protobuf;version=2`, `application/vnd.google.protobuf;version=3` | 
+[Protocol Buffers](https://protobuf.dev/) | `application/vnd.google.protobuf;version=2`, `application/vnd.google.protobuf;version=3` |
+
+##### Multi Format Schema Object Examples
 
+###### Multi Format Schema Object Example with Avro
+
+```yaml
+channels:
+  example:
+    messages:
+      myMessage:
+        payload:
+          schemaFormat: 'application/vnd.apache.avro;version=1.9.0'
+          schema:
+            type: record
+            name: User
+            namespace: com.company
+            doc: User information
+            fields:
+              - name: displayName
+                type: string
+              - name: age
+                type: int
+```
 
 #### <a name="schemaObject"></a>Schema Object
 
@@ -1818,7 +1787,7 @@ The Schema Object allows the definition of input and output data types.
 These types can be objects, but also primitives and arrays. This object is a superset of the [JSON Schema Specification Draft 07](https://json-schema.org/). The empty schema (which allows any instance to validate) MAY be represented by the `boolean` value `true` and a schema which allows no instance to validate MAY be represented by the `boolean` value `false`.
 
 Further information about the properties can be found in [JSON Schema Core](https://tools.ietf.org/html/draft-handrews-json-schema-01) and [JSON Schema Validation](https://tools.ietf.org/html/draft-handrews-json-schema-validation-01).
-Unless stated otherwise, the property definitions follow the JSON Schema specification as referenced here.
+Unless stated otherwise, the property definitions follow the JSON Schema specification as referenced here. For other formats (e.g., Avro, RAML, etc) see [Multi Format Schema Object](#multiFormatSchemaObject).
 
 ##### Properties
 
@@ -1869,6 +1838,7 @@ Alternatively, any time a Schema Object can be used, a [Reference Object](#refer
 In addition to the JSON Schema fields, the following AsyncAPI vocabulary fields MAY be used for further schema documentation:
 
 ##### Fixed Fields
+
 Field Name | Type | Description
 ---|:---:|---
 <a name="schemaObjectDiscriminator"></a>discriminator | `string` | Adds support for polymorphism. The discriminator is the schema property name that is used to differentiate between other schema that inherit this schema. The property name used MUST be defined at this schema and it MUST be in the `required` property list. When used, the value MUST be the name of this schema or any schema that inherits it. See [Composition and Inheritance](#schemaComposition) for more details.
@@ -1880,7 +1850,7 @@ This object MAY be extended with [Specification Extensions](#specificationExtens
 ###### <a name="schemaComposition"></a>Composition and Inheritance (Polymorphism)
 
 The AsyncAPI Specification allows combining and extending model definitions using the `allOf` property of JSON Schema, in effect offering model composition.
-`allOf` takes in an array of object definitions that are validated *independently* but together compose a single object.
+`allOf` takes in an array of object definitions that are validated _independently_ but together compose a single object.
 
 While composition offers model extensibility, it does not imply a hierarchy between the models.
 To support polymorphism, AsyncAPI Specification adds the support of the `discriminator` field.
@@ -1891,7 +1861,7 @@ There are two ways to define the value of a discriminator for an inheriting inst
 - Use the schema's name.
 - Override the schema's name by overriding the property with a new value. If exists, this takes precedence over the schema's name.
 
-As such, inline schema definitions, which do not have a given id, *cannot* be used in polymorphism.
+As such, inline schema definitions, which do not have a given id, _cannot_ be used in polymorphism.
 
 ##### Schema Object Examples
 
@@ -2276,25 +2246,22 @@ schemas:
       - color
 ```
 
-
-
-
-
 #### <a name="securitySchemeObject"></a>Security Scheme Object
 
 Defines a security scheme that can be used by the operations. Supported schemes are:
 
-* User/Password.
-* API key (either as user or as password).
-* X.509 certificate.
-* End-to-end encryption (either symmetric or asymmetric).
-* HTTP authentication.
-* HTTP API key.
-* OAuth2's common flows (Implicit, Resource Owner Protected Credentials, Client Credentials and Authorization Code) as defined in [RFC6749](https://tools.ietf.org/html/rfc6749).
-* [OpenID Connect Discovery](https://tools.ietf.org/html/draft-ietf-oauth-discovery-06).
-* SASL (Simple Authentication and Security Layer) as defined in [RFC4422](https://tools.ietf.org/html/rfc4422).
+- User/Password.
+- API key (either as user or as password).
+- X.509 certificate.
+- End-to-end encryption (either symmetric or asymmetric).
+- HTTP authentication.
+- HTTP API key.
+- OAuth2's common flows (Implicit, Resource Owner Protected Credentials, Client Credentials and Authorization Code) as defined in [RFC6749](https://tools.ietf.org/html/rfc6749).
+- [OpenID Connect Discovery](https://tools.ietf.org/html/draft-ietf-oauth-discovery-06).
+- SASL (Simple Authentication and Security Layer) as defined in [RFC4422](https://tools.ietf.org/html/rfc4422).
 
 ##### Fixed Fields
+
 Field Name | Type | Applies To | Description
 ---|:---:|---|---
 <a name="securitySchemeObjectType"></a>type | `string` | Any | **REQUIRED**. The type of the security scheme. Valid values are `"userPassword"`, `"apiKey"`, `"X509"`, `"symmetricEncryption"`, `"asymmetricEncryption"`, `"httpApiKey"`, `"http"`, `"oauth2"`, `"openIdConnect"`, `"plain"`, `"scramSha256"`, `"scramSha512"`, and `"gssapi"`.
@@ -2456,6 +2423,7 @@ type: scramSha512
 Allows configuration of the supported OAuth Flows.
 
 ##### Fixed Fields
+
 Field Name | Type | Description
 ---|:---:|---
 <a name="oauthFlowsImplicit"></a>implicit| [OAuth Flow Object](#oauthFlowObject) | Configuration for the OAuth Implicit flow.
@@ -2470,6 +2438,7 @@ This object MAY be extended with [Specification Extensions](#specificationExtens
 Configuration details for a supported OAuth Flow
 
 ##### Fixed Fields
+
 Field Name | Type | Applies To | Description
 ---|:---:|---|---
 <a name="oauthFlowAuthorizationUrl"></a>authorizationUrl | `string` | `oauth2` (`"implicit"`, `"authorizationCode"`) | **REQUIRED**. The authorization URL to be used for this flow. This MUST be in the form of an absolute URL.
@@ -2500,15 +2469,13 @@ availableScopes:
   read:pets: read your pets
 ```
 
-
-
 ### <a name="correlationIdObject"></a>Correlation ID Object
 
-An object that specifies an identifier at design time that can used for message tracing and correlation. 
+An object that specifies an identifier at design time that can used for message tracing and correlation.
 
 For specifying and computing the location of a Correlation ID, a [runtime expression](#runtimeExpression) is used.
 
-##### Fixed Fields
+#### Fixed Fields
 
 Field Name | Type | Description
 ---|:---|---
@@ -2538,7 +2505,7 @@ This mechanism is used by [Correlation ID Object](#correlationIdObject) and [Ope
 
 The runtime expression is defined by the following [ABNF](https://tools.ietf.org/html/rfc5234) syntax:
 
-```
+```text
       expression = ( "$message" "." source )
       source = ( header-reference | payload-reference )
       header-reference = "header" ["#" fragment]
@@ -2548,7 +2515,7 @@ The runtime expression is defined by the following [ABNF](https://tools.ietf.org
 
 The table below provides examples of runtime expressions and examples of their use in a value:
 
-##### <a name="runtimeExpressionExamples"></a>Examples
+#### <a name="runtimeExpressionExamples"></a>Examples
 
 Source Location | Example expression  | Notes
 ---|:---|:---|
@@ -2591,7 +2558,7 @@ The extensions properties are implemented as patterned fields that are always pr
 
 Field Pattern | Type | Description
 ---|:---:|---
-<a name="infoExtensions"></a>`^x-[\w\d\-\_]+$` | Any | Allows extensions to the AsyncAPI Schema. The field name MUST begin with `x-`, for example, `x-internal-id`. The value can be `null`, a primitive, an array or an object. Can have any valid JSON format value.
+<a name="infoExtensions"></a>`^x-[\w\d\.\x2d_]+$` | Any | Allows extensions to the AsyncAPI Schema. The field name MUST begin with `x-`, for example, `x-internal-id`. The value can be `null`, a primitive, an array or an object. Can have any valid JSON format value.
 
 The extensions may or may not be supported by the available tooling, but those may be extended as well to add requested support (if tools are internal or open-sourced).
 
@@ -2606,7 +2573,6 @@ Tools that do not recognize a specific `format` MAY default back to the `type` a
 
 The formats defined by the AsyncAPI Specification are:
 
-
 Common Name | `type` | [`format`](#dataTypeFormat) | Comments
 ----------- | ------ | -------- | --------
 integer | `integer` | `int32` | signed 32 bits
diff --git a/pages/docs/tools/cli/usage.md b/pages/docs/tools/cli/usage.md
index 2da2d6edd422..90967e59f25c 100644
--- a/pages/docs/tools/cli/usage.md
+++ b/pages/docs/tools/cli/usage.md
@@ -29,7 +29,7 @@ $ npm install -g @asyncapi/cli
 $ asyncapi COMMAND
 running command...
 $ asyncapi (--version)
-@asyncapi/cli/1.4.1 linux-x64 node-v18.19.0
+@asyncapi/cli/1.5.11 linux-x64 node-v18.19.1
 $ asyncapi --help [COMMAND]
 USAGE
   $ asyncapi COMMAND
@@ -93,7 +93,7 @@ EXAMPLES
   $ asyncapi bundle ./asyncapi.yaml ./features.yaml --base ./asyncapi.yaml --reference-into-components
 ```
 
-_See code: [src/commands/bundle.ts](https://github.com/asyncapi/cli/blob/v1.4.1/src/commands/bundle.ts)_
+_See code: [src/commands/bundle.ts](https://github.com/asyncapi/cli/blob/v1.5.11/src/commands/bundle.ts)_
 
 ## `asyncapi config`
 
@@ -107,7 +107,7 @@ DESCRIPTION
   CLI config settings
 ```
 
-_See code: [src/commands/config/index.ts](https://github.com/asyncapi/cli/blob/v1.4.1/src/commands/config/index.ts)_
+_See code: [src/commands/config/index.ts](https://github.com/asyncapi/cli/blob/v1.5.11/src/commands/config/index.ts)_
 
 ## `asyncapi config context`
 
@@ -121,7 +121,7 @@ DESCRIPTION
   Manage short aliases for full paths to AsyncAPI documents
 ```
 
-_See code: [src/commands/config/context/index.ts](https://github.com/asyncapi/cli/blob/v1.4.1/src/commands/config/context/index.ts)_
+_See code: [src/commands/config/context/index.ts](https://github.com/asyncapi/cli/blob/v1.5.11/src/commands/config/context/index.ts)_
 
 ## `asyncapi config context add CONTEXT-NAME SPEC-FILE-PATH`
 
@@ -143,7 +143,7 @@ DESCRIPTION
   Add a context to the store
 ```
 
-_See code: [src/commands/config/context/add.ts](https://github.com/asyncapi/cli/blob/v1.4.1/src/commands/config/context/add.ts)_
+_See code: [src/commands/config/context/add.ts](https://github.com/asyncapi/cli/blob/v1.5.11/src/commands/config/context/add.ts)_
 
 ## `asyncapi config context current`
 
@@ -160,7 +160,7 @@ DESCRIPTION
   Shows the current context that is being used
 ```
 
-_See code: [src/commands/config/context/current.ts](https://github.com/asyncapi/cli/blob/v1.4.1/src/commands/config/context/current.ts)_
+_See code: [src/commands/config/context/current.ts](https://github.com/asyncapi/cli/blob/v1.5.11/src/commands/config/context/current.ts)_
 
 ## `asyncapi config context edit CONTEXT-NAME NEW-SPEC-FILE-PATH`
 
@@ -181,7 +181,7 @@ DESCRIPTION
   Edit a context in the store
 ```
 
-_See code: [src/commands/config/context/edit.ts](https://github.com/asyncapi/cli/blob/v1.4.1/src/commands/config/context/edit.ts)_
+_See code: [src/commands/config/context/edit.ts](https://github.com/asyncapi/cli/blob/v1.5.11/src/commands/config/context/edit.ts)_
 
 ## `asyncapi config context init [CONTEXT-FILE-PATH]`
 
@@ -204,7 +204,7 @@ DESCRIPTION
   Initialize context
 ```
 
-_See code: [src/commands/config/context/init.ts](https://github.com/asyncapi/cli/blob/v1.4.1/src/commands/config/context/init.ts)_
+_See code: [src/commands/config/context/init.ts](https://github.com/asyncapi/cli/blob/v1.5.11/src/commands/config/context/init.ts)_
 
 ## `asyncapi config context list`
 
@@ -221,7 +221,7 @@ DESCRIPTION
   List all the stored contexts in the store
 ```
 
-_See code: [src/commands/config/context/list.ts](https://github.com/asyncapi/cli/blob/v1.4.1/src/commands/config/context/list.ts)_
+_See code: [src/commands/config/context/list.ts](https://github.com/asyncapi/cli/blob/v1.5.11/src/commands/config/context/list.ts)_
 
 ## `asyncapi config context remove CONTEXT-NAME`
 
@@ -241,7 +241,7 @@ DESCRIPTION
   Delete a context from the store
 ```
 
-_See code: [src/commands/config/context/remove.ts](https://github.com/asyncapi/cli/blob/v1.4.1/src/commands/config/context/remove.ts)_
+_See code: [src/commands/config/context/remove.ts](https://github.com/asyncapi/cli/blob/v1.5.11/src/commands/config/context/remove.ts)_
 
 ## `asyncapi config context use CONTEXT-NAME`
 
@@ -261,7 +261,7 @@ DESCRIPTION
   Set a context as current
 ```
 
-_See code: [src/commands/config/context/use.ts](https://github.com/asyncapi/cli/blob/v1.4.1/src/commands/config/context/use.ts)_
+_See code: [src/commands/config/context/use.ts](https://github.com/asyncapi/cli/blob/v1.5.11/src/commands/config/context/use.ts)_
 
 ## `asyncapi config versions`
 
@@ -278,7 +278,7 @@ DESCRIPTION
   Show versions of AsyncAPI tools used
 ```
 
-_See code: [src/commands/config/versions.ts](https://github.com/asyncapi/cli/blob/v1.4.1/src/commands/config/versions.ts)_
+_See code: [src/commands/config/versions.ts](https://github.com/asyncapi/cli/blob/v1.5.11/src/commands/config/versions.ts)_
 
 ## `asyncapi convert [SPEC-FILE]`
 
@@ -300,7 +300,7 @@ DESCRIPTION
   Convert asyncapi documents older to newer versions
 ```
 
-_See code: [src/commands/convert.ts](https://github.com/asyncapi/cli/blob/v1.4.1/src/commands/convert.ts)_
+_See code: [src/commands/convert.ts](https://github.com/asyncapi/cli/blob/v1.5.11/src/commands/convert.ts)_
 
 ## `asyncapi diff OLD NEW`
 
@@ -355,7 +355,7 @@ DESCRIPTION
   Find diff between two asyncapi files
 ```
 
-_See code: [src/commands/diff.ts](https://github.com/asyncapi/cli/blob/v1.4.1/src/commands/diff.ts)_
+_See code: [src/commands/diff.ts](https://github.com/asyncapi/cli/blob/v1.5.11/src/commands/diff.ts)_
 
 ## `asyncapi generate`
 
@@ -369,7 +369,7 @@ DESCRIPTION
   Generate typed models or other things like clients, applications or docs using AsyncAPI Generator templates.
 ```
 
-_See code: [src/commands/generate/index.ts](https://github.com/asyncapi/cli/blob/v1.4.1/src/commands/generate/index.ts)_
+_See code: [src/commands/generate/index.ts](https://github.com/asyncapi/cli/blob/v1.5.11/src/commands/generate/index.ts)_
 
 ## `asyncapi generate fromTemplate ASYNCAPI TEMPLATE`
 
@@ -406,7 +406,7 @@ EXAMPLES
   $ asyncapi generate fromTemplate asyncapi.yaml @asyncapi/html-template --param version=1.0.0 singleFile=true --output ./docs --force-write
 ```
 
-_See code: [src/commands/generate/fromTemplate.ts](https://github.com/asyncapi/cli/blob/v1.4.1/src/commands/generate/fromTemplate.ts)_
+_See code: [src/commands/generate/fromTemplate.ts](https://github.com/asyncapi/cli/blob/v1.5.11/src/commands/generate/fromTemplate.ts)_
 
 ## `asyncapi generate models LANGUAGE FILE`
 
@@ -486,7 +486,7 @@ DESCRIPTION
   Generates typed models
 ```
 
-_See code: [src/commands/generate/models.ts](https://github.com/asyncapi/cli/blob/v1.4.1/src/commands/generate/models.ts)_
+_See code: [src/commands/generate/models.ts](https://github.com/asyncapi/cli/blob/v1.5.11/src/commands/generate/models.ts)_
 
 ## `asyncapi new`
 
@@ -500,7 +500,6 @@ FLAGS
   -e, --example=<value>
       name of the example to use. Available examples are:
       - simple-asyncapi.yml
-      - adeo-kafka-request-reply-asyncapi.yml
       - anyof-asyncapi.yml
       - application-headers-asyncapi.yml
       - correlation-id-asyncapi.yml
@@ -544,7 +543,7 @@ EXAMPLES
   $ asyncapi new --file-name=my-asyncapi.yml --example=default-example.yml --no-tty	 - create a new file with a specific name, using one of the examples and without interactive mode
 ```
 
-_See code: [src/commands/new/index.ts](https://github.com/asyncapi/cli/blob/v1.4.1/src/commands/new/index.ts)_
+_See code: [src/commands/new/index.ts](https://github.com/asyncapi/cli/blob/v1.5.11/src/commands/new/index.ts)_
 
 ## `asyncapi new file`
 
@@ -558,7 +557,6 @@ FLAGS
   -e, --example=<value>
       name of the example to use. Available examples are:
       - simple-asyncapi.yml
-      - adeo-kafka-request-reply-asyncapi.yml
       - anyof-asyncapi.yml
       - application-headers-asyncapi.yml
       - correlation-id-asyncapi.yml
@@ -602,7 +600,7 @@ EXAMPLES
   $ asyncapi new --file-name=my-asyncapi.yml --example=default-example.yml --no-tty	 - create a new file with a specific name, using one of the examples and without interactive mode
 ```
 
-_See code: [src/commands/new/file.ts](https://github.com/asyncapi/cli/blob/v1.4.1/src/commands/new/file.ts)_
+_See code: [src/commands/new/file.ts](https://github.com/asyncapi/cli/blob/v1.5.11/src/commands/new/file.ts)_
 
 ## `asyncapi new glee`
 
@@ -610,18 +608,21 @@ Creates a new Glee project
 
 ```
 USAGE
-  $ asyncapi new glee [-h] [-n <value>] [-t <value>]
+  $ asyncapi new glee [-h] [-n <value>] [-t <value>] [-f <value>] [--force-write]
 
 FLAGS
+  -f, --file=<value>      The path to the AsyncAPI file for generating a Glee project.
   -h, --help              Show CLI help.
-  -n, --name=<value>      [default: project] name of the project
-  -t, --template=<value>  [default: default] name of the template
+  -n, --name=<value>      [default: project] Name of the Project
+  -t, --template=<value>  [default: default] Name of the Template
+  --force-write           Force writing of the generated files to given directory even if it is a git repo with unstaged
+                          files or not empty dir (defaults to false)
 
 DESCRIPTION
   Creates a new Glee project
 ```
 
-_See code: [src/commands/new/glee.ts](https://github.com/asyncapi/cli/blob/v1.4.1/src/commands/new/glee.ts)_
+_See code: [src/commands/new/glee.ts](https://github.com/asyncapi/cli/blob/v1.5.11/src/commands/new/glee.ts)_
 
 ## `asyncapi new project`
 
@@ -629,18 +630,21 @@ Creates a new Glee project
 
 ```
 USAGE
-  $ asyncapi new project [-h] [-n <value>] [-t <value>]
+  $ asyncapi new project [-h] [-n <value>] [-t <value>] [-f <value>] [--force-write]
 
 FLAGS
+  -f, --file=<value>      The path to the AsyncAPI file for generating a Glee project.
   -h, --help              Show CLI help.
-  -n, --name=<value>      [default: project] name of the project
-  -t, --template=<value>  [default: default] name of the template
+  -n, --name=<value>      [default: project] Name of the Project
+  -t, --template=<value>  [default: default] Name of the Template
+  --force-write           Force writing of the generated files to given directory even if it is a git repo with unstaged
+                          files or not empty dir (defaults to false)
 
 DESCRIPTION
   Creates a new Glee project
 ```
 
-_See code: [src/commands/new/project.ts](https://github.com/asyncapi/cli/blob/v1.4.1/src/commands/new/project.ts)_
+_See code: [src/commands/new/project.ts](https://github.com/asyncapi/cli/blob/v1.5.11/src/commands/new/project.ts)_
 
 ## `asyncapi optimize [SPEC-FILE]`
 
@@ -676,7 +680,7 @@ EXAMPLES
   $ asyncapi optimize ./asyncapi.yaml --optimization=remove-components,reuse-components,move-to-components --output=terminal --no-tty
 ```
 
-_See code: [src/commands/optimize.ts](https://github.com/asyncapi/cli/blob/v1.4.1/src/commands/optimize.ts)_
+_See code: [src/commands/optimize.ts](https://github.com/asyncapi/cli/blob/v1.5.11/src/commands/optimize.ts)_
 
 ## `asyncapi start`
 
@@ -690,7 +694,7 @@ DESCRIPTION
   Start asyncapi studio
 ```
 
-_See code: [src/commands/start/index.ts](https://github.com/asyncapi/cli/blob/v1.4.1/src/commands/start/index.ts)_
+_See code: [src/commands/start/index.ts](https://github.com/asyncapi/cli/blob/v1.5.11/src/commands/start/index.ts)_
 
 ## `asyncapi start studio`
 
@@ -709,7 +713,7 @@ DESCRIPTION
   starts a new local instance of Studio
 ```
 
-_See code: [src/commands/start/studio.ts](https://github.com/asyncapi/cli/blob/v1.4.1/src/commands/start/studio.ts)_
+_See code: [src/commands/start/studio.ts](https://github.com/asyncapi/cli/blob/v1.5.11/src/commands/start/studio.ts)_
 
 ## `asyncapi validate [SPEC-FILE]`
 
@@ -736,5 +740,5 @@ DESCRIPTION
   validate asyncapi file
 ```
 
-_See code: [src/commands/validate.ts](https://github.com/asyncapi/cli/blob/v1.4.1/src/commands/validate.ts)_
+_See code: [src/commands/validate.ts](https://github.com/asyncapi/cli/blob/v1.5.11/src/commands/validate.ts)_
 <!-- commandsstop -->
diff --git a/pages/docs/tools/generator/generator-template.md b/pages/docs/tools/generator/generator-template.md
index c6bc65c286aa..da10e6f6af30 100644
--- a/pages/docs/tools/generator/generator-template.md
+++ b/pages/docs/tools/generator/generator-template.md
@@ -572,4 +572,4 @@ Great job completing this tutorial! You have learnt how to use an AsyncAPI file
 
 If you want to tinker with a completed template and see what it would look like in production, check out the [Paho-MQTT template](https://github.com/derberg/python-mqtt-client-template/tree/v1.0.0). You can also check out the accompanying [article about creating MQTT client code](https://www.brainfart.dev/blog/asyncapi-codegen-python).
 
-You can also check out the [MQTT beginners guide]((https://medium.com/python-point/mqtt-basics-with-python-examples-7c758e605d4)) tutorial to learn more about asynchronous messaging using MQTT.
+You can also check out the [MQTT beginners guide](https://medium.com/python-point/mqtt-basics-with-python-examples-7c758e605d4) tutorial to learn more about asynchronous messaging using MQTT.
diff --git a/pages/docs/tutorials/kafka/_section.md b/pages/docs/tutorials/kafka/_section.md
new file mode 100644
index 000000000000..d96cc1127f84
--- /dev/null
+++ b/pages/docs/tutorials/kafka/_section.md
@@ -0,0 +1,4 @@
+---
+title: 'Kafka'
+weight: 220
+---
\ No newline at end of file
diff --git a/pages/docs/tutorials/kafka/configure-kafka-avro.md b/pages/docs/tutorials/kafka/configure-kafka-avro.md
new file mode 100644
index 000000000000..40a1cf1926a8
--- /dev/null
+++ b/pages/docs/tutorials/kafka/configure-kafka-avro.md
@@ -0,0 +1,162 @@
+---
+title: Describe Kafka message payload using Avro Schema
+description: Explore configuring an AsyncAPI document for Kafka messages with Avro Schema.
+weight: 230
+---
+
+## Introduction
+
+The previous tutorial on [creating an AsyncAPI document for applications consuming from Kafka](/docs/tutorials/kafka) taught you about writing an AsyncAPI document for Kafka messages using the default schema. This tutorial will teach you to write the same document using Avro Schema.
+
+While AsyncAPI schema can be the default choice for describing payloads, many prefer using Avro Schemas to define messages in Kafka. This tutorial teaches you to modify your existing AsyncAPI schema to add Avro schema into your document in both YAML and JSON formats.
+
+## Background context
+
+AsyncAPI is a specification for describing Event-Driven Architectures (EDAs) in a machine-readable format. AsyncAPI schema outlines the format and content specifications that enable a consistent representation of agreements for communication between services in an Event-Driven Architecture.
+
+[Avro](https://avro.apache.org/) is a sophisticated tool in Apache Kafka that handles data communication efficiently. It provides a standardized method for organizing and transmitting data, ensuring that different parts of the system can understand each other effectively. With Avro, there's a common language for messages, promoting compatibility and smooth operation between various components. It's like having a shared rulebook that helps different system parts communicate and exchange information seamlessly.
+
+## Define message payload with Avro Schema directly in AsyncAPI document
+
+Defining message schema with the default schema is already covered in the [previous Kafka tutorial](/docs/tutorials/Kafka). The default choice was the AsyncAPI schema, a JSON Schema superset. Here's an example of what the AsyncAPI schema looks like: 
+
+```
+messages:
+  userSignedUp:
+    payload:
+      type: object
+      properties:
+        userId:
+          type: integer
+          description: This property describes the ID of the user
+        userEmail:
+          type: string
+          description: This property describes the email of the user
+```
+
+Now it's time to shift your focus to defining messages using Avro Schemas directly within your document. 
+
+```
+messages:
+  userSignedUp:
+    payload:
+      schemaFormat: 'application/vnd.apache.avro;version=1.9.0'
+      schema:
+        type: record
+        name: UserSignedUp
+        namespace: com.company
+        doc: User sign-up information
+        fields:
+          - name: userId
+            type: int
+          - name: userEmail
+            type: string
+```
+
+In the above code snippet: 
+- The `userSignedUp` message is defined with Avro Schema, using the specified `schemaFormat` and the `schema`.
+- Use the `schemaFormat` to indicate that you're using Avro and specify the version of Avro Schema by using a MIME type.
+- The `schema` includes a `record` named `UserSignedUp` within the `com.company` namespace. It also describes two fields, `userId` and `userEmail,` defining their data types as `int` and `string`, respectively.
+
+Now let's combine the above Avro Schema with the AsyncAPI document that you created in the previous tutorial. Check out below what an AsyncAPI document fully equipped with Avro Schema looks like!
+
+```
+asyncapi: 3.0.0
+info:
+  title: User Signup API
+  version: 1.0.0
+  description: The API notifies you whenever a new user signs up in the application.
+servers:
+  kafkaServer:
+    host: test.mykafkacluster.org:8092
+    description: Kafka Server
+    protocol: kafka
+operations:
+  onUserSignedUp:
+    action: receive
+    channel:
+      $ref: '#/channels/userSignedUp'
+channels:
+  userSignedUp:
+    description: This channel contains a message per each user who signs up in our application.
+    address: user_signedup
+    messages:
+      userSignedUp:
+        $ref: '#/components/messages/userSignedUp'
+components:
+  messages:
+    userSignedUp:
+      payload:
+        schemaFormat: 'application/vnd.apache.avro;version=1.9.0'
+        schema:
+          type: record
+          name: UserSignedUp
+          namespace: com.company
+          doc: User sign-up information
+          fields:
+            - name: userId
+              type: int
+            - name: userEmail
+              type: string
+```
+
+## Reusing existing Avro Schemas
+
+Occasionally, you might find yourself with an existing set of Avro Schemas. In such cases, instead of repeatedly defining these schemas in your AsyncAPI document, integrate them seamlessly by calling out existing files.
+
+Assume you have a file named `userSchema.json` that encapsulates the Avro Schema that resembles the following:
+
+```
+// userSchema.json
+{
+  "type": "record",
+  "name": "UserSignedUp",
+  "namespace": "com.company",
+  "doc": "User sign-up information",
+  "fields": [
+    { "name": "userId", "type": "int" },
+    { "name": "userEmail", "type": "string" }
+  ]
+}
+```
+
+To seamlessly incorporate this existing Avro schema into your AsyncAPI document, you can use the `$ref` property to reference the path to the JSON file. This way, your AsyncAPI document will incorporate the Avro Schema from the external JSON file, ensuring consistency and interoperability in your Kafka ecosystem. 
+
+```
+asyncapi: 3.0.0
+info:
+  title: User Signup API
+  version: 1.0.0
+  description: The API notifies you whenever a new user signs up in the application.
+servers:
+  kafkaServer:
+    host: test.mykafkacluster.org:8092
+    description: Kafka Server
+    protocol: kafka
+operations:
+  onUserSignedUp:
+    action: receive
+    channel:
+      $ref: '#/channels/userSignedUp'
+channels:
+  userSignedUp:
+    description: This channel contains a message per each user who signs up in our application.
+    address: user_signedup
+    messages:
+      userSignedUp:
+        $ref: '#/components/messages/userSignedUp'
+components:
+  messages:
+    userSignedUp:
+      payload:
+        schemaFormat: 'application/vnd.apache.avro;version=1.9.0'
+        schema:
+          $ref: './userSchema.json'
+```
+
+## Summary
+
+In this tutorial, you smoothly updated from the default schema to utilize the capabilities of Avro Schema. The use of Avro Schema with AsyncAPI ensures improved communication in event-driven systems.  Now, you can further experiment by incorporating your business logic and experimenting with more advanced capabilities.
+
+## Next Steps
+Now that you know how to write an AsyncAPI document using Avro Schemas, let's learn how to use [Schema Registry with AsyncAPI](/docs/tutorials/kafka/managing-schemas-using-schema-registry). 
diff --git a/pages/docs/tutorials/kafka/index.md b/pages/docs/tutorials/kafka/index.md
new file mode 100644
index 000000000000..a56b8062e23c
--- /dev/null
+++ b/pages/docs/tutorials/kafka/index.md
@@ -0,0 +1,200 @@
+---
+title: Create AsyncAPI document for applications consuming from Kafka
+description: A tutorial teaching how to configure an AsyncAPI document for Kafka messages.
+weight: 220
+---
+
+## Introduction
+
+In this tutorial, you will create a schema document for Kafka Messages using AsyncAPI. You will also learn about Event-Driven Architecture, the pub/sub model, and brokers concerning Kafka. 
+  
+Suppose you have a service publishing data to a Kafka topic whenever a new user signs up on your application.
+
+You want to build a system that tracks users who have signed up for your application. As such, your application will have the following flow:
+
+```mermaid
+sequenceDiagram
+    participant Your Application (Consumer)
+    participant Kafka
+    participant Service (Producer)
+    participant User
+    Your Application (Consumer)->> Kafka: Subscribes to "userSignedUp" topic
+    User-->> Service (Producer): Signs Up
+    Service (Producer)->> Kafka: Publishes Events
+    Kafka->> Your Application (Consumer): Sends "user_signup" message
+```    
+
+
+## Background context
+
+[Event-Driven Architecture (EDA)](/docs/tutorials/getting-started/event-driven-architectures) is a design pattern that revolves around the production, detection, and reaction to events over time. It consists of three main components: a message broker, event publishers, and subscribers, which together serve as the backbone for event exchange within different services. 
+
+[Message brokers](/docs/tutorials/getting-started/event-driven-architectures#message-broker) facilitate asynchronous communications between services, meaning the sending service doesn't have to wait for the receiving service's response. Multiple services can talk to each other directly, even if they are written in different languages. 
+
+A great example of such a message broker is Apache Kafka. [Apache Kafka](https://kafka.apache.org/) is a distributed event streaming platform thousands of companies use for their event-driven system. Here, a distributed event streaming platform is a system that operates on multiple nodes, providing high availability and fault tolerance.
+
+[Publisher/Subscriber (Pub/Sub)](/docs/tutorials/getting-started/event-driven-architectures#publishersubscriber) is a typical model in EDAs, providing flexible coupling between publishers and subscribers. In this model, those who `send` event notifications act as publishers, while those who `receive` the notifications act as the corresponding subscribers.
+
+## Create AsyncAPI document for Kafka messages  
+
+In this section, you’ll create an AsyncAPI document to describe the `UserSignUp` API. The same document can be later used to generate code and documentation as per requirement.
+
+Let's begin by analyzing the document. As you progress in the tutorial, we'll break down each segment, uncovering its purpose and functionality.
+
+```
+asyncapi: 3.0.0
+info:
+  title: User Signup API
+  version: 1.0.0
+  description: The API notifies you whenever a new user signs up in the application.
+
+servers:
+  centralKafkaServer:
+    host: central.mykafkacluster.org:8092
+    description: Kafka broker running in a central warehouse
+    protocol: kafka
+  westKafkaServer:
+    host: west.mykafkacluster.org:8092
+    description: Kafka broker running in the west warehouse
+    protocol: kafka
+  eastKafkaServer:
+    host: east.mykafkacluster.org:8092
+    description: Kafka broker running in the east warehouse
+    protocol: kafka
+
+operations:
+  onUserSignedUp:
+    action: receive
+    channel:
+      $ref: '#/channels/userSignedUp'
+
+channels:
+  userSignedUp:
+    description: This channel contains a message per each user who signs up in our application.
+    address: user_signedup
+    messages:
+      userSignedUp:
+        $ref: '#/components/messages/userSignedUp'
+
+components:
+  messages:
+    userSignedUp:
+      payload:
+        type: object
+        properties:
+          userId:
+            type: integer
+            description: This property describes the id of the user
+          userEmail:
+            type: string
+            description: This property describes the email of the user
+```
+
+Let's now break it down into pieces.
+
+### Define AsyncAPI version, API information, and server
+
+First, you must describe your application, including the AsyncAPI version, the info about the document, and the server your application is based on.
+
+```
+asyncapi: 3.0.0
+info:
+  title: User Signup API
+  version: 1.0.0
+  description: The API notifies you whenever a new user signs up in the application.
+servers:
+  centralKafkaServer:
+    host: central.mykafkacluster.org:8092
+    description: Kafka broker running in a central warehouse
+    protocol: kafka
+  westKafkaServer:
+    host: west.mykafkacluster.org:8092
+    description: Kafka broker running in the west warehouse
+    protocol: kafka
+  eastKafkaServer:
+    host: east.mykafkacluster.org:8092
+    description: Kafka broker running in the east warehouse
+    protocol: kafka
+```
+
+In the above snippet:
+
+- The `asyncapi` field indicates that you use AsyncAPI version 3.0.0.
+  
+- The `info` field provides information about the API. Here the the APIs `title`, `version`, and `description` are being defined.
+  
+- The `server` field specifies the details of the server, including the `host`, `description`, and the `protocol` that is being used (i.e., Kafka). This section allows you to define multiple clusters or servers, as shown in the provided code block.
+
+<Remember>
+If an application has multiple servers hidden from the user behind a load balancer, then only the address of the load balancer must be included in the AsyncAPI document. 
+</Remember>
+
+### Define channels
+
+Next, let's move on to the `channels` section. The channel addresses are the topics in Kafka; they are the routes to which your API will send/receive messages. 
+
+```
+channels:
+  userSignedUp:
+    description: This channel contains a message per each user who signs up in our application.
+    address: user_signedup
+    messages:
+      userSignedUp:
+        $ref: '#/components/messages/userSignedUp'
+```
+
+In the above code snippet:
+  
+- The `userSignedUp` object inside `channels` describes the Kafka topic where the application will receive the information and the associated message definition. 
+- The `address` field represents the actual name of the Kafka topic and the `messages` field describes the expected messages in that topic.
+
+### Define operations
+
+Now, let's move on to the `operations` section. The `operations` property is used to describe how your application interacts with the defined channels.
+
+```
+operations:
+  onUserSignedUp:
+    action: receive
+    channel:
+      $ref: '#/channels/userSignedUp'
+```
+
+In the above code snippet:
+
+- The `onUserSignedUp` object specifies the operation's nature, which occurs when the user signs up. 
+- The `action` property indicates that the application will receive the information.
+- The `channel` property points to the channel where the operation occurs.
+
+### Define messages and schemas
+
+Finally, you'll define the messages and their payload. The payload defines how the event would look like when it's sent from the channel.
+
+```
+components:
+  messages:
+    userSignedUp:
+      payload:
+        type: object
+        properties:
+          userId:
+            type: integer
+            description: This property describes the ID of the user
+          userEmail:
+            type: string
+            description: This property describes the ID of the user
+```
+
+In the above code snippet:
+
+- The `userSignedUp` message is defined which describes the payload (content) of the message.
+  
+- The `payload` property defines the message content. Your message payload should contain a `userId`, an integer, a `userEmail` property, and a string property.
+
+## Summary
+
+The ability to generate an AsyncAPI document for Kafka is now in your toolkit. You generated an AsyncAPI document that defines the structure of the Kafka messages in a machine-readable format, which makes it easier to maintain event-driven architecture. Try adding your business logic and playing around with it.
+
+## Next steps
+
+Now that you know how to write an AsyncAPI document for Kafka messages using the default schema, let's learn how to create an [AsyncAPI document using Avro Schema instead](/docs/tutorials/kafka/configure-kafka-avro). 
diff --git a/pages/docs/tutorials/websocket/_section.md b/pages/docs/tutorials/websocket/_section.md
new file mode 100644
index 000000000000..f0967315b307
--- /dev/null
+++ b/pages/docs/tutorials/websocket/_section.md
@@ -0,0 +1,4 @@
+---
+title: 'WebSocket'
+weight: 200
+---
diff --git a/pages/docs/tutorials/websocket/index.md b/pages/docs/tutorials/websocket/index.md
new file mode 100644
index 000000000000..ca3ac0363bc3
--- /dev/null
+++ b/pages/docs/tutorials/websocket/index.md
@@ -0,0 +1,321 @@
+---
+title: Create an AsyncAPI document for a Slackbot with WebSocket
+description: In this tutorial, you'll learn how to create an AsyncAPI document designed for a Slack application that operates in Socket Mode using the WebSocket protocol.
+weight: 210
+---
+
+## Introduction
+In this tutorial, you will learn how to write an AsyncAPI document designed for a Slack application that operates in Socket Mode. The aim is to help you grasp a real-world application of AsyncAPI with the WebSocket protocol. You will learn how to write an AsyncAPI document for a consumer-only application receiving a stream of messages from a WebSocket server. You will also learn why the AsyncAPI bindings feature exists and how to use it.
+
+Consider a scenario where you are in charge of maintaining a highly active Slack workspace. You want an easy way to keep track of the popular messages across all channels, but doing this manually would be difficult. To simplify this process, you will build a Slackbot called `Heart-Counter` that actively monitors reactions added to a message and determines its popularity by counting the reactions of the “heart” emoji.
+
+Here’s a visual representation of how the `Heart-Counter` should work: 
+
+```mermaid
+sequenceDiagram
+participant Heart-Counter
+participant Slack Server (Socket Mode)
+participant User
+
+
+Heart-Counter ->>Slack Server (Socket Mode): Connect
+Note right of Heart-Counter: Establish WebSocket connection
+
+
+Slack Server (Socket Mode)->> Heart-Counter : Handshake
+Note left of Slack Server (Socket Mode): Establish Socket Mode connection
+
+Slack Server (Socket Mode)->> Heart-Counter : Sends "hello" event
+Note left of Slack Server (Socket Mode): Confirms successful connection
+
+
+
+
+
+User-->>Slack Server (Socket Mode): Adds emoji to a message.
+
+
+Slack Server (Socket Mode)->>Heart-Counter: Sending "reaction_added" payload
+
+
+Note left of Heart-Counter: Event received
+``` 
+
+## Background context
+[WebSocket](https://en.wikipedia.org/wiki/WebSocket) is a communication protocol that enables simultaneous bidirectional data exchange between a client and a server over a single, long-lived connection. Unlike HTTP, which relies on the request-response model, WebSocket is ideal for scenarios where real-time, interactive, and low-latency communication is necessary.
+
+
+```mermaid
+sequenceDiagram
+Client -->> Server: Initiate WebSocket Connection
+Server -->> Client: Message 1
+Server -->> Client: Message 2
+Server -->> Client: Message 3
+Server -->> Client: Message 4
+```
+
+In Slack, WebSocket is employed as part of its [Socket Mode](https://api.slack.com/apis/connections/socket) feature to facilitate real-time notifications between Slack's servers and third-party applications or bots. The [Slack Event API](https://api.slack.com/apis/connections/events-api) is a tool that lets you receive real-time notifications of specific events in a Slack workspace such as messages, reactions, and user presence changes.
+
+
+## Define AsyncAPI version, API information, and server
+
+You start your AsyncAPI document by specifying the AsyncAPI version and essential information about your Slack application's API, which includes details such as the `title,` `version,` and `description.`
+
+The `servers` section allows you to define the protocol and specify information about the URLs your application will use, such as  `host`, `pathname`, `protocol`, and `description`.
+
+<Remember>
+The WebSocket URL is generated  by invoking the <a href="https://api.slack.com/methods/apps.connections.open">apps.connections.open</a> method from Slack’s API. You use the authentication tokens obtained during the configuration of your Slackbot to generate this URL.
+</Remember>
+
+<CodeBlock language="yaml">
+{`asyncapi: '3.0.0'
+info:
+  title: Create an AsyncAPI document for a Slackbot with WebSocket
+  version: '1.0.0'
+  description:  |
+    The Heart-Counter manages popular messages in a Slack workspace by monitoring message reaction data
+servers:
+  production:
+    host: wss-primary.slack.com
+    pathname: /link
+    protocol: wss
+    description: Slack's server in Socket Mode for real-time communication `}
+</CodeBlock>
+
+## Define messages and schemas
+
+Your AsyncAPI document needs to be very clear on the type of event it is expected to receive. Here's where the `messages` component steps in. Using the `payload` property, you can specify what these events should look like, their structure, and what content they carry.
+
+The `payload` attribute specifies the name, format, and description of all the expected properties. `Heart-Counter` starts the popularity count of a message by validating if the `reaction` property set in the `reaction` schema definition corresponds to "heart".
+
+<CodeBlock language="yaml" highlightedLines={[5,6,9,10,42,43,44]}>
+{`components:
+  messages:
+    reaction:
+      summary: Action triggered when the channel receives a new reaction-added event
+      payload:
+        $ref: '#/components/schemas/reaction'
+    hello:
+      summary: Action triggered when a successful WebSocket connection is established
+      payload:
+        $ref: '#/components/schemas/hello'
+  schemas:
+    hello:
+      type: object
+      properties:
+        type:
+          type: string
+          description: A hello string confirming WebSocket connection
+        connection_info:
+          type: object
+          properties:
+            app_id:
+            type: string
+        num_connections:
+            type: integer
+        debug_info:
+          type: object
+          properties:
+            host:
+              type: string
+            started:
+              type: string
+            build_number:
+              type: integer
+            approximate_connection_time:
+              type: integer
+      reaction:
+        type: object
+        properties:
+          user:
+            type: string
+            description: User ID who performed this event
+          reaction:
+            type: string
+            description: The only reaction that we need is a heart emoji
+          item_user:
+            type: string
+            description: User ID that created the original item that has been reacted to
+          item:
+            type: object
+            properties:
+              channel:
+                type: string
+                description: Channel information of original message
+              ts:
+                type: string
+                description: Timestamp information of original message
+          event_ts:
+            type: string
+            description: Reaction timestamp `}
+</CodeBlock>
+
+## Define channels and  bindings
+
+The `channels` attribute defines a communication channel for the event. The `address` specifies where the channel is tuned in to receive messages while the `messages` property defines a key-value pair where each key corresponds to the event it's set up to handle.
+
+The WebSocket URL generated for `Heart-Counter` includes authentication tokens. This information is represented using `query` parameters. Query parameters are specific to HTTP protocol and partially to WebSocket, which uses HTTP to connect client and server. Since this is protocol-specific information, you must use an AsyncAPI feature called `bindings` that enables you to provide protocol-specific information inside the AsyncAPI document using the `bindings` attribute. By utilizing the `query` object from the WebSocket binding, you can outline the parameters needed for the connection and the conditions they must meet. 
+
+<CodeBlock language="yaml" highlightedLines={[9]}>
+{`channels:
+  root:
+    address: /
+    messages:
+      hello:
+        $ref: '#/components/messages/hello'
+      reaction:
+        $ref: '#/components/messages/reaction'
+    bindings:
+      ws:
+        query:
+          type: object
+          description: Tokens are produced in the WebSocket URL generated from the [apps.connections.open](https://api.slack.com/methods/apps.connections.open) method from Slack’s API
+          properties:
+            ticket:
+              type: string
+              description: Temporary token generated when connection is initiated
+              const: '13748dac-b866-4ea7-b98e-4fb7895c0a7f'
+            app_id:
+              type: string
+              description: Unique identifier assigned to the Slack app
+              const: 'fe684dfa62159c6ac646beeac31c8f4ef415e4f39c626c2dbd1530e3a690892f' `}
+</CodeBlock>
+
+## Define operations 
+The `operation` property is all about defining specific tasks your application can perform. Essentially, it's how the `Heart-Counter` interacts with Slack.
+
+In this example, the `helloListener` operation keeps an eye out for the message sent by the Slack server when a WebSocket connection is successfully established. On the other hand, the `reactionListener` is focused on the `reaction_added` event type.
+
+Your Slack application is designed to be notified of events within your workspace. It subscribes to a specific event type and uses Slack's Event API. In this case, both operations' `action` property is set to `receive` events.
+
+<CodeBlock language="yaml" highlightedLines={[3,9]}>
+{`operations:
+  helloListener:
+    action: receive
+    channel:
+      $ref: '#/channels/root'
+    messages:
+      - $ref: '#/channels/root/messages/hello'
+  reactionListener:
+    action: receive
+    channel:
+      $ref: '#/channels/root'
+    messages:
+      - $ref: '#/channels/root/messages/reaction' `}
+</CodeBlock>
+
+Congratulations, you've completed the tutorial! Putting these blocks together gives you an AsyncAPI document all ready to go.
+
+<CodeBlock language="yaml">
+{`asyncapi: '3.0.0'
+info:
+  title: Create an AsyncAPI document for a Slackbot with WebSocket
+  version: '1.0.0'
+  description:  |
+    The Heart-Counter manages popular messages in a Slack workspace by monitoring message reaction data.
+servers:
+  production:
+    host: wss-primary.slack.com
+    pathname: /link
+    protocol: wss
+    description: Slack's server in Socket Mode for real-time communication
+channels:
+  root:
+    address: /
+    messages:
+      hello:
+        $ref: '#/components/messages/hello'
+      reaction:
+        $ref: '#/components/messages/reaction'
+    bindings:
+      ws:
+        query:
+          type: object
+          description: Tokens are produced in the WebSocket URL generated from the [apps.connections.open](https://api.slack.com/methods/apps.connections.open) method from Slack’s API
+          properties:
+            ticket:
+              type: string
+              description: Temporary token generated when connection is initiated
+              const: '13748dac-b866-4ea7-b98e-4fb7895c0a7f'
+            app_id:
+              type: string
+              description: Unique identifier assigned to the Slack app
+              const: 'fe684dfa62159c6ac646beeac31c8f4ef415e4f39c626c2dbd1530e3a690892f'
+operations:
+  helloListener:
+    action: receive
+    channel:
+      $ref: '#/channels/root'
+    messages:
+      - $ref: '#/channels/root/messages/hello'
+  reactionListener:
+    action: receive
+    channel:
+      $ref: '#/channels/root'
+    messages:
+      - $ref: '#/channels/root/messages/reaction'
+components:
+  messages:
+    reaction:
+      summary: Action triggered when the channel receives a new reaction-added event
+      payload:
+        $ref: '#/components/schemas/reaction'
+    hello:
+      summary: Action triggered when a successful WebSocket connection is established
+      payload:
+        $ref: '#/components/schemas/hello'
+schemas:
+  hello:
+    type: object
+    properties:
+      type:
+        type: string
+        description: A hello string confirming WebSocket connection
+      connection_info:
+        type: object
+        properties:
+          app_id:
+            type: string
+          num_connections:
+            type: integer
+          debug_info:
+            type: object
+            properties:
+              host:
+                type: string
+              started:
+                type: string
+              build_number:
+                type: integer
+              approximate_connection_time:
+                type: integer
+    reaction:
+      type: object
+      properties:
+        user:
+          type: string
+          description: User ID who performed this event
+        reaction:
+          type: string
+          description: The only reaction that we need is a heart emoji
+        item_user:
+          type: string
+          description: User ID that created the original item that has been reacted to
+        item:
+          type: object
+          properties:
+            channel:
+              type: string
+              description: Channel information of original message
+            ts:
+              type: string
+              description: Timestamp information of original message
+        event_ts:
+          type: string
+          description: Reaction timestamp `}
+</CodeBlock>
+
+
+
+## Summary
+In this tutorial, you learned to create an AsyncAPI document for a Slackbot using WebSocket in Socket Mode. You gained practical insights into the functionality of operations, channels, messages, and schemas. Now you're equipped to handle real-world applications that facilitate bidirectional real-time data exchange, such as chatbots and live-streaming platforms.
diff --git a/pages/docs/tutorials/websocket/websocket-request-reply.md b/pages/docs/tutorials/websocket/websocket-request-reply.md
new file mode 100644
index 000000000000..5441d2a63020
--- /dev/null
+++ b/pages/docs/tutorials/websocket/websocket-request-reply.md
@@ -0,0 +1,370 @@
+---
+title: Implement Request/Reply in an AsyncAPI document for a Slack app
+description: In this tutorial, you'll learn how to write an AsyncAPI document that implements the request/reply feature in a Slack application using the WebSocket protocol.
+weight: 220
+---
+
+## Introduction
+In the [Create an AsyncAPI Document for a Slackbot with WebSockets](https://www.asyncapi.com/docs/tutorials/websocket) tutorial, you learned how to write an AsyncAPI document for a Slackbot `Heart-Counter`  that actively monitored reactions associated with a message. In this lesson, let's go a step further. After receiving a reaction, `Heart-Counter` responds via a message back to the Slack server through WebSocket to confirm the event reception. 
+
+The interaction where the Slackbot acknowledges the event and replies with a specific response sets the stage for the Request/Reply messaging pattern discussed in this context. 
+
+> Refer to the [Request/Reply pattern tutorial](https://www.asyncapi.com/docs/tutorials/getting-started/request-reply) for an introduction to its implementation. 
+
+
+```mermaid
+sequenceDiagram
+participant Heart-Counter
+participant Slack Server (Socket Mode)
+participant User
+
+
+User-->>Slack Server (Socket Mode): Adds emoji to a message.
+
+
+Slack Server (Socket Mode)->>Heart-Counter: Sending "reaction_added" payload
+Note left of Heart-Counter: Event received
+Heart-Counter->>Slack Server (Socket Mode): Sending acknowledgement
+``` 
+
+
+## Background context
+
+The [Request-Reply Messaging Pattern](https://www.asyncapi.com/docs/concepts/asyncapi-document/reply-info) in AsyncAPI is an exciting and highly anticipated feature.  The messaging pattern mirrors a traditional conversation, where one "requester" entity initiates a query or request, and the "responder" entity provides a specific and expected response.
+The messaging pattern can work in both synchronous and asynchronous environments and is very beneficial to decouple components by allowing them to operate independently in a distributed system. 
+
+```mermaid
+sequenceDiagram
+  participant Client
+  participant Server
+
+  Client->>Server: Request
+  note right of Client: Continue with other tasks
+
+  Server-->>Client: Acknowledgment
+  Server->>Server: Process Request
+  Server-->>Client: Reply
+```
+
+
+## Define messages
+
+In the `Heart-Counter` tutorial, you dealt with the `hello` event triggered when the WebSocket connection was established and the `reaction` event expected when a new reaction-added event was triggered.
+
+In this tutorial, you'll add the `acknowledge` message to your AsyncAPI document to represent the acknowledgment sent by the Slack application back to the server to indicate that it has successfully received the message.
+
+<CodeBlock language="yaml" highlightedLines={[11,12,13,14]}>
+{`components:
+  messages:
+    reaction:
+      summary: Action triggered when the channel receives a new reaction-added event
+      payload:
+        $ref: '#/components/schemas/reaction'
+    hello:
+      summary: Action triggered when a successful WebSocket connection is established
+      payload:
+        $ref: '#/components/schemas/hello'
+    acknowledge:
+      summary: Acknowledgement response sent to Server
+      payload:
+        $ref: '#/components/schemas/acknowledge' `}
+</CodeBlock>
+
+## Define schemas
+
+Previously, the `reaction` schema was simplified to include the `event` payload. However, in this instance, you will be able to elaborate on the schema for the complete request it is expected to receive.
+
+<Remember>
+The sample request and response payloads are extracted from <a href="https://api.slack.com/apis/connections/socket#events">Slack's official documentation</a>.
+</Remember>
+
+<CodeBlock language="yaml">
+{`  schemas:
+    hello:
+      type: object
+      properties:
+        type:
+          type: string
+          description: A hello string confirming WebSocket connection
+        connection_info:
+          type: object
+          properties:
+            app_id:
+              type: string
+        num_connections:
+          type: integer
+        debug_info:
+          type: object
+          properties:
+            host:
+              type: string
+            started:
+              type: string
+            build_number:
+              type: integer
+            approximate_connection_time:
+              type: integer
+    reaction:
+      type: object
+      properties:
+        envelope_id:
+          type: string
+          description: 'Unique ID assigned to payload'
+        payload:
+          type: object
+          description: 'Payload of the reaction added event'
+          properties:
+            token:
+              type: string
+            team_id:
+              type: string
+            event:
+              type: object
+              properties:
+                user:
+                  type: string
+                  description: User ID who performed this event
+                reaction:
+                  type: string
+                  description: The only reaction that you need is a heart emoji
+                item_user:
+                  type: string
+                  description: |
+                    User ID that created the original item that has been reacted
+                    to
+                item:
+                  type: object
+                  properties:
+                    channel:
+                      type: string
+                      description: Channel information of original message
+                    ts:
+                      type: string
+                      description: Timestamp information of original message
+                event_ts:
+                  type: string
+                  description: Reaction timestamp
+        type:
+          type: string
+        accepts_response_payload:
+          type: boolean `}
+</CodeBlock>
+
+Additionally, you will also be adding the `acknowledge` schema that makes use of the `envelope_id` attribute to send a reply back to Slack acknowledging that event has been received.
+
+<CodeBlock language="yaml" highlightedLines={[4,5,6]}>
+{`    acknowledge:
+      type: object
+      properties:
+        envelope_id:
+          type: string
+          description: 'Unique ID of acknowledged payload'
+        payload:
+          type: object
+          description: 'Optional payload of event' `}
+</CodeBlock>
+
+## Define acknowledge message to channel
+Extend the channel the `Heart-Counter` used to include the `acknowledge` message.
+
+<CodeBlock language="yaml" highlightedLines={[9,10]}>
+{`channels:
+  root:
+    address: /
+    messages:
+      hello:
+        $ref: '#/components/messages/hello'
+      reaction:
+        $ref: '#/components/messages/reaction'
+      acknowledge:
+        $ref: '#/components/messages/acknowledge' `}
+</CodeBlock>
+
+## Define operations
+
+Now you've reached the most important part of the tutorial; it's time to represent the Request/Reply pattern. 
+
+Both `helloListener` and `reactionListener` operations are set to `receive` events. However, in the case of `reactionListener`, you also want to represent the message sent back to the server. This is where the `reply` attribute comes into play. 
+
+Since both the request and reply function happens over the same WebSocket URL, both `channel` values stay the same. However, you can differentiate each operation's message by specifying the messages sent or received. 
+Thus, you can say that for a `reaction` message received over the `root` channel, the `reactionListener` operation will reply with the `acknowledge` message over the same channel.
+
+
+<CodeBlock language="yaml" highlightedLines={[14,15,16,17,18]}>
+{`operations:
+  helloListener:
+    action: receive
+    channel:
+      $ref: '#/channels/root'
+    messages:
+      - $ref: '#/channels/root/messages/hello'
+  reactionListener:
+    action: receive
+    channel: 
+      $ref: '#/channels/root'
+    messages:
+      - $ref: '#/channels/root/messages/reaction'
+    reply:
+      messages:
+        - $ref: '#/channels/root/messages/acknowledge'      
+      channel: 
+        $ref: '#/channels/root' `}
+</CodeBlock>
+
+Putting all this together, you have your AsyncAPI document ready to go!
+<CodeBlock language="yaml">
+{`asyncapi: 3.0.0
+info:
+  title: Implement Request/Reply in an AsyncAPI document for a Slack app
+  version: 1.0.0
+  description: >
+    The Heart-Counter manages popular messages in a Slack workspace by
+    monitoring message reaction data. It also sends an acknowledgment message
+    back to the Slack Server to indicate it has received the message.
+servers:
+  production:
+    host: wss-primary.slack.com
+    pathname: /link
+    protocol: wss
+    description: Slack's server in Socket Mode for real-time communication
+channels:
+  root:
+    address: /
+    messages:
+      hello:
+        $ref: '#/components/messages/hello'
+      reaction:
+        $ref: '#/components/messages/reaction'
+      acknowledge:
+        $ref: '#/components/messages/acknowledge'
+    bindings:
+      ws:
+        query:
+          type: object
+          description: >-
+            Tokens are produced in the WebSocket URL generated from the
+            [apps.connections.open](https://api.slack.com/methods/apps.connections.open)
+            method from Slack's API
+          properties:
+            ticket:
+              type: string
+              description: Temporary token generated when connection is initiated
+              const: 13748dac-b866-4ea7-b98e-4fb7895c0a7f
+            app_id:
+              type: string
+              description: Unique identifier assigned to the Slack app
+              const: fe684dfa62159c6ac646beeac31c8f4ef415e4f39c626c2dbd1530e3a690892f
+operations:
+  helloListener:
+    action: receive
+    channel:
+      $ref: '#/channels/root'
+    messages:
+      - $ref: '#/channels/root/messages/hello'
+  reactionListener:
+    action: receive
+    channel:
+      $ref: '#/channels/root'
+    messages:
+      - $ref: '#/channels/root/messages/reaction'
+    reply:
+      messages:
+        - $ref: '#/channels/root/messages/acknowledge'
+      channel:
+        $ref: '#/channels/root'
+components:
+  messages:
+    reaction:
+      summary: Action triggered when the channel receives a new reaction-added event
+      payload:
+        $ref: '#/components/schemas/reaction'
+    hello:
+      summary: Action triggered when a successful WebSocket connection is established
+      payload:
+        $ref: '#/components/schemas/hello'
+    acknowledge:
+      summary: Acknowledgement response sent to Server
+      payload:
+        $ref: '#/components/schemas/acknowledge'
+  schemas:
+    hello:
+      type: object
+      properties:
+        type:
+          type: string
+          description: A hello string confirming WebSocket connection
+        connection_info:
+          type: object
+          properties:
+            app_id:
+              type: string
+        num_connections:
+          type: integer
+        debug_info:
+          type: object
+          properties:
+            host:
+              type: string
+            started:
+              type: string
+            build_number:
+              type: integer
+            approximate_connection_time:
+              type: integer
+    reaction:
+      type: object
+      properties:
+        envelope_id:
+          type: string
+          description: 'Unique ID assigned to payload'
+        payload:
+          type: object
+          description: 'Payload of the reaction added event'
+          properties:
+            token:
+              type: string
+            team_id:
+              type: string
+            event:
+              type: object
+              properties:
+                user:
+                  type: string
+                  description: User ID who performed this event
+                reaction:
+                  type: string
+                  description: The only reaction that you need is a heart emoji
+                item_user:
+                  type: string
+                  description: |
+                    User ID that created the original item that has been reacted
+                    to
+                item:
+                  type: object
+                  properties:
+                    channel:
+                      type: string
+                      description: Channel information of original message
+                    ts:
+                      type: string
+                      description: Timestamp information of original message
+                event_ts:
+                  type: string
+                  description: Reaction timestamp
+        type:
+          type: string
+        accepts_response_payload:
+          type: boolean
+    acknowledge:
+      type: object
+      properties:
+        envelope_id:
+          type: string
+          description: 'Unique ID of acknowledged payload'
+        payload:
+          type: object
+          description: 'Optional payload of event' `}
+</CodeBlock>
+
+## Summary
+Great job getting to the end! In this tutorial, you learned how to create an AsyncAPI document for a use case that implemented the Request-Reply messaging pattern. Now, you can explore this pattern with sub-patterns to see how it works with real-life use cases. 
diff --git a/pages/index.js b/pages/index.js
index 67f9185d4923..c5bc7fed2b39 100644
--- a/pages/index.js
+++ b/pages/index.js
@@ -1,261 +1,24 @@
-import Container from '../components/layout/Container'
 import NavBar from '../components/navigation/NavBar'
-import Hero from '../components/Hero'
-import NewsletterSubscribe from '../components/NewsletterSubscribe'
-import Sponsors from '../components/sponsors/Sponsors'
 import Head from '../components/Head'
-import Slack from '../components/slack'
-import Button from '../components/buttons/Button'
-import Calendar from '../components/Calendar'
-import AdidasLogo from '../components/logos/Adidas'
-import AxwayLogo from '../components/logos/Axway'
-import SlackLogo from '../components/logos/Slack'
-import SalesforceLogo from '../components/logos/Salesforce'
-import SapLogo from '../components/logos/SAP'
-import Testimonial from '../components/Testimonial'
-import Heading from '../components/typography/Heading'
-import Paragraph from '../components/typography/Paragraph'
-import TextLink from '../components/typography/TextLink'
-import GoldSponsors from '../components/sponsors/GoldSponsors'
-import SilverSponsors from '../components/sponsors/SilverSponsors'
-import SupportUs from '../components/SupportUs/SupportUs'
 import StickyNavbar from '../components/navigation/StickyNavbar'
-import GoogleCalendarButton from '../components/buttons/GoogleCalendarButton';
-import ICSFileButton from '../components/buttons/ICSFileButton';
-import SubscribeButton from '../components/buttons/SubscribeButton';
-import NewsroomSection from '../components/newsroom/NewsroomSection'
 import { languageDetection } from "../lib/i18n";
 
 function HomePage() {
-  //To be enabled in a future PR
-  //languageDetection();
+  const loader = 'img/loaders/loader.png'; // preloader image for the tools
+  languageDetection();
+
   return (
     <>
       <Head />
       <StickyNavbar>
         <NavBar className="max-w-screen-xl block px-4 sm:px-6 lg:px-8 mx-auto" />
       </StickyNavbar>
-
-      <main id="main-content" className="scroll-mt-5">
-        <Container wide>
-          <Hero className="mb-24" />
-        </Container>
-
-        <Container className="text-center pb-12" wide as="section">
-          <Heading
-            level="h3"
-            typeStyle="heading-lg"
-            className="mb-4"
-          >
-            Adopted by the world leading brands
-          </Heading>
-          <Paragraph className="mt-2 mb-20 md:w-2/3 md:mx-auto">
-            These brands are already using AsyncAPI in production. Is your company using AsyncAPI and wants to be included in this list?
-            <TextLink href="https://github.com/asyncapi/website/issues/new" target="_blank">
-              Let us know here!
-            </TextLink>
-          </Paragraph>
-          <ul className="md:grid md:gap-8 md:grid-cols-2 lg:grid-cols-5">
-            <li className="justify-center flex">
-              <AdidasLogo className="h-8 text-gray-400 hover:text-black" />
-            </li>
-            <li className="justify-center flex">
-              <AxwayLogo className="mt-12 md:-mt-5 lg:-mt-5 h-14 text-gray-400 group hover:text-black" />
-            </li>
-            <li className="justify-center flex">
-              <SlackLogo className="mt-12 md:mt-2 lg:-mt-1 h-10 text-gray-400 hover:text-black group" />
-            </li>
-            <li className="justify-center flex">
-              <SalesforceLogo className="mt-12 md:mt-2 lg:-mt-4 h-16 text-gray-400" />
-            </li>
-            <li className="justify-center flex">
-              <SapLogo className="mt-12 md:mt-2 lg:-mt-2 h-12 text-gray-400" />
-            </li>
-          </ul>
-        </Container>
-
-        <div className="bg-dark py-12 mt-8">
-          <Container wide as="section">
-            <NewsletterSubscribe dark />
-          </Container>
+      <div className="h-screen">
+        <div className="flex animate-pulse w-fit mx-auto my-60 gap-4 text-black">
+          <img src={loader} className="mx-auto w-16" />
+          <div className="text-xl my-auto">Loading...</div>
         </div>
-
-        <Container className="text-center py-12" wide as="section">
-          <Heading
-            level="h3"
-            typeStyle="heading-lg"
-            className="mb-4"
-          >
-            Join our great community!
-          </Heading>
-          <Paragraph className="mt-2 md:w-1/2 md:mx-auto">
-            We're a community of great people who are passionate about AsyncAPI and event-driven architectures.
-          </Paragraph>
-          <div className="py-2 lg:py-12">
-            <Container wide>
-              <div className="lg:flex">
-                <div className="mt-10 lg:mt-0 lg:w-1/2">
-                  <Slack />
-                </div>
-                <section className="lg:text-left lg:max-w-xl lg:w-1/2 lg:ml-12">
-                  <div className="mt-5">
-                    <Heading level="h4" typeStyle="heading-md-semibold">
-                      Join our Slack workspace
-                    </Heading>
-                    <Paragraph className="mt-2">
-                      We welcome everyone to join our Slack workspace. If you have a question on how to use AsyncAPI, want to contribute, or simply want to say hello 👋 &nbsp;you're welcome to join us. We're nice people 🙂
-                    </Paragraph>
-                  </div>
-                  <div className="mt-5 flex justify-center lg:justify-start">
-                    <Button className="w-full md:w-auto" text="Join us!" href="/slack-invite" />
-                  </div>
-                </section>
-              </div>
-
-              <div className="mt-12 lg:flex lg:flex-row-reverse">
-                <section className="mt-10 lg:mt-0 lg:flex-1">
-                  <Calendar size="2" className="float-left" />
-                </section>
-                <section className="lg:text-left lg:max-w-xl lg:mr-12">
-                  <div className="mt-5 lg:mr-12">
-                    <Heading level="h3" typeStyle="heading-md-semibold">
-                      Join our public meetings
-                    </Heading>
-                    <Paragraph className="mt-2">
-                      AsyncAPI hosts different meetings every week. They are focused on different topic, sometimes purely technical and sometimes about community building. Pick one and join us!
-
-                      <TextLink href="/community/meetings">
-                        Learn more about our meetings.
-                      </TextLink>
-                    </Paragraph>
-                    <ul className="mt-5 md:flex justify-center">
-                      <li>
-                        <GoogleCalendarButton href="https://calendar.google.com/calendar/u/3?cid=Y19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bncm91cC5jYWxlbmRhci5nb29nbGUuY29t" />
-                      </li>
-                      <li>
-                        <SubscribeButton
-                          href="/community/meetings"
-                          className="mt-2 md:mt-0 md:ml-2"
-                        />
-                      </li>
-                      <li>
-                        <ICSFileButton
-                          href="https://calendar.google.com/calendar/ical/c_q9tseiglomdsj6njuhvbpts11c%40group.calendar.google.com/public/basic.ics"
-                          className="mt-2 md:mt-0 md:ml-2"
-                        />
-                      </li>
-                    </ul>
-                  </div>
-                </section>
-              </div>
-            </Container>
-            <Container wide>
-              <NewsroomSection />
-            </Container>
-          </div>
-
-        </Container>
-
-
-        <section className="pb-20" role="contentinfo" aria-label='Our Sponsors'>
-          <Container className="text-center pb-6" wide as="section">
-            <Heading
-              level="h3"
-              typeStyle="heading-lg"
-              className="mb-4"
-            >
-              Platinum Sponsors
-            </Heading>
-            <Sponsors className="mt-4" showSupportBanner={ false } />
-          </Container>
-
-          <Container className="text-center pb-6" wide as="section">
-            <Heading
-              level="h3"
-              typeStyle="heading-lg"
-              className="mb-4"
-            >
-              Gold Sponsors
-            </Heading>
-            <GoldSponsors className="mt-4" showSupportBanner={ false } />
-          </Container>
-
-          <Container className="text-center pyb-6" wide as="section">
-            <Heading
-              level="h3"
-              typeStyle="heading-lg"
-              className="mb-4"
-            >
-              Silver Sponsors
-            </Heading>
-            <SilverSponsors className="mt-4" showSupportBanner={ false } />
-          </Container>
-
-
-          <Container className="text-center py-6" wide as="section">
-            <Heading
-              level="h3"
-              typeStyle="heading-md-semibold"
-              className="mb-4"
-            >
-              Want to Sponsor Us?
-            </Heading>
-            <Paragraph className="mt-2 md:w-1/2 md:mx-auto">
-              These great organizations are already supporting AsyncAPI. Want to become a sponsor?
-              <TextLink href="https://opencollective.com/asyncapi" target="_blank">
-                Support us!
-              </TextLink>
-            </Paragraph>
-          </Container>
-        </section>
-        <Container className="text-center py-6 pb-20" wide>
-          <Heading level="h3" typeStyle="heading-lg" className="mb-4">
-            Supported by
-          </Heading>
-          <Paragraph className="mt-3 max-w-2xl mx-auto sm:mt-4 pb-4">
-            The following companies support us by letting us use their products for free. Interested in supporting us too?
-            <TextLink href="mailto:info@asyncapi.io" target="_blank">
-              Email us
-            </TextLink> for more info.
-          </Paragraph>
-          <SupportUs className="mt-4" showSupportBanner={ false } />
-        </Container>
-        <Container className="text-center pb-20 mt-8" wide as="section">
-          <Heading level="h3" typeStyle="heading-lg" className="mb-4">
-            What the experts are saying
-          </Heading>
-          <ul className="max-w-screen-xl mx-auto md:grid md:grid-cols-2 md:px-6 lg:px-8">
-            <Testimonial
-              className="md:pr-10 lg:pr-16"
-              text="Microservices underline the need for event-based communication in distributed architectures. AsyncAPI brings the richness of the REST API ecosystem to asynchronous APIs."
-              authorAvatar="/img/testimonials/matt-mclarty.jpg"
-              authorName="Matt McLarty"
-              authorDescription="Global Leader of API Strategy at MuleSoft"
-            />
-            <Testimonial
-              className="md:pl-10 lg:pl-16"
-              text="Event-driven APIs need love too! AsyncAPI brings the many benefits of a machine/human readable specification to these nuanced approaches."
-              authorAvatar="/img/testimonials/bill-doerrfeld.jpg"
-              authorName="Bill Doerrfeld"
-              authorDescription="Editor in Chief at Nordic APIs"
-            />
-            <Testimonial
-              className="md:pr-10 lg:pr-16"
-              text="Developers need to be able to quickly and consistently create event-driven applications that provide business value and react to customer needs in realtime. I can't count how many times I've heard developers ask for OpenAPI/Swagger style tools for the asynchronous and event driven world, and that is exactly what the AsyncAPI initiative is making a reality."
-              authorAvatar="/img/testimonials/jonathan-schabowsky.jpg"
-              authorName="Jonathan Schabowsky"
-              authorDescription="Sr. Architect, Office of the CTO at Solace"
-            />
-            <Testimonial
-              className="md:pl-10 lg:pl-16"
-              text="We’ve been focusing on event-driven APIs since 2014 and thank the AsyncAPI contributors everyday for driving the community towards common standards."
-              authorAvatar="/img/testimonials/eric-horesnyi.jpg"
-              authorName="Eric Horesnyi"
-              authorDescription="CEO at Streamdata.io"
-            />
-          </ul>
-        </Container>
-      </main>
+      </div>
     </>
   )
 }
diff --git a/scripts/finance/index.js b/scripts/finance/index.js
index d720bfd989a3..b0954a8e582d 100644
--- a/scripts/finance/index.js
+++ b/scripts/finance/index.js
@@ -6,8 +6,8 @@ module.exports = async function buildFinanceInfoList() {
     try {
         const currentDir = resolve(__dirname, '../../');
 
-        const expensesPath = resolve(currentDir, 'config', 'finance', '2023', 'Expenses.yml');
-        const expensesLinkPath = resolve(currentDir, 'config', 'finance', '2023', 'ExpensesLink.yml');
+        const expensesPath = resolve(currentDir, 'config', 'finance', '2024', 'Expenses.yml');
+        const expensesLinkPath = resolve(currentDir, 'config', 'finance', '2024', 'ExpensesLink.yml');
 
         const ExpensesContent = await readFile(expensesPath, 'utf-8');
         const ExpensesLinkContent = await readFile(expensesLinkPath, 'utf-8');
@@ -16,7 +16,7 @@ module.exports = async function buildFinanceInfoList() {
         const ExpensesLink = convertToJson(ExpensesLinkContent);
 
         // Ensure the directory exists before writing the files
-        const jsonDirectory = resolve(currentDir, 'config', 'finance', 'json-data', '2023');
+        const jsonDirectory = resolve(currentDir, 'config', 'finance', 'json-data', '2024');
         await mkdir(jsonDirectory, { recursive: true });
 
         // Write Expenses to a JSON files