diff --git a/configuration/etl/etl.d/xdmod-migration-9_5_0-10_0_0.json b/configuration/etl/etl.d/xdmod-migration-9_5_0-10_0_0.json
index 909eb973ff..2a01b8f699 100644
--- a/configuration/etl/etl.d/xdmod-migration-9_5_0-10_0_0.json
+++ b/configuration/etl/etl.d/xdmod-migration-9_5_0-10_0_0.json
@@ -77,6 +77,36 @@
                 }
             }
         },
+        {
+            "name": "update-moddb-tables-to-innodb",
+            "description": "Update moddb tables to InnoDB",
+            "class": "ManageTables",
+            "definition_file_list": [
+                "xdb/account-requests.json",
+                "xdb/api-keys.json",
+                "xdb/chart-pool.json",
+                "xdb/colors.json",
+                "xdb/exception-email-addresses.json",
+                "xdb/report-template-charts.json",
+                "xdb/report-templates.json",
+                "xdb/reports.json",
+                "xdb/restx509.json",
+                "xdb/schema-version-history.json",
+                "xdb/session-manager.json",
+                "xdb/user-profiles.json",
+                "xdb/user-types.json",
+                "xdb/version-check.json",
+                "acls/report-template-acls-staging.json"
+            ],
+            "endpoints": {
+                "destination": {
+                    "type": "mysql",
+                    "name": "XDMoD Data Warehouse",
+                    "config": "datawarehouse",
+                    "schema": "moddb"
+                }
+            }
+        },
         {
             "name": "update-modw-tables-to-innodb",
             "description": "Update modw_cloud tables to InnoDB",
diff --git a/configuration/etl/etl_tables.d/acls/report-template-acls-staging.json b/configuration/etl/etl_tables.d/acls/report-template-acls-staging.json
index 729419efb3..f1537c914c 100644
--- a/configuration/etl/etl_tables.d/acls/report-template-acls-staging.json
+++ b/configuration/etl/etl_tables.d/acls/report-template-acls-staging.json
@@ -1,7 +1,7 @@
 {
   "table_definition": {
     "name": "report_template_acls_staging",
-    "engine": "MyISAM",
+    "engine": "InnoDB",
     "columns": [
       {
         "name": "template_id",
diff --git a/configuration/etl/etl_tables.d/xdb/account-requests.json b/configuration/etl/etl_tables.d/xdb/account-requests.json
index c440dd0838..c7c08758c4 100644
--- a/configuration/etl/etl_tables.d/xdb/account-requests.json
+++ b/configuration/etl/etl_tables.d/xdb/account-requests.json
@@ -1,7 +1,7 @@
 {
     "table_definition": {
         "name": "AccountRequests",
-        "engine": "MyISAM",
+        "engine": "InnoDB",
         "columns": [
             {
                 "name": "id",
diff --git a/configuration/etl/etl_tables.d/xdb/api-keys.json b/configuration/etl/etl_tables.d/xdb/api-keys.json
index d8646eaa2e..bfdabf718d 100644
--- a/configuration/etl/etl_tables.d/xdb/api-keys.json
+++ b/configuration/etl/etl_tables.d/xdb/api-keys.json
@@ -1,7 +1,7 @@
 {
     "table_definition": {
         "name": "APIKeys",
-        "engine": "MyISAM",
+        "engine": "InnoDB",
         "columns": [
             {
                 "name": "id",
diff --git a/configuration/etl/etl_tables.d/xdb/chart-pool.json b/configuration/etl/etl_tables.d/xdb/chart-pool.json
index 402f7f3aa4..9910a1b3c1 100644
--- a/configuration/etl/etl_tables.d/xdb/chart-pool.json
+++ b/configuration/etl/etl_tables.d/xdb/chart-pool.json
@@ -1,7 +1,7 @@
 {
     "table_definition": {
         "name": "ChartPool",
-        "engine": "MyISAM",
+        "engine": "InnoDB",
         "columns": [
             {
                 "name": "user_id",
diff --git a/configuration/etl/etl_tables.d/xdb/colors.json b/configuration/etl/etl_tables.d/xdb/colors.json
index a08943b4e7..3d11c0b312 100644
--- a/configuration/etl/etl_tables.d/xdb/colors.json
+++ b/configuration/etl/etl_tables.d/xdb/colors.json
@@ -1,7 +1,7 @@
 {
     "table_definition": {
         "name": "Colors",
-        "engine": "MyISAM",
+        "engine": "InnoDB",
         "columns": [
             {
                 "name": "color",
diff --git a/configuration/etl/etl_tables.d/xdb/exception-email-addresses.json b/configuration/etl/etl_tables.d/xdb/exception-email-addresses.json
index cbfd40ad45..21eac0bc9f 100644
--- a/configuration/etl/etl_tables.d/xdb/exception-email-addresses.json
+++ b/configuration/etl/etl_tables.d/xdb/exception-email-addresses.json
@@ -1,7 +1,7 @@
 {
     "table_definition": {
         "name": "ExceptionEmailAddresses",
-        "engine": "MyISAM",
+        "engine": "InnoDB",
         "columns": [
             {
                 "name": "email_address",
diff --git a/configuration/etl/etl_tables.d/xdb/report-template-charts.json b/configuration/etl/etl_tables.d/xdb/report-template-charts.json
index 8b369d6880..6c11c251fd 100644
--- a/configuration/etl/etl_tables.d/xdb/report-template-charts.json
+++ b/configuration/etl/etl_tables.d/xdb/report-template-charts.json
@@ -1,7 +1,7 @@
 {
     "table_definition": {
         "name": "ReportTemplateCharts",
-        "engine": "MyISAM",
+        "engine": "InnoDB",
         "columns": [
             {
                 "name": "template_id",
diff --git a/configuration/etl/etl_tables.d/xdb/report-templates.json b/configuration/etl/etl_tables.d/xdb/report-templates.json
index 54d5d3aa1b..4be561aaf0 100644
--- a/configuration/etl/etl_tables.d/xdb/report-templates.json
+++ b/configuration/etl/etl_tables.d/xdb/report-templates.json
@@ -1,7 +1,7 @@
 {
     "table_definition": {
         "name": "ReportTemplates",
-        "engine": "MyISAM",
+        "engine": "InnoDB",
         "columns": [
             {
                 "name": "id",
diff --git a/configuration/etl/etl_tables.d/xdb/reports.json b/configuration/etl/etl_tables.d/xdb/reports.json
index 8fea35ba53..a84df5f082 100644
--- a/configuration/etl/etl_tables.d/xdb/reports.json
+++ b/configuration/etl/etl_tables.d/xdb/reports.json
@@ -1,7 +1,7 @@
 {
     "table_definition": {
         "name": "Reports",
-        "engine": "MyISAM",
+        "engine": "InnoDB",
         "columns": [
             {
                 "name": "report_id",
diff --git a/configuration/etl/etl_tables.d/xdb/restx509.json b/configuration/etl/etl_tables.d/xdb/restx509.json
index 5c87a4eedc..b047cfadeb 100644
--- a/configuration/etl/etl_tables.d/xdb/restx509.json
+++ b/configuration/etl/etl_tables.d/xdb/restx509.json
@@ -1,7 +1,7 @@
 {
     "table_definition": {
         "name": "RESTx509",
-        "engine": "MyISAM",
+        "engine": "InnoDB",
         "columns": [
             {
                 "name": "id",
diff --git a/configuration/etl/etl_tables.d/xdb/schema-version-history.json b/configuration/etl/etl_tables.d/xdb/schema-version-history.json
index 70eb71ce51..9c54cdc9a8 100644
--- a/configuration/etl/etl_tables.d/xdb/schema-version-history.json
+++ b/configuration/etl/etl_tables.d/xdb/schema-version-history.json
@@ -1,7 +1,7 @@
 {
     "table_definition": {
         "name": "schema_version_history",
-        "engine": "MyISAM",
+        "engine": "InnoDB",
         "columns": [
             {
                 "name": "database_name",
diff --git a/configuration/etl/etl_tables.d/xdb/session-manager.json b/configuration/etl/etl_tables.d/xdb/session-manager.json
index 7dfb054a20..583b91c3e8 100644
--- a/configuration/etl/etl_tables.d/xdb/session-manager.json
+++ b/configuration/etl/etl_tables.d/xdb/session-manager.json
@@ -1,7 +1,7 @@
 {
     "table_definition": {
         "name": "SessionManager",
-        "engine": "MyISAM",
+        "engine": "InnoDB",
         "columns": [
             {
                 "name": "session_token",
diff --git a/configuration/etl/etl_tables.d/xdb/user-profiles.json b/configuration/etl/etl_tables.d/xdb/user-profiles.json
index 769d7df7fa..8ca5b94039 100644
--- a/configuration/etl/etl_tables.d/xdb/user-profiles.json
+++ b/configuration/etl/etl_tables.d/xdb/user-profiles.json
@@ -1,7 +1,7 @@
 {
     "table_definition": {
         "name": "UserProfiles",
-        "engine": "MyISAM",
+        "engine": "InnoDB",
         "columns": [
             {
                 "name": "user_id",
diff --git a/configuration/etl/etl_tables.d/xdb/user-types.json b/configuration/etl/etl_tables.d/xdb/user-types.json
index ba1595386b..588f30cf22 100644
--- a/configuration/etl/etl_tables.d/xdb/user-types.json
+++ b/configuration/etl/etl_tables.d/xdb/user-types.json
@@ -1,7 +1,7 @@
 {
     "table_definition": {
         "name": "UserTypes",
-        "engine": "MyISAM",
+        "engine": "InnoDB",
         "columns": [
             {
                 "name": "id",
diff --git a/configuration/etl/etl_tables.d/xdb/version-check.json b/configuration/etl/etl_tables.d/xdb/version-check.json
index 9499461f27..47b30fd5bf 100644
--- a/configuration/etl/etl_tables.d/xdb/version-check.json
+++ b/configuration/etl/etl_tables.d/xdb/version-check.json
@@ -1,7 +1,7 @@
 {
     "table_definition": {
         "name": "VersionCheck",
-        "engine": "MyISAM",
+        "engine": "InnoDB",
         "columns": [
             {
                 "name": "entry_date",