diff --git a/data/apimap.json b/data/apimap.json
index df70f416..4359308f 100644
--- a/data/apimap.json
+++ b/data/apimap.json
@@ -30,10 +30,10 @@
    "SUSE:Updates:SLE-SERVER:12-SP3:" : {
       "issues" : {
          "WE_TEST_ISSUES" : "SUSE:Updates:SLE-WE:12-SP3:",
-         "TCM_TEST_ISSUES" : "SUSE:Maintenance:Test:SLE-Module-Toolchain:12:",
+         "TCM_TEST_ISSUES" : "SUSE:Updates:SLE-Module-Toolchain:12:",
          "HPCM_TEST_ISSUES" : "SUSE:Updates:SLE-Module-HPC:12:",
          "SDK_TEST_ISSUES" : "SUSE:Updates:SLE-SDK:12-SP3:",
-         "WSM_TEST_ISSUES" : "SUSE:Maintenance:Test:SLE-Module-Web-Scripting:12:"
+         "WSM_TEST_ISSUES" : "SUSE:Updates:SLE-Module-Web-Scripting:12:"
       },
       "flavor" : "Server-DVD-Incidents",
       "version" : "12-SP3",
@@ -58,10 +58,10 @@
       "version" : "12-SP2",
       "issues" : {
          "WE_TEST_ISSUES" : "SUSE:Updates:SLE-WE:12-SP2:",
-         "TCM_TEST_ISSUES" : "SUSE:Maintenance:Test:SLE-Module-Toolchain:12:",
+         "TCM_TEST_ISSUES" : "SUSE:Updates:SLE-Module-Toolchain:12:",
          "SDK_TEST_ISSUES" : "SUSE:Updates:SLE-SDK:12-SP2:",
          "HPCM_TEST_ISSUES" : "SUSE:Updates:SLE-Module-HPC:12:",
-         "WSM_TEST_ISSUES" : "SUSE:Maintenance:Test:SLE-Module-Web-Scripting:12:"
+         "WSM_TEST_ISSUES" : "SUSE:Updates:SLE-Module-Web-Scripting:12:"
       },
       "flavor" : "Server-DVD-Incidents",
       "archs" : [