diff --git a/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-host/gsj-ipmid-whitelist.conf b/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-host/gsj-ipmid-whitelist.conf
index a0d18b4..5eabef3 100644
--- a/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-host/gsj-ipmid-whitelist.conf
+++ b/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-host/gsj-ipmid-whitelist.conf
@@ -6,26 +6,33 @@
 0x00:0x06    //<Chassis>:<Set Power Restore Policy>
 0x00:0x08    //<Chassis>:<Set System Boot Options>
 0x00:0x09    //<Chassis>:<Get System Boot Options>
-0x00:0x0F    //<Chassis>:<Get POH Counter Command>
-0x04:0x02    //<Sensor/Event>:<Platform event>
+0x04:0x20    //<Sensor/Event>:<Get Device SDR Info>
+0x04:0x21    //<Sensor/Event>:<Get Device SDR>
+0x04:0x22    //<Sensor/Event>:<Reserve Device SDR Repository>
+0x04:0x27    //<Sensor/Event>:<Get Sensor Threshold>
+0x04:0x29    //<Sensor/Event>:<Get Sensor Event Enable>
+0x04:0x2B    //<Sensor/Event>:<Get Sensor Event Status>
 0x04:0x2D    //<Sensor/Event>:<Get Sensor Reading>
 0x04:0x2F    //<Sensor/Event>:<Get Sensor Type>
 0x04:0x30    //<Sensor/Event>:<Set Sensor Reading and Event Status>
 0x06:0x01    //<App>:<Get Device ID>
+0x06:0x02    //<App>:<Cold Reset>
+0x06:0x03    //<App>:<Warm Reset>
 0x06:0x04    //<App>:<Get Self Test Results>
-0x06:0x06    //<App>:<Set ACPI Power State>
-0x06:0x07    //<App>:<Get ACPI Power State>
 0x06:0x08    //<App>:<Get Device GUID>
-0x06:0x22    //<App>:<Reset Watchdog Timer>
-0x06:0x24    //<App>:<Set Watchdog Timer>
-0x06:0x25    //<App>:<Get Watchdog Timer>
-0x06:0x2E    //<App>:<Set BMC Global Enables>
-0x06:0x2F    //<App>:<Get BMC Global Enables>
-0x06:0x31    //<App>:<Get Message Flags>
 0x06:0x35    //<App>:<Read Event Message Buffer>
-0x06:0x36    //<App>:<Get BT Interface Capabilities>
-0x06:0x37    //<App>:<Get System GUID>
-0x06:0x42    //<App>:<Get Channel Info Command>
+0x06:0x40    //<App>:<Set Channel Access>
+0x06:0x41    //<App>:<Get Channel Access>
+0x06:0x42    //<App>:<Get Channel Info>
+0x06:0x43    //<App>:<Set User Access>
+0x06:0x44    //<App>:<Get User Access>
+0x06:0x45    //<App>:<Set User Name>
+0x06:0x46    //<App>:<Get User Name>
+0x06:0x47    //<App>:<Set User Password>
+0x06:0x48    //<App>:<Activate Payload>
+0x06:0x49    //<App>:<Deactivate Payload>
+0x06:0x4A    //<App>:<Get Payload Activation Status>
+0x06:0x4B    //<App>:<Get Payload Instance Info>
 0x06:0x54    //<App>:<Get Channel Cipher Suites>
 0x0A:0x10    //<Storage>:<Get FRU Inventory Area Info>
 0x0A:0x11    //<Storage>:<Read FRU Data>
@@ -34,9 +41,12 @@
 0x0A:0x23    //<Storage>:<Get SDR>
 0x0A:0x40    //<Storage>:<Get SEL Info>
 0x0A:0x42    //<Storage>:<Reserve SEL>
+0x0A:0x43    //<Storage>:<Get SEL Entry>
 0x0A:0x44    //<Storage>:<Add SEL Entry>
+0x0A:0x47    //<Storage>:<Clear SEL>
 0x0A:0x48    //<Storage>:<Get SEL Time>
 0x0A:0x49    //<Storage>:<Set SEL Time>
+0x0C:0x01    //<Transport>:<Set LAN Configuration Parameters>
 0x0C:0x02    //<Transport>:<Get LAN Configuration Parameters>
 0x2C:0x00    //<Group Extension>:<Group Extension Command>
 0x2C:0x01    //<Group Extension>:<Get DCMI Capabilities>
@@ -45,3 +55,7 @@
 0x2C:0x06    //<Group Extension>:<Get Asset Tag>
 0x2C:0x07    //<Group Extension>:<Get Sensor Info>
 0x2C:0x10    //<Group Extension>:<Get Temperature Readings>
+0x2C:0x3E    //<Group Extension>:<Get HPM.x Capabilities>
+0x2E:0x02    //<Google OEM>:<I2C via Proxy Adapter>
+0x2E:0x30    //<Google OEM>:<Ethernet Statistics>
+0x2E:0x32    //<Google OEM>:<Sys Commands>
diff --git a/meta-gsj/recipes-phosphor/settings/phosphor-settings-manager/restrictionmode-default-whitelist.override.yml b/meta-gsj/recipes-phosphor/settings/phosphor-settings-manager/restrictionmode-default-whitelist.override.yml
new file mode 100644
index 0000000..b0de5dd
--- /dev/null
+++ b/meta-gsj/recipes-phosphor/settings/phosphor-settings-manager/restrictionmode-default-whitelist.override.yml
@@ -0,0 +1,6 @@
+---
+/xyz/openbmc_project/control/host0/restriction_mode:
+    - Interface: xyz.openbmc_project.Control.Security.RestrictionMode
+      Properties:
+          RestrictionMode:
+              Default: RestrictionMode::Modes::Whitelist
diff --git a/meta-gsj/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-gsj/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
index da83442..53db04d 100644
--- a/meta-gsj/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
+++ b/meta-gsj/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
@@ -1,2 +1,3 @@
 FILESEXTRAPATHS_prepend_gsj := "${THISDIR}/${BPN}:"
 SRC_URI_append_gsj = " file://time-default.override.yml"
+SRC_URI_append_gsj = " file://restrictionmode-default-whitelist.override.yml"