diff --git a/openqa-maintenance.py b/openqa-maintenance.py
index 2be87ea9..2d704984 100755
--- a/openqa-maintenance.py
+++ b/openqa-maintenance.py
@@ -322,10 +322,10 @@ TARGET_REPO_SETTINGS = {
         } ],
         'test': 'qam-gnome'
     },
-    'SUSE:Updates:SLE-SERVER:12-SP1:x86_64': {
+    'SUSE:Updates:SLE-SERVER:12-SP1-LTSS:x86_64': {
         'repos' : [
-            'http://download.suse.de/ibs/SUSE/Updates/SLE-SERVER/12-SP1/x86_64/update/',
-            'http://download.suse.de/ibs/SUSE:/Maintenance:/Test:/SLE-SERVER:/12-SP1:/x86_64/update',
+            'http://download.suse.de/ibs/SUSE/Updates/SLE-SERVER/12-SP1-LTSS/x86_64/update/',
+            'http://download.suse.de/ibs/SUSE:/Maintenance:/Test:/SLE-SERVER:/12-SP1-LTSS:/x86_64/update',
             'http://download.suse.de/ibs/SUSE:/Maintenance:/Test:/SLE-SDK:/12-SP1:/x86_64/update/',
             'http://download.suse.de/ibs/SUSE/Updates/SLE-SDK/12-SP1/x86_64/update/',
         ],
@@ -337,21 +337,6 @@ TARGET_REPO_SETTINGS = {
         } ],
         'test': 'qam-gnome'
     },
-    'SUSE:Updates:SLE-DESKTOP:12-SP1:x86_64': {
-        'repos': [
-            'http://download.suse.de/ibs/SUSE/Updates/SLE-DESKTOP/12-SP1/x86_64/update/',
-            'http://download.suse.de/ibs/SUSE:/Maintenance:/Test:/SLE-DESKTOP:/12-SP1:/x86_64/update',
-            'http://download.suse.de/ibs/SUSE:/Maintenance:/Test:/SLE-SDK:/12-SP1:/x86_64/update/',
-            'http://download.suse.de/ibs/SUSE/Updates/SLE-SDK/12-SP1/x86_64/update/',
-        ],
-        'settings': [ {
-            'DISTRI': 'sle',
-            'VERSION': '12-SP1',
-            'FLAVOR': 'Desktop-DVD-Updates',
-            'ARCH': 'x86_64',
-        } ],
-        'test': 'qam-gnome'
-    },
     'SUSE:Updates:SLE-SERVER:12-SP2:x86_64': {
         'repos' : [
             'http://download.suse.de/ibs/SUSE/Updates/SLE-SERVER/12-SP2/x86_64/update/',
@@ -454,7 +439,7 @@ PROJECT_OPENQA_SETTINGS = {
                 'ARCH': 's390x'
             }),
     ],
-    'SUSE:Updates:SLE-SERVER:12-SP1:x86_64': [
+    'SUSE:Updates:SLE-SERVER:12-SP1-LTSS:x86_64': [
         SUSEUpdate(
             {
                 'DISTRI': 'sle',
@@ -463,7 +448,7 @@ PROJECT_OPENQA_SETTINGS = {
                 'ARCH': 'x86_64'
             }),
     ],
-    'SUSE:Updates:SLE-SERVER:12-SP1:ppc64le': [
+    'SUSE:Updates:SLE-SERVER:12-SP1-LTSS:ppc64le': [
         SUSEUpdate(
             {
                 'DISTRI': 'sle',
@@ -472,7 +457,7 @@ PROJECT_OPENQA_SETTINGS = {
                 'ARCH': 'ppc64le'
             }),
     ],
-    'SUSE:Updates:SLE-SERVER:12-SP1:s390x': [
+    'SUSE:Updates:SLE-SERVER:12-SP1-LTSS:s390x': [
         SUSEUpdate(
             {
                 'DISTRI': 'sle',