diff --git a/manifests/site.pp b/manifests/site.pp
index b76317ca58..08dee7e946 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1093,37 +1093,38 @@ node /^backup\d+\..*\.ci\.open.*\.org$/ {
   include openstack_project::backup_server
 }
 
-# Node-OS: trusty
+# Node-OS: xenial
 node /^openstackid\d*(\.openstack)?\.org$/ {
   $group = "openstackid"
   class { 'openstack_project::openstackid_prod':
-    site_admin_password         => hiera('openstackid_site_admin_password'),
-    id_mysql_host               => hiera('openstackid_id_mysql_host', 'localhost'),
-    id_mysql_password           => hiera('openstackid_id_mysql_password'),
-    id_mysql_user               => hiera('openstackid_id_mysql_user', 'username'),
-    id_db_name                  => hiera('openstackid_id_db_name'),
-    ss_mysql_host               => hiera('openstackid_ss_mysql_host', 'localhost'),
-    ss_mysql_password           => hiera('openstackid_ss_mysql_password'),
-    ss_mysql_user               => hiera('openstackid_ss_mysql_user', 'username'),
-    ss_db_name                  => hiera('openstackid_ss_db_name', 'username'),
-    redis_password              => hiera('openstackid_redis_password'),
-    ssl_cert_file_contents      => hiera('openstackid_ssl_cert_file_contents'),
-    ssl_key_file_contents       => hiera('openstackid_ssl_key_file_contents'),
-    ssl_chain_file_contents     => hiera('openstackid_ssl_chain_file_contents'),
-    id_recaptcha_public_key     => hiera('openstackid_recaptcha_public_key'),
-    id_recaptcha_private_key    => hiera('openstackid_recaptcha_private_key'),
-    vhost_name                  => 'openstackid.org',
-    session_cookie_domain       => 'openstackid.org',
-    serveradmin                 => 'webmaster@openstackid.org',
-    canonicalweburl             => 'https://openstackid.org/',
-    app_url                     => 'https://openstackid.org',
-    app_key                     => hiera('openstackid_app_key'),
-    id_log_error_to_email       => 'openstack@tipit.net',
-    id_log_error_from_email     => 'noreply@openstack.org',
-    email_driver                => 'smtp',
-    email_smtp_server           => 'smtp.sendgrid.net',
-    email_smtp_server_user      => hiera('openstackid_smtp_user'),
-    email_smtp_server_password  => hiera('openstackid_smtp_password'),
+    site_admin_password                 => hiera('openstackid_site_admin_password'),
+    id_mysql_host                       => hiera('openstackid_id_mysql_host', 'localhost'),
+    id_mysql_password                   => hiera('openstackid_id_mysql_password'),
+    id_mysql_user                       => hiera('openstackid_id_mysql_user', 'username'),
+    id_db_name                          => hiera('openstackid_id_db_name'),
+    ss_mysql_host                       => hiera('openstackid_ss_mysql_host', 'localhost'),
+    ss_mysql_password                   => hiera('openstackid_ss_mysql_password'),
+    ss_mysql_user                       => hiera('openstackid_ss_mysql_user', 'username'),
+    ss_db_name                          => hiera('openstackid_ss_db_name', 'username'),
+    redis_password                      => hiera('openstackid_redis_password'),
+    ssl_cert_file_contents              => hiera('openstackid_ssl_cert_file_contents'),
+    ssl_key_file_contents               => hiera('openstackid_ssl_key_file_contents'),
+    ssl_chain_file_contents             => hiera('openstackid_ssl_chain_file_contents'),
+    id_recaptcha_public_key             => hiera('openstackid_recaptcha_public_key'),
+    id_recaptcha_private_key            => hiera('openstackid_recaptcha_private_key'),
+    vhost_name                          => 'openstackid.org',
+    session_cookie_domain               => 'openstackid.org',
+    serveradmin                         => 'webmaster@openstackid.org',
+    canonicalweburl                     => 'https://openstackid.org/',
+    app_url                             => 'https://openstackid.org',
+    app_key                             => hiera('openstackid_app_key'),
+    id_log_error_to_email               => 'openstack@tipit.net',
+    id_log_error_from_email             => 'noreply@openstack.org',
+    email_driver                        => 'smtp',
+    email_smtp_server                   => 'smtp.sendgrid.net',
+    email_smtp_server_user              => hiera('openstackid_smtp_user'),
+    email_smtp_server_password          => hiera('openstackid_smtp_password'),
+    php_version                         => 7,
   }
 }
 
diff --git a/modules/openstack_project/manifests/openstackid_prod.pp b/modules/openstack_project/manifests/openstackid_prod.pp
index 371ce96acd..df3ecf88d3 100644
--- a/modules/openstack_project/manifests/openstackid_prod.pp
+++ b/modules/openstack_project/manifests/openstackid_prod.pp
@@ -42,7 +42,7 @@ class openstack_project::openstackid_prod (
   $serveradmin = '',
   $canonicalweburl = '',
   $session_cookie_domain = '',
-  $release = '1.0.25',
+  $release = '2.0.0',
   $app_url = '',
   $app_key = '',
   $email_driver = 'mail',