diff --git a/AppSourcePackages/mpa_HardwareRequestAndManagement/Logo.png b/AppSourcePackages/mpa_HardwareRequestAndManagement/Logo.png
new file mode 100644
index 00000000..f70a53c9
Binary files /dev/null and b/AppSourcePackages/mpa_HardwareRequestAndManagement/Logo.png differ
diff --git a/AppSourcePackages/mpa_HardwareRequestAndManagement/TermsOfUse.html b/AppSourcePackages/mpa_HardwareRequestAndManagement/TermsOfUse.html
new file mode 100644
index 00000000..3f602d00
--- /dev/null
+++ b/AppSourcePackages/mpa_HardwareRequestAndManagement/TermsOfUse.html
@@ -0,0 +1,23 @@
+<!-- Copyright (c) Microsoft Corporation.
+     Licensed under the MIT License. -->
+MIT License
+
+Copyright (c) Microsoft Corporation.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE
diff --git a/AppSourcePackages/mpa_HardwareRequestAndManagement/[Content_Types].xml b/AppSourcePackages/mpa_HardwareRequestAndManagement/[Content_Types].xml
new file mode 100644
index 00000000..b5c49640
--- /dev/null
+++ b/AppSourcePackages/mpa_HardwareRequestAndManagement/[Content_Types].xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">
+  <Default Extension="xml" ContentType="application/octet-stream" />
+  <Default Extension="xaml" ContentType="application/octet-stream" />
+  <Default Extension="dll" ContentType="application/octet-stream" />
+  <Default Extension="zip" ContentType="application/octet-stream" />
+  <Default Extension="jpg" ContentType="application/octet-stream" />
+  <Default Extension="gif" ContentType="application/octet-stream" />
+  <Default Extension="png" ContentType="application/octet-stream" />
+  <Default Extension="htm" ContentType="application/octet-stream" />
+  <Default Extension="html" ContentType="application/octet-stream" />
+  <Default Extension="db" ContentType="application/octet-stream" />
+  <Default Extension="css" ContentType="application/octet-stream" />
+  <Default Extension="json" ContentType="application/octet-stream" />
+  <Default Extension="msapp" ContentType="application/octet-stream" />
+</Types>
\ No newline at end of file
diff --git a/AppSourcePackages/mpa_HardwareRequestAndManagement/input.xml b/AppSourcePackages/mpa_HardwareRequestAndManagement/input.xml
new file mode 100644
index 00000000..20d99823
--- /dev/null
+++ b/AppSourcePackages/mpa_HardwareRequestAndManagement/input.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PvsPackageData>
+  <ProviderName>Microsoft</ProviderName>
+  <PackageFile>package.zip</PackageFile>
+  <SolutionAnchorName>mpa_HardwareRequestAndManagement_managed.zip</SolutionAnchorName>
+  <StartDate>01/01/2019</StartDate>
+  <EndDate>01/01/2050</EndDate>
+  <SupportedCountries>US,CA</SupportedCountries>
+  <LearnMoreLink>https://aka.ms/LearnHardwareRequestAndManagementTemplate</LearnMoreLink>
+  <Locales>
+    <PackageLocale Code="1033" IsDefault="true">
+      <Logo>logo32x32.png</Logo>
+      <Terms>
+        <PackageTerm File="TermsOfUse.html" />
+      </Terms>
+    </PackageLocale>
+  </Locales>
+</PvsPackageData>
\ No newline at end of file
diff --git a/AppSourcePackages/mpa_HardwareRequestAndManagement/logo32x32.png b/AppSourcePackages/mpa_HardwareRequestAndManagement/logo32x32.png
new file mode 100644
index 00000000..56a79ba1
Binary files /dev/null and b/AppSourcePackages/mpa_HardwareRequestAndManagement/logo32x32.png differ
diff --git a/AppSourcePackages/mpa_Kudos/PkgAssets/ImportConfig.xml b/AppSourcePackages/mpa_Kudos/PkgAssets/ImportConfig.xml
deleted file mode 100644
index 2504ecde..00000000
--- a/AppSourcePackages/mpa_Kudos/PkgAssets/ImportConfig.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configdatastorage installsampledata="false" waitforsampledatatoinstall="true" crmmigdataimportfile="">
-  <solutions>
-    <configsolutionfile solutionpackagefilename="mpa_EmployeeExperienceBase_managed.zip" publishworkflowsandactivateplugins="true" />
-    <configsolutionfile solutionpackagefilename="mpa_Kudos_managed.zip" publishworkflowsandactivateplugins="true" />
-  </solutions>
-  <externalpackages />
-  <filestoimport />
-  <filesmapstoimport />
-  <cmtdatafiles />
-</configdatastorage>
\ No newline at end of file
diff --git a/AppSourcePackages/mpa_Kudos/PkgAssets/manifest.ppkg.json b/AppSourcePackages/mpa_Kudos/PkgAssets/manifest.ppkg.json
deleted file mode 100644
index a692ad13..00000000
--- a/AppSourcePackages/mpa_Kudos/PkgAssets/manifest.ppkg.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  "SchemaVersion": "1.0",
-  "solutionParameters": {
-    "mpa_EmployeeExperienceBase": {
-      "components": []
-    },
-    "mpa_Kudos": {
-      "components": [
-        {
-          "ComponentName": "",
-          "ComponentTypeName": "connectionreference",
-          "Attributes": {
-            "Count": 4,
-            "Keys": [
-              "connectionreferencelogicalname",
-              "connectionreferencedisplayname",
-              "description",
-              "connectorid"
-            ],
-            "Values": [
-              "mpa_KudosDataverse",
-              "Kudos - Dataverse",
-              null,
-              "/providers/Microsoft.PowerApps/apis/shared_commondataserviceforapps"
-            ]
-          }
-        },
-        {
-          "ComponentName": "",
-          "ComponentTypeName": "connectionreference",
-          "Attributes": {
-            "Count": 4,
-            "Keys": [
-              "connectionreferencelogicalname",
-              "connectionreferencedisplayname",
-              "description",
-              "connectorid"
-            ],
-            "Values": [
-              "mpa_KudosO365",
-              "Kudos - O365",
-              null,
-              "/providers/Microsoft.PowerApps/apis/shared_office365users"
-            ]
-          }
-        },
-        {
-          "ComponentName": "",
-          "ComponentTypeName": "connectionreference",
-          "Attributes": {
-            "Count": 4,
-            "Keys": [
-              "connectionreferencelogicalname",
-              "connectionreferencedisplayname",
-              "description",
-              "connectorid"
-            ],
-            "Values": [
-              "mpa_KudosOutlook",
-              "Kudos - Outlook",
-              null,
-              "/providers/Microsoft.PowerApps/apis/shared_office365"
-            ]
-          }
-        }
-      ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/AppSourcePackages/mpa_OnboardingBuddy/Logo.png b/AppSourcePackages/mpa_OnboardingBuddy/Logo.png
new file mode 100644
index 00000000..cab26420
Binary files /dev/null and b/AppSourcePackages/mpa_OnboardingBuddy/Logo.png differ
diff --git a/AppSourcePackages/mpa_SAPProcurement/PkgAssets/ImportConfig.xml b/AppSourcePackages/mpa_SAPProcurement/PkgAssets/ImportConfig.xml
deleted file mode 100644
index 7b8e464f..00000000
--- a/AppSourcePackages/mpa_SAPProcurement/PkgAssets/ImportConfig.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configdatastorage installsampledata="false" waitforsampledatatoinstall="true" crmmigdataimportfile="">
-  <solutions>
-    <configsolutionfile solutionpackagefilename="mpa_SAPBase_managed.zip" publishworkflowsandactivateplugins="true" />
-    <configsolutionfile solutionpackagefilename="mpa_SAPProcurement_managed.zip" publishworkflowsandactivateplugins="true" />
-  </solutions>
-  <externalpackages />
-  <filestoimport />
-  <filesmapstoimport />
-  <cmtdatafiles />
-</configdatastorage>
\ No newline at end of file
diff --git a/AppSourcePackages/mpa_SAPProcurement/PkgAssets/manifest.ppkg.json b/AppSourcePackages/mpa_SAPProcurement/PkgAssets/manifest.ppkg.json
deleted file mode 100644
index c6adc5e2..00000000
--- a/AppSourcePackages/mpa_SAPProcurement/PkgAssets/manifest.ppkg.json
+++ /dev/null
@@ -1,156 +0,0 @@
-{
-  "SchemaVersion": "1.0",
-  "solutionParameters": {
-    "mpa_SAPBase": {
-      "components": [
-        {
-          "ComponentName": "",
-          "ComponentTypeName": "EnvironmentVariableDefinition",
-          "Attributes": {
-            "Count": 5,
-            "Keys": [
-              "schemaname",
-              "displayname",
-              "description",
-              "type",
-              "defaultvalue"
-            ],
-            "Values": [
-              "mpa_SAPApplicationServer",
-              "SAP Application Server",
-              "JSON string that contains system parameters, host, system number, client, etc.",
-              "100000000",
-              null
-            ]
-          }
-        },
-        {
-          "ComponentName": "",
-          "ComponentTypeName": "EnvironmentVariableDefinition",
-          "Attributes": {
-            "Count": 5,
-            "Keys": [
-              "schemaname",
-              "displayname",
-              "description",
-              "type",
-              "defaultvalue"
-            ],
-            "Values": [
-              "mpa_SAPClientID",
-              "SAP Client ID",
-              "The SAP client ID to connect to the SAP system. The SAP backends' client (or 'Mandant') into which to log in. It's a number ranging from 000 to 999. Used separately in IDoc transactions.",
-              "100000000",
-              null
-            ]
-          }
-        },
-        {
-          "ComponentName": "",
-          "ComponentTypeName": "EnvironmentVariableDefinition",
-          "Attributes": {
-            "Count": 5,
-            "Keys": [
-              "schemaname",
-              "displayname",
-              "description",
-              "type",
-              "defaultvalue"
-            ],
-            "Values": [
-              "mpa_SAPCountofRowsToRead",
-              "SAP Count of Rows To Read",
-              "Sets the maximum number of records to be returned on any search query and helps to alleviate performance concerns",
-              "100000001",
-              "1000"
-            ]
-          }
-        },
-        {
-          "ComponentName": "",
-          "ComponentTypeName": "EnvironmentVariableDefinition",
-          "Attributes": {
-            "Count": 5,
-            "Keys": [
-              "schemaname",
-              "displayname",
-              "description",
-              "type",
-              "defaultvalue"
-            ],
-            "Values": [
-              "mpa_SAPSPRAS",
-              "SAP SPRAS",
-              "Language Key from T0002",
-              "100000000",
-              "EN"
-            ]
-          }
-        },
-        {
-          "ComponentName": "",
-          "ComponentTypeName": "EnvironmentVariableDefinition",
-          "Attributes": {
-            "Count": 5,
-            "Keys": [
-              "schemaname",
-              "displayname",
-              "description",
-              "type",
-              "defaultvalue"
-            ],
-            "Values": [
-              "mpa_SAPSystemID",
-              "SAP System ID",
-              "The SAP system's three-letter system ID (Mandatory if connection type Message Server and message server service isn't present). Used separately in IDoc transactions.",
-              "100000000",
-              null
-            ]
-          }
-        }
-      ]
-    },
-    "mpa_SAPProcurement": {
-      "components": [
-        {
-          "ComponentName": "",
-          "ComponentTypeName": "connectionreference",
-          "Attributes": {
-            "Count": 4,
-            "Keys": [
-              "connectionreferencelogicalname",
-              "connectionreferencedisplayname",
-              "description",
-              "connectorid"
-            ],
-            "Values": [
-              "mpa_SAPDataverse",
-              "SAP Dataverse Connection",
-              null,
-              "/providers/Microsoft.PowerApps/apis/shared_commondataserviceforapps"
-            ]
-          }
-        },
-        {
-          "ComponentName": "",
-          "ComponentTypeName": "connectionreference",
-          "Attributes": {
-            "Count": 4,
-            "Keys": [
-              "connectionreferencelogicalname",
-              "connectionreferencedisplayname",
-              "description",
-              "connectorid"
-            ],
-            "Values": [
-              "mpa_SAPERP",
-              "SAP ERP Connection",
-              null,
-              "/providers/Microsoft.PowerApps/apis/shared_saperp"
-            ]
-          }
-        }
-      ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/DeploymentPackages/mpa_HardwareRequestAndManagement/PackageImportExtension.cs b/DeploymentPackages/mpa_HardwareRequestAndManagement/PackageImportExtension.cs
new file mode 100644
index 00000000..36ed5af4
--- /dev/null
+++ b/DeploymentPackages/mpa_HardwareRequestAndManagement/PackageImportExtension.cs
@@ -0,0 +1,95 @@
+using System;
+using System.ComponentModel.Composition;
+using Microsoft.Xrm.Tooling.PackageDeployment.CrmPackageExtentionBase;
+
+namespace mpa_HardwareRequestAndManagement
+{
+    /// <summary>
+    /// Import package starter frame.
+    /// </summary>
+    [Export(typeof(IImportExtensions))]
+    public class PackageImportExtension : ImportExtension
+    {
+        #region Metadata
+
+        /// <summary>
+        /// Folder name where package assets are located in the final output package zip.
+        /// </summary>
+        public override string GetImportPackageDataFolderName => "PkgAssets";
+
+        /// <summary>
+        /// Name of the Import Package to Use
+        /// </summary>
+        /// <param name="plural">if true, return plural version</param>
+        public override string GetNameOfImport(bool plural) => "mpa_HardwareRequestAndManagement";
+
+        /// <summary>
+        /// Long name of the Import Package.
+        /// </summary>
+        public override string GetLongNameOfImport => "mpa_HardwareRequestAndManagement";
+
+        /// <summary>
+        /// Description of the package, used in the package selection UI
+        /// </summary>
+        public override string GetImportPackageDescriptionText => "mpa_HardwareRequestAndManagement";
+
+        #endregion
+
+        /// <summary>
+        /// Called to Initialize any functions in the Custom Extension.
+        /// </summary>
+        /// <see cref="ImportExtension.InitializeCustomExtension"/>
+        public override void InitializeCustomExtension()
+        {
+        }
+
+        /// <summary>
+        /// Called before the Main Import process begins, after solutions and data.
+        /// </summary>
+        /// <see cref="ImportExtension.BeforeImportStage"/>
+        /// <returns></returns>
+        public override bool BeforeImportStage()
+        {
+            return true;
+        }
+
+        /// <summary>
+        /// Raised before the named solution is imported to allow for any configuration settings to be made to the import process
+        /// </summary>
+        /// <see cref="ImportExtension.PreSolutionImport"/>
+        /// <param name="solutionName">name of the solution about to be imported</param>
+        /// <param name="solutionOverwriteUnmanagedCustomizations">Value of this field from the solution configuration entry</param>
+        /// <param name="solutionPublishWorkflowsAndActivatePlugins">Value of this field from the solution configuration entry</param>
+        /// <param name="overwriteUnmanagedCustomizations">If set to true, imports the Solution with Override Customizations enabled</param>
+        /// <param name="publishWorkflowsAndActivatePlugins">If set to true, attempts to auto publish workflows and activities as part of solution deployment</param>
+        public override void PreSolutionImport(string solutionName, bool solutionOverwriteUnmanagedCustomizations, bool solutionPublishWorkflowsAndActivatePlugins, out bool overwriteUnmanagedCustomizations, out bool publishWorkflowsAndActivatePlugins)
+        {
+            base.PreSolutionImport(solutionName, solutionOverwriteUnmanagedCustomizations, solutionPublishWorkflowsAndActivatePlugins, out overwriteUnmanagedCustomizations, out publishWorkflowsAndActivatePlugins);
+        }
+
+        /// <summary>
+        /// Called during a solution upgrade when both solutions, old and new, are present in the system.
+        /// This function can be used to provide a means to do data transformation or upgrade while a solution update is occurring.
+        /// </summary>
+        /// <see cref="ImportExtension.RunSolutionUpgradeMigrationStep"/>
+        /// <param name="solutionName">Name of the solution</param>
+        /// <param name="oldVersion">version number of the old solution</param>
+        /// <param name="newVersion">Version number of the new solution</param>
+        /// <param name="oldSolutionId">Solution ID of the old solution</param>
+        /// <param name="newSolutionId">Solution ID of the new solution</param>
+        public override void RunSolutionUpgradeMigrationStep(string solutionName, string oldVersion, string newVersion, Guid oldSolutionId, Guid newSolutionId)
+        {
+            base.RunSolutionUpgradeMigrationStep(solutionName, oldVersion, newVersion, oldSolutionId, newSolutionId);
+        }
+
+        /// <summary>
+        /// Called After all Import steps are complete, allowing for final customizations or tweaking of the instance.
+        /// </summary>
+        /// <see cref="ImportExtension.AfterPrimaryImport"/>
+        /// <returns></returns>
+        public override bool AfterPrimaryImport()
+        {
+            return true;
+        }
+    }
+}
diff --git a/DeploymentPackages/mpa_HardwareRequestAndManagement/PkgAssets/ImportConfig.xml b/DeploymentPackages/mpa_HardwareRequestAndManagement/PkgAssets/ImportConfig.xml
new file mode 100644
index 00000000..866e9f65
--- /dev/null
+++ b/DeploymentPackages/mpa_HardwareRequestAndManagement/PkgAssets/ImportConfig.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  More information about ImportConfig.xml file
+  https://docs.microsoft.com/en-us/power-platform/alm/package-deployer-tool
+
+  Common attributes on the root element:
+  - installsampledata (bool)
+  - waitforsampledatatoinstall (bool)
+  - agentdesktopzipfile (string)
+  - agentdesktopexename (string)
+  - crmmigdataimportfile (string)
+-->
+<configdatastorage installsampledata="false" waitforsampledatatoinstall="true">
+  <solutions>
+    <!--
+      Solutions to import
+
+      This section will be populated by default at build time and is populated with the solutions specified in the project via:
+      - ProjectReference, where the project is a Dataverse Solution project (e.g. *.cdsproj)
+      - PpSolution, explicitly added loose zip file of a solution.
+    
+      The order of these elements is significant as it indicates the order in which solutions will be installed into the environment.
+
+      <configsolutionfile solutionpackagefilename="solutionFile.zip" />
+    -->
+  </solutions>
+  <filestoimport>
+    <!--
+      Contains an array of <configimportfile> and <zipimportdetails> nodes that are used to describe individual files and zip files respectively to be imported.
+      
+      <configimportfile filename="File.csv" filetype="CSV" associatedmap="" importtoentity="FileEntity" datadelimiter="" fielddelimiter="comma" enableduplicatedetection="true" isfirstrowheader="true"  isrecordownerateam="false" owneruser="" waitforimporttocomplete="true"/>
+      <configimportfile filename="File.zip" filetype="ZIP" associatedmap="ZipFileMap" importtoentity="FileEntity" datadelimiter="" fielddelimiter="comma" enableduplicatedetection="true" isfirstrowheader="true"  isrecordownerateam="false" owneruser="" waitforimporttocomplete="true"/>
+      <zipimportdetails>
+        <zipimportdetail filename="subfile1.csv" filetype="csv" importtoentity="account" />
+        <zipimportdetail filename="subfile2.txt" filetype="csv" importtoentity="contact" />
+      </zipimportdetails>
+    -->
+  </filestoimport>
+  <filesmapstoimport>
+    <!--
+      <configimportmapfile filename="FileMap.xml" />
+      <configimportmapfile filename="ZipFileMap.xml" />
+    -->
+  </filesmapstoimport>
+</configdatastorage>
\ No newline at end of file
diff --git a/DeploymentPackages/mpa_HardwareRequestAndManagement/PkgAssets/manifest.ppkg.json b/DeploymentPackages/mpa_HardwareRequestAndManagement/PkgAssets/manifest.ppkg.json
new file mode 100644
index 00000000..874e444a
--- /dev/null
+++ b/DeploymentPackages/mpa_HardwareRequestAndManagement/PkgAssets/manifest.ppkg.json
@@ -0,0 +1,4 @@
+// Note: comments are removed at build time.
+{
+  "SchemaVersion": "1.0"
+}
\ No newline at end of file
diff --git a/DeploymentPackages/mpa_HardwareRequestAndManagement/mpa_HardwareRequestAndManagement.csproj b/DeploymentPackages/mpa_HardwareRequestAndManagement/mpa_HardwareRequestAndManagement.csproj
new file mode 100644
index 00000000..29e3bb42
--- /dev/null
+++ b/DeploymentPackages/mpa_HardwareRequestAndManagement/mpa_HardwareRequestAndManagement.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net472</TargetFramework>
+    <AssemblyTitle>mpa_HardwareRequestAndManagement</AssemblyTitle>
+    <Product>mpa_HardwareRequestAndManagement</Product>
+    <Copyright>Copyright © 2023</Copyright>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.PowerApps.MSBuild.PDPackage" Version="1.*">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.CrmSdk.XrmTooling.CoreAssembly" Version="9.1.0.79" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CrmSdk.XrmTooling.PackageDeployment" Version="9.1.0.74" PrivateAssets="all" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System.ComponentModel.Composition" />
+  </ItemGroup>
+  <ItemGroup>
+    <PdSolution Include="..\..\Solutions\mpa_ITBase\bin\Release\mpa_ITBase_managed.zip" />
+    <PdSolution Include="..\..\Solutions\mpa_HardwareRequestAndManagement\bin\Release\mpa_HardwareRequestAndManagement_managed.zip" />
+  </ItemGroup>
+</Project>