diff --git a/tools/packages.microsoft.com/mapping.json b/tools/packages.microsoft.com/mapping.json
index 8bb238e1e8..9ae06c5f1b 100644
--- a/tools/packages.microsoft.com/mapping.json
+++ b/tools/packages.microsoft.com/mapping.json
@@ -1,58 +1,89 @@
 {
-  "Packages" : [
+  "Packages": [
       {
           "url": "microsoft-centos8-prod",
-          "distribution" : ["centos"],
-          "PackageFormat" : "PACKAGE_NAME-POWERSHELL_RELEASE-1.rh.x86_64.rpm"
+          "distribution": [
+              "centos"
+          ],
+          "PackageFormat": "PACKAGE_NAME-POWERSHELL_RELEASE-1.rh.x86_64.rpm"
       },
       {
           "url": "microsoft-rhel8.0-prod",
-          "distribution" : ["trusty"],
-          "PackageFormat" : "PACKAGE_NAME-POWERSHELL_RELEASE-1.rh.x86_64.rpm"
+          "distribution": [
+              "trusty"
+          ],
+          "PackageFormat": "PACKAGE_NAME-POWERSHELL_RELEASE-1.rh.x86_64.rpm"
       },
       {
           "url": "microsoft-rhel7.3-prod",
-          "distribution" : ["trusty"],
-          "PackageFormat" : "PACKAGE_NAME-POWERSHELL_RELEASE-1.rh.x86_64.rpm"
+          "distribution": [
+              "trusty"
+          ],
+          "PackageFormat": "PACKAGE_NAME-POWERSHELL_RELEASE-1.rh.x86_64.rpm"
       },
       {
           "url": "cbl-mariner-2.0-prod-Microsoft-x86_64",
-          "distribution" : ["bionic"],
-          "PackageFormat" : "PACKAGE_NAME-POWERSHELL_RELEASE-1.cm.x86_64.rpm",
-          "channel" : "stable"
+          "distribution": [
+              "bionic"
+          ],
+          "PackageFormat": "PACKAGE_NAME-POWERSHELL_RELEASE-1.cm.x86_64.rpm",
+          "channel": "stable"
       },
       {
           "url": "cbl-mariner-2.0-preview-Microsoft-x86_64",
-          "distribution" : ["bionic"],
-          "PackageFormat" : "PACKAGE_NAME-POWERSHELL_RELEASE-1.cm.x86_64.rpm",
-          "channel" : "preview"
+          "distribution": [
+              "bionic"
+          ],
+          "PackageFormat": "PACKAGE_NAME-POWERSHELL_RELEASE-1.cm.x86_64.rpm",
+          "channel": "preview"
       },
       {
-          "distribution" : ["stretch"],
-          "PackageFormat" : "PACKAGE_NAME_POWERSHELL_RELEASE-1.deb_amd64.deb"
-      },
-      {
-          "distribution" : ["buster"],
-          "PackageFormat" : "PACKAGE_NAME_POWERSHELL_RELEASE-1.deb_amd64.deb"
-      },
-      {
-          "distribution" : ["bionic"],
-          "PackageFormat" : "PACKAGE_NAME_POWERSHELL_RELEASE-1.deb_amd64.deb"
-      },
-      {
-          "distribution" : ["jammy"],
-          "PackageFormat" : "PACKAGE_NAME_POWERSHELL_RELEASE-1.deb_amd64.deb"
-      },
-      {
-          "distribution": ["focal"],
+          "url": "microsoft-debian-stretch-prod",
+          "distribution": [
+              "stretch"
+          ],
           "PackageFormat": "PACKAGE_NAME_POWERSHELL_RELEASE-1.deb_amd64.deb"
       },
       {
-          "distribution": ["xenial"],
+          "url": "microsoft-debian-buster-prod",
+          "distribution": [
+              "buster"
+          ],
           "PackageFormat": "PACKAGE_NAME_POWERSHELL_RELEASE-1.deb_amd64.deb"
       },
       {
-          "distribution": ["bullseye"],
+          "url": "microsoft-ubuntu-bionic-prod",
+          "distribution": [
+              "bionic"
+          ],
+          "PackageFormat": "PACKAGE_NAME_POWERSHELL_RELEASE-1.deb_amd64.deb"
+      },
+      {
+          "url": "microsoft-ubuntu-jammy-prod",
+          "distribution": [
+              "jammy"
+          ],
+          "PackageFormat": "PACKAGE_NAME_POWERSHELL_RELEASE-1.deb_amd64.deb"
+      },
+      {
+          "url": "microsoft-ubuntu-focal-prod",
+          "distribution": [
+              "focal"
+          ],
+          "PackageFormat": "PACKAGE_NAME_POWERSHELL_RELEASE-1.deb_amd64.deb"
+      },
+      {
+          "url": "microsoft-ubuntu-xenial-prod",
+          "distribution": [
+              "xenial"
+          ],
+          "PackageFormat": "PACKAGE_NAME_POWERSHELL_RELEASE-1.deb_amd64.deb"
+      },
+      {
+          "url": "microsoft-debian-bullseye-prod",
+          "distribution": [
+              "bullseye"
+          ],
           "PackageFormat": "PACKAGE_NAME_POWERSHELL_RELEASE-1.deb_amd64.deb"
       }
   ]