diff --git a/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200827115451_Initial.Designer.cs b/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200827222216_Initial.Designer.cs
similarity index 98%
rename from services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200827115451_Initial.Designer.cs
rename to services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200827222216_Initial.Designer.cs
index 5b47ec5b8..dd77eb1e8 100644
--- a/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200827115451_Initial.Designer.cs
+++ b/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200827222216_Initial.Designer.cs
@@ -10,7 +10,7 @@
 namespace FilterLists.Directory.Infrastructure.Migrations.Migrations
 {
     [DbContext(typeof(QueryDbContext))]
-    [Migration("20200827115451_Initial")]
+    [Migration("20200827222216_Initial")]
     partial class Initial
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -93,7 +93,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer");
 
                     b.Property<string>("Iso6391")
-                        .HasColumnType("text");
+                        .HasColumnType("character varying(2)");
 
                     b.HasKey("FilterListId", "Iso6391");
 
@@ -165,7 +165,9 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
             modelBuilder.Entity("FilterLists.Directory.Infrastructure.Persistence.Queries.Entities.Language", b =>
                 {
                     b.Property<string>("Iso6391")
-                        .HasColumnType("text");
+                        .HasColumnType("character(2)")
+                        .IsFixedLength(true)
+                        .HasMaxLength(2);
 
                     b.Property<string>("Name")
                         .IsRequired()
diff --git a/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200827115451_Initial.cs b/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200827222216_Initial.cs
similarity index 99%
rename from services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200827115451_Initial.cs
rename to services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200827222216_Initial.cs
index 724b0eeae..f578db48a 100644
--- a/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200827115451_Initial.cs
+++ b/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200827222216_Initial.cs
@@ -11,7 +11,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 name: "Languages",
                 columns: table => new
                 {
-                    Iso6391 = table.Column<string>(nullable: false),
+                    Iso6391 = table.Column<string>(fixedLength: true, maxLength: 2, nullable: false),
                     Name = table.Column<string>(nullable: false)
                 },
                 constraints: table =>
diff --git a/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/QueryDbContextModelSnapshot.cs b/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/QueryDbContextModelSnapshot.cs
index 390a06a38..134294415 100644
--- a/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/QueryDbContextModelSnapshot.cs
+++ b/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/QueryDbContextModelSnapshot.cs
@@ -91,7 +91,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer");
 
                     b.Property<string>("Iso6391")
-                        .HasColumnType("text");
+                        .HasColumnType("character varying(2)");
 
                     b.HasKey("FilterListId", "Iso6391");
 
@@ -163,7 +163,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
             modelBuilder.Entity("FilterLists.Directory.Infrastructure.Persistence.Queries.Entities.Language", b =>
                 {
                     b.Property<string>("Iso6391")
-                        .HasColumnType("text");
+                        .HasColumnType("character(2)")
+                        .IsFixedLength(true)
+                        .HasMaxLength(2);
 
                     b.Property<string>("Name")
                         .IsRequired()
diff --git a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Language.cs b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Language.cs
index 028cab568..96302394a 100644
--- a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Language.cs
+++ b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Language.cs
@@ -18,6 +18,9 @@ public virtual void Configure(EntityTypeBuilder<Language> builder)
         {
             _ = builder ?? throw new ArgumentNullException(nameof(builder));
             builder.HasKey(l => l.Iso6391);
+            builder.Property(l => l.Iso6391)
+                .IsFixedLength()
+                .HasMaxLength(2);
             builder.HasDataJsonFile<Language>();
         }
     }