diff --git a/src/debug_utils.c b/src/debug_utils.c
index 61ba0b8d9e..a01d44fd21 100644
--- a/src/debug_utils.c
+++ b/src/debug_utils.c
@@ -27,6 +27,12 @@
 #include <stdio.h> /* for snprintf */
 #include <stdlib.h>
 
+#undef G_LOG_DOMAIN
+/**
+ * @brief GLib log domain.
+ */
+#define G_LOG_DOMAIN "md  utils"
+
 /**
  * @brief Initialize Sentry using the current gvmd version and DSN.
  *
diff --git a/src/gmp_agent_groups.c b/src/gmp_agent_groups.c
index feffc59c87..0eba043b05 100644
--- a/src/gmp_agent_groups.c
+++ b/src/gmp_agent_groups.c
@@ -17,7 +17,7 @@
 /**
  * @brief GLib log domain.
  */
-#define G_LOG_DOMAIN "md gmp"
+#define G_LOG_DOMAIN "md    gmp"
 
 /* GET_AGENT_GROUPS */
 
diff --git a/src/gmp_agents.c b/src/gmp_agents.c
index ecda646a84..0f88e3dd22 100644
--- a/src/gmp_agents.c
+++ b/src/gmp_agents.c
@@ -18,7 +18,7 @@
 #include "manage.h"
 
 #undef G_LOG_DOMAIN
-#define G_LOG_DOMAIN "md gmp"
+#define G_LOG_DOMAIN "md    gmp"
 
 /* GET_AGENTS. */
 
diff --git a/src/gmp_logout.c b/src/gmp_logout.c
index 9a3ae836bb..25f5819334 100644
--- a/src/gmp_logout.c
+++ b/src/gmp_logout.c
@@ -26,6 +26,12 @@
 #include "gmp_logout.h"
 #include "manage.h"
 
+#undef G_LOG_DOMAIN
+/**
+ * @brief GLib log domain.
+ */
+#define G_LOG_DOMAIN "md    gmp"
+
 /**
  * @brief The logout command.
  */
diff --git a/src/gmp_oci_image_targets.c b/src/gmp_oci_image_targets.c
index 43baea3a6c..fb8ad1f2c8 100644
--- a/src/gmp_oci_image_targets.c
+++ b/src/gmp_oci_image_targets.c
@@ -20,7 +20,7 @@
 /**
  * @brief GLib log domain.
  */
-#define G_LOG_DOMAIN "md gmp"
+#define G_LOG_DOMAIN "md    gmp"
 
 /* CREATE_OCI_IMAGE_TARGET. */
 
diff --git a/src/gmp_port_lists.c b/src/gmp_port_lists.c
index d61acaf963..766f70d8c4 100644
--- a/src/gmp_port_lists.c
+++ b/src/gmp_port_lists.c
@@ -33,6 +33,12 @@
 #include <string.h>
 #include <strings.h>
 
+#undef G_LOG_DOMAIN
+/**
+ * @brief GLib log domain.
+ */
+#define G_LOG_DOMAIN "md    gmp"
+
 
 /* CREATE_PORT_LIST. */
 
diff --git a/src/gmp_report_configs.c b/src/gmp_report_configs.c
index a0ab2f5aeb..8a31eff4a0 100644
--- a/src/gmp_report_configs.c
+++ b/src/gmp_report_configs.c
@@ -33,6 +33,11 @@
 #include <string.h>
 #include <strings.h>
 
+#undef G_LOG_DOMAIN
+/**
+ * @brief GLib log domain.
+ */
+#define G_LOG_DOMAIN "md    gmp"
 
 /* General helper functions */
 
diff --git a/src/gmp_report_formats.c b/src/gmp_report_formats.c
index 4346cb9f8a..ecf812c5d3 100644
--- a/src/gmp_report_formats.c
+++ b/src/gmp_report_formats.c
@@ -33,6 +33,12 @@
 #include <string.h>
 #include <strings.h>
 
+#undef G_LOG_DOMAIN
+/**
+ * @brief GLib log domain.
+ */
+#define G_LOG_DOMAIN "md    gmp"
+
 
 /* CREATE_REPORT_FORMAT. */
 
diff --git a/src/manage_authentication.c b/src/manage_authentication.c
index d67a3637d2..b27cb0df23 100644
--- a/src/manage_authentication.c
+++ b/src/manage_authentication.c
@@ -22,6 +22,13 @@
 #include <stdlib.h>
 #include <string.h>
 
+#undef G_LOG_DOMAIN
+/**
+ * @brief GLib log domain.
+ */
+#define G_LOG_DOMAIN "md manage"
+
+
 // prefer stack rather than heap so that we use the defaults on usage failure
 // rather than having to check and fail.
 struct PBASettings settings = {{0}, COUNT_DEFAULT, PREFIX_DEFAULT};
diff --git a/src/manage_commands.c b/src/manage_commands.c
index ccab368724..5a9e3b060c 100644
--- a/src/manage_commands.c
+++ b/src/manage_commands.c
@@ -16,6 +16,13 @@
 #include "manage_commands.h"
 #include "manage_resources.h"
 
+#undef G_LOG_DOMAIN
+/**
+ * @brief GLib log domain.
+ */
+#define G_LOG_DOMAIN "md manage"
+
+
 /**
  * @brief The GMP command list.
  */
diff --git a/src/manage_filter_utils.c b/src/manage_filter_utils.c
index 10221cc106..b2ae4512c3 100644
--- a/src/manage_filter_utils.c
+++ b/src/manage_filter_utils.c
@@ -17,6 +17,12 @@
 #include "manage_utils.h"
 #include "manage_filter_utils.h"
 
+#undef G_LOG_DOMAIN
+/**
+ * @brief GLib log domain.
+ */
+#define G_LOG_DOMAIN "md  utils"
+
 /**
  * @brief Internal function for getting a filter term by UUID.
  */
diff --git a/src/manage_get.c b/src/manage_get.c
index b46418421d..7036a06a94 100644
--- a/src/manage_get.c
+++ b/src/manage_get.c
@@ -27,6 +27,13 @@
 #include <stdlib.h>
 #include <string.h>
 
+#undef G_LOG_DOMAIN
+/**
+ * @brief GLib log domain.
+ */
+#define G_LOG_DOMAIN "md manage"
+
+
 /**
  * @brief Reset command data.
  *
diff --git a/src/manage_preferences.c b/src/manage_preferences.c
index 197a622ee7..2ea5797f8f 100644
--- a/src/manage_preferences.c
+++ b/src/manage_preferences.c
@@ -25,6 +25,13 @@
 
 #include <stdlib.h>
 
+#undef G_LOG_DOMAIN
+/**
+ * @brief GLib log domain.
+ */
+#define G_LOG_DOMAIN "md manage"
+
+
 /**
  * @brief Create a new preference.
  *
diff --git a/src/manage_resources.c b/src/manage_resources.c
index 942538e8c2..b16be59608 100644
--- a/src/manage_resources.c
+++ b/src/manage_resources.c
@@ -12,6 +12,12 @@
 
 #include "manage_resources.h"
 
+#undef G_LOG_DOMAIN
+/**
+ * @brief GLib log domain.
+ */
+#define G_LOG_DOMAIN "md manage"
+
 
 
 /* Resource type information. */
diff --git a/src/manage_settings.c b/src/manage_settings.c
index 3d763014d5..697fd0a66c 100644
--- a/src/manage_settings.c
+++ b/src/manage_settings.c
@@ -13,6 +13,13 @@
 #include <assert.h>
 #include "manage_settings.h"
 
+#undef G_LOG_DOMAIN
+/**
+ * @brief GLib log domain.
+ */
+#define G_LOG_DOMAIN "md manage"
+
+
 /**
  * @brief Internal function for getting a setting value as a string.
  *
diff --git a/src/manage_sql_alerts.c b/src/manage_sql_alerts.c
index 3147b90df8..6186d57251 100644
--- a/src/manage_sql_alerts.c
+++ b/src/manage_sql_alerts.c
@@ -26,6 +26,12 @@
 
 #include <gvm/base/hosts.h>
 
+#undef G_LOG_DOMAIN
+/**
+ * @brief GLib log domain.
+ */
+#define G_LOG_DOMAIN "md manage"
+
 /**
  * @file
  * @brief GVM management layer: Alert SQL
diff --git a/src/manage_sql_assets.c b/src/manage_sql_assets.c
index b420d570dd..8f5c435140 100644
--- a/src/manage_sql_assets.c
+++ b/src/manage_sql_assets.c
@@ -27,6 +27,13 @@
 #include <gvm/base/hosts.h>
 #include <gvm/util/xmlutils.h>
 
+#undef G_LOG_DOMAIN
+/**
+ * @brief GLib log domain.
+ */
+#define G_LOG_DOMAIN "md manage"
+
+
 static int
 report_host_dead (report_host_t);
 
diff --git a/src/manage_sql_events.c b/src/manage_sql_events.c
index 05a2e044a5..6a8c6aba4d 100644
--- a/src/manage_sql_events.c
+++ b/src/manage_sql_events.c
@@ -30,6 +30,13 @@
 
 #include <gvm/base/array.h>
 
+#undef G_LOG_DOMAIN
+/**
+ * @brief GLib log domain.
+ */
+#define G_LOG_DOMAIN "md manage"
+
+
 /**
  * @brief Initialise an event alert iterator.
  *
diff --git a/src/manage_sql_scan_queue.c b/src/manage_sql_scan_queue.c
index a1cc1d2c2f..d8f885f481 100644
--- a/src/manage_sql_scan_queue.c
+++ b/src/manage_sql_scan_queue.c
@@ -13,6 +13,13 @@
 #include "sql.h"
 #include "time.h"
 
+#undef G_LOG_DOMAIN
+/**
+ * @brief GLib log domain.
+ */
+#define G_LOG_DOMAIN "md manage"
+
+
 /**
  * @brief Remove all entries from the scan queue.
  */
diff --git a/src/manage_tls_certificates.c b/src/manage_tls_certificates.c
index b2d79a1b67..47a7c93d7e 100644
--- a/src/manage_tls_certificates.c
+++ b/src/manage_tls_certificates.c
@@ -34,6 +34,13 @@
 
 #include <string.h>
 
+#undef G_LOG_DOMAIN
+/**
+ * @brief GLib log domain.
+ */
+#define G_LOG_DOMAIN "md manage"
+
+
 /**
  * @brief Extract data from a SSLDetails:[...] host detail value
  *