diff --git a/manifests/init.pp b/manifests/init.pp
index f3d5f2d1967bd381e694754addc846ee9b7824ae..617573838af6477373e41fa4b3bb45fd60e8defa 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -71,27 +71,8 @@ class aim_control (
   }
 
   include aim_control::firewall
-
-  class aim_control::remi {
-    # Ensure the Remi release package is installed
-    package { 'remi-release':
-      ensure   => installed,
-      provider => 'rpm',
-      source   => 'https://rpms.remirepo.net/enterprise/remi-release-9.rpm',
-      before   => Exec['enable remi-php74'],
-    }
-
-    # Enable PHP 7.4 module
-    exec { 'enable remi-php74':
-      command     => 'dnf module enable php:remi-7.4 -y',
-      path        => ['/bin', '/usr/bin'],
-      refreshonly => true,
-      require     => Package['remi-release'],
-    }
-  }
-
   include apache
-  include aim_control::remi
+  include aim_control::remirepo
 
   class { 'apache::mod::php':
     package_name => 'php74',
diff --git a/manifests/remirepo.pp b/manifests/remirepo.pp
new file mode 100644
index 0000000000000000000000000000000000000000..edfd545b1ac9f50da627687a2376cf80fd4d789e
--- /dev/null
+++ b/manifests/remirepo.pp
@@ -0,0 +1,17 @@
+class aim_control::remirepo {
+    # Ensure the Remi release package is installed
+    package { 'remi-release':
+      ensure   => installed,
+      provider => 'rpm',
+      source   => 'https://rpms.remirepo.net/enterprise/remi-release-9.rpm',
+      before   => Exec['enable remi-php74'],
+    }
+
+    # Enable PHP 7.4 module
+    exec { 'enable remi-php74':
+      command     => 'dnf module enable php:remi-7.4 -y',
+      path        => ['/bin', '/usr/bin'],
+      refreshonly => true,
+      require     => Package['remi-release'],
+    }
+  }