diff --git a/data/elastic-template.json b/data/elastic-template.json
index ed4b172..da3799d 100644
--- a/data/elastic-template.json
+++ b/data/elastic-template.json
@@ -1,51 +1,53 @@
 {
     "order": 0,
     "index_patterns": ["swh-tasks-*"],
     "settings": {
         "index": {
             "codec": "best_compression",
             "refresh_interval": "30s"
         }
     },
     "mappings" : {
         "task" : {
             "_source" : { "enabled": true},
             "properties": {
                 "task_id": {"type": "double"},
                 "task_policy": {"type": "text"},
                 "task_status": {"type": "text"},
                 "task_run_id": {"type": "double"},
                 "arguments": {
                     "type": "object",
                     "properties" : {
                         "args": {
-                            "type": "nested"
+                            "type": "nested",
+                            "dynamic": false
                         },
                         "kwargs": {
-                            "type": "object"
+                            "type": "object",
+                            "dynamic": false
                         }
                     }
                 },
                 "type": {"type": "text"},
                 "backend_id": {"type": "text"},
                 "metadata": {
                     "type": "object",
                     "enabled" : false
                 },
                 "scheduled":  {
                     "type": "date",
                     "format": "yyyy-MM-dd HH:mm:ss||yyyy-MM-dd||strict_date_optional_time||epoch_millis"
                 },
                 "started":  {
                     "type": "date",
                     "format": "yyyy-MM-dd HH:mm:ss||yyyy-MM-dd||strict_date_optional_time||epoch_millis"
                 },
                 "ended":  {
                     "type": "date",
                     "format": "yyyy-MM-dd HH:mm:ss||yyyy-MM-dd||strict_date_optional_time||epoch_millis"
                 }
             }
         }
     },
     "aliases": {}
 }