diff --git a/data/migrations/versions/7a525c68eb13_add_oci_app_models.py b/data/migrations/versions/7a525c68eb13_add_oci_app_models.py
index 1188a312d..8abe4648c 100644
--- a/data/migrations/versions/7a525c68eb13_add_oci_app_models.py
+++ b/data/migrations/versions/7a525c68eb13_add_oci_app_models.py
@@ -20,7 +20,7 @@ def upgrade(tables):
   op.create_table(
     'tagkind',
     sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('name', UTF8CharField(length=255), nullable=False),
+    sa.Column('name', sa.String(length=255), nullable=False),
     sa.PrimaryKeyConstraint('id', name=op.f('pk_tagkind'))
   )
   op.create_index('tagkind_name', 'tagkind', ['name'], unique=True)
@@ -28,7 +28,7 @@ def upgrade(tables):
   op.create_table(
     'blobplacementlocation',
     sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('name', UTF8CharField(length=255), nullable=False),
+    sa.Column('name', sa.String(length=255), nullable=False),
     sa.PrimaryKeyConstraint('id', name=op.f('pk_blobplacementlocation'))
   )
   op.create_index('blobplacementlocation_name', 'blobplacementlocation', ['name'], unique=True)
@@ -36,7 +36,7 @@ def upgrade(tables):
   op.create_table(
     'blob',
     sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('digest', UTF8CharField(length=255), nullable=False),
+    sa.Column('digest', sa.String(length=255), nullable=False),
     sa.Column('media_type_id', sa.Integer(), nullable=False),
     sa.Column('size', sa.BigInteger(), nullable=False),
     sa.Column('uncompressed_size', sa.BigInteger(), nullable=True),
@@ -61,7 +61,7 @@ def upgrade(tables):
   op.create_table(
     'manifest',
     sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('digest', UTF8CharField(length=255), nullable=False),
+    sa.Column('digest', sa.String(length=255), nullable=False),
     sa.Column('media_type_id', sa.Integer(), nullable=False),
     sa.Column('manifest_json', UTF8LongText, nullable=False),
     sa.ForeignKeyConstraint(['media_type_id'], ['mediatype.id'], name=op.f('fk_manifest_media_type_id_mediatype')),
@@ -73,7 +73,7 @@ def upgrade(tables):
   op.create_table(
     'manifestlist',
     sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('digest', UTF8CharField(length=255), nullable=False),
+    sa.Column('digest', sa.String(length=255), nullable=False),
     sa.Column('manifest_list_json', UTF8LongText, nullable=False),
     sa.Column('schema_version', UTF8CharField(length=255), nullable=False),
     sa.Column('media_type_id', sa.Integer(), nullable=False),
@@ -111,7 +111,7 @@ def upgrade(tables):
   op.create_table(
     'blobuploading',
     sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('uuid', UTF8CharField(length=255), nullable=False),
+    sa.Column('uuid', sa.String(length=255), nullable=False),
     sa.Column('created', sa.DateTime(), nullable=False),
     sa.Column('repository_id', sa.Integer(), nullable=False),
     sa.Column('location_id', sa.Integer(), nullable=False),
@@ -135,12 +135,12 @@ def upgrade(tables):
   op.create_table(
     'derivedimage',
     sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('uuid', UTF8CharField(length=255), nullable=False),
+    sa.Column('uuid', sa.String(length=255), nullable=False),
     sa.Column('source_manifest_id', sa.Integer(), nullable=False),
     sa.Column('derived_manifest_json', UTF8LongText, nullable=False),
     sa.Column('media_type_id', sa.Integer(), nullable=False),
     sa.Column('blob_id', sa.Integer(), nullable=False),
-    sa.Column('uniqueness_hash', UTF8CharField(length=255), nullable=False),
+    sa.Column('uniqueness_hash', sa.String(length=255), nullable=False),
     sa.Column('signature_blob_id', sa.Integer(), nullable=True),
     sa.ForeignKeyConstraint(['blob_id'], ['blob.id'], name=op.f('fk_derivedimage_blob_id_blob')),
     sa.ForeignKeyConstraint(['media_type_id'], ['mediatype.id'], name=op.f('fk_derivedimage_media_type_id_mediatype')),
@@ -225,7 +225,7 @@ def upgrade(tables):
   op.create_table(
     'tag',
     sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('name', UTF8CharField(length=255), nullable=False),
+    sa.Column('name', UTF8CharField(length=190), nullable=False),
     sa.Column('repository_id', sa.Integer(), nullable=False),
     sa.Column('manifest_list_id', sa.Integer(), nullable=True),
     sa.Column('lifetime_start', sa.BigInteger(), nullable=False),