diff --git a/manifests/params.pp b/manifests/params.pp
index 04d65d86d..9b3be006e 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -130,8 +130,8 @@ class neutron::params {
     $dhcp_agent_package         = 'neutron-dhcp-agent'
     $lbaasv2_agent_package      = 'neutron-lbaasv2-agent'
     $metering_agent_package     = 'neutron-metering-agent'
-    $vpnaas_agent_package       = 'neutron-vpn-agent'
-    $openswan_package           = 'openswan'
+    $vpnaas_agent_package       = 'python-neutron-vpnaas'
+    $openswan_package           = 'strongswan'
     $libreswan_package          = false
     $metadata_agent_package     = 'neutron-metadata-agent'
     $l3_agent_package           = 'neutron-l3-agent'
diff --git a/manifests/services/fwaas.pp b/manifests/services/fwaas.pp
index 11d0d41b5..a5cd78eff 100644
--- a/manifests/services/fwaas.pp
+++ b/manifests/services/fwaas.pp
@@ -60,7 +60,8 @@ class neutron::services::fwaas (
   if ($::osfamily == 'Debian') {
     # Debian platforms
     if $vpnaas_agent_package {
-      ensure_resource( 'package', $::neutron::params::vpnaas_agent_package, {
+      ensure_resource( 'package', 'neutron-vpn-agent', {
+        'name'   => $::neutron::params::vpnaas_agent_package,
         'ensure' => $neutron::package_ensure,
         'tag'    => ['neutron-package', 'openstack'],
       })
diff --git a/releasenotes/notes/vpnaas_ubuntu_package_fix-7c0e74066ad01e7e.yaml b/releasenotes/notes/vpnaas_ubuntu_package_fix-7c0e74066ad01e7e.yaml
new file mode 100644
index 000000000..b9bb4b550
--- /dev/null
+++ b/releasenotes/notes/vpnaas_ubuntu_package_fix-7c0e74066ad01e7e.yaml
@@ -0,0 +1,8 @@
+---
+fixes:
+  - |
+    As of Queens the neutron-vpn-agent package for Ubuntu is no longer provided and
+    has been replaced with the package python-neutron-vpnaas.
+  - |
+    On Debian there is no package named openswan and the package that should be
+    installed for VPNaaS is strongswan.
diff --git a/spec/classes/neutron_agents_vpnaas_spec.rb b/spec/classes/neutron_agents_vpnaas_spec.rb
index 9146e7b57..421b1c12e 100644
--- a/spec/classes/neutron_agents_vpnaas_spec.rb
+++ b/spec/classes/neutron_agents_vpnaas_spec.rb
@@ -128,7 +128,7 @@ describe 'neutron::agents::vpnaas' do
         case facts[:osfamily]
         when 'Debian'
           {
-            :openswan_package     => 'openswan',
+            :openswan_package     => 'strongswan',
             :vpnaas_agent_package => 'neutron-vpn-agent'
           }
         when 'RedHat'
diff --git a/spec/classes/neutron_services_fwaas_spec.rb b/spec/classes/neutron_services_fwaas_spec.rb
index 7a58c8cda..5957b9ce0 100644
--- a/spec/classes/neutron_services_fwaas_spec.rb
+++ b/spec/classes/neutron_services_fwaas_spec.rb
@@ -90,6 +90,7 @@ describe 'neutron::services::fwaas' do
       it 'installs neutron vpnaas agent package' do
         should contain_package('neutron-vpn-agent').with(
           :ensure => 'present',
+          :name   => platform_params[:vpnaas_package_name],
           :tag    => ['neutron-package', 'openstack'],
         )
       end
@@ -117,7 +118,8 @@ describe 'neutron::services::fwaas' do
         case facts[:osfamily]
         when 'Debian'
           { 
-            :fwaas_package_name => 'python3-neutron-fwaas'
+            :fwaas_package_name   => 'python3-neutron-fwaas',
+            :vpnaas_package_name  => 'python-neutron-vpnaas'
           }
         when 'RedHat'
           {
diff --git a/spec/classes/neutron_services_vpnaas_spec.rb b/spec/classes/neutron_services_vpnaas_spec.rb
index d1183861b..14cb79137 100644
--- a/spec/classes/neutron_services_vpnaas_spec.rb
+++ b/spec/classes/neutron_services_vpnaas_spec.rb
@@ -67,7 +67,7 @@ describe 'neutron::services::vpnaas' do
         case facts[:osfamily]
         when 'Debian'
           {
-            :vpnaas_package_name => 'neutron-vpn-agent'
+            :vpnaas_package_name => 'python-neutron-vpnaas'
           }
         when 'RedHat'
           {