diff --git a/src/components/BareMetalHosts/BaremetalHostRole.js b/src/components/BareMetalHosts/BaremetalHostRole.js
index ed76e8d39..82c6c747a 100644
--- a/src/components/BareMetalHosts/BaremetalHostRole.js
+++ b/src/components/BareMetalHosts/BaremetalHostRole.js
@@ -1,4 +1,4 @@
-import { getHostRole } from '../../selectors';
+import { getMachineRole } from '../../selectors';
 import { DASHES } from '../../constants';
 
-export const BaremetalHostRole = ({ machine }) => getHostRole(machine) || DASHES;
+export const BaremetalHostRole = ({ machine }) => getMachineRole(machine) || DASHES;
diff --git a/src/components/BareMetalHosts/fixtures/BaremetalHostRole.fixture.js b/src/components/BareMetalHosts/fixtures/BaremetalHostRole.fixture.js
index 706000624..9a46079c2 100644
--- a/src/components/BareMetalHosts/fixtures/BaremetalHostRole.fixture.js
+++ b/src/components/BareMetalHosts/fixtures/BaremetalHostRole.fixture.js
@@ -8,7 +8,7 @@ export default [
       machine: {
         metadata: {
           labels: {
-            'machine.openshift.io/cluster-api-machine-role': 'worker',
+            'sigs.k8s.io/cluster-api-machine-role': 'worker',
           },
         },
       },
diff --git a/src/selectors/host/selectors.js b/src/selectors/host/selectors.js
index c8919e210..b63af10a9 100644
--- a/src/selectors/host/selectors.js
+++ b/src/selectors/host/selectors.js
@@ -2,10 +2,6 @@ import { get } from 'lodash';
 
 export const getOperationalStatus = host => get(host, 'status.operationalStatus');
 export const getProvisioningState = host => get(host, 'status.provisioning.state');
-
-export const getHostRole = hostMachine =>
-  get(hostMachine, ['metadata', 'labels', 'machine.openshift.io/cluster-api-machine-role']);
-
 export const getHostMachineName = host => get(host, 'spec.machineRef.name');
 export const getHostBmcAddress = host => get(host, 'spec.bmc.address');
 export const getHostErrorMessage = host => get(host, 'status.errorMessage');
diff --git a/src/selectors/machine/fixtures/selectors.fixture.js b/src/selectors/machine/fixtures/selectors.fixture.js
new file mode 100644
index 000000000..eb02b1908
--- /dev/null
+++ b/src/selectors/machine/fixtures/selectors.fixture.js
@@ -0,0 +1,11 @@
+export default [
+  {
+    machine: {
+      metadata: {
+        labels: {
+          'sigs.k8s.io/cluster-api-machine-role': 'worker',
+        },
+      },
+    },
+  },
+];
diff --git a/src/selectors/machine/index.js b/src/selectors/machine/index.js
index 4203546e8..35a6f8696 100644
--- a/src/selectors/machine/index.js
+++ b/src/selectors/machine/index.js
@@ -1 +1,2 @@
 export * from './combined';
+export * from './selectors';
diff --git a/src/selectors/machine/selectors.js b/src/selectors/machine/selectors.js
new file mode 100644
index 000000000..80ca119b6
--- /dev/null
+++ b/src/selectors/machine/selectors.js
@@ -0,0 +1,3 @@
+import { get } from 'lodash';
+
+export const getMachineRole = machine => get(machine, ['metadata', 'labels', 'sigs.k8s.io/cluster-api-machine-role']);
diff --git a/src/selectors/machine/tests/selectors.test.js b/src/selectors/machine/tests/selectors.test.js
new file mode 100644
index 000000000..5006560c3
--- /dev/null
+++ b/src/selectors/machine/tests/selectors.test.js
@@ -0,0 +1,8 @@
+import fixtures from '../fixtures/selectors.fixture';
+import { getMachineRole } from '../selectors';
+
+describe('getMachineRole selector', () => {
+  it('returns machine role', () => {
+    expect(getMachineRole(fixtures[0].machine)).toEqual('worker');
+  });
+});