diff --git a/build.gradle b/build.gradle
index 0964b23..556de2c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -81,6 +81,12 @@
                     'name':     'swarm',
                     'digest':   'sha256:6ca9b40980e2fcdcd229900ec8933f3e92c14ead22c9404cb09736cb4f3a9248'
             ],
+            'onos':  [
+                    'type':     'image',
+                    'upstream': upstreamReg,
+                    'name':     'onosproject/onos',
+                    'digest':   'sha256:0f65940cfc7759c0bf63c4e60d30c4ad31a2565fadfbb9d9160a27ef87edd8e2'
+            ],
     ]
 
     // Deployment target config file (yaml format); this can be overwritten from the command line
diff --git a/components/cord-onos-publisher b/components/cord-onos-publisher
index 4d55607..a5e7cf6 160000
--- a/components/cord-onos-publisher
+++ b/components/cord-onos-publisher
@@ -1 +1 @@
-Subproject commit 4d5560799016882d8cfe57861d875819f984b689
+Subproject commit a5e7cf62576938b2bda24ae8dedc66ca2c03b3b2
diff --git a/components/maas b/components/maas
index 8d62307..bc29100 160000
--- a/components/maas
+++ b/components/maas
@@ -1 +1 @@
-Subproject commit 8d62307bed1f9079f3f0e5f5067be41f8196f0d7
+Subproject commit bc2910096ca58c482d92d6d3e0f444d90e496597
diff --git a/settings.gradle b/settings.gradle
index d5f0856..b21e954 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,2 @@
 include 'components/maas'
-include 'components/cord-tester'
 include 'components/cord-onos-publisher'