diff --git a/conf/components/cinder.yaml b/conf/components/cinder.yaml
index 71701302..3a96e772 100755
--- a/conf/components/cinder.yaml
+++ b/conf/components/cinder.yaml
@@ -9,33 +9,5 @@ api_host: "$(auto:ip)"
 api_port: 8776
 protocol: http
 
-# Needed for setting up your database
-db:
-  type: "$(db:type)"
-  user: "$(db:user)"
-  host: "$(db:host)"
-  port: "$(db:port)"
-
-# Interactions with keystone are via the following settings
-keystone:
-  auth_host: "$(keystone:auth_host)"
-  auth_port: "$(keystone:auth_port)"
-  auth_proto: "$(keystone:auth_proto)"
-  service_host: "$(keystone:service_host)"
-  service_port: "$(keystone:service_port)"
-  service_proto: "$(keystone:service_proto)"
-
-# Rabbit mq hookins
-rabbit:
-  user_id: "$(rabbit-mq:user_id)"
-  host: "$(rabbit-mq:host)"
-
-# This is needed to allow installs based on personas
-wanted_passwords:
-  rabbit: 'rabbit user'
-  service_token: 'service admin token'
-  admin_password: 'keystone admin user'
-  service_password: 'service authentication password'
-  sql: "database user"
 
 ...
diff --git a/conf/components/db.yaml b/conf/components/db.yaml
index 61f698cd..6892aeb0 100644
--- a/conf/components/db.yaml
+++ b/conf/components/db.yaml
@@ -6,6 +6,4 @@ port: 3306
 type: mysql
 user: root
 
-wanted_passwords:
-  sql: "database user"
 ...
diff --git a/conf/components/general.yaml b/conf/components/general.yaml
index 89c7a00a..1a9479fc 100644
--- a/conf/components/general.yaml
+++ b/conf/components/general.yaml
@@ -9,4 +9,35 @@ ip: "$(auto:ip)"
 # For example, before uploading to glance we need keystone and glance to be online.
 # Sometimes this takes 5 to 10 seconds to start these up....
 service_wait_seconds: 5
+
+
+# Needed for setting up your database
+db:
+  type: "$(db:type)"
+  user: "$(db:user)"
+  host: "$(db:host)"
+  port: "$(db:port)"
+
+# Interactions with keystone are via the following settings
+keystone:
+  auth_host: "$(keystone:auth_host)"
+  auth_port: "$(keystone:auth_port)"
+  auth_proto: "$(keystone:auth_proto)"
+  service_host: "$(keystone:service_host)"
+  service_port: "$(keystone:service_port)"
+  service_proto: "$(keystone:service_proto)"
+
+# Rabbit mq hookins
+rabbit:
+  user_id: "$(rabbit-mq:user_id)"
+  host: "$(rabbit-mq:host)"
+
+# This is needed to allow installs based on personas
+wanted_passwords:
+  rabbit: 'rabbit user'
+  service_token: 'service admin token'
+  admin_password: 'keystone admin user'
+  service_password: 'service authentication password'
+  sql: "database user"
+  
 ...
diff --git a/conf/components/glance.yaml b/conf/components/glance.yaml
index c62b94b6..4ad829fe 100644
--- a/conf/components/glance.yaml
+++ b/conf/components/glance.yaml
@@ -13,13 +13,6 @@ verbose: True
 image_urls:
 - "http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-disk.img"
 
-# Needed for setting up your database
-db:
-  type: "$(db:type)"
-  user: "$(db:user)"
-  host: "$(db:host)"
-  port: "$(db:port)"
-
 patches:
   # After check-out/download time patches
   download: []
@@ -36,13 +29,6 @@ exclude_tests:
 
 # Interactions with keystone are via the following settings
 paste_flavor: 'keystone'
-keystone:
-  auth_host: "$(keystone:auth_host)"
-  auth_port: "$(keystone:auth_port)"
-  auth_proto: "$(keystone:auth_proto)"
-  service_host: "$(keystone:service_host)"
-  service_port: "$(keystone:service_port)"
-  service_proto: "$(keystone:service_proto)"
 
 # Images that are downloaded are stored here with
 # metadata about them, so that re-examination before
diff --git a/conf/components/horizon.yaml b/conf/components/horizon.yaml
index b0630173..8fc88c99 100644
--- a/conf/components/horizon.yaml
+++ b/conf/components/horizon.yaml
@@ -17,10 +17,4 @@ apache_user: "$(auto:user)"
 # Port horizon should run on
 port: 80
 
-# Needed for setting up your database
-db:
-  type: "$(db:type)"
-  user: "$(db:user)"
-  host: "$(db:host)"
-  port: "$(db:port)"
 ...
diff --git a/conf/components/keystone.yaml b/conf/components/keystone.yaml
index b5a9e87e..f7892a2a 100644
--- a/conf/components/keystone.yaml
+++ b/conf/components/keystone.yaml
@@ -13,13 +13,6 @@ service_host: "$(auto:ip)"
 service_port: 5000
 service_proto: http
 
-# Needed for setting up your database
-db:
-  type: "$(db:type)"
-  user: "$(db:user)"
-  host: "$(db:host)"
-  port: "$(db:port)"
-
 # Package time patches
 patches:
   package:
@@ -63,11 +56,4 @@ cinder:
   api_host: "$(cinder:api_host)"
   api_port: "$(cinder:api_port)"
 
-# This is needed to allow installs based on personas
-wanted_passwords:
-  rabbit: 'rabbit user'
-  service_token: 'service admin token'
-  admin_password: 'keystone admin user'
-  service_password: 'service authentication password'
-  sql: "database user"
 ...
diff --git a/conf/components/nova.yaml b/conf/components/nova.yaml
index 28a5c81c..bf72e726 100644
--- a/conf/components/nova.yaml
+++ b/conf/components/nova.yaml
@@ -143,33 +143,4 @@ exclude_tests:
 exclude_tests_dir:
   - smoketests
 
-# Needed for setting up your database
-db:
-  type: "$(db:type)"
-  user: "$(db:user)"
-  host: "$(db:host)"
-  port: "$(db:port)"
-
-# Interactions with keystone are via the following settings
-keystone:
-  auth_host: "$(keystone:auth_host)"
-  auth_port: "$(keystone:auth_port)"
-  auth_proto: "$(keystone:auth_proto)"
-  service_host: "$(keystone:service_host)"
-  service_port: "$(keystone:service_port)"
-  service_proto: "$(keystone:service_proto)"
-
-# Rabbit mq hookins
-rabbit:
-  user_id: "$(rabbit-mq:user_id)"
-  host: "$(rabbit-mq:host)"
-
-# This is needed to allow installs based on personas
-wanted_passwords:
-  rabbit: 'rabbit user'
-  service_token: 'service admin token'
-  admin_password: 'keystone admin user'
-  service_password: 'service authentication password'
-  sql: "database user"
-
 ...
diff --git a/conf/components/quantum.yaml b/conf/components/quantum.yaml
index 1356a5cf..a036531f 100644
--- a/conf/components/quantum.yaml
+++ b/conf/components/quantum.yaml
@@ -9,34 +9,6 @@ api_host: "$(auto:ip)"
 api_port: 9696
 protocol: http
 
-# Needed for setting up your database
-db:
-  type: "$(db:type)"
-  user: "$(db:user)"
-  host: "$(db:host)"
-  port: "$(db:port)"
-
-# Interactions with keystone are via the following settings
-keystone:
-  auth_host: "$(keystone:auth_host)"
-  auth_port: "$(keystone:auth_port)"
-  auth_proto: "$(keystone:auth_proto)"
-  service_host: "$(keystone:service_host)"
-  service_port: "$(keystone:service_port)"
-  service_proto: "$(keystone:service_proto)"
-
-# Rabbit mq hookins
-rabbit:
-  user_id: "$(rabbit-mq:user_id)"
-  host: "$(rabbit-mq:host)"
-
-# This is needed to allow installs based on personas
-wanted_passwords:
-  service_token: 'service admin token'
-  admin_password: 'keystone admin user'
-  service_password: 'service authentication password'
-  sql: "database user"
-
 core_plugin: linuxbridge
 
 network_vlan_ranges: physnet1:100:299