diff --git a/.github/workflows/build-checks.yml b/.github/workflows/build-checks.yml
index bc4b9a53b..b375162f1 100644
--- a/.github/workflows/build-checks.yml
+++ b/.github/workflows/build-checks.yml
@@ -32,6 +32,12 @@ jobs:
     - name: Installing SF managed packages
       run: sf package install --package "04t4W0000038bemQAA" -o ciorg -w 15 --noprompt  
 
+    - name: Installing Health Cloud managed package
+      run: sf package install --package "04t4W000002V2Ub" -o ciorg -w 15 --noprompt 
+
+    - name: Installing the IAM package 
+      run: sf package install --package "04tJQ0000014BvZYAU" -o ciorg -w 15 --noprompt 
+
     - name: Set deployment user standard security
       run: |
           sf force:user:permsetlicense:assign -u ciorg -n "OmniStudio"
diff --git a/dev-app-post/main/default/flows/Create_EDRD_Case.flow-meta.xml b/dev-app-post/main/default/flows/Create_EDRD_Case.flow-meta.xml
index 0e3708938..2b4d5538c 100644
--- a/dev-app-post/main/default/flows/Create_EDRD_Case.flow-meta.xml
+++ b/dev-app-post/main/default/flows/Create_EDRD_Case.flow-meta.xml
@@ -408,7 +408,7 @@
             <label>Patient Not Deceased</label>
         </rules>
     </decisions>
-    <description>updated Changes related to ACR with EDRD Data Migration field.</description>
+    <description>EDRD Staff error message</description>
     <dynamicChoiceSets>
         <name>caseTypeSet</name>
         <dataType>Picklist</dataType>
@@ -485,15 +485,15 @@
         <name>Create_Medication_request_with_New_Case</name>
         <label>Create Medication request with New Case</label>
         <locationX>50</locationX>
-        <locationY>3734</locationY>
+        <locationY>3626</locationY>
         <assignRecordIdToReference>MedicationRequestRec</assignRecordIdToReference>
         <connector>
-            <targetReference>Sucees</targetReference>
+            <targetReference>Get_New_Case</targetReference>
         </connector>
         <inputAssignments>
             <field>Case__c</field>
             <value>
-                <elementReference>StoreNewCase.Id</elementReference>
+                <elementReference>New_case_Creation_for_Rec_type_New</elementReference>
             </value>
         </inputAssignments>
         <inputAssignments>
@@ -583,7 +583,7 @@
         <inputAssignments>
             <field>Type</field>
             <value>
-                <elementReference>StoreNewCase.Type</elementReference>
+                <stringValue>New</stringValue>
             </value>
         </inputAssignments>
         <object>MedicationRequest</object>
@@ -592,15 +592,18 @@
         <name>Create_Medication_request_with_New_Case_without_indef</name>
         <label>Create Medication request with New Case without indef</label>
         <locationX>314</locationX>
-        <locationY>3734</locationY>
+        <locationY>3626</locationY>
         <assignRecordIdToReference>MedicationRequestRec</assignRecordIdToReference>
         <connector>
-            <targetReference>Sucees</targetReference>
+            <targetReference>Get_New_Case</targetReference>
         </connector>
+        <faultConnector>
+            <targetReference>EDRD_Staff</targetReference>
+        </faultConnector>
         <inputAssignments>
             <field>Case__c</field>
             <value>
-                <elementReference>StoreNewCase.Id</elementReference>
+                <elementReference>New_case_Creation_for_Rec_type_New_without_indef</elementReference>
             </value>
         </inputAssignments>
         <inputAssignments>
@@ -684,7 +687,7 @@
         <inputAssignments>
             <field>Type</field>
             <value>
-                <elementReference>StoreNewCase.Type</elementReference>
+                <stringValue>New</stringValue>
             </value>
         </inputAssignments>
         <object>MedicationRequest</object>
@@ -692,16 +695,16 @@
     <recordCreates>
         <name>Create_Medication_Request_with_New_Renewal_Case</name>
         <label>Create Medication Request with New Renewal Case</label>
-        <locationX>578</locationX>
-        <locationY>3734</locationY>
+        <locationX>842</locationX>
+        <locationY>3626</locationY>
         <assignRecordIdToReference>MedicationRequestRec</assignRecordIdToReference>
         <connector>
-            <targetReference>Success</targetReference>
+            <targetReference>Get_Renewal_Case</targetReference>
         </connector>
         <inputAssignments>
             <field>Case__c</field>
             <value>
-                <elementReference>StoreRenewalCase.Id</elementReference>
+                <elementReference>New_renewal_case_creation_for_RecType_Renew</elementReference>
             </value>
         </inputAssignments>
         <inputAssignments>
@@ -791,7 +794,7 @@
         <inputAssignments>
             <field>Type</field>
             <value>
-                <elementReference>StoreRenewalCase.Type</elementReference>
+                <stringValue>Renewal</stringValue>
             </value>
         </inputAssignments>
         <object>MedicationRequest</object>
@@ -799,16 +802,19 @@
     <recordCreates>
         <name>Create_Medication_Request_with_New_Renewal_Case_without_indef</name>
         <label>Create Medication Request with New Renewal Case without indef</label>
-        <locationX>842</locationX>
-        <locationY>3734</locationY>
+        <locationX>1106</locationX>
+        <locationY>3626</locationY>
         <assignRecordIdToReference>MedicationRequestRec</assignRecordIdToReference>
         <connector>
-            <targetReference>Success</targetReference>
+            <targetReference>Get_Renewal_Case</targetReference>
         </connector>
+        <faultConnector>
+            <targetReference>Copy_1_of_EDRD_Staff</targetReference>
+        </faultConnector>
         <inputAssignments>
             <field>Case__c</field>
             <value>
-                <elementReference>StoreRenewalCase.Id</elementReference>
+                <elementReference>New_renewal_case_creation_for_RecType_Renew_without_indef</elementReference>
             </value>
         </inputAssignments>
         <inputAssignments>
@@ -892,7 +898,7 @@
         <inputAssignments>
             <field>Type</field>
             <value>
-                <elementReference>StoreRenewalCase.Type</elementReference>
+                <stringValue>Renewal</stringValue>
             </value>
         </inputAssignments>
         <object>MedicationRequest</object>
@@ -903,7 +909,7 @@
         <locationX>50</locationX>
         <locationY>3218</locationY>
         <connector>
-            <targetReference>Get_Newly_created_Case</targetReference>
+            <targetReference>Upload_Document</targetReference>
         </connector>
         <inputAssignments>
             <field>ContactId</field>
@@ -998,7 +1004,7 @@
         <locationX>314</locationX>
         <locationY>3218</locationY>
         <connector>
-            <targetReference>Get_Newly_created_Case_without_indef</targetReference>
+            <targetReference>Upload_Document</targetReference>
         </connector>
         <inputAssignments>
             <field>ContactId</field>
@@ -1084,10 +1090,10 @@
     <recordCreates>
         <name>New_renewal_case_creation_for_RecType_Renew</name>
         <label>New renewal case creation for RecType Renew</label>
-        <locationX>578</locationX>
+        <locationX>842</locationX>
         <locationY>3218</locationY>
         <connector>
-            <targetReference>Get_newly_created_Renewal_Rec</targetReference>
+            <targetReference>UploadDocument</targetReference>
         </connector>
         <inputAssignments>
             <field>ContactId</field>
@@ -1179,10 +1185,10 @@
     <recordCreates>
         <name>New_renewal_case_creation_for_RecType_Renew_without_indef</name>
         <label>New renewal case creation for RecType Renew without indef</label>
-        <locationX>842</locationX>
+        <locationX>1106</locationX>
         <locationY>3218</locationY>
         <connector>
-            <targetReference>Get_newly_created_Renewal_Rec_without_indef</targetReference>
+            <targetReference>UploadDocument</targetReference>
         </connector>
         <inputAssignments>
             <field>ContactId</field>
@@ -1268,7 +1274,7 @@
     <recordLookups>
         <name>get_ACRRecord</name>
         <label>get_ACRRecord</label>
-        <locationX>908</locationX>
+        <locationX>1238</locationX>
         <locationY>1430</locationY>
         <assignNullValuesIfNoRecordsFound>false</assignNullValuesIfNoRecordsFound>
         <connector>
@@ -1330,7 +1336,7 @@
     <recordLookups>
         <name>Get_Case_Record_Type_for_renewal</name>
         <label>Get Case Record Type for renewal</label>
-        <locationX>710</locationX>
+        <locationX>974</locationX>
         <locationY>3002</locationY>
         <assignNullValuesIfNoRecordsFound>false</assignNullValuesIfNoRecordsFound>
         <connector>
@@ -1360,7 +1366,7 @@
     <recordLookups>
         <name>Get_EDRD_MR_Record_Type</name>
         <label>Get EDRD MR Record Type</label>
-        <locationX>446</locationX>
+        <locationX>578</locationX>
         <locationY>1862</locationY>
         <assignNullValuesIfNoRecordsFound>false</assignNullValuesIfNoRecordsFound>
         <connector>
@@ -1388,7 +1394,7 @@
     <recordLookups>
         <name>Get_EDRDCPRecord</name>
         <label>Get_EDRDCPRecord</label>
-        <locationX>2112</locationX>
+        <locationX>2591</locationX>
         <locationY>782</locationY>
         <assignNullValuesIfNoRecordsFound>false</assignNullValuesIfNoRecordsFound>
         <connector>
@@ -1415,7 +1421,7 @@
     <recordLookups>
         <name>Get_Medication</name>
         <label>Get Medication</label>
-        <locationX>446</locationX>
+        <locationX>578</locationX>
         <locationY>1754</locationY>
         <assignNullValuesIfNoRecordsFound>true</assignNullValuesIfNoRecordsFound>
         <connector>
@@ -1452,42 +1458,15 @@
         <queriedFields>Renewal_Recommended_Dosage__c</queriedFields>
     </recordLookups>
     <recordLookups>
-        <name>Get_Newly_created_Case</name>
-        <label>Get Newly created Case</label>
-        <locationX>50</locationX>
-        <locationY>3326</locationY>
-        <assignNullValuesIfNoRecordsFound>true</assignNullValuesIfNoRecordsFound>
-        <connector>
-            <targetReference>Upload_Document</targetReference>
-        </connector>
-        <filterLogic>and</filterLogic>
-        <filters>
-            <field>Id</field>
-            <operator>EqualTo</operator>
-            <value>
-                <elementReference>New_case_Creation_for_Rec_type_New</elementReference>
-            </value>
-        </filters>
-        <object>Case</object>
-        <outputReference>StoreNewCase</outputReference>
-        <queriedFields>Id</queriedFields>
-        <queriedFields>ContactId</queriedFields>
-        <queriedFields>Provider__c</queriedFields>
-        <queriedFields>Type</queriedFields>
-        <queriedFields>Status</queriedFields>
-        <queriedFields>CaseNumber</queriedFields>
-        <queriedFields>Origin</queriedFields>
-    </recordLookups>
-    <recordLookups>
-        <name>Get_Newly_created_Case_without_indef</name>
-        <label>Get Newly created Case without indef</label>
-        <locationX>314</locationX>
-        <locationY>3326</locationY>
+        <name>Get_New_Case</name>
+        <label>Get New Case</label>
+        <locationX>182</locationX>
+        <locationY>4058</locationY>
         <assignNullValuesIfNoRecordsFound>true</assignNullValuesIfNoRecordsFound>
         <connector>
-            <targetReference>Upload_Document</targetReference>
+            <targetReference>Sucees</targetReference>
         </connector>
-        <filterLogic>and</filterLogic>
+        <filterLogic>or</filterLogic>
         <filters>
             <field>Id</field>
             <operator>EqualTo</operator>
@@ -1495,69 +1474,17 @@
                 <elementReference>New_case_Creation_for_Rec_type_New_without_indef</elementReference>
             </value>
         </filters>
-        <object>Case</object>
-        <outputReference>StoreNewCase</outputReference>
-        <queriedFields>Id</queriedFields>
-        <queriedFields>ContactId</queriedFields>
-        <queriedFields>Provider__c</queriedFields>
-        <queriedFields>Type</queriedFields>
-        <queriedFields>Status</queriedFields>
-        <queriedFields>CaseNumber</queriedFields>
-        <queriedFields>Origin</queriedFields>
-    </recordLookups>
-    <recordLookups>
-        <name>Get_newly_created_Renewal_Rec</name>
-        <label>Get newly created Renewal Rec</label>
-        <locationX>578</locationX>
-        <locationY>3326</locationY>
-        <assignNullValuesIfNoRecordsFound>false</assignNullValuesIfNoRecordsFound>
-        <connector>
-            <targetReference>UploadDocument</targetReference>
-        </connector>
-        <filterLogic>and</filterLogic>
         <filters>
             <field>Id</field>
             <operator>EqualTo</operator>
             <value>
-                <elementReference>New_renewal_case_creation_for_RecType_Renew</elementReference>
-            </value>
-        </filters>
-        <object>Case</object>
-        <outputReference>StoreRenewalCase</outputReference>
-        <queriedFields>Id</queriedFields>
-        <queriedFields>ContactId</queriedFields>
-        <queriedFields>Provider__c</queriedFields>
-        <queriedFields>Type</queriedFields>
-        <queriedFields>Status</queriedFields>
-        <queriedFields>CaseNumber</queriedFields>
-        <queriedFields>Origin</queriedFields>
-    </recordLookups>
-    <recordLookups>
-        <name>Get_newly_created_Renewal_Rec_without_indef</name>
-        <label>Get newly created Renewal Rec without indef</label>
-        <locationX>842</locationX>
-        <locationY>3326</locationY>
-        <assignNullValuesIfNoRecordsFound>false</assignNullValuesIfNoRecordsFound>
-        <connector>
-            <targetReference>UploadDocument</targetReference>
-        </connector>
-        <filterLogic>and</filterLogic>
-        <filters>
-            <field>Id</field>
-            <operator>EqualTo</operator>
-            <value>
-                <elementReference>New_renewal_case_creation_for_RecType_Renew_without_indef</elementReference>
+                <elementReference>New_case_Creation_for_Rec_type_New</elementReference>
             </value>
         </filters>
         <object>Case</object>
-        <outputReference>StoreRenewalCase</outputReference>
+        <outputReference>StoreNewCase</outputReference>
         <queriedFields>Id</queriedFields>
-        <queriedFields>ContactId</queriedFields>
-        <queriedFields>Provider__c</queriedFields>
-        <queriedFields>Type</queriedFields>
-        <queriedFields>Status</queriedFields>
         <queriedFields>CaseNumber</queriedFields>
-        <queriedFields>Origin</queriedFields>
     </recordLookups>
     <recordLookups>
         <name>Get_Patient_Contact_rec</name>
@@ -1754,6 +1681,35 @@
         <object>CareProgramEnrollee</object>
         <storeOutputAutomatically>true</storeOutputAutomatically>
     </recordLookups>
+    <recordLookups>
+        <name>Get_Renewal_Case</name>
+        <label>Get Renewal Case</label>
+        <locationX>974</locationX>
+        <locationY>4058</locationY>
+        <assignNullValuesIfNoRecordsFound>true</assignNullValuesIfNoRecordsFound>
+        <connector>
+            <targetReference>Success</targetReference>
+        </connector>
+        <filterLogic>or</filterLogic>
+        <filters>
+            <field>Id</field>
+            <operator>EqualTo</operator>
+            <value>
+                <elementReference>New_renewal_case_creation_for_RecType_Renew</elementReference>
+            </value>
+        </filters>
+        <filters>
+            <field>Id</field>
+            <operator>EqualTo</operator>
+            <value>
+                <elementReference>New_renewal_case_creation_for_RecType_Renew_without_indef</elementReference>
+            </value>
+        </filters>
+        <object>Case</object>
+        <outputReference>StoreRenewalCase</outputReference>
+        <queriedFields>Id</queriedFields>
+        <queriedFields>CaseNumber</queriedFields>
+    </recordLookups>
     <recordLookups>
         <name>getProviderRecordType</name>
         <label>Get Provider Record Type</label>
@@ -1800,6 +1756,22 @@
         <showFooter>true</showFooter>
         <showHeader>true</showHeader>
     </screens>
+    <screens>
+        <name>Copy_1_of_EDRD_Staff</name>
+        <label>EDRD Staff Error Screen</label>
+        <locationX>1370</locationX>
+        <locationY>3734</locationY>
+        <allowBack>false</allowBack>
+        <allowFinish>true</allowFinish>
+        <allowPause>false</allowPause>
+        <fields>
+            <name>Copy_1_of_EDRD_Staff_Error</name>
+            <fieldText>&lt;p&gt;&lt;span style=&quot;color: rgb(28, 27, 27);&quot;&gt;You do not have the privilege of renewing a case.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot;color: rgb(28, 27, 27);&quot;&gt;Please contact your Administrator.&lt;/span&gt;&lt;/p&gt;</fieldText>
+            <fieldType>DisplayText</fieldType>
+        </fields>
+        <showFooter>true</showFooter>
+        <showHeader>true</showHeader>
+    </screens>
     <screens>
         <name>CP_ErrorScreen</name>
         <label>CP_ErrorScreen</label>
@@ -1848,6 +1820,22 @@
         <showFooter>true</showFooter>
         <showHeader>true</showHeader>
     </screens>
+    <screens>
+        <name>EDRD_Staff</name>
+        <label>EDRD Staff Error Screen</label>
+        <locationX>578</locationX>
+        <locationY>3734</locationY>
+        <allowBack>false</allowBack>
+        <allowFinish>true</allowFinish>
+        <allowPause>false</allowPause>
+        <fields>
+            <name>EDRD_Staff_Error</name>
+            <fieldText>&lt;p&gt;&lt;span style=&quot;color: rgb(27, 26, 26);&quot;&gt;You do not have the privilege of creating a new case.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot;color: rgb(27, 26, 26);&quot;&gt;Please contact your Administrator.&lt;/span&gt;&lt;/p&gt;</fieldText>
+            <fieldType>DisplayText</fieldType>
+        </fields>
+        <showFooter>true</showFooter>
+        <showHeader>true</showHeader>
+    </screens>
     <screens>
         <name>Indication_Screen</name>
         <label>Indication Screen</label>
@@ -2174,7 +2162,7 @@
         <description>New Case</description>
         <name>New_Cases</name>
         <label>New Case</label>
-        <locationX>2665</locationX>
+        <locationX>3168</locationX>
         <locationY>350</locationY>
         <allowBack>true</allowBack>
         <allowFinish>true</allowFinish>
@@ -2569,7 +2557,7 @@
     <screens>
         <name>Search_Patient</name>
         <label>Search Patient</label>
-        <locationX>2665</locationX>
+        <locationX>3168</locationX>
         <locationY>458</locationY>
         <allowBack>true</allowBack>
         <allowFinish>true</allowFinish>
@@ -2597,7 +2585,7 @@
     <screens>
         <name>Search_Provider_for_New_Case</name>
         <label>Search Provider for New Case</label>
-        <locationX>908</locationX>
+        <locationX>1238</locationX>
         <locationY>1214</locationY>
         <allowBack>true</allowBack>
         <allowFinish>true</allowFinish>
@@ -2624,8 +2612,8 @@
     <screens>
         <name>Success</name>
         <label>Success</label>
-        <locationX>710</locationX>
-        <locationY>3926</locationY>
+        <locationX>974</locationX>
+        <locationY>4166</locationY>
         <allowBack>false</allowBack>
         <allowFinish>true</allowFinish>
         <allowPause>false</allowPause>
@@ -2709,7 +2697,7 @@
         <name>Sucees</name>
         <label>Sucees</label>
         <locationX>182</locationX>
-        <locationY>3926</locationY>
+        <locationY>4166</locationY>
         <allowBack>false</allowBack>
         <allowFinish>true</allowFinish>
         <allowPause>false</allowPause>
@@ -2793,7 +2781,7 @@
         <name>Upload_Document</name>
         <label>Upload Document</label>
         <locationX>182</locationX>
-        <locationY>3518</locationY>
+        <locationY>3410</locationY>
         <allowBack>true</allowBack>
         <allowFinish>true</allowFinish>
         <allowPause>false</allowPause>
@@ -2837,8 +2825,8 @@
     <screens>
         <name>UploadDocument</name>
         <label>Upload Document</label>
-        <locationX>710</locationX>
-        <locationY>3518</locationY>
+        <locationX>974</locationX>
+        <locationY>3410</locationY>
         <allowBack>true</allowBack>
         <allowFinish>true</allowFinish>
         <allowPause>false</allowPause>
@@ -2880,7 +2868,7 @@
         <showHeader>false</showHeader>
     </screens>
     <start>
-        <locationX>2539</locationX>
+        <locationX>3042</locationX>
         <locationY>0</locationY>
         <connector>
             <targetReference>getProviderRecordType</targetReference>
diff --git a/force-app/main/default/permissionsets/Salesforce_Backup_Administrator.permissionset-meta.xml b/dev-app-post/main/default/permissionsets/Salesforce_Backup_Administrator.permissionset-meta.xml
similarity index 99%
rename from force-app/main/default/permissionsets/Salesforce_Backup_Administrator.permissionset-meta.xml
rename to dev-app-post/main/default/permissionsets/Salesforce_Backup_Administrator.permissionset-meta.xml
index 9a304dcbf..548f6e6cf 100644
--- a/force-app/main/default/permissionsets/Salesforce_Backup_Administrator.permissionset-meta.xml
+++ b/dev-app-post/main/default/permissionsets/Salesforce_Backup_Administrator.permissionset-meta.xml
@@ -3188,24 +3188,6 @@
         <object>ProductFulfillmentLocation</object>
         <viewAllRecords>true</viewAllRecords>
     </objectPermissions>
-    <objectPermissions>
-        <allowCreate>true</allowCreate>
-        <allowDelete>true</allowDelete>
-        <allowEdit>true</allowEdit>
-        <allowRead>true</allowRead>
-        <modifyAllRecords>true</modifyAllRecords>
-        <object>ProductRelatedServiceProcess</object>
-        <viewAllRecords>true</viewAllRecords>
-    </objectPermissions>
-    <objectPermissions>
-        <allowCreate>true</allowCreate>
-        <allowDelete>true</allowDelete>
-        <allowEdit>true</allowEdit>
-        <allowRead>true</allowRead>
-        <modifyAllRecords>true</modifyAllRecords>
-        <object>ProductRequest</object>
-        <viewAllRecords>true</viewAllRecords>
-    </objectPermissions>
     <objectPermissions>
         <allowCreate>true</allowCreate>
         <allowDelete>true</allowDelete>
diff --git a/force-app/main/default/queues/EDRD_Ministry_Queue.queue-meta.xml b/force-app/main/default/queues/EDRD_Ministry_Queue.queue-meta.xml
index 505d32c4c..df3590d96 100644
--- a/force-app/main/default/queues/EDRD_Ministry_Queue.queue-meta.xml
+++ b/force-app/main/default/queues/EDRD_Ministry_Queue.queue-meta.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Queue xmlns="http://soap.sforce.com/2006/04/metadata">
-    <doesSendEmailToMembers>true</doesSendEmailToMembers>
+    <doesSendEmailToMembers>false</doesSendEmailToMembers>
     <email>nour.sahib@gov.bc.ca</email>
     <name>EDRD MOH Queue</name>
+    <queueMembers>
+        <roles>
+            <role>EDRD_Admin</role>
+            <role>EDRD_Staff</role>
+        </roles>
+    </queueMembers>
     <queueSobject>
         <sobjectType>Case</sobjectType>
     </queueSobject>
diff --git a/force-app/main/default/queues/EDRD_PSP_Queue.queue-meta.xml b/force-app/main/default/queues/EDRD_PSP_Queue.queue-meta.xml
index ec469e2cd..5677d2dbf 100644
--- a/force-app/main/default/queues/EDRD_PSP_Queue.queue-meta.xml
+++ b/force-app/main/default/queues/EDRD_PSP_Queue.queue-meta.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Queue xmlns="http://soap.sforce.com/2006/04/metadata">
-    <doesSendEmailToMembers>true</doesSendEmailToMembers>
+    <doesSendEmailToMembers>false</doesSendEmailToMembers>
     <email>psp@phsa.ca</email>
     <name>EDRD PSP Queue</name>
+    <queueMembers>
+        <roles>
+            <role>EDRD_Admin</role>
+            <role>EDRD_Staff</role>
+        </roles>
+    </queueMembers>
     <queueSobject>
         <sobjectType>Case</sobjectType>
     </queueSobject>
diff --git a/force-app/main/default/reports/UserSetup.reportFolder-meta.xml b/force-app/main/default/reports/UserSetup.reportFolder-meta.xml
index 667bcf18f..7e8b0c84f 100644
--- a/force-app/main/default/reports/UserSetup.reportFolder-meta.xml
+++ b/force-app/main/default/reports/UserSetup.reportFolder-meta.xml
@@ -5,5 +5,10 @@
         <sharedTo>sasalesforceadmin@gov.bc.ca</sharedTo>
         <sharedToType>User</sharedToType>
     </folderShares>
+    <folderShares>
+        <accessLevel>Manage</accessLevel>
+        <sharedTo>SAT_Admin</sharedTo>
+        <sharedToType>Group</sharedToType>
+    </folderShares>
     <name>User Setup</name>
 </ReportFolder>
diff --git a/sfdx-project.json b/sfdx-project.json
index 5f4d4e03a..abbba8fd1 100644
--- a/sfdx-project.json
+++ b/sfdx-project.json
@@ -541,6 +541,8 @@
     "Special Authority App@12.0.9-5": "04tOG000000JtDhYAK",
     "Special Authority App@12.0.10-2": "04tOG000000K0GnYAK",
     "Special Authority App@12.0.10-9": "04tOG000000LVtdYAG",
-    "Special Authority App@12.0.11-1": "04tOG000000LWOHYA4"
+    "Special Authority App@12.0.11-1": "04tOG000000LWOHYA4",
+    "Special Authority App@12.0.11-4": "04tOG000000NRcDYAW",
+    "Special Authority App@12.0.11-6": "04tOG000000NeZRYA0"
   }
 }
\ No newline at end of file