diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index b660218..71d9f1c 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -2,7 +2,7 @@
 set -e
 DIR="$(realpath "$(dirname "${0}")")"
 
-until PGPASSWORD="${POSTGRES_PASSWORD}" psql -h "${DB_HOST}" -U "${POSTGRES_USER}" -c '\q' 2>/dev/null
+until PGPASSWORD="${POSTGRES_PASSWORD}" psql -h "${DB_HOST}" -U "${POSTGRES_USER}" -c '\q' "${POSTGRES_DB}" 2>/dev/null
 do
     echo "PostgreSQL is starting... Waiting"
     sleep 1
diff --git a/src/events/messageCreate.ts b/src/events/messageCreate.ts
index 795107b..ad77cb6 100644
--- a/src/events/messageCreate.ts
+++ b/src/events/messageCreate.ts
@@ -2,7 +2,7 @@ import { Prisma } from "@prisma/client";
 import { Message, TextChannel } from "discord.js";
 import { InterServerClient } from "../classes/Client";
 import { EventData } from "../typings/index";
-import { INTERSERVER_WH_NAME } from "../utils/constants.js";
+import { INTERSERVER_WH_NAME, SERVERS_HEADERS } from "../utils/constants.js";
 
 const data: EventData = {
     name: "messageCreate",
@@ -36,15 +36,24 @@ const data: EventData = {
                 });
             }
 
+            const lastMessage = (
+                await msg.channel.messages.fetch({ limit: 2 })
+            ).last();
+
             const whMessage = await webhook.send({
-                content:
-                    msg.cleanContent.length == 0
-                        ? "​" // Invisible char
-                        : msg.cleanContent,
-                username: `${msg.author.username} - ${msg.guild.name}`,
+                content: `${
+                    lastMessage?.author.id === msg.author.id &&
+                    lastMessage?.guildId === msg.guildId
+                        ? ""
+                        : `***${
+                              SERVERS_HEADERS[msg.guildId] ??
+                              `❓ ${msg.guild.name}`
+                          }***`
+                }\n${msg.content}`,
+                username: msg.author.username,
                 avatarURL: msg.author.avatarURL(),
                 embeds: msg.embeds,
-                allowedMentions: { parse: ["users"] },
+                allowedMentions: { parse: [] },
                 files: msg.attachments.map((attachement) => attachement.url)
             });
             clones.push({ channelId, id: whMessage.id });
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index c79c2dc..bb9cff5 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -2,3 +2,14 @@
  * Name of the interserver webhook
  */
 export const INTERSERVER_WH_NAME = "FIIBOT_INTERSERVEUR";
+
+/**
+ * Server emoji names map
+ */
+export enum SERVERS_HEADERS {
+    "622831434427662346" = "<:lpt:970386551945187338> LPT",
+    "696156347946762240" = "<:mim:970386612162797638> MIM",
+    "456901919344951298" = "<:cli:970386525906948106> CLI",
+    "706283053160464395" = "<:hub:970386593405894687> HUB",
+    "793993155343024160" = "<:hub:970386593405894687> TEST"
+}