diff --git a/assets/databases/heimdall/tables/cluster_tags.sql b/assets/databases/heimdall/tables/cluster_tags.sql
index 4e0ca9c..3ce821c 100644
--- a/assets/databases/heimdall/tables/cluster_tags.sql
+++ b/assets/databases/heimdall/tables/cluster_tags.sql
@@ -1,7 +1,9 @@
 create table if not exists cluster_tags
 (
     system_cluster_id int not null,
-    cluster_tag varchar(64) not null,
+    cluster_tag varchar(128) not null,
     constraint _cluster_tags_pk primary key (system_cluster_id, cluster_tag),
     constraint _cluster_tags_cluster_tag unique (cluster_tag, system_cluster_id)
 );
+
+alter table cluster_tags alter column cluster_tag type varchar(128);
diff --git a/assets/databases/heimdall/tables/command_cluster_tags.sql b/assets/databases/heimdall/tables/command_cluster_tags.sql
index 06c0b23..58a3f60 100644
--- a/assets/databases/heimdall/tables/command_cluster_tags.sql
+++ b/assets/databases/heimdall/tables/command_cluster_tags.sql
@@ -1,6 +1,8 @@
 create table if not exists command_cluster_tags
 (
     system_command_id int not null,
-    command_cluster_tag varchar(64) not null,
+    command_cluster_tag varchar(128) not null,
     constraint _command_cluster_tags_pk primary key (system_command_id, command_cluster_tag)
 );
+
+alter table command_cluster_tags alter column command_cluster_tag type varchar(128);
diff --git a/assets/databases/heimdall/tables/command_tags.sql b/assets/databases/heimdall/tables/command_tags.sql
index 98ad93a..857217e 100644
--- a/assets/databases/heimdall/tables/command_tags.sql
+++ b/assets/databases/heimdall/tables/command_tags.sql
@@ -1,7 +1,9 @@
 create table if not exists command_tags
 (
     system_command_id int not null,
-    command_tag varchar(64) not null,
+    command_tag varchar(128) not null,
     constraint _command_tags_pk primary key (system_command_id, command_tag),
     constraint _commands_tags_command_tag unique (command_tag, system_command_id)
 );
+
+alter table command_tags alter column command_tag type varchar(128);
diff --git a/assets/databases/heimdall/tables/job_cluster_tags.sql b/assets/databases/heimdall/tables/job_cluster_tags.sql
index c525667..4bed45e 100644
--- a/assets/databases/heimdall/tables/job_cluster_tags.sql
+++ b/assets/databases/heimdall/tables/job_cluster_tags.sql
@@ -1,7 +1,9 @@
 create table if not exists job_cluster_tags
 (
     system_job_id bigint not null,
-    cluster_tag varchar(64) not null,
+    cluster_tag varchar(128) not null,
     constraint _job_cluster_tags_pk primary key (system_job_id, cluster_tag),
     constraint _job_cluster_tags_cluster_tag unique (cluster_tag, system_job_id)
 );
+
+alter table job_cluster_tags alter column cluster_tag type varchar(128);
diff --git a/assets/databases/heimdall/tables/job_command_tags.sql b/assets/databases/heimdall/tables/job_command_tags.sql
index f4e81b6..dd08ec8 100644
--- a/assets/databases/heimdall/tables/job_command_tags.sql
+++ b/assets/databases/heimdall/tables/job_command_tags.sql
@@ -1,7 +1,9 @@
 create table if not exists job_command_tags
 (
     system_job_id bigint not null,
-    command_tag varchar(64) not null,
+    command_tag varchar(128) not null,
     constraint _job_command_tags_pk primary key (system_job_id, command_tag),
     constraint _job_command_tags_command_tag unique (command_tag, system_job_id)
 );
+
+alter table job_command_tags alter column command_tag type varchar(128);
diff --git a/assets/databases/heimdall/tables/job_tags.sql b/assets/databases/heimdall/tables/job_tags.sql
index 9d44b3e..87d62f1 100644
--- a/assets/databases/heimdall/tables/job_tags.sql
+++ b/assets/databases/heimdall/tables/job_tags.sql
@@ -1,7 +1,9 @@
 create table if not exists job_tags
 (
     system_job_id bigint not null,
-    job_tag varchar(64) not null,
+    job_tag varchar(128) not null,
     constraint _job_tags_pk primary key (system_job_id, job_tag),
     constraint _job_tags_job_tag unique (job_tag, system_job_id)
 );
+
+alter table job_tags alter column job_tag type varchar(128);