diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa7070f..1a7a36a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,11 +3,19 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 
+## Unreleased
+
+### Changed
+- Moved to bionic (18.04 LTS)
+
+### Added
+- `import-virsh` script to convert ova archive to libvirt qemu/kvm format
+
 ## [v2018.02] Berlin summit
 
 ### Changed
 - Changed from Vagrant provisioning to disk-image-creator
-- Fixed version to Ubuntu Xenial Xerus (18.04 LTS)
+- Fixed version to Ubuntu Xenial Xerus (16.04 LTS)
 
 ### Added
 - Kept Vagrantfile to provision a CentOS VM that can build the Traning VM
diff --git a/elements/upstream-training/environment.d/99-apt b/elements/upstream-training/environment.d/99-apt
index e79224c..8bd1777 100644
--- a/elements/upstream-training/environment.d/99-apt
+++ b/elements/upstream-training/environment.d/99-apt
@@ -1,2 +1,2 @@
 DIB_DEBIAN_COMPONENTS=main,universe,multiverse
-DIB_RELEASE=xenial
+DIB_RELEASE=bionic
diff --git a/elements/upstream-training/package-installs.yaml b/elements/upstream-training/package-installs.yaml
index 8d11aee..172a650 100644
--- a/elements/upstream-training/package-installs.yaml
+++ b/elements/upstream-training/package-installs.yaml
@@ -52,8 +52,7 @@ virtualbox-guest-x11:
 
 # Configure vmware GUI
 open-vm-tools-desktop:
-open-vm-tools-dkms:
-xserver-xorg-input-vmmouse:
+open-vm-tools:
 xserver-xorg-video-vmware:
 
 # Configure qemu-kvm GUI
@@ -108,9 +107,9 @@ libpq-dev:
 libsasl2-dev:
 libssl-dev:
 libsystemd-dev:
-libvirt-bin:
-libvirt-dev:
+libvirt-clients:
 libvirt-daemon-system:
+libvirt-dev:
 libxml2-dev:
 libxslt1-dev:
 libyaml-dev:
@@ -145,7 +144,6 @@ sysfsutils:
 tcpdump:
 tgt:
 thin-provisioning-tools:
-ubuntu-cloud-keyring:
 unzip:
 uuid-runtime:
 vlan:
diff --git a/elements/upstream-training/static/tmp/requirements.txt b/elements/upstream-training/static/tmp/requirements.txt
index 8bcdc68..9232d52 100644
--- a/elements/upstream-training/static/tmp/requirements.txt
+++ b/elements/upstream-training/static/tmp/requirements.txt
@@ -14,7 +14,7 @@ PyJWT==1.6.4
 PyMySQL==0.9.2
 PyNaCl==1.3.0
 PyYAML==3.13
-Pygments==2.2.0
+Pygments==2.3.0
 Routes==2.4.1
 SQLAlchemy==1.2.14
 Sphinx==1.8.2
@@ -77,7 +77,7 @@ colorama==0.4.0
 configparser==3.5.0
 contextlib2==0.5.5
 coverage==4.5.2
-cryptography==2.4.1
+cryptography==2.4.2
 cursive==0.2.2
 ddt==1.2.0
 debtcollector==1.20.0
@@ -92,7 +92,7 @@ dnspython==1.15.0
 doc8==0.8.0
 docutils==0.14
 dogpile.cache==0.6.7
-dulwich==0.19.8
+dulwich==0.19.9
 enum34==1.1.6
 etcd3==0.8.1
 etcd3gw==0.2.4
@@ -148,7 +148,7 @@ more-itertools==4.3.0
 mox3==0.26.0
 msgpack==0.5.6
 munch==2.3.2
-mysqlclient==1.3.7
+mysqlclient==1.3.10
 netaddr==0.7.19
 netifaces==0.10.7
 networkx==2.2
@@ -171,18 +171,18 @@ os-xenapi==0.3.4
 osc-lib==1.11.1
 osc-placement==1.3.0
 oslo.cache==1.31.0
-oslo.concurrency==3.28.1
+oslo.concurrency==3.29.0
 oslo.config==6.7.0
 oslo.context==2.21.0
 oslo.db==4.42.0
 oslo.i18n==3.22.1
-oslo.log==3.40.1
-oslo.messaging==9.2.0
+oslo.log==3.41.0
+oslo.messaging==9.2.1
 oslo.middleware==3.36.0
 oslo.policy==1.41.0
 oslo.privsep==1.30.1
 oslo.reports==1.29.1
-oslo.rootwrap==5.14.1
+oslo.rootwrap==5.15.0
 oslo.serialization==2.28.1
 oslo.service==1.33.0
 oslo.upgradecheck==0.1.1
@@ -216,7 +216,7 @@ pyasn1==0.4.4
 pycadf==2.8.0
 pycodestyle==2.4.0
 pycparser==2.19
-pydot==1.2.4
+pydot==1.3.0
 pyflakes==0.8.1
 pyinotify==0.9.6
 pylint==1.9.2
@@ -227,7 +227,7 @@ pypowervm==1.1.18
 pyroute2==0.5.3
 pysaml2==4.6.3
 pysendfile==2.0.1
-pytest==3.10.1
+pytest==4.0.0
 python-barbicanclient==4.8.0
 python-cinderclient==4.1.0
 python-dateutil==2.7.5
@@ -268,7 +268,7 @@ singledispatch==3.4.0.3
 six==1.11.0
 smmap2==2.0.5
 snowballstemmer==1.2.1
-sortedcontainers==2.0.5
+sortedcontainers==2.1.0
 sphinxcontrib-websupport==1.1.0
 sqlalchemy-migrate==0.11.0
 sqlparse==0.2.4