diff --git a/.gitignore b/.gitignore
index e67a6a1af..831c0c072 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,10 @@
 *.py[cod]
 
+# Ansible files
+*.retry
+
 # Prevent hosts files from sneaking into the git repo
 ansible/hosts
-ansible/pbench-host-file
 
 log/*
 
diff --git a/ansible/gather/site.yml b/ansible/gather/site.yml
index 8e00b660a..78699a51d 100644
--- a/ansible/gather/site.yml
+++ b/ansible/gather/site.yml
@@ -26,8 +26,6 @@
   become: true
   tasks:
   - name: Dump all vars
-    local_action: template src=dump_facts.j2 dest={{ browbeat_path }}/machine_facts.json
+    local_action: template src=dump_facts.j2 dest={{ browbeat_path }}/metadata/machine_facts.json
   - name: Generate metadata jsons
-    shell : python {{ browbeat_path }}/lib/Metadata.py {{ browbeat_path }}
-
-
+    shell : python {{ browbeat_path }}/lib/Metadata.py {{ browbeat_path }}/metadata
diff --git a/browbeat-complete.yaml b/browbeat-complete.yaml
index ae36021ab..fad4d52c5 100644
--- a/browbeat-complete.yaml
+++ b/browbeat-complete.yaml
@@ -8,11 +8,11 @@ elasticsearch:
   port: 9200
   metadata_files:
     - name: hardware-metadata
-      file: hardware-metadata.json
-    - name: os-metadata
-      file: os-metadata.json
+      file: metadata/hardware-metadata.json
+    - name: environment-metadata
+      file: metadata/environment-metadata.json
     - name: software-metadata
-      file: software-metadata.json
+      file: metadata/software-metadata.json
 ansible:
   hosts: ansible/hosts
   adjust:
diff --git a/browbeat-config.yaml b/browbeat-config.yaml
index 7241eb15f..87731c565 100644
--- a/browbeat-config.yaml
+++ b/browbeat-config.yaml
@@ -8,11 +8,11 @@ elasticsearch:
   port: 9200
   metadata_files:
     - name: hardware-metadata
-      file: hardware-metadata.json
-    - name: os-metadata
-      file: os-metadata.json
+      file: metadata/hardware-metadata.json
+    - name: environment-metadata
+      file: metadata/environment-metadata.json
     - name: software-metadata
-      file: software-metadata.json
+      file: metadata/software-metadata.json
 ansible:
   hosts: ansible/hosts
   adjust:
diff --git a/conf/browbeat-keystone-complete.yaml b/conf/browbeat-keystone-complete.yaml
index 387026791..a73b1ed1f 100644
--- a/conf/browbeat-keystone-complete.yaml
+++ b/conf/browbeat-keystone-complete.yaml
@@ -3,6 +3,17 @@
 browbeat:
   results : results/
   rerun: 3
+elasticsearch:
+  enabled: false
+  host: 1.1.1.1
+  port: 9200
+  metadata_files:
+    - name: hardware-metadata
+      file: metadata/hardware-metadata.json
+    - name: environment-metadata
+      file: metadata/environment-metadata.json
+    - name: software-metadata
+      file: metadata/software-metadata.json
 ansible:
   hosts: ansible/hosts
   adjust:
diff --git a/conf/browbeat-keystone-minimal.yaml b/conf/browbeat-keystone-minimal.yaml
index 630fef8c3..c234a119a 100644
--- a/conf/browbeat-keystone-minimal.yaml
+++ b/conf/browbeat-keystone-minimal.yaml
@@ -3,6 +3,17 @@
 browbeat:
   results : results/
   rerun: 1
+elasticsearch:
+  enabled: false
+  host: 1.1.1.1
+  port: 9200
+  metadata_files:
+    - name: hardware-metadata
+      file: metadata/hardware-metadata.json
+    - name: environment-metadata
+      file: metadata/environment-metadata.json
+    - name: software-metadata
+      file: metadata/software-metadata.json
 ansible:
   hosts: ansible/hosts
   adjust:
diff --git a/conf/browbeat-perfkit-complete.yaml b/conf/browbeat-perfkit-complete.yaml
index cba37ae1d..f5f035f8d 100644
--- a/conf/browbeat-perfkit-complete.yaml
+++ b/conf/browbeat-perfkit-complete.yaml
@@ -2,6 +2,17 @@
 browbeat:
   results : results/
   rerun: 3
+elasticsearch:
+  enabled: false
+  host: 1.1.1.1
+  port: 9200
+  metadata_files:
+    - name: hardware-metadata
+      file: metadata/hardware-metadata.json
+    - name: environment-metadata
+      file: metadata/environment-metadata.json
+    - name: software-metadata
+      file: metadata/software-metadata.json
 ansible:
   hosts: ansible/hosts
   adjust:
diff --git a/metadata/.gitignore b/metadata/.gitignore
new file mode 100644
index 000000000..36e081d66
--- /dev/null
+++ b/metadata/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory (placeholder directory)
+*
+# Except this file
+!.gitignore