diff --git a/hieradata/node/lsstcam-aio05.cp.lsst.org.yaml b/hieradata/node/lsstcam-aio05.cp.lsst.org.yaml
new file mode 100644
index 0000000000..1de43bf153
--- /dev/null
+++ b/hieradata/node/lsstcam-aio05.cp.lsst.org.yaml
@@ -0,0 +1,15 @@
+---
+nm::connections:
+  enp0s31f6:
+    content:
+      connection:
+        id: "enp0s31f6"
+        uuid: "b93cc6e9-e4ba-4905-8e07-363ce3b90e28"
+        type: "ethernet"
+        interface-name: "enp0s31f6"
+      ethernet: {}
+      ipv4:
+        method: "auto"
+      ipv6:
+        method: "disabled"
+      proxy: {}
diff --git a/hieradata/node/lsstcam-aio06.cp.lsst.org.yaml b/hieradata/node/lsstcam-aio06.cp.lsst.org.yaml
new file mode 100644
index 0000000000..1de43bf153
--- /dev/null
+++ b/hieradata/node/lsstcam-aio06.cp.lsst.org.yaml
@@ -0,0 +1,15 @@
+---
+nm::connections:
+  enp0s31f6:
+    content:
+      connection:
+        id: "enp0s31f6"
+        uuid: "b93cc6e9-e4ba-4905-8e07-363ce3b90e28"
+        type: "ethernet"
+        interface-name: "enp0s31f6"
+      ethernet: {}
+      ipv4:
+        method: "auto"
+      ipv6:
+        method: "disabled"
+      proxy: {}
diff --git a/spec/hosts/nodes/lsstcam-aio05.cp.lsst.org_spec.rb b/spec/hosts/nodes/lsstcam-aio05.cp.lsst.org_spec.rb
new file mode 100644
index 0000000000..38430ebb10
--- /dev/null
+++ b/spec/hosts/nodes/lsstcam-aio05.cp.lsst.org_spec.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'lsstcam-aio05.cp.lsst.org', :sitepp do
+  on_supported_os.each do |os, os_facts|
+    next if os =~ %r{centos-7-x86_64}
+
+    context "on #{os}" do
+      let(:facts) do
+        override_facts(os_facts,
+                       fqdn: 'lsstcam-aio05.cp.lsst.org',
+                       is_virtual: false,
+                       virtual: 'physical',
+                       dmi: {
+                         'product' => {
+                           'name' => 'OptiPlex AIO 7410 35W',
+                         },
+                       })
+      end
+      let(:node_params) do
+        {
+          role: 'ccs-desktop',
+          cluster: 'lsstcam-ccs',
+          site: 'cp',
+        }
+      end
+
+      it { is_expected.to compile.with_all_deps }
+
+      include_examples 'baremetal no bmc'
+      include_context 'with nm interface'
+
+      it { is_expected.to have_nm__connection_resource_count(1) }
+
+      context 'with enp0s31f6' do
+        let(:interface) { 'enp0s31f6' }
+
+        it_behaves_like 'nm enabled interface'
+        it_behaves_like 'nm ethernet interface'
+        it_behaves_like 'nm dhcp interface'
+      end
+    end # on os
+  end # on_supported_os
+end
diff --git a/spec/hosts/nodes/lsstcam-aio06.cp.lsst.org_spec.rb b/spec/hosts/nodes/lsstcam-aio06.cp.lsst.org_spec.rb
new file mode 100644
index 0000000000..c394ffbe24
--- /dev/null
+++ b/spec/hosts/nodes/lsstcam-aio06.cp.lsst.org_spec.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'lsstcam-aio06.cp.lsst.org', :sitepp do
+  on_supported_os.each do |os, os_facts|
+    next if os =~ %r{centos-7-x86_64}
+
+    context "on #{os}" do
+      let(:facts) do
+        override_facts(os_facts,
+                       fqdn: 'lsstcam-aio06.cp.lsst.org',
+                       is_virtual: false,
+                       virtual: 'physical',
+                       dmi: {
+                         'product' => {
+                           'name' => 'OptiPlex AIO 7410 35W',
+                         },
+                       })
+      end
+      let(:node_params) do
+        {
+          role: 'ccs-desktop',
+          cluster: 'lsstcam-ccs',
+          site: 'cp',
+        }
+      end
+
+      it { is_expected.to compile.with_all_deps }
+
+      include_examples 'baremetal no bmc'
+      include_context 'with nm interface'
+
+      it { is_expected.to have_nm__connection_resource_count(1) }
+
+      context 'with enp0s31f6' do
+        let(:interface) { 'enp0s31f6' }
+
+        it_behaves_like 'nm enabled interface'
+        it_behaves_like 'nm ethernet interface'
+        it_behaves_like 'nm dhcp interface'
+      end
+    end # on os
+  end # on_supported_os
+end