diff --git a/data/prodinf01n01.main.unkin.net.yaml b/data/prodinf01n01.main.unkin.net.yaml
index 0c809bb..6a68965 100644
--- a/data/prodinf01n01.main.unkin.net.yaml
+++ b/data/prodinf01n01.main.unkin.net.yaml
@@ -1,4 +1,4 @@
 ---
 classes:
-  - roles::puppet::puppetmaster
+  - roles::infra::puppet::master
 environment: testing
diff --git a/data/prodinf01n04.main.unkin.net.yaml b/data/prodinf01n04.main.unkin.net.yaml
index 59ce265..76e0d10 100644
--- a/data/prodinf01n04.main.unkin.net.yaml
+++ b/data/prodinf01n04.main.unkin.net.yaml
@@ -1,4 +1,4 @@
 ---
 classes:
-  - roles::puppet::puppetdb_api
+  - roles::infra::puppetdb::api
 environment: testing
diff --git a/data/prodinf01n05.main.unkin.net.yaml b/data/prodinf01n05.main.unkin.net.yaml
index cf3988b..535f8a3 100644
--- a/data/prodinf01n05.main.unkin.net.yaml
+++ b/data/prodinf01n05.main.unkin.net.yaml
@@ -1,4 +1,4 @@
 ---
 classes:
-  - roles::puppet::puppetdb_sql
+  - roles::infra::puppetdb::sql
 environment: testing
diff --git a/data/prodinf01n06.main.unkin.net.yaml b/data/prodinf01n06.main.unkin.net.yaml
index 0b03f70..3172fa6 100644
--- a/data/prodinf01n06.main.unkin.net.yaml
+++ b/data/prodinf01n06.main.unkin.net.yaml
@@ -1,4 +1,4 @@
 ---
 classes:
-  - roles::puppet::puppetboard
+  - roles::infra::puppetboard::server
 environment: testing