diff --git a/ct/headers/bitfocus-companion b/ct/headers/bitfocus-companion
index f75212a5..56521d7b 100644
--- a/ct/headers/bitfocus-companion
+++ b/ct/headers/bitfocus-companion
@@ -1,6 +1,6 @@
-    ____  _ __  ____                         ______                                  _           
-   / __ )(_) /_/ __/___  _______  _______   / ____/___  ____ ___  ____  ____ _____  (_)___  ____ 
-  / __  / / __/ /_/ __ \/ ___/ / / / ___/  / /   / __ \/ __ `__ \/ __ \/ __ `/ __ \/ / __ \/ __ \
- / /_/ / / /_/ __/ /_/ / /__/ /_/ (__  )  / /___/ /_/ / / / / / / /_/ / /_/ / / / / / /_/ / / / /
-/_____/_/\__/_/  \____/\___/\__,_/____/   \____/\____/_/ /_/ /_/ .___/\__,_/_/ /_/_/\____/_/ /_/ 
-                                                              /_/                                
+    ____  _ __  ____                            ______                                  _           
+   / __ )(_) /_/ __/___  _______  _______      / ____/___  ____ ___  ____  ____ _____  (_)___  ____ 
+  / __  / / __/ /_/ __ \/ ___/ / / / ___/_____/ /   / __ \/ __ `__ \/ __ \/ __ `/ __ \/ / __ \/ __ \
+ / /_/ / / /_/ __/ /_/ / /__/ /_/ (__  )_____/ /___/ /_/ / / / / / / /_/ / /_/ / / / / / /_/ / / / /
+/_____/_/\__/_/  \____/\___/\__,_/____/      \____/\____/_/ /_/ /_/ .___/\__,_/_/ /_/_/\____/_/ /_/ 
+                                                                 /_/                                
diff --git a/misc/tools.func b/misc/tools.func
index c066685a..0e3fd0c2 100644
--- a/misc/tools.func
+++ b/misc/tools.func
@@ -6059,8 +6059,11 @@ function setup_mongodb() {
   }
 
   # Setup repository
+  # MongoDB 8.x versions beyond 8.0 reuse the server-8.0.asc PGP key
+  local MONGO_KEY_VERSION="${MONGO_VERSION}"
+  [[ "${MONGO_VERSION}" == 8.[1-9]* ]] && MONGO_KEY_VERSION="8.0"
   manage_tool_repository "mongodb" "$MONGO_VERSION" "$MONGO_BASE_URL" \
-    "https://www.mongodb.org/static/pgp/server-${MONGO_VERSION}.asc" || {
+    "https://www.mongodb.org/static/pgp/server-${MONGO_KEY_VERSION}.asc" || {
     msg_error "Failed to setup MongoDB repository"
     return 100
   }