diff --git a/pkg.in/lists/openstack/block b/pkg.in/lists/openstack/block
index 4404ab99..836e4673 100644
--- a/pkg.in/lists/openstack/block
+++ b/pkg.in/lists/openstack/block
@@ -1,4 +1,3 @@
-python-module-MySQLdb
 lvm2
 openstack-cinder
-python-module-rtslib
+
diff --git a/pkg.in/lists/openstack/compute b/pkg.in/lists/openstack/compute
index 74929c3a..914062e0 100644
--- a/pkg.in/lists/openstack/compute
+++ b/pkg.in/lists/openstack/compute
@@ -1,3 +1,4 @@
-python-module-MySQLdb
 openstack-nova-compute
-openstack-neutron-openvswitch
+openstack-neutron-openvswitch-agent
+openstack-neutron-linuxbridge-agent
+openstack-ceilometer-compute
diff --git a/pkg.in/lists/openstack/controller b/pkg.in/lists/openstack/controller
index c1bc5e62..e9c600c7 100644
--- a/pkg.in/lists/openstack/controller
+++ b/pkg.in/lists/openstack/controller
@@ -1,34 +1,20 @@
-python-module-MySQLdb
+MySQL-server
+rabbitmq-server
+memcached
 openstack-keystone
-python-module-keystoneclient
 openstack-glance
-python-module-glanceclient
 openstack-nova-api
 openstack-nova-conductor
 openstack-nova-console
 openstack-nova-novncproxy
 openstack-nova-scheduler
-python-module-novaclient
 openstack-neutron
-python-module-neutronclient
-memcached
-python-module-memcached
-apache2-mod_wsgi
-openstack-dashboard
 openstack-cinder
-python-module-swiftclient
 openstack-swift
 openstack-heat-api
 openstack-heat-engine
 openstack-heat-api-cfn
-openstack-ceilometer-api
-openstack-ceilometer-collector
 openstack-ceilometer-notification
 openstack-ceilometer-central
 openstack-ceilometer-alarm
-python-module-ceilometerclient
-mongo
-mongo-server-mongod
-python-module-troveclient
-MySQL-server
-rabbitmq-server
+openstack-dashboard
diff --git a/pkg.in/lists/openstack/network b/pkg.in/lists/openstack/network
index aa6593d9..8cdcae99 100644
--- a/pkg.in/lists/openstack/network
+++ b/pkg.in/lists/openstack/network
@@ -1,6 +1,8 @@
-python-module-MySQLdb
 openstack-neutron
-openstack-neutron-openvswitch
-openstack-ceilometer-compute
-python-module-ceilometerclient
-python-module-pecan
+openstack-neutron-openvswitch-agent
+openstack-neutron-l3-agent
+openstack-neutron-linuxbridge-agent
+openstack-neutron-metadata-agent
+openstack-neutron-server
+openstack-neutron-fwaas
+openstack-neutron-lbaas
diff --git a/pkg.in/lists/openstack/storage b/pkg.in/lists/openstack/storage
index bfc68db6..b38fb6eb 100644
--- a/pkg.in/lists/openstack/storage
+++ b/pkg.in/lists/openstack/storage
@@ -1,6 +1,4 @@
-python-module-MySQLdb
 openstack-swift-account
 openstack-swift-container
 openstack-swift-object
 xfsprogs
-xinetd