diff --git a/Dockerfile.synchronizer b/Dockerfile.synchronizer
index f0f9042..2584e96 100644
--- a/Dockerfile.synchronizer
+++ b/Dockerfile.synchronizer
@@ -16,7 +16,7 @@
 
 # xosproject/fabric-crossconnect-synchronizer
 
-FROM xosproject/xos-synchronizer-base:2.2.5
+FROM xosproject/xos-synchronizer-base:2.2.18
 COPY xos/synchronizer /opt/xos/synchronizers/fabric-crossconnect
 COPY VERSION /opt/xos/synchronizers/fabric-crossconnect/
 
diff --git a/xos/synchronizer/migrations/0003_auto_20190312_1841.py b/xos/synchronizer/migrations/0003_auto_20190312_1841.py
new file mode 100644
index 0000000..8076246
--- /dev/null
+++ b/xos/synchronizer/migrations/0003_auto_20190312_1841.py
@@ -0,0 +1,51 @@
+# 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:41
+from __future__ import unicode_literals
+
+import core.models.xosbase_header
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fabric-crossconnect', '0002_auto_20190305_0239'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='bngportmapping_decl',
+            name='backend_status',
+            field=models.CharField(default=b'Provisioning in progress', max_length=1024),
+        ),
+        migrations.AlterField(
+            model_name='bngportmapping_decl',
+            name='leaf_model_name',
+            field=models.CharField(help_text=b'The most specialized model in this chain of inheritance, often defined by a service developer', max_length=1024),
+        ),
+        migrations.AlterField(
+            model_name='bngportmapping_decl',
+            name='updated',
+            field=models.DateTimeField(default=django.utils.timezone.now, help_text=b'Time this model was changed by a non-synchronizer'),
+        ),
+        migrations.AlterField(
+            model_name='fabriccrossconnectserviceinstance_decl',
+            name='switch_datapath_id',
+            field=core.models.xosbase_header.StrippedCharField(help_text=b'Datapath id of switch where crossconnect will be installed', max_length=256),
+        ),
+    ]
diff --git a/xos/synchronizer/models/fabric-crossconnect.xproto b/xos/synchronizer/models/fabric-crossconnect.xproto
index 3290495..d908092 100644
--- a/xos/synchronizer/models/fabric-crossconnect.xproto
+++ b/xos/synchronizer/models/fabric-crossconnect.xproto
@@ -25,14 +25,8 @@
 message BNGPortMapping (XOSBase) {
     required string s_tag = 1 [
         help_text = "Single s-tag, range of s-tags, or 'ANY'",
-        blank = False,
-        db_index = False,
-        null = False,
         tosca_key = True,
         unique = True];
     required int32 switch_port = 2 [
-        help_text = "Switch port where BNG or other egress point is connected",
-        blank = False,
-        db_index = False,
-        null = False];
+        help_text = "Switch port where BNG or other egress point is connected"];
 }