diff --git a/configuration/etl/etl.d/xdmod-migration-9_0_0-9_5_0.json b/configuration/etl/etl.d/xdmod-migration-9_0_0-9_5_0.json
index 645b02379c..f02b14d531 100644
--- a/configuration/etl/etl.d/xdmod-migration-9_0_0-9_5_0.json
+++ b/configuration/etl/etl.d/xdmod-migration-9_0_0-9_5_0.json
@@ -45,6 +45,23 @@
                     "schema": "moddb"
                 }
             }
+        },
+        {
+            "name": "update-modw-tables",
+            "description": "Update modw tables",
+            "class": "ManageTables",
+            "definition_file_list": [
+                "jobs/xdw/job-records.json",
+                "jobs/xdw/queue.json"
+            ],
+            "endpoints": {
+                "destination": {
+                    "type": "mysql",
+                    "name": "Data Warehouse Database",
+                    "config": "datawarehouse",
+                    "schema": "modw"
+                }
+            }
         }
     ]
 }
diff --git a/configuration/etl/etl_tables.d/jobs/xdw/job-records.json b/configuration/etl/etl_tables.d/jobs/xdw/job-records.json
index adf770da13..719cb2d459 100644
--- a/configuration/etl/etl_tables.d/jobs/xdw/job-records.json
+++ b/configuration/etl/etl_tables.d/jobs/xdw/job-records.json
@@ -125,7 +125,7 @@
             },
             {
                 "name": "queue",
-                "type": "varchar(32)",
+                "type": "varchar(255)",
                 "comment": "Resource queue where the job ran",
                 "nullable": true
             },
diff --git a/configuration/etl/etl_tables.d/jobs/xdw/jobfact_by_.json b/configuration/etl/etl_tables.d/jobs/xdw/jobfact_by_.json
index d3429cf429..2582303b7c 100644
--- a/configuration/etl/etl_tables.d/jobs/xdw/jobfact_by_.json
+++ b/configuration/etl/etl_tables.d/jobs/xdw/jobfact_by_.json
@@ -72,7 +72,7 @@
             },
             {
                 "name": "queue",
-                "type": "char(50)",
+                "type": "char(255)",
                 "nullable": false,
                 "comment": "DIMENSION: The queue of the resource on which the jobs ran."
             },
diff --git a/configuration/etl/etl_tables.d/jobs/xdw/jobfact_by_day.json b/configuration/etl/etl_tables.d/jobs/xdw/jobfact_by_day.json
index 578f53d28a..78148823ba 100644
--- a/configuration/etl/etl_tables.d/jobs/xdw/jobfact_by_day.json
+++ b/configuration/etl/etl_tables.d/jobs/xdw/jobfact_by_day.json
@@ -78,7 +78,7 @@
             },
             {
                 "name": "queue",
-                "type": "char(50)",
+                "type": "char(255)",
                 "nullable": false,
                 "comment": "DIMENSION: The queue of the resource on which the jobs ran."
             },
diff --git a/configuration/etl/etl_tables.d/jobs/xdw/queue.json b/configuration/etl/etl_tables.d/jobs/xdw/queue.json
index 92572d54de..854d1055b2 100644
--- a/configuration/etl/etl_tables.d/jobs/xdw/queue.json
+++ b/configuration/etl/etl_tables.d/jobs/xdw/queue.json
@@ -6,7 +6,7 @@
         "columns": [
             {
                 "name": "id",
-                "type": "char(50)",
+                "type": "char(255)",
                 "nullable": false,
                 "default": "",
                 "comment": "The name of the queue."
@@ -19,7 +19,7 @@
             },
             {
                 "name": "queue_origin_id",
-                "type": "char(50)",
+                "type": "char(255)",
                 "nullable": true
             }
         ],