diff --git a/vss-extension-server-2018.json b/vss-extension-server-2018.json
index 6d222c7..a617e94 100644
--- a/vss-extension-server-2018.json
+++ b/vss-extension-server-2018.json
@@ -46,11 +46,12 @@
   ],
   "targets": [
     {
-      "id": "Microsoft.VisualStudio.Services"
+      "id": "Microsoft.TeamFoundation.Server",
+      "version": "[16.0]"
     }
   ],
   "demands": [ 
-    "api-version/3.0"
+    "api-version/4.0"
   ],
   "icons": {
     "default": "icon-nexus-logo.png"
diff --git a/vss-extension.json b/vss-extension.json
index 65a6319..8f5e553 100644
--- a/vss-extension.json
+++ b/vss-extension.json
@@ -46,11 +46,15 @@
   ],
   "targets": [
     {
-      "id": "Microsoft.VisualStudio.Services"
+      "id": "Microsoft.VisualStudio.Services.Cloud"
+    },
+    {
+      "id": "Microsoft.TeamFoundation.Server",
+      "version": "[17.0,)"
     }
   ],
   "demands": [ 
-    "api-version/3.0"
+    "api-version/5.0"
   ],
   "icons": {
     "default": "icon-nexus-logo.png"