diff --git a/metadata.yaml b/metadata.yaml
index 0441576..d478242 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -5,3 +5,4 @@ description: |
  The Base Layer for OpenStack reactive charms
 tags:
   - openstack
+series: []
diff --git a/requirements.txt b/requirements.txt
index 5625389..0bfc41d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,4 @@
 # Requirements to build the layer
 charm-tools
-ruamel.yaml==0.10.12
 simplejson
 flake8
diff --git a/tox.ini b/tox.ini
index a2c4984..af6a477 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@ envlist = pep8
 toxworkdir = /tmp/tox
 
 [testenv]
-basepython = python2.7
+basepython = python3
 setenv = VIRTUAL_ENV={envdir}
          PYTHONHASHSEED=0
          TERM=linux
@@ -29,7 +29,6 @@ commands =
   /bin/ln -s {envdir}/tmp/build {toxinidir}/build
 
 [testenv:venv]
-basepython = python3
 commands = {posargs}
 
 [testenv:py27]
diff --git a/wheelhouse.txt b/wheelhouse.txt
index 3e8d1a0..bd63690 100644
--- a/wheelhouse.txt
+++ b/wheelhouse.txt
@@ -1,3 +1,8 @@
+# charmhelpers.contrib.openstack.cert_utils charms with certificates relation
+dnspython
+# charmhelpers.contrib.network all
 netifaces>=0.10.4
+# charmhelpers.contrib.openstack.context all
+psutil
 # charms_openstack - pull from github until first release
 git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack