diff --git a/elk_metrics_6x/bootstrap-embedded-ansible.sh b/elk_metrics_6x/bootstrap-embedded-ansible.sh
index d4251b2e..6079c9c5 100755
--- a/elk_metrics_6x/bootstrap-embedded-ansible.sh
+++ b/elk_metrics_6x/bootstrap-embedded-ansible.sh
@@ -17,8 +17,9 @@ export OPTS=()
 export ANSIBLE_EMBED_HOME="${HOME}/ansible25"
 OPTS+=('ANSIBLE_EMBED_HOME')
 
+source /etc/os-release
 if [[ ! -e "${ANSIBLE_EMBED_HOME}/bin/ansible" ]]; then
-  if [  ${DISTRIB_RELEASE} = "14.04" ]; then
+  if [  ${VERSION_ID} = "14.04" ]; then
     apt-get update
     apt-get -y install python-virtualenv
     echo "done installing python-virtualenv"
diff --git a/elk_metrics_6x/installKibana.yml b/elk_metrics_6x/installKibana.yml
index 087160c1..2172331b 100644
--- a/elk_metrics_6x/installKibana.yml
+++ b/elk_metrics_6x/installKibana.yml
@@ -22,5 +22,53 @@
   roles:
     - role: elastic_kibana
 
+  post_tasks:
+    - name: Create basic indexes
+      uri:
+        url: "http://127.0.0.1:5601/api/saved_objects/index-pattern/{{ item.name }}"
+        method: POST
+        body: "{{ item.index_options | to_json }}"
+        status_code: 200,409
+        body_format: json
+        headers:
+          Content-Type: "application/json"
+          kbn-xsrf: "{{ inventory_hostname | to_uuid }}"
+      with_items:
+        - name: "*"
+          index_options:
+            attributes:
+              title: "*"
+              timeFieldName: "@timestamp"
+        - name: "journalbeat-*"
+          index_options:
+            attributes:
+              title: "journalbeat-*"
+              timeFieldName: "@timestamp"
+      register: kibana_indexes
+      until: kibana_indexes is success
+      retries: 6
+      delay: 10
+      run_once: true
+
+    - name: Create basic indexes
+      uri:
+        url: "http://127.0.0.1:5601/api/kibana/settings/defaultIndex"
+        method: POST
+        body: "{{ item.index_options | to_json }}"
+        status_code: 200
+        body_format: json
+        headers:
+          Content-Type: "application/json"
+          kbn-xsrf: "{{ inventory_hostname | to_uuid }}"
+      with_items:
+        - name: "*"
+          index_options:
+            value: "*"
+      register: kibana_indexes
+      until: kibana_indexes is success
+      retries: 6
+      delay: 10
+      run_once: true
+
   tags:
     - server-install
diff --git a/elk_metrics_6x/roles/elastic_apm_server/handlers/main.yml b/elk_metrics_6x/roles/elastic_apm_server/handlers/main.yml
index 69f1a9d5..b61ae69b 100644
--- a/elk_metrics_6x/roles/elastic_apm_server/handlers/main.yml
+++ b/elk_metrics_6x/roles/elastic_apm_server/handlers/main.yml
@@ -13,13 +13,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Enable and restart apm server
+- name: Enable and restart apm-server (systemd)
   systemd:
     name: "apm-server"
     enabled: true
     state: restarted
     daemon_reload: true
   when:
-    - (elk_package_state | default('present')) != 'absent'
-  tags:
-    - config
+    - ansible_service_mgr == 'systemd'
+  listen: Enable and restart apm server
+
+- name: Enable and restart apm-server (upstart)
+  service:
+    name: "apm-server"
+    state: restarted
+    enabled: yes
+  when:
+    - ansible_service_mgr == 'upstart'
+  listen: Enable and restart apm server
diff --git a/elk_metrics_6x/roles/elastic_apm_server/meta/main.yml b/elk_metrics_6x/roles/elastic_apm_server/meta/main.yml
index 4f8ef5b4..4191ac34 100644
--- a/elk_metrics_6x/roles/elastic_apm_server/meta/main.yml
+++ b/elk_metrics_6x/roles/elastic_apm_server/meta/main.yml
@@ -22,6 +22,7 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
+        - trusty
         - xenial
         - bionic
   categories:
diff --git a/elk_metrics_6x/roles/elastic_apm_server/tasks/main.yml b/elk_metrics_6x/roles/elastic_apm_server/tasks/main.yml
index cb249018..5970f939 100644
--- a/elk_metrics_6x/roles/elastic_apm_server/tasks/main.yml
+++ b/elk_metrics_6x/roles/elastic_apm_server/tasks/main.yml
@@ -46,12 +46,16 @@
     group: "root"
     owner: "root"
     mode: "0755"
+  when:
+    - ansible_service_mgr == 'systemd'
 
 - name: Apply systemd options
   template:
     src: "{{ item.src }}"
     dest: "/etc/systemd/system/apm-server.service.d/{{ item.dest }}"
     mode: "0644"
+  when:
+    - ansible_service_mgr == 'systemd'
   with_items:
     - src: "systemd.general-overrides.conf.j2"
       dest: "apm-server-overrides.conf"
@@ -66,5 +70,6 @@
     - Enable and restart apm server
 
 - include_tasks: apm_setup.yml
-  tags:
-    - setup
+
+- name: Force beat handlers
+  meta: flush_handlers
diff --git a/elk_metrics_6x/roles/elastic_auditbeat/handlers/main.yml b/elk_metrics_6x/roles/elastic_auditbeat/handlers/main.yml
index 8fdf3a74..ccc20d33 100644
--- a/elk_metrics_6x/roles/elastic_auditbeat/handlers/main.yml
+++ b/elk_metrics_6x/roles/elastic_auditbeat/handlers/main.yml
@@ -13,13 +13,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Enable and restart auditbeat
+- name: Enable and restart auditbeat (systemd)
   systemd:
     name: "auditbeat"
-    enabled: "true"
+    enabled: true
     state: restarted
     daemon_reload: true
   when:
-    - (elk_package_state | default('present')) != 'absent'
-  tags:
-    - config
+    - ansible_service_mgr == 'systemd'
+  listen: Enable and restart auditbeat
+
+- name: Enable and restart auditbeat (upstart)
+  service:
+    name: "auditbeat"
+    state: restarted
+    enabled: yes
+  when:
+    - ansible_service_mgr == 'upstart'
+  listen: Enable and restart auditbeat
diff --git a/elk_metrics_6x/roles/elastic_auditbeat/meta/main.yml b/elk_metrics_6x/roles/elastic_auditbeat/meta/main.yml
index baefd460..9faaba56 100644
--- a/elk_metrics_6x/roles/elastic_auditbeat/meta/main.yml
+++ b/elk_metrics_6x/roles/elastic_auditbeat/meta/main.yml
@@ -22,6 +22,7 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
+        - trusty
         - xenial
         - bionic
   categories:
diff --git a/elk_metrics_6x/roles/elastic_auditbeat/tasks/main.yml b/elk_metrics_6x/roles/elastic_auditbeat/tasks/main.yml
index 44ee4b3b..a493ec42 100644
--- a/elk_metrics_6x/roles/elastic_auditbeat/tasks/main.yml
+++ b/elk_metrics_6x/roles/elastic_auditbeat/tasks/main.yml
@@ -46,12 +46,16 @@
     group: "root"
     owner: "root"
     mode: "0755"
+  when:
+    - ansible_service_mgr == 'systemd'
 
 - name: Apply systemd options
   template:
     src: "{{ item.src }}"
     dest: "/etc/systemd/system/auditbeat.service.d/{{ item.dest }}"
     mode: "0644"
+  when:
+    - ansible_service_mgr == 'systemd'
   with_items:
     - src: "systemd.general-overrides.conf.j2"
       dest: "auditbeat-overrides.conf"
@@ -66,3 +70,6 @@
     - Enable and restart auditbeat
 
 - include_tasks: auditbeat_setup.yml
+
+- name: Force beat handlers
+  meta: flush_handlers
diff --git a/elk_metrics_6x/roles/elastic_curator/meta/main.yml b/elk_metrics_6x/roles/elastic_curator/meta/main.yml
index 236fc87f..c1e7ffbe 100644
--- a/elk_metrics_6x/roles/elastic_curator/meta/main.yml
+++ b/elk_metrics_6x/roles/elastic_curator/meta/main.yml
@@ -22,6 +22,7 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
+        - trusty
         - xenial
         - bionic
   categories:
diff --git a/elk_metrics_6x/roles/elastic_curator/tasks/curator_systemd.yml b/elk_metrics_6x/roles/elastic_curator/tasks/curator_systemd.yml
new file mode 100644
index 00000000..e393a51c
--- /dev/null
+++ b/elk_metrics_6x/roles/elastic_curator/tasks/curator_systemd.yml
@@ -0,0 +1,36 @@
+---
+# Copyright 2018, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+- name: Run the systemd service role
+  include_role:
+    name: systemd_service
+    private: true
+  vars:
+    systemd_service_enabled: "{{ ((elk_package_state | default('present')) != 'absent') | ternary(true, false) }}"
+    systemd_service_restart_changed: false
+    systemd_user_name: curator
+    systemd_group_name: curator
+    systemd_services:
+      - service_name: "curator"
+        execstarts:
+          - /opt/elasticsearch-curator/bin/curator
+            --config /var/lib/curator/curator.yml
+            /var/lib/curator/actions.yml
+        timer:
+          state: "started"
+          options:
+            OnBootSec: 30min
+            OnUnitActiveSec: 24h
+            Persistent: true
diff --git a/elk_metrics_6x/roles/elastic_curator/tasks/curator_upstart.yml b/elk_metrics_6x/roles/elastic_curator/tasks/curator_upstart.yml
new file mode 100644
index 00000000..cc71f25f
--- /dev/null
+++ b/elk_metrics_6x/roles/elastic_curator/tasks/curator_upstart.yml
@@ -0,0 +1,23 @@
+---
+# Copyright 2018, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+- name: Create cron job for curator
+  cron:
+    name: "Run curator"
+    minute: 0
+    hour: 2
+    user: "curator"
+    job: "/opt/elasticsearch-curator/bin/curator --config /var/lib/curator/curator.yml /var/lib/curator/actions.yml"
+    cron_file: "elasticsearch-curator"
diff --git a/elk_metrics_6x/roles/elastic_curator/tasks/main.yml b/elk_metrics_6x/roles/elastic_curator/tasks/main.yml
index 0cbccce0..355e7e8f 100644
--- a/elk_metrics_6x/roles/elastic_curator/tasks/main.yml
+++ b/elk_metrics_6x/roles/elastic_curator/tasks/main.yml
@@ -25,6 +25,11 @@
   tags:
     - always
 
+- name: exit playbook after uninstall
+  meta: end_play
+  when:
+      ansible_service_mgr != 'systemd'
+
 - name: Ensure virtualenv is installed
   package:
     name: "{{ curator_distro_packages }}"
@@ -88,24 +93,4 @@
   notify:
     - Enable and restart curator.timer
 
-- name: Run the systemd service role
-  include_role:
-    name: systemd_service
-    private: true
-  vars:
-    systemd_service_enabled: "{{ ((elk_package_state | default('present')) != 'absent') | ternary(true, false) }}"
-    systemd_service_restart_changed: false
-    systemd_user_name: curator
-    systemd_group_name: curator
-    systemd_services:
-      - service_name: "curator"
-        execstarts:
-          - /opt/elasticsearch-curator/bin/curator
-            --config /var/lib/curator/curator.yml
-            /var/lib/curator/actions.yml
-        timer:
-          state: "started"
-          options:
-            OnBootSec: 30min
-            OnUnitActiveSec: 24h
-            Persistent: true
+- include_tasks: "curator_{{ ansible_service_mgr }}.yml"
diff --git a/elk_metrics_6x/roles/elastic_data_hosts/meta/main.yml b/elk_metrics_6x/roles/elastic_data_hosts/meta/main.yml
index 97c92d44..c7d684e6 100644
--- a/elk_metrics_6x/roles/elastic_data_hosts/meta/main.yml
+++ b/elk_metrics_6x/roles/elastic_data_hosts/meta/main.yml
@@ -22,6 +22,7 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
+        - trusty
         - xenial
         - bionic
   categories:
diff --git a/elk_metrics_6x/roles/elastic_dependencies/meta/main.yml b/elk_metrics_6x/roles/elastic_dependencies/meta/main.yml
index a1d466fd..1dbd7a67 100644
--- a/elk_metrics_6x/roles/elastic_dependencies/meta/main.yml
+++ b/elk_metrics_6x/roles/elastic_dependencies/meta/main.yml
@@ -23,6 +23,7 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
+        - trusty
         - xenial
         - bionic
   categories:
diff --git a/elk_metrics_6x/roles/elastic_dependencies/tasks/main.yml b/elk_metrics_6x/roles/elastic_dependencies/tasks/main.yml
index 36f2db2d..8b030320 100644
--- a/elk_metrics_6x/roles/elastic_dependencies/tasks/main.yml
+++ b/elk_metrics_6x/roles/elastic_dependencies/tasks/main.yml
@@ -70,7 +70,7 @@
         path: "/var/lib/{{ service_name }}"
       register: service_dir
 
-    - name: Check for existing rollup job
+    - name: Check for data directory
       debug:
         msg: >-
           The service data directory [ /var/lib/{{ service_name }} ] already
diff --git a/elk_metrics_6x/roles/elastic_filebeat/handlers/main.yml b/elk_metrics_6x/roles/elastic_filebeat/handlers/main.yml
index 5fdc924a..f14aa2c1 100644
--- a/elk_metrics_6x/roles/elastic_filebeat/handlers/main.yml
+++ b/elk_metrics_6x/roles/elastic_filebeat/handlers/main.yml
@@ -13,13 +13,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Enable and restart filebeat
+- name: Enable and restart filebeat (systemd)
   systemd:
     name: "filebeat"
     enabled: true
     state: restarted
     daemon_reload: true
   when:
-    - (elk_package_state | default('present')) != 'absent'
-  tags:
-    - config
+    - ansible_service_mgr == 'systemd'
+  listen: Enable and restart filebeat
+
+- name: Enable and restart filebeat (upstart)
+  service:
+    name: "filebeat"
+    state: restarted
+    enabled: yes
+  when:
+    - ansible_service_mgr == 'upstart'
+  listen: Enable and restart filebeat
diff --git a/elk_metrics_6x/roles/elastic_filebeat/meta/main.yml b/elk_metrics_6x/roles/elastic_filebeat/meta/main.yml
index a3b68c14..c3076d91 100644
--- a/elk_metrics_6x/roles/elastic_filebeat/meta/main.yml
+++ b/elk_metrics_6x/roles/elastic_filebeat/meta/main.yml
@@ -22,6 +22,7 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
+        - trusty
         - xenial
         - bionic
   categories:
diff --git a/elk_metrics_6x/roles/elastic_filebeat/tasks/main.yml b/elk_metrics_6x/roles/elastic_filebeat/tasks/main.yml
index 0d4a1c2e..b89f5fd5 100644
--- a/elk_metrics_6x/roles/elastic_filebeat/tasks/main.yml
+++ b/elk_metrics_6x/roles/elastic_filebeat/tasks/main.yml
@@ -46,14 +46,19 @@
     group: "root"
     owner: "root"
     mode: "0755"
+  when:
+    - ansible_service_mgr == 'systemd'
 
 - name: Apply systemd options
   template:
     src: "{{ item.src }}"
     dest: "/etc/systemd/system/filebeat.service.d/{{ item.dest }}"
     mode: "0644"
+  when:
+    - ansible_service_mgr == 'systemd'
   with_items:
-    - { src: "systemd.general-overrides.conf.j2", dest: "filebeat-overrides.conf" }
+    - src: "systemd.general-overrides.conf.j2"
+      dest: "filebeat-overrides.conf"
   notify:
     - Enable and restart filebeat
 
@@ -175,3 +180,6 @@
     - Enable and restart filebeat
 
 - include_tasks: filebeat_setup.yml
+
+- name: Force beat handlers
+  meta: flush_handlers
diff --git a/elk_metrics_6x/roles/elastic_heartbeat/handlers/main.yml b/elk_metrics_6x/roles/elastic_heartbeat/handlers/main.yml
index ac87f12c..62e57961 100644
--- a/elk_metrics_6x/roles/elastic_heartbeat/handlers/main.yml
+++ b/elk_metrics_6x/roles/elastic_heartbeat/handlers/main.yml
@@ -13,13 +13,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Enable and restart heartbeat
+- name: Enable and restart heartbeat (systemd)
   systemd:
     name: "heartbeat-elastic"
     enabled: true
     state: restarted
     daemon_reload: true
   when:
-    - (elk_package_state | default('present')) != 'absent'
-  tags:
-    - config
+    - ansible_service_mgr == 'systemd'
+  listen: Enable and restart heartbeat
+
+- name: Enable and restart heartbeat (upstart)
+  service:
+    name: "heartbeat-elastic"
+    state: restarted
+    enabled: yes
+  when:
+    - ansible_service_mgr == 'upstart'
+  listen: Enable and restart heartbeat
diff --git a/elk_metrics_6x/roles/elastic_heartbeat/meta/main.yml b/elk_metrics_6x/roles/elastic_heartbeat/meta/main.yml
index 4761a67b..ad5a729a 100644
--- a/elk_metrics_6x/roles/elastic_heartbeat/meta/main.yml
+++ b/elk_metrics_6x/roles/elastic_heartbeat/meta/main.yml
@@ -22,6 +22,7 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
+        - trusty
         - xenial
         - bionic
   categories:
diff --git a/elk_metrics_6x/roles/elastic_heartbeat/tasks/main.yml b/elk_metrics_6x/roles/elastic_heartbeat/tasks/main.yml
index f52185ba..d5bc52f5 100644
--- a/elk_metrics_6x/roles/elastic_heartbeat/tasks/main.yml
+++ b/elk_metrics_6x/roles/elastic_heartbeat/tasks/main.yml
@@ -46,18 +46,36 @@
     group: "root"
     owner: "root"
     mode: "0755"
+  when:
+    - ansible_service_mgr == 'systemd'
+
+- name: Apply systemd options
+  template:
+    src: "{{ item.src }}"
+    dest: "{{ item.dest }}"
+    mode: "0644"
+  when:
+    - ansible_service_mgr == 'systemd'
+  with_items:
+    - src: "systemd.general-overrides.conf.j2"
+      dest: "/etc/systemd/system/heartbeat.service.d/heartbeat-overrides.conf"
+  notify:
+    - Enable and restart heartbeat
 
 - name: Create heartbeat configs
   template:
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"
     mode: "0644"
+  when:
+    - ansible_service_mgr == 'systemd'
   with_items:
-    - src: "systemd.general-overrides.conf.j2"
-      dest: "/etc/systemd/system/heartbeat.service.d/heartbeat-overrides.conf"
     - src: templates/heartbeat.yml.j2
       dest: /etc/heartbeat/heartbeat.yml
   notify:
     - Enable and restart heartbeat
 
 - include_tasks: heartbeat_setup.yml
+
+- name: Force beat handlers
+  meta: flush_handlers
diff --git a/elk_metrics_6x/roles/elastic_journalbeat/meta/main.yml b/elk_metrics_6x/roles/elastic_journalbeat/meta/main.yml
index b38e1402..568404b6 100644
--- a/elk_metrics_6x/roles/elastic_journalbeat/meta/main.yml
+++ b/elk_metrics_6x/roles/elastic_journalbeat/meta/main.yml
@@ -22,6 +22,7 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
+        - trusty
         - xenial
         - bionic
   categories:
diff --git a/elk_metrics_6x/roles/elastic_journalbeat/tasks/main.yml b/elk_metrics_6x/roles/elastic_journalbeat/tasks/main.yml
index 24535b2f..d4abf0a4 100644
--- a/elk_metrics_6x/roles/elastic_journalbeat/tasks/main.yml
+++ b/elk_metrics_6x/roles/elastic_journalbeat/tasks/main.yml
@@ -33,7 +33,8 @@
 - name: exit playbook after uninstall
   meta: end_play
   when:
-    - not journal_dir.stat.exists | bool
+    - not (journal_dir.stat.exists | bool) or
+      ansible_service_mgr != 'systemd'
 
 - name: Ensure beat is installed
   package:
@@ -94,7 +95,7 @@
     owner: "root"
     mode: "0755"
 
-- name: Drop journalbeat conf files
+- name: Apply systemd options
   template:
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"
@@ -102,6 +103,15 @@
   with_items:
     - src: "systemd.general-overrides.conf.j2"
       dest: "/etc/systemd/system/journalbeat.service.d/journalbeat-overrides.conf"
+  notify:
+    - Enable and restart journalbeat
+
+- name: Drop journalbeat conf files
+  template:
+    src: "{{ item.src }}"
+    dest: "{{ item.dest }}"
+    mode: "0644"
+  with_items:
     - src: templates/journalbeat.yml.j2
       dest: /etc/journalbeat/journalbeat.yml
   notify:
@@ -132,3 +142,6 @@
             After: network-online.target
 
 - include_tasks: journalbeat_setup.yml
+
+- name: Force beat handlers
+  meta: flush_handlers
diff --git a/elk_metrics_6x/roles/elastic_kibana/handlers/main.yml b/elk_metrics_6x/roles/elastic_kibana/handlers/main.yml
index 12f4111f..619855db 100644
--- a/elk_metrics_6x/roles/elastic_kibana/handlers/main.yml
+++ b/elk_metrics_6x/roles/elastic_kibana/handlers/main.yml
@@ -13,25 +13,27 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Enable and restart nginx
+- name: Enable and restart services (systemd)
   systemd:
-    name: "nginx"
-    enabled: true
-    state: restarted
-  when:
-    - (elk_package_state | default('present')) != 'absent'
-  listen: Enable and restart services
-  tags:
-    - config
-
-- name: Enable and restart kibana
-  systemd:
-    name: "kibana"
+    name: "{{ item }}"
     enabled: true
     state: restarted
     daemon_reload: true
   when:
-    - (elk_package_state | default('present')) != 'absent'
+    - ansible_service_mgr == 'systemd'
+  with_items:
+    - nginx
+    - kibana
+  listen: Enable and restart services
+
+- name: Enable and restart services (upstart)
+  service:
+    name: "{{ item }}"
+    state: restarted
+    enabled: yes
+  when:
+    - ansible_service_mgr == 'upstart'
+  with_items:
+    - nginx
+    - kibana
   listen: Enable and restart services
-  tags:
-    - config
diff --git a/elk_metrics_6x/roles/elastic_kibana/meta/main.yml b/elk_metrics_6x/roles/elastic_kibana/meta/main.yml
index 9736c5c9..fe889e75 100644
--- a/elk_metrics_6x/roles/elastic_kibana/meta/main.yml
+++ b/elk_metrics_6x/roles/elastic_kibana/meta/main.yml
@@ -22,6 +22,7 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
+        - trusty
         - xenial
         - bionic
   categories:
diff --git a/elk_metrics_6x/roles/elastic_kibana/tasks/main.yml b/elk_metrics_6x/roles/elastic_kibana/tasks/main.yml
index 9391e964..ba02a81f 100644
--- a/elk_metrics_6x/roles/elastic_kibana/tasks/main.yml
+++ b/elk_metrics_6x/roles/elastic_kibana/tasks/main.yml
@@ -63,15 +63,19 @@
     group: "root"
     owner: "root"
     mode: "0755"
+  when:
+    - ansible_service_mgr == 'systemd'
 
 - name: Apply systemd options
   template:
     src: "{{ item.src }}"
-    dest: "/etc/systemd/system/kibana.service.d/{{ item.dest }}"
+    dest: "{{ item.dest }}"
     mode: "0644"
+  when:
+    - ansible_service_mgr == 'systemd'
   with_items:
     - src: "systemd.general-overrides.conf.j2"
-      dest: "kibana-overrides.conf"
+      dest: "/etc/systemd/system/kibana.service.d/kibana-overrides.conf"
   notify:
     - Enable and restart services
 
diff --git a/elk_metrics_6x/roles/elastic_logstash/handlers/main.yml b/elk_metrics_6x/roles/elastic_logstash/handlers/main.yml
index 8ea50751..c8e3f6b3 100644
--- a/elk_metrics_6x/roles/elastic_logstash/handlers/main.yml
+++ b/elk_metrics_6x/roles/elastic_logstash/handlers/main.yml
@@ -13,13 +13,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Enable and restart logstash
+- name: Enable and restart logstash (systemd)
   systemd:
     name: "logstash"
     enabled: true
     state: restarted
     daemon_reload: true
   when:
-    - (elk_package_state | default('present')) != 'absent'
-  tags:
-    - config
+    - ansible_service_mgr == 'systemd'
+  listen: Enable and restart logstash
+
+- name: Enable and restart logstash (upstart)
+  service:
+    name: "logstash"
+    state: restarted
+    enabled: yes
+  when:
+    - ansible_service_mgr == 'upstart'
+  listen: Enable and restart logstash
diff --git a/elk_metrics_6x/roles/elastic_logstash/meta/main.yml b/elk_metrics_6x/roles/elastic_logstash/meta/main.yml
index c33cbc49..d40186fc 100644
--- a/elk_metrics_6x/roles/elastic_logstash/meta/main.yml
+++ b/elk_metrics_6x/roles/elastic_logstash/meta/main.yml
@@ -22,6 +22,7 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
+        - trusty
         - xenial
         - bionic
   categories:
diff --git a/elk_metrics_6x/roles/elastic_logstash/tasks/main.yml b/elk_metrics_6x/roles/elastic_logstash/tasks/main.yml
index dec0dab0..74f2430f 100644
--- a/elk_metrics_6x/roles/elastic_logstash/tasks/main.yml
+++ b/elk_metrics_6x/roles/elastic_logstash/tasks/main.yml
@@ -46,15 +46,19 @@
     group: "root"
     owner: "root"
     mode: "0755"
+  when:
+    - ansible_service_mgr == 'systemd'
 
 - name: Apply systemd options
   template:
     src: "{{ item.src }}"
-    dest: "/etc/systemd/system/logstash.service.d/{{ item.dest }}"
+    dest: "{{ item.dest }}"
     mode: "0644"
+  when:
+    - ansible_service_mgr == 'systemd'
   with_items:
     - src: "systemd.general-overrides.conf.j2"
-      dest: "logstash-overrides.conf"
+      dest: "/etc/systemd/system/logstash.service.d/logstash-overrides.conf"
   notify:
     - Enable and restart logstash
 
diff --git a/elk_metrics_6x/roles/elastic_metricbeat/handlers/main.yml b/elk_metrics_6x/roles/elastic_metricbeat/handlers/main.yml
index 9493df01..e1cbbd8d 100644
--- a/elk_metrics_6x/roles/elastic_metricbeat/handlers/main.yml
+++ b/elk_metrics_6x/roles/elastic_metricbeat/handlers/main.yml
@@ -13,13 +13,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Enable and restart metricbeat
+- name: Enable and restart metricbeat (systemd)
   systemd:
     name: "metricbeat"
     enabled: true
     state: restarted
     daemon_reload: true
   when:
-    - (elk_package_state | default('present')) != 'absent'
-  tags:
-    - config
+    - ansible_service_mgr == 'systemd'
+  listen: Enable and restart metricbeat
+
+- name: Enable and restart metricbeat (upstart)
+  service:
+    name: "elasticsearch"
+    state: restarted
+    enabled: yes
+  when:
+    - ansible_service_mgr == 'upstart'
+  listen: Enable and restart metricbeat
diff --git a/elk_metrics_6x/roles/elastic_metricbeat/meta/main.yml b/elk_metrics_6x/roles/elastic_metricbeat/meta/main.yml
index 56942ddd..c26b3847 100644
--- a/elk_metrics_6x/roles/elastic_metricbeat/meta/main.yml
+++ b/elk_metrics_6x/roles/elastic_metricbeat/meta/main.yml
@@ -22,6 +22,7 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
+        - trusty
         - xenial
         - bionic
   categories:
diff --git a/elk_metrics_6x/roles/elastic_metricbeat/tasks/main.yml b/elk_metrics_6x/roles/elastic_metricbeat/tasks/main.yml
index 2229e242..5a4ed81d 100644
--- a/elk_metrics_6x/roles/elastic_metricbeat/tasks/main.yml
+++ b/elk_metrics_6x/roles/elastic_metricbeat/tasks/main.yml
@@ -222,11 +222,13 @@
   notify:
     - Enable and restart metricbeat
 
-- name: Drop metricbeat conf file
+- name: Drop metricbeat conf files
   template:
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"
     mode: "0644"
+  when:
+    - ansible_service_mgr == 'systemd'
   with_items:
     - src: templates/metricbeat.yml.j2
       dest: /etc/metricbeat/metricbeat.yml
@@ -234,3 +236,6 @@
     - Enable and restart metricbeat
 
 - include_tasks: metricbeat_setup.yml
+
+- name: Force beat handlers
+  meta: flush_handlers
diff --git a/elk_metrics_6x/roles/elastic_packetbeat/handlers/main.yml b/elk_metrics_6x/roles/elastic_packetbeat/handlers/main.yml
index 068f373c..fa1a0211 100644
--- a/elk_metrics_6x/roles/elastic_packetbeat/handlers/main.yml
+++ b/elk_metrics_6x/roles/elastic_packetbeat/handlers/main.yml
@@ -13,13 +13,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Enable and restart packetbeat
+- name: Enable and restart packetbeat (systemd)
   systemd:
     name: "packetbeat"
     enabled: true
     state: restarted
     daemon_reload: true
   when:
-    - (elk_package_state | default('present')) != 'absent'
-  tags:
-    - config
+    - ansible_service_mgr == 'systemd'
+  listen: Enable and restart packetbeat
+
+- name: Enable and restart packetbeat (upstart)
+  service:
+    name: "elasticsearch"
+    state: restarted
+    enabled: yes
+  when:
+    - ansible_service_mgr == 'upstart'
+  listen: Enable and restart packetbeat
diff --git a/elk_metrics_6x/roles/elastic_packetbeat/meta/main.yml b/elk_metrics_6x/roles/elastic_packetbeat/meta/main.yml
index 00721aaa..fd64a943 100644
--- a/elk_metrics_6x/roles/elastic_packetbeat/meta/main.yml
+++ b/elk_metrics_6x/roles/elastic_packetbeat/meta/main.yml
@@ -22,6 +22,7 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
+        - trusty
         - xenial
         - bionic
   categories:
diff --git a/elk_metrics_6x/roles/elastic_packetbeat/tasks/main.yml b/elk_metrics_6x/roles/elastic_packetbeat/tasks/main.yml
index d634ea48..80be5255 100644
--- a/elk_metrics_6x/roles/elastic_packetbeat/tasks/main.yml
+++ b/elk_metrics_6x/roles/elastic_packetbeat/tasks/main.yml
@@ -46,6 +46,21 @@
     group: "root"
     owner: "root"
     mode: "0755"
+  when:
+    - ansible_service_mgr == 'systemd'
+
+- name: Apply systemd options
+  template:
+    src: "{{ item.src }}"
+    dest: "{{ item.dest }}"
+    mode: "0644"
+  when:
+    - ansible_service_mgr == 'systemd'
+  with_items:
+    - src: "systemd.general-overrides.conf.j2"
+      dest: "/etc/systemd/system/packetbeat.service.d/packetbeat-overrides.conf"
+  notify:
+    - Enable and restart packetbeat
 
 - name: Drop packetbeat conf files
   template:
@@ -53,11 +68,12 @@
     dest: "{{ item.dest }}"
     mode: "0644"
   with_items:
-    - src: "systemd.general-overrides.conf.j2"
-      dest: "/etc/systemd/system/packetbeat.service.d/packetbeat-overrides.conf"
     - src: templates/packetbeat.yml.j2
       dest: /etc/packetbeat/packetbeat.yml
   notify:
     - Enable and restart packetbeat
 
 - include_tasks: packetbeat_setup.yml
+
+- name: Force beat handlers
+  meta: flush_handlers
diff --git a/elk_metrics_6x/roles/elastic_repositories/defaults/main.yml b/elk_metrics_6x/roles/elastic_repositories/defaults/main.yml
new file mode 100644
index 00000000..c4e99cd8
--- /dev/null
+++ b/elk_metrics_6x/roles/elastic_repositories/defaults/main.yml
@@ -0,0 +1,17 @@
+---
+# Copyright 2018, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# List of PPA repositories used on ubuntu based systems
+elastic_repo_ppas: []
diff --git a/elk_metrics_6x/roles/elastic_repositories/meta/main.yml b/elk_metrics_6x/roles/elastic_repositories/meta/main.yml
index 094ed533..5df9b15c 100644
--- a/elk_metrics_6x/roles/elastic_repositories/meta/main.yml
+++ b/elk_metrics_6x/roles/elastic_repositories/meta/main.yml
@@ -22,6 +22,7 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
+        - trusty
         - xenial
         - bionic
   categories:
diff --git a/elk_metrics_6x/roles/elastic_repositories/tasks/elastic_apt_repos.yml b/elk_metrics_6x/roles/elastic_repositories/tasks/elastic_apt_repos.yml
index 9bbd6389..776dfeb4 100644
--- a/elk_metrics_6x/roles/elastic_repositories/tasks/elastic_apt_repos.yml
+++ b/elk_metrics_6x/roles/elastic_repositories/tasks/elastic_apt_repos.yml
@@ -35,3 +35,8 @@
   delay: 2
   tags:
     - package_install
+
+- name: Add PPA (legacy)
+  apt_repository:
+    repo: "{{ item }}"
+  with_items: "{{ elastic_repo_ppas }}"
diff --git a/elk_metrics_6x/roles/elastic_repositories/vars/ubuntu-14.04.yml b/elk_metrics_6x/roles/elastic_repositories/vars/ubuntu-14.04.yml
new file mode 100644
index 00000000..2714e5fc
--- /dev/null
+++ b/elk_metrics_6x/roles/elastic_repositories/vars/ubuntu-14.04.yml
@@ -0,0 +1,20 @@
+---
+# Copyright 2018, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+elastic_repo_distro_packages:
+  - apt-transport-https
+
+elastic_repo_ppas:
+  - "ppa:openjdk-r/ppa"
diff --git a/elk_metrics_6x/roles/elastic_retention/meta/main.yml b/elk_metrics_6x/roles/elastic_retention/meta/main.yml
index 56c8b899..ab69fa29 100644
--- a/elk_metrics_6x/roles/elastic_retention/meta/main.yml
+++ b/elk_metrics_6x/roles/elastic_retention/meta/main.yml
@@ -22,6 +22,7 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
+        - trusty
         - xenial
         - bionic
   categories:
diff --git a/elk_metrics_6x/roles/elastic_rollup/meta/main.yml b/elk_metrics_6x/roles/elastic_rollup/meta/main.yml
index bfdc31d8..1c53bb47 100644
--- a/elk_metrics_6x/roles/elastic_rollup/meta/main.yml
+++ b/elk_metrics_6x/roles/elastic_rollup/meta/main.yml
@@ -22,6 +22,7 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
+        - trusty
         - xenial
         - bionic
   categories:
diff --git a/elk_metrics_6x/roles/elastic_rollup/tasks/main.yml b/elk_metrics_6x/roles/elastic_rollup/tasks/main.yml
index 0ce194d9..a5e3b081 100644
--- a/elk_metrics_6x/roles/elastic_rollup/tasks/main.yml
+++ b/elk_metrics_6x/roles/elastic_rollup/tasks/main.yml
@@ -56,7 +56,7 @@
         body_format: json
       register: elk_indexes
       until: elk_indexes is success
-      retries: 3
+      retries: 5
       delay: 5
       when:
         - hostvars[inventory_hostname]['elastic_' + index_name + '_retention'] > days_until_rollup
@@ -75,7 +75,7 @@
           index_options: {}
         - url: "http://{{ coordination_nodes[0] }}/_xpack/rollup/job/rollup_{{ index_name }}"
           method: PUT
-          status_code: 200
+          status_code: 200,400
           index_options:
             index_pattern: "{{ index_name }}-*"
             rollup_index: "rollup_{{ index_name }}"
@@ -88,7 +88,7 @@
                 delay: "{{ days_until_rollup }}d"
         - url: "http://{{ coordination_nodes[0] }}/_xpack/rollup/job/rollup_{{ index_name }}/_start"
           method: POST
-          status_code: 200
+          status_code: 200,404
           index_options: {}
       run_once: true
   when:
diff --git a/elk_metrics_6x/roles/elasticsearch/handlers/main.yml b/elk_metrics_6x/roles/elasticsearch/handlers/main.yml
index f1403d58..3dacb437 100644
--- a/elk_metrics_6x/roles/elasticsearch/handlers/main.yml
+++ b/elk_metrics_6x/roles/elasticsearch/handlers/main.yml
@@ -13,13 +13,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Enable and restart elastic
+- name: Enable and restart elasticsearch (systemd)
   systemd:
     name: "elasticsearch"
     enabled: true
     state: restarted
     daemon_reload: true
   when:
-    - (elk_package_state | default('present')) != 'absent'
-  tags:
-    - config
+    - ansible_service_mgr == 'systemd'
+  listen: Enable and restart elastic
+
+- name: Enable and restart elasticsearch (upstart)
+  service:
+    name: "elasticsearch"
+    state: restarted
+    enabled: yes
+  when:
+    - ansible_service_mgr == 'upstart'
+  listen: Enable and restart elastic
diff --git a/elk_metrics_6x/roles/elasticsearch/meta/main.yml b/elk_metrics_6x/roles/elasticsearch/meta/main.yml
index 448ea90e..496db7f1 100644
--- a/elk_metrics_6x/roles/elasticsearch/meta/main.yml
+++ b/elk_metrics_6x/roles/elasticsearch/meta/main.yml
@@ -22,6 +22,7 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
+        - trusty
         - xenial
         - bionic
   categories:
diff --git a/elk_metrics_6x/roles/elasticsearch/tasks/main.yml b/elk_metrics_6x/roles/elasticsearch/tasks/main.yml
index b650f9ec..8c13ef73 100644
--- a/elk_metrics_6x/roles/elasticsearch/tasks/main.yml
+++ b/elk_metrics_6x/roles/elasticsearch/tasks/main.yml
@@ -51,6 +51,22 @@
     group: "root"
     owner: "root"
     mode: "0755"
+  when:
+    - ansible_service_mgr == 'systemd'
+
+- name: Apply systemd options
+  template:
+    src: "{{ item.src }}"
+    dest: "{{ item.dest }}"
+  when:
+    - ansible_service_mgr == 'systemd'
+  with_items:
+    - src: "systemd.elasticsearch-overrides.conf.j2"
+      dest: "/etc/systemd/system/elasticsearch.service.d/elasticsearch-overrides.conf"
+  notify:
+    - Enable and restart elastic
+  tags:
+    - config
 
 - name: Drop elasticsearch conf file
   template:
@@ -63,8 +79,6 @@
       dest: /etc/elasticsearch/jvm.options
     - src: templates/es-log4j2.properties.j2
       dest: /etc/elasticsearch/log4j2.properties
-    - src: "systemd.elasticsearch-overrides.conf.j2"
-      dest: "/etc/systemd/system/elasticsearch.service.d/elasticsearch-overrides.conf"
   notify:
     - Enable and restart elastic
   tags:
diff --git a/elk_metrics_6x/roles/go_install_1.10/meta/main.yml b/elk_metrics_6x/roles/go_install_1.10/meta/main.yml
index 05efc49e..31e6c45f 100644
--- a/elk_metrics_6x/roles/go_install_1.10/meta/main.yml
+++ b/elk_metrics_6x/roles/go_install_1.10/meta/main.yml
@@ -22,6 +22,7 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
+        - trusty
         - xenial
         - bionic
   categories:
diff --git a/elk_metrics_6x/templates/auditbeat.yml.j2 b/elk_metrics_6x/templates/auditbeat.yml.j2
index e8d7002a..d1c13bde 100644
--- a/elk_metrics_6x/templates/auditbeat.yml.j2
+++ b/elk_metrics_6x/templates/auditbeat.yml.j2
@@ -32,7 +32,9 @@ auditbeat.modules:
 # The auditd module collects events from the audit framework in the Linux
 # kernel. You need to specify audit rules for the events that you want to audit.
 - module: auditd
+{% if ansible_kernel is version_compare('4.4', '>=') %}
   socket_type: {{ (apply_security_hardening | default(true) | bool) | ternary('multicast', 'unicast') }}
+{% endif %}
   resolve_ids: true
   failure_mode: silent
   backlog_limit: 8196
diff --git a/elk_metrics_6x/tests/_container-setup.yml b/elk_metrics_6x/tests/_container-setup.yml
index c3815a25..4a7df76c 100644
--- a/elk_metrics_6x/tests/_container-setup.yml
+++ b/elk_metrics_6x/tests/_container-setup.yml
@@ -29,16 +29,6 @@
         macvlan_mode: bridge
 
   pre_tasks:
-    - name: Show host facts
-      debug:
-        var: hostvars
-
-    - name: First ensure apt cache is always refreshed
-      apt:
-        update_cache: yes
-      when:
-        - ansible_pkg_mgr == 'apt'
-
     - name: Ensure root ssh key
       user:
         name: "{{ ansible_env.USER | default('root') }}"
@@ -62,24 +52,6 @@
         manage_dir: no
 
   roles:
-    - role: "systemd_networkd"
-      systemd_networkd_prefix: "elk_metrics_6x"
-      systemd_interface_cleanup: true
-      systemd_run_networkd: true
-      systemd_netdevs:
-        - NetDev:
-            Name: dummy0
-            Kind: dummy
-        - NetDev:
-            Name: br-mgmt
-            Kind: bridge
-      systemd_networks:
-        - interface: "dummy0"
-          bridge: "br-mgmt"
-        - interface: "br-mgmt"
-          address: "172.29.236.1"
-          netmask: "255.255.255.0"
-
     - role: "nspawn_hosts"
 
 
diff --git a/elk_metrics_6x/tests/_key-setup.yml b/elk_metrics_6x/tests/_key-setup.yml
new file mode 100644
index 00000000..8376ed35
--- /dev/null
+++ b/elk_metrics_6x/tests/_key-setup.yml
@@ -0,0 +1,41 @@
+---
+# Copyright 2018, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+- name: Setup host keys
+  hosts: physical_hosts
+  connection: local
+  become: true
+  tasks:
+    - name: Ensure root ssh key
+      user:
+        name: "{{ ansible_env.USER | default('root') }}"
+        generate_ssh_key: "yes"
+        ssh_key_bits: 2048
+        ssh_key_file: ".ssh/id_rsa"
+
+    - name: Get root ssh key
+      slurp:
+        src: '~/.ssh/id_rsa.pub'
+      register: _root_ssh_key
+
+    - name: Prepare container ssh key fact
+      set_fact:
+        nspawn_container_ssh_key: "{{ _root_ssh_key['content'] | b64decode }}"
+
+    - name: Ensure public ssh key is in authorized_keys
+      authorized_key:
+        user: "{{ ansible_env.USER | default('root') }}"
+        key: "{{ nspawn_container_ssh_key }}"
+        manage_dir: no
diff --git a/elk_metrics_6x/tests/functional.yml b/elk_metrics_6x/tests/functional.yml
index bce66905..8c80c100 100644
--- a/elk_metrics_6x/tests/functional.yml
+++ b/elk_metrics_6x/tests/functional.yml
@@ -27,6 +27,10 @@
     ANSIBLE_HOST_KEY_CHECKING: "False"
     ANSIBLE_LOG_PATH: "/tmp/elk-metrics-6x-logs/ansible-elk-test.log"
 
+  vars:
+    # inventory_file: "inventory/test-{{ (ansible_service_mgr == 'systemd') | ternary('container', 'metal') }}-inventory.yml"
+    inventory_file: "inventory/test-metal-inventory.yml"
+
   pre_tasks:
     - name: Create swap file
       command: "dd if=/dev/zero of=/swap.img bs=1M count=4096"
@@ -71,6 +75,12 @@
         - "iptables -P OUTPUT ACCEPT"
         - "touch /tmp/elk-metrics-6x-logs/iptables.flushed"
 
+    - name: First ensure apt cache is always refreshed
+      apt:
+        update_cache: yes
+      when:
+        - ansible_pkg_mgr == 'apt'
+
   tasks:
     - name: Run embedded ansible installation
       become: yes
@@ -94,33 +104,39 @@
     - name: Run environment setup
       become: yes
       become_user: root
-      command: "/root/ansible25/bin/ansible-playbook -i inventory/test-inventory.yml -e @test-vars.yml _container-setup.yml"
+      command: "/root/ansible25/bin/ansible-playbook -i {{ inventory_file }} -e @test-vars.yml _key-setup.yml"
       environment:
         ANSIBLE_ACTION_PLUGINS: "/root/ansible25/repositories/ansible-config_template/action"
         ANSIBLE_CONNECTION_PLUGINS: "/root/ansible25/repositories/openstack-ansible-plugins/connection"
         ANSIBLE_LOG_PATH: "/tmp/elk-metrics-6x-logs/ansible-elk-test-container-setup.log"
       args:
         chdir: "src/{{ current_test_repo }}/elk_metrics_6x/tests"
+      when:
+        - ansible_service_mgr != 'systemd'
+
+    - name: Run environment setup
+      become: yes
+      become_user: root
+      command: "/root/ansible25/bin/ansible-playbook -i {{ inventory_file }} -e @test-vars.yml _container-setup.yml"
+      environment:
+        ANSIBLE_ACTION_PLUGINS: "/root/ansible25/repositories/ansible-config_template/action"
+        ANSIBLE_CONNECTION_PLUGINS: "/root/ansible25/repositories/openstack-ansible-plugins/connection"
+        ANSIBLE_LOG_PATH: "/tmp/elk-metrics-6x-logs/ansible-elk-test-container-setup.log"
+      args:
+        chdir: "src/{{ current_test_repo }}/elk_metrics_6x/tests"
+      when:
+        - ansible_service_mgr == 'systemd'
 
     - name: Wait 15 seconds
       command: "sleep 15"
       changed_when: false
-
-    - name: Log all facts
-      become: yes
-      become_user: root
-      command: "/root/ansible25/bin/ansible -m setup -i tests/inventory/test-inventory.yml all"
-      environment:
-        ANSIBLE_ACTION_PLUGINS: "/root/ansible25/repositories/ansible-config_template/action"
-        ANSIBLE_CONNECTION_PLUGINS: "/root/ansible25/repositories/openstack-ansible-plugins/connection"
-        ANSIBLE_LOG_PATH: "/tmp/elk-metrics-6x-logs/ansible-elk-test-facts.log"
-      args:
-        chdir: "src/{{ current_test_repo }}/elk_metrics_6x"
+      when:
+        - ansible_service_mgr == 'systemd'
 
     - name: Run functional test
       become: yes
       become_user: root
-      command: "/root/ansible25/bin/ansible-playbook -i tests/inventory/test-inventory.yml -e @tests/test-vars.yml site.yml"
+      command: "/root/ansible25/bin/ansible-playbook -i tests/{{ inventory_file }} -e @tests/test-vars.yml site.yml"
       environment:
         ANSIBLE_ACTION_PLUGINS: "/root/ansible25/repositories/ansible-config_template/action"
         ANSIBLE_CONNECTION_PLUGINS: "/root/ansible25/repositories/openstack-ansible-plugins/connection"
@@ -131,7 +147,7 @@
     - name: Show cluster state
       become: yes
       become_user: root
-      command: "/root/ansible25/bin/ansible-playbook -i tests/inventory/test-inventory.yml -e @tests/test-vars.yml showElasticCluster.yml"
+      command: "/root/ansible25/bin/ansible-playbook -i tests/{{ inventory_file }} -e @tests/test-vars.yml showElasticCluster.yml"
       environment:
         ANSIBLE_ACTION_PLUGINS: "/root/ansible25/repositories/ansible-config_template/action"
         ANSIBLE_CONNECTION_PLUGINS: "/root/ansible25/repositories/openstack-ansible-plugins/connection"
diff --git a/elk_metrics_6x/tests/inventory/test-inventory.yml b/elk_metrics_6x/tests/inventory/test-container-inventory.yml
similarity index 85%
rename from elk_metrics_6x/tests/inventory/test-inventory.yml
rename to elk_metrics_6x/tests/inventory/test-container-inventory.yml
index 41e8e5a3..6451a65a 100644
--- a/elk_metrics_6x/tests/inventory/test-inventory.yml
+++ b/elk_metrics_6x/tests/inventory/test-container-inventory.yml
@@ -10,11 +10,12 @@ hosts:
           ansible_user: root
       vars:
         physical_host: localhost
+        management_cidr: "172.29.236.0/24"
         container_networks:
           management_address:
             address: "172.29.236.1"
             netmask: "255.255.255.0"
-            bridge: "br-mgmt"
+            bridge: "{{ hostvars[physical_host]['ansible_default_ipv4']['alias'] }}"
 
 
 all_containers:
@@ -25,7 +26,7 @@ all_containers:
       management_address:
         address: "{{ ansible_host }}"
         netmask: "255.255.255.0"
-        bridge: "br-mgmt"
+        bridge: "{{ hostvars[physical_host]['ansible_default_ipv4']['alias'] }}"
 
   children:
     elastic-logstash:
diff --git a/elk_metrics_6x/tests/inventory/test-metal-inventory.yml b/elk_metrics_6x/tests/inventory/test-metal-inventory.yml
new file mode 100644
index 00000000..97b6f536
--- /dev/null
+++ b/elk_metrics_6x/tests/inventory/test-metal-inventory.yml
@@ -0,0 +1,24 @@
+---
+# The hosts group is used to target physical host machines. Enter all physical
+# host machines here.
+hosts:
+  children:
+    physical_hosts:
+      hosts:
+        localhost:
+          ansible_host: 127.0.0.1
+          ansible_user: root
+      vars:
+        physical_host: localhost
+
+    elastic-logstash:
+      hosts:
+        localhost: {}
+
+    kibana:
+      hosts:
+        localhost: {}
+
+    apm-server:
+      hosts:
+        localhost: {}
diff --git a/elk_metrics_6x/tests/manual-test.rc b/elk_metrics_6x/tests/manual-test.rc
index ecd52e52..7a1158cc 100644
--- a/elk_metrics_6x/tests/manual-test.rc
+++ b/elk_metrics_6x/tests/manual-test.rc
@@ -10,7 +10,7 @@ if [[ ! -d "/tmp/elk-metrics-6x-logs" ]]; then
 fi
 
 echo "To build a test environment run the following:"
-echo -e "# /root/ansible25/bin/ansible-playbook -i tests/inventory/test-inventory.yml tests/test.yml --limit localhost\n"
+echo -e "# /root/ansible25/bin/ansible-playbook -i tests/inventory/test-container-inventory.yml tests/test.yml --limit localhost\n"
 
 echo "Run manual functional tests by executing the following:"
-echo -e "# /root/ansible25/bin/ansible-playbook -i tests/inventory/test-inventory.yml site.yml\n"
+echo -e "# /root/ansible25/bin/ansible-playbook -i tests/inventory/test-container-inventory.yml site.yml\n"
diff --git a/elk_metrics_6x/tests/test-vars.yml b/elk_metrics_6x/tests/test-vars.yml
index aa736896..dcbc0bd6 100644
--- a/elk_metrics_6x/tests/test-vars.yml
+++ b/elk_metrics_6x/tests/test-vars.yml
@@ -22,6 +22,3 @@ q_mem: 128
 h_mem: 512
 
 osa_test_repo: "openstack/openstack-ansible-ops"
-
-# Set the data interface to a known value
-elastic_data_interface: "{{ (inventory_hostname == 'localhost') | ternary('mv-mgmt', 'mv-mv-mgmt') }}"
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 1c448471..7f07b614 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -36,6 +36,12 @@
 #     nodeset: opensuse-423
 #     voting: false
 
+- job:
+    name: "openstack-ansible-ops:elk_metrics_6x-ubuntu-trusty"
+    parent: "openstack-ansible-ops:elk_metrics_6x-ubuntu-xenial"
+    nodeset: ubuntu-trusty
+    voting: false
+
 - job:
     name: "openstack-ansible-ops:elk_metrics_6x-ubuntu-bionic"
     parent: "openstack-ansible-ops:elk_metrics_6x-ubuntu-xenial"
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 599d54b4..37533c5e 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -17,6 +17,7 @@
       - openstack-ansible-role-jobs
     check:
       jobs:
+        - "openstack-ansible-ops:elk_metrics_6x-ubuntu-trusty"
         - "openstack-ansible-ops:elk_metrics_6x-ubuntu-xenial"
         - "openstack-ansible-ops:elk_metrics_6x-ubuntu-bionic"
     gate: