diff --git a/xos/core/xoslib/methods/ceilometerview.py b/xos/core/xoslib/methods/ceilometerview._unused
similarity index 100%
rename from xos/core/xoslib/methods/ceilometerview.py
rename to xos/core/xoslib/methods/ceilometerview._unused
diff --git a/xos/core/xoslib/methods/monitoringchannel.py b/xos/core/xoslib/methods/monitoringchannel._unused
similarity index 100%
rename from xos/core/xoslib/methods/monitoringchannel.py
rename to xos/core/xoslib/methods/monitoringchannel._unused
diff --git a/xos/services/ceilometer/admin.py b/xos/onboard/ceilometer/admin.py
similarity index 100%
rename from xos/services/ceilometer/admin.py
rename to xos/onboard/ceilometer/admin.py
diff --git a/xos/api/tenant/ceilometer/monitoringchannel.py b/xos/onboard/ceilometer/api/tenant/ceilometer/monitoringchannel.py
similarity index 100%
rename from xos/api/tenant/ceilometer/monitoringchannel.py
rename to xos/onboard/ceilometer/api/tenant/ceilometer/monitoringchannel.py
diff --git a/xos/onboard/ceilometer/ceilometer-onboard.yaml b/xos/onboard/ceilometer/ceilometer-onboard.yaml
new file mode 100644
index 0000000..82c955f
--- /dev/null
+++ b/xos/onboard/ceilometer/ceilometer-onboard.yaml
@@ -0,0 +1,25 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+description: Onboard the exampleservice
+
+imports:
+   - custom_types/xos.yaml
+
+topology_template:
+  node_templates:
+    servicecontroller#ceilometer:
+      type: tosca.nodes.ServiceController
+      properties:
+          base_url: file:///opt/xos/onboard/ceilometer/
+          # The following will concatenate with base_url automatically, if
+          # base_url is non-null.
+          models: models.py
+          admin: admin.py
+          admin_template: templates/ceilometeradmin.html, templates/sflowadmin.html
+          synchronizer: synchronizer/manifest
+          synchronizer_run: monitoring_channel_synchronizer.py
+          tosca_resource: tosca/resources/ceilometerservice.py, tosca/resources/ceilometertenant.py, tosca/resources/sflowservice.py
+          rest_tenant: subdirectory:ceilometer api/tenant/ceilometer/monitoringchannel.py
+          private_key: file:///opt/xos/key_import/monitoring_channel_rsa
+          public_key: file:///opt/xos/key_import/monitoring_channel_rsa.pub
+
diff --git a/xos/services/ceilometer/models.py b/xos/onboard/ceilometer/models.py
similarity index 100%
rename from xos/services/ceilometer/models.py
rename to xos/onboard/ceilometer/models.py
diff --git a/xos/synchronizers/monitoring_channel/files/docker.list b/xos/onboard/ceilometer/synchronizer/files/docker.list
similarity index 100%
rename from xos/synchronizers/monitoring_channel/files/docker.list
rename to xos/onboard/ceilometer/synchronizer/files/docker.list
diff --git a/xos/synchronizers/monitoring_channel/files/vm-resolv.conf b/xos/onboard/ceilometer/synchronizer/files/vm-resolv.conf
similarity index 100%
rename from xos/synchronizers/monitoring_channel/files/vm-resolv.conf
rename to xos/onboard/ceilometer/synchronizer/files/vm-resolv.conf
diff --git a/xos/onboard/ceilometer/synchronizer/manifest b/xos/onboard/ceilometer/synchronizer/manifest
new file mode 100644
index 0000000..c679225
--- /dev/null
+++ b/xos/onboard/ceilometer/synchronizer/manifest
@@ -0,0 +1,26 @@
+templates/Dockerfile.monitoring_channel
+templates/ceilometer_proxy_config.j2
+templates/Dockerfile.sflowpubsub
+templates/sflow_pub_sub/sample_sflow_pub_sub.conf_sample
+templates/sflow_pub_sub/README
+templates/sflow_pub_sub/sflow_sub_records.py
+templates/sflow_pub_sub/start_sflow_pub_sub
+templates/sflow_pub_sub/sflow_pub_sub_main.py
+templates/sflow_pub_sub/sflow_pub_sub_config.j2
+templates/start-monitoring-channel.sh.j2
+templates/monitoring-channel.conf.j2
+templates/ceilometer_proxy_server.py
+templates/start_ceilometer_proxy
+manifest
+monitoring_channel_synchronizer_config
+steps/sync_sflowtenant.yaml
+steps/sync_sflowtenant.py
+steps/sync_monitoringchannel.yaml
+steps/sync_monitoringchannel.py
+steps/sync_sflowservice.yaml
+steps/sync_sflowservice.py
+files/vm-resolv.conf
+files/docker.list
+model-deps
+supervisor/monitoring_channel_observer.conf
+monitoring_channel_synchronizer.py
diff --git a/xos/synchronizers/monitoring_channel/model-deps b/xos/onboard/ceilometer/synchronizer/model-deps
similarity index 100%
rename from xos/synchronizers/monitoring_channel/model-deps
rename to xos/onboard/ceilometer/synchronizer/model-deps
diff --git a/xos/synchronizers/monitoring_channel/monitoring_channel_synchronizer.py b/xos/onboard/ceilometer/synchronizer/monitoring_channel_synchronizer.py
similarity index 100%
rename from xos/synchronizers/monitoring_channel/monitoring_channel_synchronizer.py
rename to xos/onboard/ceilometer/synchronizer/monitoring_channel_synchronizer.py
diff --git a/xos/synchronizers/monitoring_channel/monitoring_channel_synchronizer_config b/xos/onboard/ceilometer/synchronizer/monitoring_channel_synchronizer_config
similarity index 100%
rename from xos/synchronizers/monitoring_channel/monitoring_channel_synchronizer_config
rename to xos/onboard/ceilometer/synchronizer/monitoring_channel_synchronizer_config
diff --git a/xos/synchronizers/monitoring_channel/steps/sync_monitoringchannel.py b/xos/onboard/ceilometer/synchronizer/steps/sync_monitoringchannel.py
similarity index 100%
rename from xos/synchronizers/monitoring_channel/steps/sync_monitoringchannel.py
rename to xos/onboard/ceilometer/synchronizer/steps/sync_monitoringchannel.py
diff --git a/xos/synchronizers/monitoring_channel/steps/sync_monitoringchannel.yaml b/xos/onboard/ceilometer/synchronizer/steps/sync_monitoringchannel.yaml
similarity index 100%
rename from xos/synchronizers/monitoring_channel/steps/sync_monitoringchannel.yaml
rename to xos/onboard/ceilometer/synchronizer/steps/sync_monitoringchannel.yaml
diff --git a/xos/synchronizers/monitoring_channel/steps/sync_sflowservice.py b/xos/onboard/ceilometer/synchronizer/steps/sync_sflowservice.py
similarity index 100%
rename from xos/synchronizers/monitoring_channel/steps/sync_sflowservice.py
rename to xos/onboard/ceilometer/synchronizer/steps/sync_sflowservice.py
diff --git a/xos/synchronizers/monitoring_channel/steps/sync_sflowservice.yaml b/xos/onboard/ceilometer/synchronizer/steps/sync_sflowservice.yaml
similarity index 100%
rename from xos/synchronizers/monitoring_channel/steps/sync_sflowservice.yaml
rename to xos/onboard/ceilometer/synchronizer/steps/sync_sflowservice.yaml
diff --git a/xos/synchronizers/monitoring_channel/steps/sync_sflowtenant.py b/xos/onboard/ceilometer/synchronizer/steps/sync_sflowtenant.py
similarity index 100%
rename from xos/synchronizers/monitoring_channel/steps/sync_sflowtenant.py
rename to xos/onboard/ceilometer/synchronizer/steps/sync_sflowtenant.py
diff --git a/xos/synchronizers/monitoring_channel/steps/sync_sflowtenant.yaml b/xos/onboard/ceilometer/synchronizer/steps/sync_sflowtenant.yaml
similarity index 100%
rename from xos/synchronizers/monitoring_channel/steps/sync_sflowtenant.yaml
rename to xos/onboard/ceilometer/synchronizer/steps/sync_sflowtenant.yaml
diff --git a/xos/synchronizers/monitoring_channel/supervisor/monitoring_channel_observer.conf b/xos/onboard/ceilometer/synchronizer/supervisor/monitoring_channel_observer.conf
similarity index 100%
rename from xos/synchronizers/monitoring_channel/supervisor/monitoring_channel_observer.conf
rename to xos/onboard/ceilometer/synchronizer/supervisor/monitoring_channel_observer.conf
diff --git a/xos/synchronizers/monitoring_channel/templates/Dockerfile.monitoring_channel b/xos/onboard/ceilometer/synchronizer/templates/Dockerfile.monitoring_channel
similarity index 100%
rename from xos/synchronizers/monitoring_channel/templates/Dockerfile.monitoring_channel
rename to xos/onboard/ceilometer/synchronizer/templates/Dockerfile.monitoring_channel
diff --git a/xos/synchronizers/monitoring_channel/templates/Dockerfile.sflowpubsub b/xos/onboard/ceilometer/synchronizer/templates/Dockerfile.sflowpubsub
similarity index 100%
rename from xos/synchronizers/monitoring_channel/templates/Dockerfile.sflowpubsub
rename to xos/onboard/ceilometer/synchronizer/templates/Dockerfile.sflowpubsub
diff --git a/xos/synchronizers/monitoring_channel/templates/ceilometer_proxy_config.j2 b/xos/onboard/ceilometer/synchronizer/templates/ceilometer_proxy_config.j2
similarity index 100%
rename from xos/synchronizers/monitoring_channel/templates/ceilometer_proxy_config.j2
rename to xos/onboard/ceilometer/synchronizer/templates/ceilometer_proxy_config.j2
diff --git a/xos/synchronizers/monitoring_channel/templates/ceilometer_proxy_server.py b/xos/onboard/ceilometer/synchronizer/templates/ceilometer_proxy_server.py
similarity index 100%
rename from xos/synchronizers/monitoring_channel/templates/ceilometer_proxy_server.py
rename to xos/onboard/ceilometer/synchronizer/templates/ceilometer_proxy_server.py
diff --git a/xos/synchronizers/monitoring_channel/templates/monitoring-channel.conf.j2 b/xos/onboard/ceilometer/synchronizer/templates/monitoring-channel.conf.j2
similarity index 100%
rename from xos/synchronizers/monitoring_channel/templates/monitoring-channel.conf.j2
rename to xos/onboard/ceilometer/synchronizer/templates/monitoring-channel.conf.j2
diff --git a/xos/synchronizers/monitoring_channel/templates/sflow_pub_sub/README b/xos/onboard/ceilometer/synchronizer/templates/sflow_pub_sub/README
similarity index 100%
rename from xos/synchronizers/monitoring_channel/templates/sflow_pub_sub/README
rename to xos/onboard/ceilometer/synchronizer/templates/sflow_pub_sub/README
diff --git a/xos/synchronizers/monitoring_channel/templates/sflow_pub_sub/sample_sflow_pub_sub.conf_sample b/xos/onboard/ceilometer/synchronizer/templates/sflow_pub_sub/sample_sflow_pub_sub.conf_sample
similarity index 100%
rename from xos/synchronizers/monitoring_channel/templates/sflow_pub_sub/sample_sflow_pub_sub.conf_sample
rename to xos/onboard/ceilometer/synchronizer/templates/sflow_pub_sub/sample_sflow_pub_sub.conf_sample
diff --git a/xos/synchronizers/monitoring_channel/templates/sflow_pub_sub/sflow_pub_sub_config.j2 b/xos/onboard/ceilometer/synchronizer/templates/sflow_pub_sub/sflow_pub_sub_config.j2
similarity index 100%
rename from xos/synchronizers/monitoring_channel/templates/sflow_pub_sub/sflow_pub_sub_config.j2
rename to xos/onboard/ceilometer/synchronizer/templates/sflow_pub_sub/sflow_pub_sub_config.j2
diff --git a/xos/synchronizers/monitoring_channel/templates/sflow_pub_sub/sflow_pub_sub_main.py b/xos/onboard/ceilometer/synchronizer/templates/sflow_pub_sub/sflow_pub_sub_main.py
similarity index 100%
rename from xos/synchronizers/monitoring_channel/templates/sflow_pub_sub/sflow_pub_sub_main.py
rename to xos/onboard/ceilometer/synchronizer/templates/sflow_pub_sub/sflow_pub_sub_main.py
diff --git a/xos/synchronizers/monitoring_channel/templates/sflow_pub_sub/sflow_sub_records.py b/xos/onboard/ceilometer/synchronizer/templates/sflow_pub_sub/sflow_sub_records.py
similarity index 100%
rename from xos/synchronizers/monitoring_channel/templates/sflow_pub_sub/sflow_sub_records.py
rename to xos/onboard/ceilometer/synchronizer/templates/sflow_pub_sub/sflow_sub_records.py
diff --git a/xos/synchronizers/monitoring_channel/templates/sflow_pub_sub/start_sflow_pub_sub b/xos/onboard/ceilometer/synchronizer/templates/sflow_pub_sub/start_sflow_pub_sub
similarity index 100%
rename from xos/synchronizers/monitoring_channel/templates/sflow_pub_sub/start_sflow_pub_sub
rename to xos/onboard/ceilometer/synchronizer/templates/sflow_pub_sub/start_sflow_pub_sub
diff --git a/xos/synchronizers/monitoring_channel/templates/start-monitoring-channel.sh.j2 b/xos/onboard/ceilometer/synchronizer/templates/start-monitoring-channel.sh.j2
similarity index 100%
rename from xos/synchronizers/monitoring_channel/templates/start-monitoring-channel.sh.j2
rename to xos/onboard/ceilometer/synchronizer/templates/start-monitoring-channel.sh.j2
diff --git a/xos/synchronizers/monitoring_channel/templates/start_ceilometer_proxy b/xos/onboard/ceilometer/synchronizer/templates/start_ceilometer_proxy
similarity index 100%
rename from xos/synchronizers/monitoring_channel/templates/start_ceilometer_proxy
rename to xos/onboard/ceilometer/synchronizer/templates/start_ceilometer_proxy
diff --git a/xos/services/ceilometer/templates/ceilometeradmin.html b/xos/onboard/ceilometer/templates/ceilometeradmin.html
similarity index 100%
rename from xos/services/ceilometer/templates/ceilometeradmin.html
rename to xos/onboard/ceilometer/templates/ceilometeradmin.html
diff --git a/xos/services/ceilometer/templates/sflowadmin.html b/xos/onboard/ceilometer/templates/sflowadmin.html
similarity index 100%
rename from xos/services/ceilometer/templates/sflowadmin.html
rename to xos/onboard/ceilometer/templates/sflowadmin.html
diff --git a/xos/tosca/resources/ceilometerservice.py b/xos/onboard/ceilometer/tosca/resources/ceilometerservice.py
similarity index 100%
rename from xos/tosca/resources/ceilometerservice.py
rename to xos/onboard/ceilometer/tosca/resources/ceilometerservice.py
diff --git a/xos/tosca/resources/ceilometertenant.py b/xos/onboard/ceilometer/tosca/resources/ceilometertenant.py
similarity index 100%
rename from xos/tosca/resources/ceilometertenant.py
rename to xos/onboard/ceilometer/tosca/resources/ceilometertenant.py
diff --git a/xos/tosca/resources/sflowservice.py b/xos/onboard/ceilometer/tosca/resources/sflowservice.py
similarity index 100%
rename from xos/tosca/resources/sflowservice.py
rename to xos/onboard/ceilometer/tosca/resources/sflowservice.py
diff --git a/xos/tools/xos-manage b/xos/tools/xos-manage
index 1a3961f..2ed85f3 100755
--- a/xos/tools/xos-manage
+++ b/xos/tools/xos-manage
@@ -143,7 +143,7 @@
     python ./manage.py makemigrations requestrouter
     python ./manage.py makemigrations syndicate_storage
     python ./manage.py makemigrations mcord
-    python ./manage.py makemigrations ceilometer
+#    python ./manage.py makemigrations ceilometer
 #    python ./manage.py makemigrations onos
     python ./manage.py makemigrations openvpn
 #    python ./manage.py makemigrations vtr
diff --git a/xos/xos/settings.py b/xos/xos/settings.py
index c292432..796aac2 100644
--- a/xos/xos/settings.py
+++ b/xos/xos/settings.py
@@ -184,7 +184,7 @@
     'services.hpc',
     'services.mcord',
 #    'services.onos',
-    'services.ceilometer',
+#    'services.ceilometer',
     'services.requestrouter',
     'services.syndicate_storage',
     'services.openvpn',