diff --git a/cmk/plugins/sap/agents/mk_sap.py b/cmk/plugins/sap/agents/mk_sap.py
index 54976fdd344..894b1d003a6 100755
--- a/cmk/plugins/sap/agents/mk_sap.py
+++ b/cmk/plugins/sap/agents/mk_sap.py
@@ -498,13 +498,19 @@ def check(pyrfc, cfg_entry):
                 )
 
     for host, host_sap in sap_data.items():
-        sys.stdout.write("<<<<%s%s>>>>\n" % (cfg_entry.get("host_prefix", ""), host))
+        sys.stdout.write(
+            "<<<<%s%s%s>>>>\n"
+            % (cfg_entry.get("host_prefix", ""), host, cfg_entry.get("host_postfix", ""))
+        )
         sys.stdout.write("<<<sap:sep(9)>>>\n")
         sys.stdout.write("%s\n" % "\n".join(host_sap))
     sys.stdout.write("<<<<>>>>\n")
 
     for host, host_logs in logs.items():
-        sys.stdout.write("<<<<%s>>>>\n" % host)
+        sys.stdout.write(
+            "<<<<%s%s%s>>>>\n"
+            % (cfg_entry.get("host_prefix", ""), host, cfg_entry.get("host_postfix", ""))
+        )
         sys.stdout.write("<<<logwatch>>>\n")
         for log, lines in host_logs.items():
             sys.stdout.write("[[[%s]]]\n" % log)