diff --git a/Dockerfile b/Dockerfile
index 7e8fca9..c23ba68 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ WORKDIR /tmp
 ARG DEBIAN_FRONTEND=noninteractive
 
 # Install necessary libraries for subsequent commands
-RUN apt-get update && apt-get install -y podman wget git dumb-init python3.6 python3-distutils python3-pip python3-apt
+RUN apt-get update && apt-get install -y podman wget vim git dumb-init python3.6 python3-distutils python3-pip python3-apt
 
 # Install and setup snafu for storing vegeta results into ES
 RUN mkdir -p /opt/touchstone/ \
diff --git a/config/clair-vegeta.json b/config/clair-vegeta.json
index c7b0524..6805dea 100644
--- a/config/clair-vegeta.json
+++ b/config/clair-vegeta.json
@@ -1,25 +1,5 @@
 {
   "elasticsearch": {
-    "metadata": {
-      "cpuinfo-metadata": {
-        "additional_fields": [
-          "pod_name"
-        ],
-        "fields": [
-          "value.Model name",
-          "value.Architecture",
-          "value.CPU(s)"
-        ]
-      },
-      "meminfo-metadata": {
-        "additional_fields": [
-          "pod_name"
-        ],
-        "fields": [
-          "value.MemTotal"
-        ]
-      }
-    },
     "clair-test-index": [
       {
         "filter": {},
diff --git a/config/quay-vegeta.json b/config/quay-vegeta.json
index f597561..943a2b9 100644
--- a/config/quay-vegeta.json
+++ b/config/quay-vegeta.json
@@ -1,104 +1,83 @@
 {
-    "elasticsearch": {
-      "metadata": {
-        "cpuinfo-metadata": {
-          "additional_fields": [
-            "pod_name"
-          ],
-          "fields": [
-            "value.Model name",
-            "value.Architecture",
-            "value.CPU(s)"
-          ]
-        },
-        "meminfo-metadata": {
-          "additional_fields": [
-            "pod_name"
+  "elasticsearch": {
+    "quay-vegeta-results": [
+      {
+        "filter": {},
+        "buckets": [
+          "targets.keyword"
+        ],
+        "aggregations": {
+          "rps": [
+            "avg"
+          ],
+          "throughput": [
+            "avg"
+          ],
+          "requests": [
+            "avg"
+          ],
+          "req_latency": [
+            "avg"
+          ],
+          "p95_latency": [
+            "avg"
+          ],
+          "p99_latency": [
+            "avg"
+          ],
+          "max_latency": [
+            "avg"
+          ],
+          "min_latency": [
+            "avg"
+          ],
+          "bytes_in": [
+            "avg"
+          ],
+          "bytes_out": [
+            "avg"
+          ],
+          "status_codes.0": [
+            "sum"
+          ],
+          "status_codes.200": [
+            "sum"
           ],
-          "fields": [
-            "value.MemTotal"
+          "status_codes.201": [
+            "sum"
+          ],
+          "status_codes.204": [
+            "sum"
+          ],
+          "status_codes.400": [
+            "sum"
+          ],
+          "status_codes.401": [
+            "sum"
+          ],
+          "status_codes.403": [
+            "sum"
+          ],
+          "status_codes.404": [
+            "sum"
+          ],
+          "status_codes.408": [
+            "sum"
+          ],
+          "status_codes.500": [
+            "sum"
+          ],
+          "status_codes.502": [
+            "sum"
+          ],
+          "status_codes.503": [
+            "sum"
+          ],
+          "status_codes.504": [
+            "sum"
           ]
         }
-      },
-      "quay-vegeta-results": [
-        {
-          "filter": {},
-          "buckets": [
-            "targets.keyword"
-          ],
-          "aggregations": {
-            "rps": [
-              "avg"
-            ],
-            "throughput": [
-              "avg"
-            ],
-            "requests": [
-              "avg"
-            ],
-            "req_latency": [
-              "avg"
-            ],
-            "p95_latency": [
-              "avg"
-            ],
-            "p99_latency": [
-              "avg"
-            ],
-            "max_latency": [
-              "avg"
-            ],
-            "min_latency": [
-              "avg"
-            ],
-            "bytes_in": [
-              "avg"
-            ],
-            "bytes_out": [
-              "avg"
-            ],
-            "status_codes.0": [
-              "sum"
-            ],
-            "status_codes.200": [
-              "sum"
-            ],
-            "status_codes.201": [
-              "sum"
-            ],
-            "status_codes.204": [
-              "sum"
-            ],
-            "status_codes.400": [
-              "sum"
-            ],
-            "status_codes.401": [
-              "sum"
-            ],
-            "status_codes.403": [
-              "sum"
-            ],
-            "status_codes.404": [
-              "sum"
-            ],
-            "status_codes.408": [
-              "sum"
-            ],
-            "status_codes.500": [
-              "sum"
-            ],
-            "status_codes.502": [
-              "sum"
-            ],
-            "status_codes.503": [
-              "sum"
-            ],
-            "status_codes.504": [
-              "sum"
-            ]
-          }
-        }
-      ]
-    }
+      }
+    ]
   }
-  
\ No newline at end of file
+}