diff --git a/src/Apps/W1/Quality Management/app/src/Installation/QltyInstall.Codeunit.al b/src/Apps/W1/Quality Management/app/src/Installation/QltyInstall.Codeunit.al
index f01bdccda4..daae8e73c1 100644
--- a/src/Apps/W1/Quality Management/app/src/Installation/QltyInstall.Codeunit.al	
+++ b/src/Apps/W1/Quality Management/app/src/Installation/QltyInstall.Codeunit.al	
@@ -4,6 +4,7 @@
 // ------------------------------------------------------------------------------------------------
 namespace Microsoft.QualityManagement.Installation;
 
+using Microsoft.QualityManagement.Configuration;
 using Microsoft.QualityManagement.Setup.ApplicationAreas;
 
 /// <summary>
@@ -15,8 +16,10 @@ codeunit 20421 "Qlty. Install"
 
     trigger OnInstallAppPerCompany()
     var
+        QltyAutoConfigure: Codeunit "Qlty. Auto Configure";
         QltyApplicationAreaMgmt: Codeunit "Qlty. Application Area Mgmt.";
     begin
+        QltyAutoConfigure.EnsureBasicSetupExists(false);
         QltyApplicationAreaMgmt.RefreshExperienceTierCurrentCompany();
     end;
 }
diff --git a/src/Apps/W1/QualityManagementContosoCoffeeDemoDataset/DemoData/1.Setup Data/CreateQualityInspResult.Codeunit.al b/src/Apps/W1/QualityManagementContosoCoffeeDemoDataset/DemoData/2.Master Data/CreateQualityInspResult.Codeunit.al
similarity index 100%
rename from src/Apps/W1/QualityManagementContosoCoffeeDemoDataset/DemoData/1.Setup Data/CreateQualityInspResult.Codeunit.al
rename to src/Apps/W1/QualityManagementContosoCoffeeDemoDataset/DemoData/2.Master Data/CreateQualityInspResult.Codeunit.al
diff --git a/src/Apps/W1/QualityManagementContosoCoffeeDemoDataset/DemoData/1.Setup Data/CreateQualityLookupValue.Codeunit.al b/src/Apps/W1/QualityManagementContosoCoffeeDemoDataset/DemoData/2.Master Data/CreateQualityLookupValue.Codeunit.al
similarity index 100%
rename from src/Apps/W1/QualityManagementContosoCoffeeDemoDataset/DemoData/1.Setup Data/CreateQualityLookupValue.Codeunit.al
rename to src/Apps/W1/QualityManagementContosoCoffeeDemoDataset/DemoData/2.Master Data/CreateQualityLookupValue.Codeunit.al
diff --git a/src/Apps/W1/QualityManagementContosoCoffeeDemoDataset/DemoData/1.Setup Data/CreateQualityTest.Codeunit.al b/src/Apps/W1/QualityManagementContosoCoffeeDemoDataset/DemoData/2.Master Data/CreateQualityTest.Codeunit.al
similarity index 100%
rename from src/Apps/W1/QualityManagementContosoCoffeeDemoDataset/DemoData/1.Setup Data/CreateQualityTest.Codeunit.al
rename to src/Apps/W1/QualityManagementContosoCoffeeDemoDataset/DemoData/2.Master Data/CreateQualityTest.Codeunit.al
diff --git a/src/Apps/W1/QualityManagementContosoCoffeeDemoDataset/DemoData/QualityManagementModule.Codeunit.al b/src/Apps/W1/QualityManagementContosoCoffeeDemoDataset/DemoData/QualityManagementModule.Codeunit.al
index 699c3d6230..fe9f789cd3 100644
--- a/src/Apps/W1/QualityManagementContosoCoffeeDemoDataset/DemoData/QualityManagementModule.Codeunit.al
+++ b/src/Apps/W1/QualityManagementContosoCoffeeDemoDataset/DemoData/QualityManagementModule.Codeunit.al
@@ -25,13 +25,16 @@ codeunit 5592 "Quality Management Module" implements "Contoso Demo Data Module"
 
     procedure CreateSetupData()
     begin
-        Codeunit.Run(Codeunit::"Create Quality Lookup Value");
-        Codeunit.Run(Codeunit::"Create Quality Test");
-        Codeunit.Run(Codeunit::"Create Quality Insp. Result");
+        // Results, No. Series, and Source Configurations are created by the main QM app on install
+        // via Qlty. Auto Configure.EnsureBasicSetupExists().
+        exit;
     end;
 
     procedure CreateMasterData()
     begin
+        Codeunit.Run(Codeunit::"Create Quality Lookup Value");
+        Codeunit.Run(Codeunit::"Create Quality Test");
+        Codeunit.Run(Codeunit::"Create Quality Insp. Result");
         Codeunit.Run(Codeunit::"Create QM Insp. Template Hdr");
         Codeunit.Run(Codeunit::"Create QM Insp. Template Line");
         Codeunit.Run(Codeunit::"Create QM Result Condit. Conf.");