diff --git a/bootstrap/sql/migrations/native/1.6.0/mysql/schemaChanges.sql b/bootstrap/sql/migrations/native/1.6.0/mysql/schemaChanges.sql
index 607c80a98fe..da582723697 100644
--- a/bootstrap/sql/migrations/native/1.6.0/mysql/schemaChanges.sql
+++ b/bootstrap/sql/migrations/native/1.6.0/mysql/schemaChanges.sql
@@ -629,7 +629,7 @@ create table ACT_RU_EVENT_SUBSCR (
     EVENT_NAME_ varchar(255),
     EXECUTION_ID_ varchar(64),
     PROC_INST_ID_ varchar(64),
-    ACTIVITY_ID_ varchar(64),
+    ACTIVITY_ID_ varchar(255),
     CONFIGURATION_ varchar(255),
     CREATED_ timestamp(3) not null DEFAULT CURRENT_TIMESTAMP(3),
     PROC_DEF_ID_ varchar(64),
@@ -1403,4 +1403,7 @@ WHERE JSON_UNQUOTE(JSON_EXTRACT(json, '$.serviceType')) = 'Mstr';
 -- Update serviceType in chart_entity table
 UPDATE chart_entity
 SET json = JSON_SET(json, '$.serviceType', 'MicroStrategy')
-WHERE JSON_UNQUOTE(JSON_EXTRACT(json, '$.serviceType')) = 'Mstr';
\ No newline at end of file
+WHERE JSON_UNQUOTE(JSON_EXTRACT(json, '$.serviceType')) = 'Mstr';
+
+-- Increase Flowable ACTIVITY_ID_ column size to support longer user-defined workflow node names
+ALTER TABLE ACT_RU_EVENT_SUBSCR ALTER COLUMN ACTIVITY_ID_ TYPE varchar(255);
\ No newline at end of file
diff --git a/bootstrap/sql/migrations/native/1.6.0/postgres/schemaChanges.sql b/bootstrap/sql/migrations/native/1.6.0/postgres/schemaChanges.sql
index 672a6706d99..aa51a8e3911 100644
--- a/bootstrap/sql/migrations/native/1.6.0/postgres/schemaChanges.sql
+++ b/bootstrap/sql/migrations/native/1.6.0/postgres/schemaChanges.sql
@@ -588,7 +588,7 @@ create table ACT_RU_EVENT_SUBSCR (
     EVENT_NAME_ varchar(255),
     EXECUTION_ID_ varchar(64),
     PROC_INST_ID_ varchar(64),
-    ACTIVITY_ID_ varchar(64),
+    ACTIVITY_ID_ varchar(255),
     CONFIGURATION_ varchar(255),
     CREATED_ timestamp not null,
     PROC_DEF_ID_ varchar(64),
@@ -1374,4 +1374,7 @@ WHERE jsonb_extract_path_text(json, 'serviceType') = 'Mstr';
 -- Update serviceType in chart_entity table
 UPDATE chart_entity
 SET json = jsonb_set(json, '{serviceType}', '"MicroStrategy"')
-WHERE jsonb_extract_path_text(json, 'serviceType') = 'Mstr';
\ No newline at end of file
+WHERE jsonb_extract_path_text(json, 'serviceType') = 'Mstr';
+
+-- Increase Flowable ACTIVITY_ID_ column size to support longer user-defined workflow node names
+ALTER TABLE ACT_RU_EVENT_SUBSCR ALTER COLUMN ACTIVITY_ID_ TYPE varchar(255);
\ No newline at end of file