diff --git a/tools/deployment/baremetal/005-setup-nodes.sh b/tools/deployment/baremetal/005-setup-nodes.sh
index c06e8ee72b..2f04fcc316 100755
--- a/tools/deployment/baremetal/005-setup-nodes.sh
+++ b/tools/deployment/baremetal/005-setup-nodes.sh
@@ -16,10 +16,12 @@
 
 set -xe
 
-#NOTE: We only want to run control plane components on the primary node
-kubectl label nodes openstack-control-plane- --all --overwrite
-PRIMARY_NODE="$(kubectl get nodes -l openstack-helm-node-class=primary -o name | awk -F '/' '{ print $NF; exit }')"
-kubectl label node ${PRIMARY_NODE} openstack-control-plane=enabled
+#NOTE: We only want to run ceph and control plane components on the primary node
+for LABEL in openstack-control-plane ceph-osd ceph-mon ceph-mds ceph-rgw ceph-mgr; do
+  kubectl label nodes ${LABEL}- --all --overwrite
+  PRIMARY_NODE="$(kubectl get nodes -l openstack-helm-node-class=primary -o name | awk -F '/' '{ print $NF; exit }')"
+  kubectl label node ${PRIMARY_NODE} ${LABEL}=enabled
+done
 
 #NOTE: Build charts
 make all
diff --git a/tools/deployment/baremetal/030-ceph.sh b/tools/deployment/baremetal/030-ceph.sh
deleted file mode 100755
index bef54dc9c1..0000000000
--- a/tools/deployment/baremetal/030-ceph.sh
+++ /dev/null
@@ -1,187 +0,0 @@
-#!/bin/bash
-
-# Copyright 2017 The Openstack-Helm Authors.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-set -xe
-
-#NOTE: Pull images and lint chart
-for CHART in ceph-mon ceph-osd ceph-client; do
-  make pull-images "${CHART}"
-done
-
-#NOTE: Deploy command
-uuidgen > /tmp/ceph-fs-uuid.txt
-tee /tmp/ceph.yaml <<EOF
-labels:
-  jobs:
-    node_selector_key: openstack-helm-node-class
-    node_selector_value: primary
-  provisioner:
-    node_selector_key: openstack-helm-node-class
-    node_selector_value: primary
-  mon:
-    node_selector_key: openstack-helm-node-class
-    node_selector_value: primary
-  mds:
-    node_selector_key: openstack-helm-node-class
-    node_selector_value: primary
-  osd:
-    node_selector_key: openstack-helm-node-class
-    node_selector_value: primary
-  rgw:
-    node_selector_key: openstack-helm-node-class
-    node_selector_value: primary
-  mgr:
-    node_selector_key: openstack-helm-node-class
-    node_selector_value: primary
-endpoints:
-  identity:
-    namespace: openstack
-  object_store:
-    namespace: ceph
-  ceph_mon:
-    namespace: ceph
-network:
-  public: 172.17.0.1/16
-  cluster: 172.17.0.1/16
-deployment:
-  storage_secrets: true
-  ceph: true
-  rbd_provisioner: true
-  cephfs_provisioner: true
-  client_secrets: false
-  rgw_keystone_user_and_endpoints: false
-bootstrap:
-  enabled: true
-conf:
-  rgw_ks:
-    enabled: true
-  ceph:
-    global:
-      fsid: ${CEPH_FS_ID}
-      osd_pool_default_size: 1
-    osd:
-      osd_crush_chooseleaf_type: 0
-  pool:
-    crush:
-      tunables: ${CRUSH_TUNABLES}
-    target:
-      osd: 1
-      pg_per_osd: 100
-    default:
-      crush_rule: same_host
-    spec:
-      # RBD pool
-      - name: rbd
-        application: rbd
-        replication: 1
-        percent_total_data: 40
-      # CephFS pools
-      - name: cephfs_metadata
-        application: cephfs
-        replication: 1
-        percent_total_data: 5
-      - name: cephfs_data
-        application: cephfs
-        replication: 1
-        percent_total_data: 10
-      # RadosGW pools
-      - name: .rgw.root
-        application: rgw
-        replication: 1
-        percent_total_data: 0.1
-      - name: default.rgw.control
-        application: rgw
-        replication: 1
-        percent_total_data: 0.1
-      - name: default.rgw.data.root
-        application: rgw
-        replication: 1
-        percent_total_data: 0.1
-      - name: default.rgw.gc
-        application: rgw
-        replication: 1
-        percent_total_data: 0.1
-      - name: default.rgw.log
-        application: rgw
-        replication: 1
-        percent_total_data: 0.1
-      - name: default.rgw.intent-log
-        application: rgw
-        replication: 1
-        percent_total_data: 0.1
-      - name: default.rgw.meta
-        application: rgw
-        replication: 1
-        percent_total_data: 0.1
-      - name: default.rgw.usage
-        application: rgw
-        replication: 1
-        percent_total_data: 0.1
-      - name: default.rgw.users.keys
-        application: rgw
-        replication: 1
-        percent_total_data: 0.1
-      - name: default.rgw.users.email
-        application: rgw
-        replication: 1
-        percent_total_data: 0.1
-      - name: default.rgw.users.swift
-        application: rgw
-        replication: 1
-        percent_total_data: 0.1
-      - name: default.rgw.users.uid
-        application: rgw
-        replication: 1
-        percent_total_data: 0.1
-      - name: default.rgw.buckets.extra
-        application: rgw
-        replication: 1
-        percent_total_data: 0.1
-      - name: default.rgw.buckets.index
-        application: rgw
-        replication: 1
-        percent_total_data: 3
-      - name: default.rgw.buckets.data
-        application: rgw
-        replication: 1
-        percent_total_data: 34.8
-  storage:
-    osd:
-      - data:
-          type: directory
-          location: /var/lib/openstack-helm/ceph/osd/osd-one
-        journal:
-          type: directory
-          location: /var/lib/openstack-helm/ceph/osd/journal-one
-EOF
-
-for CHART in ceph-mon ceph-osd ceph-client; do
-  helm install ./${CHART} \
-    --namespace=ceph \
-    --name=${CHART} \
-    --values=/tmp/ceph.yaml
-
-  #NOTE: Wait for deploy
-  ./tools/deployment/common/wait-for-pods.sh ceph
-
-  #NOTE: Validate deploy
-  MON_POD=$(kubectl get pods \
-    --namespace=ceph \
-    --selector="application=ceph" \
-    --selector="component=mon" \
-    --no-headers | awk '{ print $1; exit }')
-  kubectl exec -n ceph ${MON_POD} -- ceph -s
-done
diff --git a/tools/deployment/baremetal/030-ceph.sh b/tools/deployment/baremetal/030-ceph.sh
new file mode 120000
index 0000000000..4e486c1189
--- /dev/null
+++ b/tools/deployment/baremetal/030-ceph.sh
@@ -0,0 +1 @@
+../developer/ceph/040-ceph.sh
\ No newline at end of file
diff --git a/tools/deployment/baremetal/035-ceph-ns-activate.sh b/tools/deployment/baremetal/035-ceph-ns-activate.sh
deleted file mode 100755
index fc6dbe203a..0000000000
--- a/tools/deployment/baremetal/035-ceph-ns-activate.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-
-# Copyright 2017 The Openstack-Helm Authors.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-set -xe
-
-#NOTE: Pull images and lint chart
-make pull-images ceph-client
-
-#NOTE: Deploy command
-tee /tmp/ceph-openstack-config.yaml <<EOF
-labels:
-  jobs:
-    node_selector_key: openstack-helm-node-class
-    node_selector_value: primary
-endpoints:
-  identity:
-    namespace: openstack
-  object_store:
-    namespace: ceph
-  ceph_mon:
-    namespace: ceph
-network:
-  public: 172.17.0.1/16
-  cluster: 172.17.0.1/16
-deployment:
-  storage_secrets: false
-  ceph: false
-  rbd_provisioner: false
-  cephfs_provisioner: false
-  client_secrets: true
-  rgw_keystone_user_and_endpoints: false
-bootstrap:
-  enabled: false
-conf:
-  rgw_ks:
-    enabled: true
-  ceph:
-    global:
-      fsid: "$(cat /tmp/ceph-fs-uuid.txt)"
-EOF
-helm install ./ceph-client \
-  --namespace=openstack \
-  --name=ceph-openstack-config \
-  --values=/tmp/ceph-openstack-config.yaml
-
-#NOTE: Wait for deploy
-./tools/deployment/common/wait-for-pods.sh openstack
-
-#NOTE: Validate Deployment info
-kubectl get -n openstack jobs --show-all
-kubectl get -n openstack secrets
-kubectl get -n openstack configmaps
diff --git a/tools/deployment/baremetal/035-ceph-ns-activate.sh b/tools/deployment/baremetal/035-ceph-ns-activate.sh
new file mode 120000
index 0000000000..bcec597e51
--- /dev/null
+++ b/tools/deployment/baremetal/035-ceph-ns-activate.sh
@@ -0,0 +1 @@
+../developer/ceph/045-ceph-ns-activate.sh
\ No newline at end of file