diff --git a/Dockerfile.synchronizer b/Dockerfile.synchronizer
index c38a7ac..0b24cbf 100644
--- a/Dockerfile.synchronizer
+++ b/Dockerfile.synchronizer
@@ -16,7 +16,7 @@
 
 # xosproject/onos-synchronizer
 
-FROM xosproject/xos-synchronizer-base:2.2.5
+FROM xosproject/xos-synchronizer-base:2.2.18
 COPY xos/synchronizer /opt/xos/synchronizers/onos
 COPY VERSION /opt/xos/synchronizers/onos/
 
diff --git a/xos/synchronizer/migrations/0004_auto_20190312_1829.py b/xos/synchronizer/migrations/0004_auto_20190312_1829.py
new file mode 100644
index 0000000..e0690ba
--- /dev/null
+++ b/xos/synchronizer/migrations/0004_auto_20190312_1829.py
@@ -0,0 +1,50 @@
+# Copyright 2017-present Open Networking Foundation
+#
+# 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.
+
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.11 on 2019-03-12 22:29
+from __future__ import unicode_literals
+
+import core.models.xosbase_header
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('onos', '0003_auto_20190305_0236'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='onosapp_decl',
+            name='app_id',
+            field=core.models.xosbase_header.StrippedCharField(help_text=b'Application identifier', max_length=256),
+        ),
+        migrations.AlterField(
+            model_name='onosservice_decl',
+            name='rest_hostname',
+            field=core.models.xosbase_header.StrippedCharField(help_text=b'Hostname of ONOS Service REST endpoint', max_length=255),
+        ),
+        migrations.AlterField(
+            model_name='onosservice_decl',
+            name='rest_password',
+            field=core.models.xosbase_header.StrippedCharField(default=b'karaf', help_text=b'Password to use when authenticating to ONOS', max_length=255),
+        ),
+        migrations.AlterField(
+            model_name='onosservice_decl',
+            name='rest_username',
+            field=core.models.xosbase_header.StrippedCharField(default=b'karaf', help_text=b'Username to use when authenticating to ONOS', max_length=255),
+        ),
+    ]
diff --git a/xos/synchronizer/models/onos.xproto b/xos/synchronizer/models/onos.xproto
index b9b0a33..8f27d32 100644
--- a/xos/synchronizer/models/onos.xproto
+++ b/xos/synchronizer/models/onos.xproto
@@ -10,22 +10,18 @@
     required string app_id = 1 [
         help_text="Application identifier",
         content_type = "stripped",
-        db_index = False,
         max_length = 256];
     optional string dependencies = 2 [
         help_text="Comma separated list of required application application ids",
         content_type = "stripped",
-        db_index = False,
         max_length = 1024];
     optional string url = 3 [
         help_text="URL at which the application is available, if it needs to be downloaded",
         content_type = "stripped",
-        db_index = False,
         max_length = 1024];
     optional string version = 4 [
         help_text="Application version number",
         content_type = "stripped",
-        db_index = False,
         max_length = 256];
 }
 
@@ -36,21 +32,18 @@
     required string rest_hostname = 1 [
         help_text = "Hostname of ONOS Service REST endpoint",
         content_type = "stripped",
-        db_index = False,
         max_length = 255];
     required int32 rest_port = 2 [
         help_text = "Port numnber of ONOS Service REST endpoint",
-        db_index = False,
         default = 8181];
     required string rest_username = 3 [
         help_text = "Username to use when authenticating to ONOS",
-        content_type = "stripped", db_index = False,
+        content_type = "stripped", 
         default="karaf",
         max_length = 255];
     required string rest_password = 4 [
         help_text = "Password to use when authenticating to ONOS",
         content_type = "stripped",
-        db_index = False,
         default="karaf",
         max_length = 255];
 }