diff --git a/configuration/etl/etl.d/storage.json b/configuration/etl/etl.d/storage.json
index 08809886e6..94e0348eb5 100644
--- a/configuration/etl/etl.d/storage.json
+++ b/configuration/etl/etl.d/storage.json
@@ -88,7 +88,8 @@
                     "type": "jsonfile",
                     "name": "User storage usage input file",
                     "path": "storage/user_usage.json",
-                    "array_element_schema_path": "storage/user_usage.schema.json"
+                    "array_element_schema_path": "storage/user_usage.schema.json",
+                    "field_names": ["file_system", "username", "directory", "dt", "file_count", "logical_usage", "physical_usage", "soft_threshold", "hard_threshold"]
                 }
             }
         },
diff --git a/configuration/etl/etl_tables.d/storage/directory.json b/configuration/etl/etl_tables.d/storage/directory.json
index 1a0e405d56..fbdd7eb7fb 100644
--- a/configuration/etl/etl_tables.d/storage/directory.json
+++ b/configuration/etl/etl_tables.d/storage/directory.json
@@ -32,8 +32,5 @@
                 "is_unique": true
             }
         ]
-    },
-    "destination_columns": {
-        "path": "path"
     }
 }
diff --git a/configuration/etl/etl_tables.d/storage/file_system.json b/configuration/etl/etl_tables.d/storage/file_system.json
index 0e740c56b2..3282705ffe 100644
--- a/configuration/etl/etl_tables.d/storage/file_system.json
+++ b/configuration/etl/etl_tables.d/storage/file_system.json
@@ -32,8 +32,5 @@
                 "is_unique": true
             }
         ]
-    },
-    "destination_columns": {
-        "name": "name"
     }
 }
diff --git a/configuration/etl/etl_tables.d/storage/user.json b/configuration/etl/etl_tables.d/storage/user.json
index 73411d268d..c127f52c3c 100644
--- a/configuration/etl/etl_tables.d/storage/user.json
+++ b/configuration/etl/etl_tables.d/storage/user.json
@@ -32,8 +32,5 @@
                 "is_unique": true
             }
         ]
-    },
-    "destination_columns": {
-        "username": "username"
     }
 }
diff --git a/configuration/etl/etl_tables.d/storage/user_usage.json b/configuration/etl/etl_tables.d/storage/user_usage.json
index ac77175c16..208f9641c4 100644
--- a/configuration/etl/etl_tables.d/storage/user_usage.json
+++ b/configuration/etl/etl_tables.d/storage/user_usage.json
@@ -102,17 +102,19 @@
             }
         ]
     },
-    "destination_columns": {
-        "file_system_id": "file_system",
-        "user_id": "username",
-        "directory_id": "directory",
-        "dt": "dt",
-        "ts": "dt",
-        "file_count": "file_count",
-        "logical_usage": "logical_usage",
-        "physical_usage": "physical_usage",
-        "soft_threshold": "soft_threshold",
-        "hard_threshold": "hard_threshold"
+    "destination_record_map": {
+        "user_usage": {
+            "file_system_id": "file_system",
+            "user_id": "username",
+            "directory_id": "directory",
+            "dt": "dt",
+            "ts": "dt",
+            "file_count": "file_count",
+            "logical_usage": "logical_usage",
+            "physical_usage": "physical_usage",
+            "soft_threshold": "soft_threshold",
+            "hard_threshold": "hard_threshold"
+        }
     },
     "custom_insert_values_components": {
         "file_system_id": "(SELECT file_system_id FROM modw_storage.file_system WHERE name = ?)",