diff --git a/.travis.yml b/.travis.yml
index c685e7c..6d2d1ac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,10 +20,6 @@
   - bundle install
 
 env:
-    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=cluster
-    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=single-ceph
-    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=single-barbican
-    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=single
     - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=cluster
     - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=single-ceph
     - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=single-barbican
diff --git a/glance/db/offline_sync.sls b/glance/db/offline_sync.sls
index a066eb8..d93f2da 100644
--- a/glance/db/offline_sync.sls
+++ b/glance/db/offline_sync.sls
@@ -6,3 +6,12 @@
   {%- if grains.get('noservices') or server.get('role', 'primary') == 'secondary' %}
   - onlyif: /bin/false
   {%- endif %}
+
+glance_load_metadatafs:
+  cmd.run:
+  - name: glance-manage db_load_metadefs
+  - require:
+    - cmd: glance_syncdb
+    {%- if grains.get('noservices') or server.get('role', 'primary') == 'secondary' %}
+  - onlyif: /bin/false
+    {%- endif %}
diff --git a/glance/server.sls b/glance/server.sls
index a74e32b..9442fc8 100644
--- a/glance/server.sls
+++ b/glance/server.sls
@@ -42,7 +42,6 @@
     - pkg: glance_packages
   - require_in:
     - sls: glance.db.offline_sync
-    - cmd: glance_load_metadatafs
 
 /etc/glance/glance-registry.conf:
   file.managed:
@@ -52,7 +51,6 @@
     - pkg: glance_packages
   - require_in:
     - sls: glance.db.offline_sync
-    - cmd: glance_load_metadatafs
 
 /etc/glance/glance-scrubber.conf:
   file.managed:
@@ -62,7 +60,6 @@
     - pkg: glance_packages
   - require_in:
     - sls: glance.db.offline_sync
-    - cmd: glance_load_metadatafs
 
 /etc/glance/glance-api.conf:
   file.managed:
@@ -72,7 +69,6 @@
     - pkg: glance_packages
   - require_in:
     - sls: glance.db.offline_sync
-    - cmd: glance_load_metadatafs
 
 /etc/glance/glance-api-paste.ini:
   file.managed:
@@ -82,7 +78,6 @@
     - pkg: glance_packages
   - require_in:
     - sls: glance.db.offline_sync
-    - cmd: glance_load_metadatafs
 
 {%- if server.version == 'newton' or server.version == 'ocata' %}
 
@@ -99,7 +94,6 @@
     - pkg: glance_glare_package
   - require_in:
     - sls: glance.db.offline_sync
-    - cmd: glance_load_metadatafs
 
 /etc/glance/glance-glare.conf:
   file.managed:
@@ -110,7 +104,6 @@
     - pkg: glance_glare_package
   - require_in:
     - sls: glance.db.offline_sync
-    - cmd: glance_load_metadatafs
 
 {%- if not grains.get('noservices', False) %}
 
@@ -120,7 +113,6 @@
   - name: glance-glare
   - require:
     - sls: glance.db.offline_sync
-    - cmd: glance_load_metadatafs
   - watch:
     - file: /etc/glance/glance-glare.conf
     {%- if server.message_queue.get('ssl',{}).get('enabled',False) %}
@@ -229,16 +221,6 @@
     - service: glance_services
 {% endif %}
 
-glance_load_metadatafs:
-  cmd.run:
-  - name: glance-manage db_load_metadefs
-  - require:
-    - sls: glance.db.offline_sync
-    {%- if grains.get('noservices', False) %}
-  - onlyif: /bin/false
-    {%- endif %}
-
-
 {%- if not grains.get('noservices', False) %}
 
 glance_services: