diff --git a/orion.py b/orion.py
index f40b19a..1d455b0 100644
--- a/orion.py
+++ b/orion.py
@@ -52,7 +52,7 @@ def orion(config, debug, output):
         logger.error("An error occurred: %s", e)
         sys.exit(1)
     for test in data["tests"]:
-        metadata = get_metadata(test)
+        metadata = get_metadata(test, logger)
         logger.info("The test %s has started", test["name"])
         match = Matcher(index="perf_scale_ci", level=level)
         uuids = match.get_uuid_by_metadata(metadata)
@@ -108,7 +108,7 @@ def orion(config, debug, output):
         match.save_results(merged_df, csv_file_path=output)
 
 
-def get_metadata(test):
+def get_metadata(test,logger):
     """Gets metadata of the run from each test
 
     Args:
@@ -117,21 +117,13 @@ def get_metadata(test):
     Returns:
         dict: dictionary of the metadata
     """
-    metadata_columns = [
-        "platform",
-        "masterNodesType",
-        "masterNodesCount",
-        "workerNodesType",
-        "workerNodesCount",
-        "benchmark",
-        "ocpVersion",
-        "networkType",
-        "encrypted",
-        "fips",
-        "ipsec",
-    ]
-    metadata = {key: test[key] for key in metadata_columns if key in test}
+    metadata = {}
+    for k,v in test.items():
+        if k in ["metrics","name"]:
+            continue
+        metadata[k] = v
     metadata["ocpVersion"] = str(metadata["ocpVersion"])
+    logger.debug('metadata' + str(metadata))
     return metadata
 
 
diff --git a/requirements.txt b/requirements.txt
index b98bd22..e3f3ac3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ click==8.1.7
 elastic-transport==8.11.0
 elasticsearch==8.11.1
 elasticsearch7==7.13.0
-fmatch==0.0.2
+fmatch==0.0.3
 numpy==1.26.3
 pandas==2.1.4
 python-dateutil==2.8.2