diff --git a/.gitreview b/.gitreview
index 975ab6db..69292d42 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
 host=review.opendev.org
 port=29418
 project=openstack/puppet-openstack-integration.git
+defaultbranch=stable/2025.1
diff --git a/Puppetfile b/Puppetfile
index fbf0b3db..93f3f5a8 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -3,15 +3,15 @@
 ## OpenStack modules
 mod 'aodh',
   :git => 'https://opendev.org/openstack/puppet-aodh',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'barbican',
   :git => 'https://opendev.org/openstack/puppet-barbican',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'ceilometer',
   :git => 'https://opendev.org/openstack/puppet-ceilometer',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'ceph',
   :git => 'https://opendev.org/openstack/puppet-ceph',
@@ -19,111 +19,107 @@ mod 'ceph',
 
 mod 'cinder',
   :git => 'https://opendev.org/openstack/puppet-cinder',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'cloudkitty',
   :git => 'https://opendev.org/openstack/puppet-cloudkitty',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'designate',
   :git => 'https://opendev.org/openstack/puppet-designate',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'glance',
   :git => 'https://opendev.org/openstack/puppet-glance',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'gnocchi',
   :git => 'https://opendev.org/openstack/puppet-gnocchi',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'heat',
   :git => 'https://opendev.org/openstack/puppet-heat',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'horizon',
   :git => 'https://opendev.org/openstack/puppet-horizon',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'ironic',
   :git => 'https://opendev.org/openstack/puppet-ironic',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'keystone',
   :git => 'https://opendev.org/openstack/puppet-keystone',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'magnum',
   :git => 'https://opendev.org/openstack/puppet-magnum',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'manila',
   :git => 'https://opendev.org/openstack/puppet-manila',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'mistral',
   :git => 'https://opendev.org/openstack/puppet-mistral',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'neutron',
   :git => 'https://opendev.org/openstack/puppet-neutron',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'nova',
   :git => 'https://opendev.org/openstack/puppet-nova',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'octavia',
   :git => 'https://opendev.org/openstack/puppet-octavia',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'openstack_extras',
   :git => 'https://opendev.org/openstack/puppet-openstack_extras',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'openstacklib',
   :git => 'https://opendev.org/openstack/puppet-openstacklib',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'oslo',
   :git => 'https://opendev.org/openstack/puppet-oslo',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'ovn',
   :git => 'https://opendev.org/openstack/puppet-ovn',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'placement',
   :git => 'https://opendev.org/openstack/puppet-placement',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'swift',
   :git => 'https://opendev.org/openstack/puppet-swift',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'tempest',
   :git => 'https://opendev.org/openstack/puppet-tempest',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'trove',
   :git => 'https://opendev.org/openstack/puppet-trove',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'vswitch',
   :git => 'https://opendev.org/openstack/puppet-vswitch',
-  :ref => 'master'
-
-mod 'vitrage',
-  :git => 'https://opendev.org/openstack/puppet-vitrage',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'watcher',
   :git => 'https://opendev.org/openstack/puppet-watcher',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'zaqar',
   :git => 'https://opendev.org/openstack/puppet-zaqar',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 ## External modules
 mod 'kmod',
@@ -184,7 +180,7 @@ mod 'memcached',
 
 mod 'dns',
   :git => 'https://github.com/theforeman/puppet-dns',
-  :ref => '11.0.1'
+  :ref => '12.1.0'
 
 mod 'archive',
   :git => 'https://github.com/voxpupuli/puppet-archive',
@@ -196,7 +192,8 @@ mod 'ssh_keygen',
 
 mod 'redis',
   :git => 'https://github.com/voxpupuli/puppet-redis',
-  :ref => 'v11.1.0'
+  # NOTE(tkajinam): Temporal bump to fix broken idempotency
+  :ref => '27a95724b0a9597bbd9a314a96ff47da7eaaac18'
 
 mod 'systemd',
   :git => 'https://github.com/voxpupuli/puppet-systemd',
diff --git a/README.md b/README.md
index bba23689..af15ca5e 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,6 @@ scenario](#all-in-one).
 | ceph       |      X      |             |             |      X      |             |              |
 | ceph mds   |             |             |             |      X      |             |              |
 | ceph rgw   |             |             |             |      X      |             |              |
-| vitrage    |      X      |             |             |             |             |              |
 | watcher    |      X      |             |             |             |             |              |
 | vpnaas     |             |             |             |      X      |      X      |              |
 | taas       |             |             |             |      X      |             |              |
diff --git a/configure_facts.sh b/configure_facts.sh
index 745915fa..b1cbcdaa 100644
--- a/configure_facts.sh
+++ b/configure_facts.sh
@@ -18,7 +18,7 @@ export OS_NAME_VERS=${ID}${VERSION_ID}
 
 # Write out facts to the facter folder when we generate them.
 export WRITE_FACTS=${WRITE_FACTS:-true}
-export OPENSTACK_VERSION=${OPENSTACK_VERSION:-master}
+export OPENSTACK_VERSION=${OPENSTACK_VERSION:-epoxy}
 export DLRN_TAG=${DLRN_TAG:-puppet-passed-ci}
 export DLRN_ROOT=${DLRN_ROOT:-${OS_NAME_VERS}-${OPENSTACK_VERSION}}
 export DLRN_BASE=${DLRN_BASE:-${DLRN_ROOT}/${DLRN_TAG}}
diff --git a/copy_logs.sh b/copy_logs.sh
index 553d9cd3..f25842a6 100755
--- a/copy_logs.sh
+++ b/copy_logs.sh
@@ -546,13 +546,6 @@ datastore list
 EOC
 fi
 
-# vitrage resources
-if [ -d $LOG_DIR/vitrage ]; then
-    openstack >> $LOG_DIR/openstack_resources/vitrage.txt <<-EOC
-rca service list
-EOC
-fi
-
 # gnocchi resources
 if [ -d $LOG_DIR/gnocchi ]; then
     openstack >> $LOG_DIR/openstack_resources/gnocchi.txt <<-EOC
diff --git a/fixtures/scenario001.pp b/fixtures/scenario001.pp
index 028c0b33..78b8b10f 100644
--- a/fixtures/scenario001.pp
+++ b/fixtures/scenario001.pp
@@ -58,30 +58,23 @@
   show_multiple_locations => true,
 }
 class { 'openstack_integration::neutron':
-  notification_topics => ['notifications', 'vitrage_notifications'],
-  metering_enabled    => true,
+  metering_enabled => true,
 }
 include openstack_integration::placement
 class { 'openstack_integration::nova':
-  libvirt_rbd         => true,
-  notification_topics => ['notifications', 'vitrage_notifications'],
-  cinder_enabled      => true,
+  libvirt_rbd    => true,
+  cinder_enabled => true,
 }
 class { 'openstack_integration::cinder':
   backend       => 'rbd',
   cinder_backup => 'ceph',
 }
 include openstack_integration::ceilometer
-class { 'openstack_integration::aodh':
-  notification_topics => ['notifications', 'vitrage_notifications'],
-}
-include openstack_integration::vitrage
+include openstack_integration::aodh
 class { 'openstack_integration::ceph':
   ceph_pools => ['glance', 'nova', 'cinder', 'gnocchi', 'backups']
 }
-class { 'openstack_integration::heat':
-  notification_topics => ['notifications', 'vitrage_notifications'],
-}
+include openstack_integration::heat
 class { 'openstack_integration::provision':
   # NOTE(tkajinam): Use raw format to use rbd image cloning when creating
   #                 a volume from an image.
@@ -100,7 +93,6 @@
   ceilometer    => true,
   aodh          => true,
   heat          => true,
-  vitrage       => true,
   watcher       => true,
   image_format  => 'raw',
 }
diff --git a/manifests/aodh.pp b/manifests/aodh.pp
index 61ccdc6e..dd179eae 100644
--- a/manifests/aodh.pp
+++ b/manifests/aodh.pp
@@ -1,13 +1,6 @@
 # Configure the Aodh service
 #
-# [*notification_topics*]
-#   (optional) AMQP topic used for OpenStack notifications
-#   Defaults to $facts['os_service_default'].
-#
-class openstack_integration::aodh (
-  $notification_topics = $facts['os_service_default'],
-) {
-
+class openstack_integration::aodh {
   include openstack_integration::config
   include openstack_integration::params
 
@@ -54,7 +47,6 @@
       'password'  => 'an_even_bigger_secret',
     }),
     rabbit_use_ssl             => $::openstack_integration::config::ssl,
-    notification_topics        => $notification_topics,
     notification_driver        => 'messagingv2',
   }
   class { 'aodh::db::mysql':
diff --git a/manifests/ceilometer.pp b/manifests/ceilometer.pp
index aae12547..a3b7e815 100644
--- a/manifests/ceilometer.pp
+++ b/manifests/ceilometer.pp
@@ -27,7 +27,7 @@
   class { 'ceilometer::cache':
     backend          => $::openstack_integration::config::cache_driver,
     enabled          => true,
-    memcache_servers => $::openstack_integration::config::memcached_servers,
+    memcache_servers => $::openstack_integration::config::memcache_servers,
     redis_server     => $::openstack_integration::config::redis_server,
     redis_password   => 'a_big_secret',
     redis_sentinels  => $::openstack_integration::config::redis_sentinel_server,
diff --git a/manifests/cinder.pp b/manifests/cinder.pp
index 5b4bedf5..5f3df15c 100644
--- a/manifests/cinder.pp
+++ b/manifests/cinder.pp
@@ -14,15 +14,10 @@
 #   Possible values: undef, swift, ceph
 #   defaults to undef
 #
-# [*notification_topics*]
-#   (optional) AMQP topic used for OpenStack notifications
-#   Defaults to $facts['os_service_default'].
-#
 class openstack_integration::cinder (
-  $backend             = 'iscsi',
-  $volume_encryption   = false,
-  $cinder_backup       = undef,
-  $notification_topics = $facts['os_service_default'],
+  $backend           = 'iscsi',
+  $volume_encryption = false,
+  $cinder_backup     = undef,
 ) {
 
   include openstack_integration::config
@@ -99,7 +94,6 @@
       'username'  => 'cinder',
       'password'  => 'an_even_bigger_secret',
     }),
-    notification_topics        => $notification_topics,
     notification_driver        => 'messagingv2',
     rabbit_use_ssl             => $::openstack_integration::config::ssl,
   }
diff --git a/manifests/designate.pp b/manifests/designate.pp
index 147b0c5a..e747314e 100644
--- a/manifests/designate.pp
+++ b/manifests/designate.pp
@@ -1,13 +1,6 @@
 # Configure the Designate service
 #
-# [*notification_topics*]
-#   (optional) AMQP topic used for OpenStack notifications
-#   Defaults to $facts['os_service_default'].
-#
-class openstack_integration::designate (
-  $notification_topics = $facts['os_service_default'],
-) {
-
+class openstack_integration::designate {
   include openstack_integration::config
   include openstack_integration::params
   include openstack_integration::bind
@@ -50,7 +43,6 @@
       'password'  => 'an_even_bigger_secret',
     }),
     rabbit_use_ssl             => $::openstack_integration::config::ssl,
-    notification_topics        => $notification_topics,
     notification_driver        => 'messagingv2',
   }
   class { 'designate::db':
diff --git a/manifests/heat.pp b/manifests/heat.pp
index 246a3860..fadf3b00 100644
--- a/manifests/heat.pp
+++ b/manifests/heat.pp
@@ -1,13 +1,6 @@
 # Configure the Heat service
 #
-# [*notification_topics*]
-#   (optional) AMQP topic used for OpenStack notifications
-#   Defaults to $facts['os_service_default'].
-#
-class openstack_integration::heat (
-  $notification_topics = $facts['os_service_default'],
-) {
-
+class openstack_integration::heat {
   include openstack_integration::config
   include openstack_integration::params
 
@@ -77,7 +70,6 @@
       'password'  => 'an_even_bigger_secret',
     }),
     rabbit_use_ssl             => $::openstack_integration::config::ssl,
-    notification_topics        => $notification_topics,
     notification_driver        => 'messagingv2',
   }
   class { 'heat::db::mysql':
diff --git a/manifests/ironic.pp b/manifests/ironic.pp
index f93bc8f7..be1946f1 100644
--- a/manifests/ironic.pp
+++ b/manifests/ironic.pp
@@ -1,9 +1,5 @@
 # Configure the Ironic service
 #
-# [*notification_topics*]
-#   (optional) AMQP topic used for OpenStack notifications
-#   Defaults to $facts['os_service_default'].
-#
 # [*inspector_backend*]
 #   (optional) The storage backend for storing introspection data.
 #   Defaults to 'database'.
@@ -13,7 +9,6 @@
 #   Defaults to false
 #
 class openstack_integration::ironic (
-  $notification_topics      = $facts['os_service_default'],
   $inspector_backend        = 'database',
   $send_power_notifications = false,
 ) {
@@ -100,7 +95,6 @@
       'password'  => 'an_even_bigger_secret',
     }),
     rabbit_use_ssl             => $::openstack_integration::config::ssl,
-    notification_topics        => $notification_topics,
     notification_driver        => 'messagingv2',
   }
   class { 'ironic::db::mysql':
diff --git a/manifests/manila.pp b/manifests/manila.pp
index c299aacd..9ce9a1d4 100644
--- a/manifests/manila.pp
+++ b/manifests/manila.pp
@@ -5,13 +5,8 @@
 #   Can be 'lvm'.
 #   Defaults to 'lvm'.
 #
-# [*notification_topics*]
-#   (optional) AMQP topic used for OpenStack notifications
-#   Defaults to $facts['os_service_default'].
-#
 class openstack_integration::manila (
-  $backend             = 'lvm',
-  $notification_topics = $facts['os_service_default'],
+  $backend = 'lvm',
 ) {
 
   include openstack_integration::config
@@ -77,7 +72,6 @@
       'username'  => 'manila',
       'password'  => 'an_even_bigger_secret',
     }),
-    notification_topics        => $notification_topics,
     notification_driver        => 'messagingv2',
     rabbit_use_ssl             => $::openstack_integration::config::ssl,
   }
diff --git a/manifests/neutron.pp b/manifests/neutron.pp
index 7272ef50..92cf85df 100644
--- a/manifests/neutron.pp
+++ b/manifests/neutron.pp
@@ -41,10 +41,6 @@
 #   (optional) Flag to enable external dns integration with Designate
 #   Defaults to false.
 #
-# [*notification_topics*]
-#   (optional) AMQP topic used for OpenStack notifications
-#   Defaults to $facts['os_service_default'].
-#
 class openstack_integration::neutron (
   $driver                     = 'openvswitch',
   $ovn_metadata_agent_enabled = true,
@@ -56,7 +52,6 @@
   $bgp_dragent_enabled        = false,
   $baremetal_enabled          = false,
   $designate_enabled          = false,
-  $notification_topics        = $facts['os_service_default'],
 ) {
 
   $use_httpd = $facts['os']['family'] ? {
@@ -235,7 +230,6 @@
     use_ssl                    => $::openstack_integration::config::ssl,
     cert_file                  => $::openstack_integration::params::cert_path,
     key_file                   => "/etc/neutron/ssl/private/${facts['networking']['fqdn']}.pem",
-    notification_topics        => $notification_topics,
     notification_driver        => 'messagingv2',
     dhcp_agent_notification    => $dhcp_agent_notification,
   }
diff --git a/manifests/nova.pp b/manifests/nova.pp
index d05d409f..4d02cdc9 100644
--- a/manifests/nova.pp
+++ b/manifests/nova.pp
@@ -18,10 +18,6 @@
 #   (optional) Boolean to configure or not volume encryption
 #   Defaults to false.
 #
-# [*notification_topics*]
-#   (optional) AMQP topic used for OpenStack notifications
-#   Defaults to $facts['os_service_default'].
-#
 # [*cinder_enabled*]
 #   (optional) Boolean to configure or not cinder options.
 #   Defaults to false.
@@ -35,7 +31,6 @@
   $libvirt_virt_type      = 'qemu',
   $libvirt_cpu_mode       = 'none',
   $volume_encryption      = false,
-  $notification_topics    = $facts['os_service_default'],
   $cinder_enabled         = false,
   $libvirt_guests_enabled = false,
 ) {
@@ -148,7 +143,6 @@
     rabbit_use_ssl             => $::openstack_integration::config::ssl,
     notification_driver        => 'messagingv2',
     notify_on_state_change     => 'vm_and_task_state',
-    notification_topics        => $notification_topics,
     ssl_only                   => $::openstack_integration::config::ssl,
     source_is_ipv6             => $::openstack_integration::config::ipv6,
     key                        => "/etc/nova/ssl/private/${facts['networking']['fqdn']}.pem",
diff --git a/manifests/octavia.pp b/manifests/octavia.pp
index 5ff53a81..de2f6ea3 100644
--- a/manifests/octavia.pp
+++ b/manifests/octavia.pp
@@ -1,9 +1,5 @@
 # Configure the octavia service
 #
-# [*notification_topics*]
-#   (optional) AMQP topic used for OpenStack notifications
-#   Defaults to $facts['os_service_default'].
-#
 # [*provider_driver*]
 #   (optional) Provider driver used in Octavia.
 #   Defaults to 'amphora'.
@@ -13,9 +9,8 @@
 #   Defaults to 'redis'.
 #
 class openstack_integration::octavia (
-  $notification_topics = $facts['os_service_default'],
-  $provider_driver     = 'amphora',
-  $jobboard_backend    = 'redis',
+  $provider_driver  = 'amphora',
+  $jobboard_backend = 'redis',
 ) {
 
   include openstack_integration::config
@@ -71,7 +66,6 @@
       'password'  => 'an_even_bigger_secret',
     }),
     rabbit_use_ssl             => $::openstack_integration::config::ssl,
-    notification_topics        => $notification_topics,
     notification_driver        => 'messagingv2',
   }
   class { 'octavia::db::mysql':
diff --git a/manifests/placement.pp b/manifests/placement.pp
index 520fc2b2..4dfc6da8 100644
--- a/manifests/placement.pp
+++ b/manifests/placement.pp
@@ -54,7 +54,9 @@
     }),
   }
   include placement::db::sync
-  include placement::api
+  class { 'placement::api':
+    api_service_name => 'httpd',
+  }
   if ($facts['os']['name'] != 'Debian') {
     class { 'placement::wsgi::apache':
       bind_host => $::openstack_integration::config::host,
diff --git a/manifests/repos.pp b/manifests/repos.pp
index 80167579..39bdcd8e 100644
--- a/manifests/repos.pp
+++ b/manifests/repos.pp
@@ -6,10 +6,8 @@
         'Ubuntu': {
           include apt
           class { 'openstack_extras::repo::debian::ubuntu':
-            release         => 'caracal',
-            # TODO(tkajinam): Switch to UCA once openstackclient in Dalmatian
-            # is updated. See https://bugs.launchpad.net/bugs/2097764 .
-            manage_uca      => false,
+            release         => 'epoxy',
+            manage_uca      => true,
             package_require => true,
             uca_location    => pick($facts['uca_mirror_host'], 'http://ubuntu-cloud.archive.canonical.com/ubuntu'),
           }
@@ -17,7 +15,7 @@
         'Debian': {
           include apt
           class { 'openstack_extras::repo::debian::debian':
-            release         => 'caracal',
+            release         => 'epoxy',
             package_require => true,
           }
         }
@@ -33,11 +31,11 @@
       )
       $delorean_repo = pick(
         $facts['delorean_repo_path'],
-        "https://trunk.rdoproject.org/centos${facts['os']['release']['major']}-master/puppet-passed-ci/delorean.repo"
+        "https://trunk.rdoproject.org/centos${facts['os']['release']['major']}-epoxy/puppet-passed-ci/delorean.repo"
       )
       $delorean_deps_repo = pick(
         $facts['delorean_deps_repo_path'],
-        "https://trunk.rdoproject.org/centos${facts['os']['release']['major']}-master/delorean-deps.repo"
+        "https://trunk.rdoproject.org/centos${facts['os']['release']['major']}-epoxy/delorean-deps.repo"
       )
 
       class { 'openstack_extras::repo::redhat::redhat':
diff --git a/manifests/ssl_key.pp b/manifests/ssl_key.pp
index 1091e155..3a529646 100644
--- a/manifests/ssl_key.pp
+++ b/manifests/ssl_key.pp
@@ -27,13 +27,13 @@
     file { "/etc/${name}/ssl":
       ensure                  => directory,
       owner                   => $key_owner,
-      mode                    => '0775',
+      mode                    => '0750',
       selinux_ignore_defaults => true,
     }
     file { "/etc/${name}/ssl/private":
       ensure                  => directory,
       owner                   => $key_owner,
-      mode                    => '0755',
+      mode                    => '0750',
       require                 => File["/etc/${name}/ssl"],
       selinux_ignore_defaults => true,
       before                  => File[$_key_path]
@@ -45,6 +45,6 @@
     owner                   => $key_owner,
     source                  => "puppet:///modules/openstack_integration/ipv${openstack_integration::config::ip_version}.key",
     selinux_ignore_defaults => true,
-    mode                    => '0600',
+    mode                    => '0640',
   }
 }
diff --git a/manifests/tempest.pp b/manifests/tempest.pp
index 10bd2682..e6a2f491 100644
--- a/manifests/tempest.pp
+++ b/manifests/tempest.pp
@@ -92,10 +92,6 @@
 #   (optional) Define if Trove needs to be tested.
 #   Default to false.
 #
-# [*vitrage*]
-#   (optional) Define if Vitrage needs to be tested.
-#   Default to false.
-#
 # [*vpnaas*]
 #   (optional) Define if Neutron VPNaaS needs to be tested.
 #   Default to false.
@@ -172,7 +168,6 @@
   $swift                   = false,
   $trove                   = false,
   $watcher                 = false,
-  $vitrage                 = false,
   $vpnaas                  = false,
   $taas                    = false,
   $zaqar                   = false,
@@ -327,7 +322,6 @@
     zaqar_available                    => $zaqar,
     manila_available                   => $manila,
     mistral_available                  => $mistral,
-    vitrage_available                  => $vitrage,
     gnocchi_available                  => $gnocchi,
     watcher_available                  => $watcher,
     public_network_name                => 'public',
diff --git a/manifests/vitrage.pp b/manifests/vitrage.pp
deleted file mode 100644
index 0d00be0c..00000000
--- a/manifests/vitrage.pp
+++ /dev/null
@@ -1,107 +0,0 @@
-class openstack_integration::vitrage {
-
-  include openstack_integration::config
-  include openstack_integration::params
-
-  openstack_integration::mq_user { 'vitrage':
-    password => 'an_even_bigger_secret',
-    before   => Anchor['vitrage::service::begin'],
-  }
-
-  if $::openstack_integration::config::ssl {
-    openstack_integration::ssl_key { 'vitrage':
-      notify  => Service['httpd'],
-      require => Anchor['vitrage::install::end'],
-    }
-    Exec['update-ca-certificates'] ~> Service['httpd']
-  }
-
-  class { 'vitrage::db::mysql':
-    charset  => $::openstack_integration::params::mysql_charset,
-    collate  => $::openstack_integration::params::mysql_collate,
-    password => 'vitrage',
-    host     => $::openstack_integration::config::host,
-  }
-
-  class { 'vitrage::db':
-    database_connection => os_database_connection({
-      'dialect'  => 'mysql+pymysql',
-      'host'     => $::openstack_integration::config::ip_for_url,
-      'username' => 'vitrage',
-      'password' => 'vitrage',
-      'database' => 'vitrage',
-      'charset'  => 'utf8',
-      'extra'    => $::openstack_integration::config::db_extra,
-    }),
-  }
-
-  class { 'vitrage::db::sync': }
-
-  class { 'vitrage::logging':
-    debug => true,
-  }
-
-  class { 'vitrage':
-    default_transport_url      => os_transport_url({
-      'transport' => $::openstack_integration::config::messaging_notify_proto,
-      'host'      => $::openstack_integration::config::host,
-      'port'      => $::openstack_integration::config::messaging_notify_port,
-      'username'  => 'vitrage',
-      'password'  => 'an_even_bigger_secret',
-    }),
-    notification_transport_url => os_transport_url({
-      'transport' => $::openstack_integration::config::messaging_notify_proto,
-      'host'      => $::openstack_integration::config::host,
-      'port'      => $::openstack_integration::config::messaging_notify_port,
-      'username'  => 'vitrage',
-      'password'  => 'an_even_bigger_secret',
-    }),
-    rabbit_use_ssl             => $::openstack_integration::config::ssl,
-    snapshots_interval         => 120,
-    types                      => 'nova.host,nova.instance,nova.zone,cinder.volume,neutron.port,neutron.network,doctor',
-    notification_driver        => 'messagingv2',
-  }
-
-  class { 'vitrage::keystone::auth':
-    public_url   => "${::openstack_integration::config::base_url}:8999",
-    internal_url => "${::openstack_integration::config::base_url}:8999",
-    admin_url    => "${::openstack_integration::config::base_url}:8999",
-    roles        => ['admin', 'service'],
-    password     => 'a_big_secret',
-  }
-  class { 'vitrage::keystone::authtoken':
-    password                     => 'a_big_secret',
-    user_domain_name             => 'Default',
-    project_domain_name          => 'Default',
-    auth_url                     => $::openstack_integration::config::keystone_admin_uri,
-    www_authenticate_uri         => $::openstack_integration::config::keystone_auth_uri,
-    memcached_servers            => $::openstack_integration::config::memcached_servers,
-    service_token_roles_required => true,
-  }
-  class { 'vitrage::api':
-    enabled      => true,
-    service_name => 'httpd',
-  }
-  class { 'vitrage::wsgi::apache':
-    bind_host => $::openstack_integration::config::host,
-    ssl       => $::openstack_integration::config::ssl,
-    ssl_key   => "/etc/vitrage/ssl/private/${facts['networking']['fqdn']}.pem",
-    ssl_cert  => $::openstack_integration::params::cert_path,
-    workers   => 2,
-  }
-  class { 'vitrage::service_credentials':
-    auth_url => $::openstack_integration::config::keystone_auth_uri,
-    password => 'a_big_secret',
-  }
-  class { 'vitrage::graph': }
-  class { 'vitrage::notifier':
-    notifiers => ['nova'],
-  }
-  class { 'vitrage::persistor': }
-  class { 'vitrage::coordination':
-    backend_url => $::openstack_integration::config::tooz_url,
-  }
-  Class['openstack_integration::redis'] -> Anchor['vitrage::service::begin']
-  class { 'vitrage::client': }
-
-}
diff --git a/openstack_modules.txt b/openstack_modules.txt
index d4d6f869..aab49f5d 100644
--- a/openstack_modules.txt
+++ b/openstack_modules.txt
@@ -26,6 +26,5 @@ swift
 tempest
 trove
 vswitch
-vitrage
 watcher
 zaqar
diff --git a/playbooks/prepare-node-common.yaml b/playbooks/prepare-node-common.yaml
index e8838a95..818b0f93 100644
--- a/playbooks/prepare-node-common.yaml
+++ b/playbooks/prepare-node-common.yaml
@@ -45,6 +45,7 @@
           - zlib-devel
           - langpacks-en
           - glibc-langpack-en
+          - libffi-devel
 
       when:
         - ansible_os_family == 'RedHat'
@@ -76,6 +77,7 @@
         - libaugeas-dev
         - pkg-config
         - zlib1g-dev
+        - libffi-dev
         - python3-pip
 
     - name: Install Ruby dependencies (Debian)
@@ -91,4 +93,5 @@
         - libxslt1-dev
         - ruby-dev
         - zlib1g-dev
+        - libffi-dev
         - python3-pip
diff --git a/run_tests.sh b/run_tests.sh
index 39df8436..9aa10fcf 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -291,9 +291,6 @@ echo "TelemetryAlarming" >> /tmp/openstack/tempest/test-include-list.txt
 # Gnocchi
 echo "telemetry_tempest_plugin.scenario.test_gnocchi" >> /tmp/openstack/tempest/test-include-list.txt
 
-# Vitrage
-echo "TestEvents" >> /tmp/openstack/tempest/test-include-list.txt
-
 # Test Autoscaling with Telemetry
 # TODO(tkajinam): This test case is disabled because of instability
 #echo "test_telemetry_integration" >> /tmp/openstack/tempest/test-include-list.txt
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index b8172d09..94b5d38d 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -37,7 +37,6 @@
       - name: openstack/puppet-tempest
       - name: openstack/puppet-trove
       - name: openstack/puppet-vswitch
-      - name: openstack/puppet-vitrage
       - name: openstack/puppet-watcher
       - name: openstack/puppet-zaqar
       - name: openstack/tempest