diff --git a/classes/database/initializers b/classes/database/initializers
index e69de29..efc97db 100644
--- a/classes/database/initializers
+++ b/classes/database/initializers
@@ -0,0 +1,12 @@
+# Initializers for database servers
+system-setup
+packages
+
+# Modules for database servers
+oam
+system-config
+ssh-hardening
+
+# Roles for database servers
+security
+monitoring
\ No newline at end of file
diff --git a/classes/database/modules b/classes/database/modules
index e69de29..e55c089 100644
--- a/classes/database/modules
+++ b/classes/database/modules
@@ -0,0 +1,8 @@
+# Modules for database servers
+oam
+system-config
+ssh-hardening
+
+# Roles for database servers
+security
+monitoring
\ No newline at end of file
diff --git a/classes/database/roles b/classes/database/roles
index e69de29..cd098ad 100644
--- a/classes/database/roles
+++ b/classes/database/roles
@@ -0,0 +1,3 @@
+# Roles for database servers
+security
+monitoring
\ No newline at end of file
diff --git a/classes/dev-workstation/initializers b/classes/dev-workstation/initializers
index e69de29..f1df166 100644
--- a/classes/dev-workstation/initializers
+++ b/classes/dev-workstation/initializers
@@ -0,0 +1,12 @@
+# Initializers for development workstations
+system-setup
+packages
+
+# Modules for development workstations
+oam
+system-config
+ssh-hardening
+
+# Roles for development workstations
+security
+monitoring
\ No newline at end of file
diff --git a/classes/dev-workstation/modules b/classes/dev-workstation/modules
index e69de29..77670ee 100644
--- a/classes/dev-workstation/modules
+++ b/classes/dev-workstation/modules
@@ -0,0 +1,8 @@
+# Modules for development workstations
+oam
+system-config
+ssh-hardening
+
+# Roles for development workstations
+security
+monitoring
\ No newline at end of file
diff --git a/classes/dev-workstation/roles b/classes/dev-workstation/roles
index e69de29..062b990 100644
--- a/classes/dev-workstation/roles
+++ b/classes/dev-workstation/roles
@@ -0,0 +1,3 @@
+# Roles for development workstations
+security
+monitoring
\ No newline at end of file
diff --git a/classes/ntp-server/initializers b/classes/ntp-server/initializers
index e69de29..955cd9a 100644
--- a/classes/ntp-server/initializers
+++ b/classes/ntp-server/initializers
@@ -0,0 +1,12 @@
+# Initializers for NTP servers
+system-setup
+packages
+
+# Modules for NTP servers
+oam
+system-config
+ssh-hardening
+
+# Roles for NTP servers
+security
+monitoring
\ No newline at end of file
diff --git a/classes/ntp-server/modules b/classes/ntp-server/modules
index e69de29..661e78b 100644
--- a/classes/ntp-server/modules
+++ b/classes/ntp-server/modules
@@ -0,0 +1,8 @@
+# Modules for NTP servers
+oam
+system-config
+ssh-hardening
+
+# Roles for NTP servers
+security
+monitoring
\ No newline at end of file
diff --git a/classes/ntp-server/roles b/classes/ntp-server/roles
index e69de29..f7c721e 100644
--- a/classes/ntp-server/roles
+++ b/classes/ntp-server/roles
@@ -0,0 +1,3 @@
+# Roles for NTP servers
+security
+monitoring
\ No newline at end of file
diff --git a/classes/physical/initializers b/classes/physical/initializers
index 0587259..26260e2 100644
--- a/classes/physical/initializers
+++ b/classes/physical/initializers
@@ -1,8 +1,6 @@
 # Initializers for physical servers
 system-setup
 packages
-ssh-keys
-user-configuration
 
 # Modules for physical servers
 oam
diff --git a/classes/physical/modules b/classes/physical/modules
index 8fd50d9..728ddaa 100644
--- a/classes/physical/modules
+++ b/classes/physical/modules
@@ -2,4 +2,7 @@
 oam
 system-config
 ssh-hardening
-security-hardening
\ No newline at end of file
+
+# Roles for physical servers
+security
+monitoring
\ No newline at end of file
diff --git a/classes/physical/roles b/classes/physical/roles
index e69de29..c458a53 100644
--- a/classes/physical/roles
+++ b/classes/physical/roles
@@ -0,0 +1,3 @@
+# Roles for physical servers
+security
+monitoring
\ No newline at end of file
diff --git a/classes/webserver/initializers b/classes/webserver/initializers
index e69de29..91c3398 100644
--- a/classes/webserver/initializers
+++ b/classes/webserver/initializers
@@ -0,0 +1,12 @@
+# Initializers for web servers
+system-setup
+packages
+
+# Modules for web servers
+oam
+system-config
+ssh-hardening
+
+# Roles for web servers
+security
+monitoring
\ No newline at end of file
diff --git a/classes/webserver/modules b/classes/webserver/modules
index e69de29..f7b0d95 100644
--- a/classes/webserver/modules
+++ b/classes/webserver/modules
@@ -0,0 +1,8 @@
+# Modules for web servers
+oam
+system-config
+ssh-hardening
+
+# Roles for web servers
+security
+monitoring
\ No newline at end of file
diff --git a/classes/webserver/roles b/classes/webserver/roles
index e69de29..382e43b 100644
--- a/classes/webserver/roles
+++ b/classes/webserver/roles
@@ -0,0 +1,3 @@
+# Roles for web servers
+security
+monitoring
\ No newline at end of file