diff --git a/roles/vpn/tasks/main.yml b/roles/vpn/tasks/main.yml
index 7fab8bb..8e732e1 100644
--- a/roles/vpn/tasks/main.yml
+++ b/roles/vpn/tasks/main.yml
@@ -15,10 +15,6 @@
     - name: Install strongSwan
       package: name=strongswan state=present
 
-    - name: Get StrongSwan versions
-      shell: ipsec --versioncode | grep -oE "^U([0-9]*|\.)*" | sed "s/^U\|\.//g"
-      register: strongswan_version
-
     - include: ipec_configuration.yml
     - include: openssl.yml
       tags: update-users
diff --git a/roles/vpn/tasks/ubuntu-hacks.yml b/roles/vpn/tasks/ubuntu-hacks.yml
deleted file mode 100644
index a64b754..0000000
--- a/roles/vpn/tasks/ubuntu-hacks.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-
-- name: Configure apt to use the Xenial release by default
-  template:
-    src: 01_xenial_aptconf.j2
-    dest: /etc/apt/apt.conf.d/01xenial
-
-- name: Configure packages preferences
-  template:
-    src: 01_strongswan.pref.j2
-    dest: /etc/apt/preferences.d/01_strongswan.pref
-
-- name: Configure the Ubuntu Zesty repository
-  apt_repository:
-    repo: deb http://mirrors.kernel.org/ubuntu/ zesty main
-    state: present
-    filename: 'zesty'
-    update_cache: yes
diff --git a/roles/vpn/tasks/ubuntu.yml b/roles/vpn/tasks/ubuntu.yml
index db046ad..ccc561b 100644
--- a/roles/vpn/tasks/ubuntu.yml
+++ b/roles/vpn/tasks/ubuntu.yml
@@ -3,9 +3,6 @@
 - set_fact:
     strongswan_additional_plugins: []
 
-- include: ubuntu-hacks.yml
-  when: ansible_distribution_version == "16.04"
-
 - name: Ubuntu | Install strongSwan
   apt:
     name: strongswan
diff --git a/roles/vpn/templates/01_strongswan.pref.j2 b/roles/vpn/templates/01_strongswan.pref.j2
deleted file mode 100644
index 3249758..0000000
--- a/roles/vpn/templates/01_strongswan.pref.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-Package: *strongswan*
-Pin: release n=zesty
-Pin-Priority: 9000
diff --git a/roles/vpn/templates/01_xenial_aptconf.j2 b/roles/vpn/templates/01_xenial_aptconf.j2
deleted file mode 100644
index c589ffc..0000000
--- a/roles/vpn/templates/01_xenial_aptconf.j2
+++ /dev/null
@@ -1 +0,0 @@
-APT::Default-Release "xenial";