diff --git a/hieradata/roles/infra/puppet.yaml b/hieradata/roles/infra/puppet.yaml
index 028acf6..f9e0186 100644
--- a/hieradata/roles/infra/puppet.yaml
+++ b/hieradata/roles/infra/puppet.yaml
@@ -1,3 +1,9 @@
 ---
 profiles::packages::include:
-  puppetserver: {}
+  puppetdb-termini:
+    ensure: purged
+    before: Class['puppetdb::master::config']
+  puppetserver:
+    ensure: purged
+    before: Package['openvox-server']
+  openvox-server: {}
diff --git a/hieradata/roles/infra/puppet/master.yaml b/hieradata/roles/infra/puppet/master.yaml
index 12b6909..f1a7010 100644
--- a/hieradata/roles/infra/puppet/master.yaml
+++ b/hieradata/roles/infra/puppet/master.yaml
@@ -19,11 +19,6 @@ profiles::puppet::autosign::domains:
 # profiles::puppet::autosign::nodes:
 #  - 'somenode.main.unkin.net'
 
-# not ready to migrate puppet masters yet
-profiles::puppet::agent::version: '7.34.0'
-profiles::puppet::agent::openvox_enable: false
-
-
 profiles::puppet::cobbler_enc::cobbler_scheme: https
 profiles::puppet::cobbler_enc::cobbler_hostname: cobbler.main.unkin.net
 profiles::puppet::cobbler_enc::version: 'system'
diff --git a/site/profiles/manifests/puppet/puppetmaster.pp b/site/profiles/manifests/puppet/puppetmaster.pp
index 17bb350..e0e6db4 100644
--- a/site/profiles/manifests/puppet/puppetmaster.pp
+++ b/site/profiles/manifests/puppet/puppetmaster.pp
@@ -23,9 +23,10 @@ class profiles::puppet::puppetmaster (
     class { 'puppetdb::master::config':
       puppetdb_server     => $puppetdb_host,
       manage_storeconfigs => false,
+      terminus_package    => 'openvoxdb-termini',
     }
 
-    Package['puppetserver']
+    Package['openvox-server']
     -> Class['profiles::puppet::gems']
     -> Class['profiles::puppet::r10k']
     -> Class['profiles::puppet::g10k']