diff --git a/heat/db/sqlalchemy/migrate_repo/versions/033_software_config.py b/heat/db/sqlalchemy/migrate_repo/versions/033_software_config.py
index 593a62b03a..2e733799ec 100644
--- a/heat/db/sqlalchemy/migrate_repo/versions/033_software_config.py
+++ b/heat/db/sqlalchemy/migrate_repo/versions/033_software_config.py
@@ -33,7 +33,7 @@ def upgrade(migrate_engine):
         sqlalchemy.Column('group', sqlalchemy.String(255)),
         sqlalchemy.Column('config', LongText),
         sqlalchemy.Column('io', Json),
-        sqlalchemy.Column('tenant', sqlalchemy.String(256),
+        sqlalchemy.Column('tenant', sqlalchemy.String(64),
                           nullable=False,
                           index=True),
         mysql_engine='InnoDB',
@@ -62,7 +62,7 @@ def upgrade(migrate_engine):
         sqlalchemy.Column('action', sqlalchemy.String(255)),
         sqlalchemy.Column('status', sqlalchemy.String(255)),
         sqlalchemy.Column('status_reason', sqlalchemy.String(255)),
-        sqlalchemy.Column('tenant', sqlalchemy.String(256),
+        sqlalchemy.Column('tenant', sqlalchemy.String(64),
                           nullable=False,
                           index=True),
         mysql_engine='InnoDB',
diff --git a/heat/db/sqlalchemy/models.py b/heat/db/sqlalchemy/models.py
index c5c3ef7122..70e94a47a4 100644
--- a/heat/db/sqlalchemy/models.py
+++ b/heat/db/sqlalchemy/models.py
@@ -296,7 +296,7 @@ class SoftwareConfig(BASE, HeatBase):
     group = sqlalchemy.Column('group', sqlalchemy.String(255))
     config = sqlalchemy.Column('config', Json)
     tenant = sqlalchemy.Column(
-        'tenant', sqlalchemy.String(256), nullable=False)
+        'tenant', sqlalchemy.String(64), nullable=False)
 
 
 class SoftwareDeployment(BASE, HeatBase, StateAware):
@@ -320,7 +320,7 @@ class SoftwareDeployment(BASE, HeatBase, StateAware):
     input_values = sqlalchemy.Column('input_values', Json)
     output_values = sqlalchemy.Column('output_values', Json)
     tenant = sqlalchemy.Column(
-        'tenant', sqlalchemy.String(256), nullable=False)
+        'tenant', sqlalchemy.String(64), nullable=False)
     stack_user_project_id = sqlalchemy.Column(sqlalchemy.String(64),
                                               nullable=True)