diff --git a/hieradata/role/ess.yaml b/hieradata/role/ess.yaml
index a0b1b53d17..70cda758ad 100644
--- a/hieradata/role/ess.yaml
+++ b/hieradata/role/ess.yaml
@@ -5,6 +5,7 @@ classes:
   - "profile::core::gpio"
   - "profile::core::i2c"
   - "profile::pi::config"
+  - "profile::pi::rubinhat"
 
 # disabling the kernel version check is needed on el7
 docker::overlay2_override_kernel_check: true
@@ -12,5 +13,3 @@ docker::storage_driver: "overlay2"
 # ipa docker group is 70014
 docker::socket_group: "70014"
 docker::socket_override: true
-# SCL has no architecture for aarch64
-profile::core::common::manage_scl: false
diff --git a/hieradata/role/laserrpi.yaml b/hieradata/role/laserrpi.yaml
index 3d10a1af85..c13b7ba22a 100644
--- a/hieradata/role/laserrpi.yaml
+++ b/hieradata/role/laserrpi.yaml
@@ -10,5 +10,3 @@ docker::storage_driver: "overlay2"
 # ipa docker group is 70014
 docker::socket_group: "70014"
 docker::socket_override: true
-# SCL has no architecture for aarch64
-profile::core::common::manage_scl: false
diff --git a/spec/hosts/roles/allsky_cam_spec.rb b/spec/hosts/roles/allsky_cam_spec.rb
index cb58bd3a77..9e40df1e15 100644
--- a/spec/hosts/roles/allsky_cam_spec.rb
+++ b/spec/hosts/roles/allsky_cam_spec.rb
@@ -7,6 +7,15 @@
 describe "#{role} role" do
   on_supported_os.each do |os, os_facts|
     context "on #{os}" do
+      os_facts = override_facts(os_facts,
+                                cpuinfo: {
+                                  'processor' => {
+                                    'Model' => 'Raspberry Pi 4 Model B Rev 1.2',
+                                  },
+                                },
+                                os: {
+                                  'architecture' => 'aarch64',
+                                })
       let(:facts) { os_facts }
       let(:node_params) do
         {
@@ -17,7 +26,7 @@
 
       lsst_sites.each do |site|
         fqdn = "#{role}.#{site}.lsst.org"
-        override_facts(os_facts, fqdn: fqdn, networking: { fqdn => fqdn })
+        os_facts = override_facts(os_facts, fqdn: fqdn, networking: { fqdn => fqdn })
 
         describe fqdn, :sitepp do
           let(:site) { site }
diff --git a/spec/hosts/roles/ess_spec.rb b/spec/hosts/roles/ess_spec.rb
index 8e661f4b69..442f477577 100644
--- a/spec/hosts/roles/ess_spec.rb
+++ b/spec/hosts/roles/ess_spec.rb
@@ -7,10 +7,14 @@
 describe "#{role} role" do
   on_supported_os.each do |os, os_facts|
     context "on #{os}" do
-      os_facts = override_facts(os_facts, cpuinfo: {
+      os_facts = override_facts(os_facts,
+                                cpuinfo: {
                                   'processor' => {
                                     'Model' => 'Raspberry Pi 4 Model B Rev 1.2',
                                   },
+                                },
+                                os: {
+                                  'architecture' => 'aarch64',
                                 })
       let(:facts) { os_facts }
       let(:node_params) do
@@ -22,15 +26,17 @@
 
       lsst_sites.each do |site|
         fqdn = "#{role}.#{site}.lsst.org"
-        override_facts(os_facts, fqdn: fqdn, networking: { fqdn => fqdn })
+        os_facts = override_facts(os_facts, fqdn: fqdn, networking: { fqdn => fqdn })
 
         describe fqdn, :sitepp do
           let(:site) { site }
 
           it { is_expected.to compile.with_all_deps }
 
+          include_examples 'common', os_facts: os_facts
           include_examples 'gpio'
           include_examples 'i2c', os_facts: os_facts
+          include_examples 'rubinhat'
         end # host
       end # lsst_sites
     end # on os
diff --git a/spec/hosts/roles/laserrpi_spec.rb b/spec/hosts/roles/laserrpi_spec.rb
index 99f0228449..19b8ea6d82 100644
--- a/spec/hosts/roles/laserrpi_spec.rb
+++ b/spec/hosts/roles/laserrpi_spec.rb
@@ -7,6 +7,15 @@
 describe "#{role} role" do
   on_supported_os.each do |os, os_facts|
     context "on #{os}" do
+      os_facts = override_facts(os_facts,
+                                cpuinfo: {
+                                  'processor' => {
+                                    'Model' => 'Raspberry Pi 4 Model B Rev 1.2',
+                                  },
+                                },
+                                os: {
+                                  'architecture' => 'aarch64',
+                                })
       let(:facts) { os_facts }
       let(:node_params) do
         {
@@ -17,12 +26,14 @@
 
       lsst_sites.each do |site|
         fqdn = "#{role}.#{site}.lsst.org"
-        override_facts(os_facts, fqdn: fqdn, networking: { fqdn => fqdn })
+        os_facts = override_facts(os_facts, fqdn: fqdn, networking: { fqdn => fqdn })
 
         describe fqdn, :sitepp do
           let(:site) { site }
 
           it { is_expected.to compile.with_all_deps }
+
+          include_examples 'common', os_facts: os_facts
         end # host
       end # lsst_sites
     end # on os