diff --git a/gbpservice/neutron/db/migration/alembic_migrations/versions/HEAD b/gbpservice/neutron/db/migration/alembic_migrations/versions/HEAD
index b84a5874c..90f645c45 100644
--- a/gbpservice/neutron/db/migration/alembic_migrations/versions/HEAD
+++ b/gbpservice/neutron/db/migration/alembic_migrations/versions/HEAD
@@ -1 +1 @@
-da6a25bbcfa8
+cb5b16acbeb0
diff --git a/gbpservice/neutron/db/migration/alembic_migrations/versions/cb5b16acbeb0_alter_project_id_length.py b/gbpservice/neutron/db/migration/alembic_migrations/versions/cb5b16acbeb0_alter_project_id_length.py
new file mode 100644
index 000000000..0722de8dd
--- /dev/null
+++ b/gbpservice/neutron/db/migration/alembic_migrations/versions/cb5b16acbeb0_alter_project_id_length.py
@@ -0,0 +1,38 @@
+#    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.
+#
+
+"""alter project_id column length in gp_apic_tenant_specific_nat_epg
+
+Revision ID: cb5b16acbeb0
+Revises: da6a25bbcfa8
+Create Date: 2017-06-10 00:00:00.000000
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = 'cb5b16acbeb0'
+down_revision = 'da6a25bbcfa8'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    op.alter_column('gp_apic_tenant_specific_nat_epg',
+                    'project_id',
+                    existing_type=sa.String(36),
+                    type_=sa.String(255), nullable=False)
+
+
+def downgrade():
+    pass
diff --git a/gbpservice/neutron/services/grouppolicy/drivers/cisco/apic/apic_mapping.py b/gbpservice/neutron/services/grouppolicy/drivers/cisco/apic/apic_mapping.py
index 18ed7d0f4..da5b33162 100644
--- a/gbpservice/neutron/services/grouppolicy/drivers/cisco/apic/apic_mapping.py
+++ b/gbpservice/neutron/services/grouppolicy/drivers/cisco/apic/apic_mapping.py
@@ -217,14 +217,13 @@ class L3PolicyMustBeSame(gpexc.GroupPolicyBadRequest):
                 "L2 policy when BridgeDomain is being reused.")
 
 
-class TenantSpecificNatEpg(model_base.BASEV2):
+class TenantSpecificNatEpg(model_base.BASEV2, model_base.HasProjectPrimaryKey):
     """Tenants that use a specific NAT EPG for an external segment."""
     __tablename__ = 'gp_apic_tenant_specific_nat_epg'
     external_segment_id = sa.Column(
         sa.String(36), sa.ForeignKey('gp_external_segments.id',
                                      ondelete='CASCADE'),
         primary_key=True)
-    tenant_id = sa.Column(sa.String(36), primary_key=True)
 
 
 SHADOW_PREFIX = 'Shd-'