diff --git a/shared/main.php b/shared/main.php
index 1e695b5..35f54e4 100644
--- a/shared/main.php
+++ b/shared/main.php
@@ -16,7 +16,7 @@ limitations under the License.
 */
 
 function uupApiVersion() {
-    return '1.20.4';
+    return '1.21.0';
 }
 
 require_once dirname(__FILE__).'/auths.php';
diff --git a/shared/requests.php b/shared/requests.php
index 4497c61..bb76c6d 100644
--- a/shared/requests.php
+++ b/shared/requests.php
@@ -169,8 +169,14 @@ function composeFetchUpdRequest($device, $encData, $arch, $flight, $ring, $build
 
     $branch = branchFromBuild($build);
 
+    if($sku == 7 || $sku == 8) {
+        $mainProduct = 'Server.OS';
+    } else {
+        $mainProduct = 'Client.OS.rs2';
+    }
+
     $products = array(
-        'PN=Client.OS.rs2.'.$arch.'&Branch='.$branch.'&PrimaryOSProduct=1&Repairable=1&V='.$build,
+        'PN='.$mainProduct.'.'.$arch.'&Branch='.$branch.'&PrimaryOSProduct=1&Repairable=1&V='.$build,
         'PN=Windows.Appraiser.'.$arch.'&Repairable=1&V='.$build,
         'PN=Windows.AppraiserData.'.$arch.'&Repairable=1&V='.$build,
         'PN=Windows.EmergencyUpdate.'.$arch.'&Repairable=1&V='.$build,