diff --git a/elements/boot-stack/element-deps b/elements/boot-stack/element-deps
index d72de1b5a..bdf7dd70e 100644
--- a/elements/boot-stack/element-deps
+++ b/elements/boot-stack/element-deps
@@ -4,10 +4,10 @@ heat-engine
 iptables
 keystone
 mysql
+neutron-openvswitch-agent
+neutron-server
 nova-api
 openstack-clients
 os-apply-config
 os-refresh-config
 os-svc-install
-neutron-openvswitch-agent
-neutron-server
diff --git a/elements/cinder-api/element-deps b/elements/cinder-api/element-deps
index 52764e840..97597e3f9 100644
--- a/elements/cinder-api/element-deps
+++ b/elements/cinder-api/element-deps
@@ -1,5 +1,5 @@
 cinder
-os-svc-install
 os-refresh-config
+os-svc-install
 source-repositories
 use-ephemeral
diff --git a/elements/cinder/element-deps b/elements/cinder/element-deps
index 32475be2b..247d00ba8 100644
--- a/elements/cinder/element-deps
+++ b/elements/cinder/element-deps
@@ -1,6 +1,6 @@
 iptables
-os-svc-install
-os-refresh-config
 os-apply-config
+os-refresh-config
+os-svc-install
 source-repositories
 use-ephemeral
diff --git a/elements/devstack/element-deps b/elements/devstack/element-deps
index e02ec47de..49d7b40d6 100644
--- a/elements/devstack/element-deps
+++ b/elements/devstack/element-deps
@@ -1,2 +1,2 @@
-stackuser
 source-repositories
+stackuser
diff --git a/elements/diskimage-builder/element-deps b/elements/diskimage-builder/element-deps
index 887eaa8db..7ecaecb25 100644
--- a/elements/diskimage-builder/element-deps
+++ b/elements/diskimage-builder/element-deps
@@ -1,2 +1,2 @@
-source-repositories
 pip-and-virtualenv
+source-repositories
diff --git a/elements/geard/element-deps b/elements/geard/element-deps
index 6fee94ec1..d785d4e17 100644
--- a/elements/geard/element-deps
+++ b/elements/geard/element-deps
@@ -1,2 +1,2 @@
-os-svc-install
 os-refresh-config
+os-svc-install
diff --git a/elements/glance/element-deps b/elements/glance/element-deps
index c17278b3d..78c0138fb 100644
--- a/elements/glance/element-deps
+++ b/elements/glance/element-deps
@@ -1,5 +1,5 @@
 iptables
-os-svc-install
-os-refresh-config
 os-apply-config
+os-refresh-config
+os-svc-install
 source-repositories
diff --git a/elements/heat/element-deps b/elements/heat/element-deps
index 5ad2c9fe0..b3563628e 100644
--- a/elements/heat/element-deps
+++ b/elements/heat/element-deps
@@ -1,4 +1,4 @@
-os-svc-install
 os-apply-config
 os-refresh-config
+os-svc-install
 source-repositories
diff --git a/elements/nagios3/element-deps b/elements/nagios3/element-deps
index 72211209a..fceae001c 100644
--- a/elements/nagios3/element-deps
+++ b/elements/nagios3/element-deps
@@ -1,5 +1,5 @@
+apache2
+openstack-clients
 os-apply-config
 os-refresh-config
 postfix
-apache2
-openstack-clients
diff --git a/elements/neutron/element-deps b/elements/neutron/element-deps
index 6bcdd1a09..78c0138fb 100644
--- a/elements/neutron/element-deps
+++ b/elements/neutron/element-deps
@@ -1,5 +1,5 @@
 iptables
-os-svc-install
 os-apply-config
 os-refresh-config
+os-svc-install
 source-repositories
diff --git a/elements/nova/element-deps b/elements/nova/element-deps
index 5ad2c9fe0..b3563628e 100644
--- a/elements/nova/element-deps
+++ b/elements/nova/element-deps
@@ -1,4 +1,4 @@
-os-svc-install
 os-apply-config
 os-refresh-config
+os-svc-install
 source-repositories
diff --git a/elements/openstack-clients/element-deps b/elements/openstack-clients/element-deps
index f15b616ff..6e2fcb089 100644
--- a/elements/openstack-clients/element-deps
+++ b/elements/openstack-clients/element-deps
@@ -1,3 +1,3 @@
-source-repositories
 pip-and-virtualenv
 pip-manifest
+source-repositories
diff --git a/elements/os-collect-config/element-deps b/elements/os-collect-config/element-deps
index a635a3a03..f7d9c6721 100644
--- a/elements/os-collect-config/element-deps
+++ b/elements/os-collect-config/element-deps
@@ -1,4 +1,4 @@
-source-repositories
-os-refresh-config
 os-apply-config
+os-refresh-config
 pip-manifest
+source-repositories
diff --git a/elements/os-refresh-config/element-deps b/elements/os-refresh-config/element-deps
index a124d5280..fb9e815e0 100644
--- a/elements/os-refresh-config/element-deps
+++ b/elements/os-refresh-config/element-deps
@@ -1,5 +1,5 @@
-pip-and-virtualenv
-source-repositories
-os-collect-config
 os-apply-config
+os-collect-config
+pip-and-virtualenv
 pip-manifest
+source-repositories
diff --git a/elements/qpidd/element-deps b/elements/qpidd/element-deps
index e0c4dd42f..9d8b6b7a5 100644
--- a/elements/qpidd/element-deps
+++ b/elements/qpidd/element-deps
@@ -1,2 +1,2 @@
-os-refresh-config
 os-apply-config
+os-refresh-config
diff --git a/elements/rabbitmq-server/element-deps b/elements/rabbitmq-server/element-deps
index 857f951c3..8ab89933c 100644
--- a/elements/rabbitmq-server/element-deps
+++ b/elements/rabbitmq-server/element-deps
@@ -1,3 +1,3 @@
 iptables
-os-refresh-config
 os-apply-config
+os-refresh-config
diff --git a/elements/snmpd/element-deps b/elements/snmpd/element-deps
index bee2a8c58..b0a0c5d7d 100644
--- a/elements/snmpd/element-deps
+++ b/elements/snmpd/element-deps
@@ -1 +1 @@
-os-apply-config
\ No newline at end of file
+os-apply-config
diff --git a/elements/swift-proxy/element-deps b/elements/swift-proxy/element-deps
index 9016b68da..1a4869905 100644
--- a/elements/swift-proxy/element-deps
+++ b/elements/swift-proxy/element-deps
@@ -1,2 +1,2 @@
-swift
 memcached
+swift
diff --git a/elements/tripleo-cd/element-deps b/elements/tripleo-cd/element-deps
index 429e80e38..08dc63051 100644
--- a/elements/tripleo-cd/element-deps
+++ b/elements/tripleo-cd/element-deps
@@ -1,2 +1,2 @@
-source-repositories
 pypi-mirror
+source-repositories
diff --git a/elements/tuskar/element-deps b/elements/tuskar/element-deps
index 3762e50e9..b3563628e 100644
--- a/elements/tuskar/element-deps
+++ b/elements/tuskar/element-deps
@@ -1,4 +1,4 @@
-os-svc-install
-os-refresh-config
 os-apply-config
+os-refresh-config
+os-svc-install
 source-repositories