diff --git a/REFERENCE.md b/REFERENCE.md
index 1771d7d7..c7acece6 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -184,6 +184,8 @@ Data type: `Boolean`
 
 A feature flag to include the 'epel' class and depend on it for package installation.
 
+Default value: `false`
+
 ##### <a name="-letsencrypt--agree_tos"></a>`agree_tos`
 
 Data type: `Boolean`
diff --git a/data/common.yaml b/data/common.yaml
deleted file mode 100644
index 23925b49..00000000
--- a/data/common.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-letsencrypt::configure_epel: false
diff --git a/manifests/init.pp b/manifests/init.pp
index dd4c80ea..9c37d08a 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -61,7 +61,7 @@
 #                       Example: "example.com www.example.com"
 #
 class letsencrypt (
-  Boolean $configure_epel,
+  Boolean $configure_epel            = false,
   Optional[String] $email            = undef,
   Array $environment                 = [],
   String $package_name               = 'certbot',
diff --git a/manifests/plugin/dns_cloudflare.pp b/manifests/plugin/dns_cloudflare.pp
index f5f7d694..a35d982c 100644
--- a/manifests/plugin/dns_cloudflare.pp
+++ b/manifests/plugin/dns_cloudflare.pp
@@ -23,7 +23,7 @@
   Boolean $manage_package           = true,
   Integer $propagation_seconds      = 10,
 ) {
-  require letsencrypt
+  include letsencrypt
 
   if ! $api_key and ! $api_token {
     fail('No authentication method provided, please specify either api_token or api_key and api_email.')
@@ -34,8 +34,15 @@
       fail('No package name provided for certbot dns cloudflare plugin.')
     }
 
+    $requirement = if $letsencrypt::configure_epel {
+      Class['epel']
+    } else {
+      undef
+    }
+
     package { $package_name:
-      ensure => $letsencrypt::package_ensure,
+      ensure  => $letsencrypt::package_ensure,
+      require => $requirement,
     }
   }
 
diff --git a/manifests/plugin/dns_rfc2136.pp b/manifests/plugin/dns_rfc2136.pp
index 5c358945..094c8f5b 100644
--- a/manifests/plugin/dns_rfc2136.pp
+++ b/manifests/plugin/dns_rfc2136.pp
@@ -24,7 +24,7 @@
   Stdlib::Absolutepath $config_dir = $letsencrypt::config_dir,
   Boolean $manage_package          = true,
 ) {
-  require letsencrypt
+  include letsencrypt
 
   if $manage_package {
     package { $package_name:
diff --git a/manifests/plugin/dns_route53.pp b/manifests/plugin/dns_route53.pp
index 09a59337..27a1ac9b 100644
--- a/manifests/plugin/dns_route53.pp
+++ b/manifests/plugin/dns_route53.pp
@@ -12,7 +12,7 @@
   Integer $propagation_seconds     = 10,
   Boolean $manage_package          = true,
 ) {
-  require letsencrypt
+  include letsencrypt
 
   if $manage_package {
     package { $package_name:
diff --git a/manifests/plugin/nginx.pp b/manifests/plugin/nginx.pp
index d63be1cc..a49f070d 100644
--- a/manifests/plugin/nginx.pp
+++ b/manifests/plugin/nginx.pp
@@ -6,7 +6,7 @@
   Boolean $manage_package = true,
   String[1] $package_name = 'python3-certbot-nginx',
 ) {
-  require letsencrypt
+  include letsencrypt
 
   if $manage_package {
     package { $package_name:
diff --git a/metadata.json b/metadata.json
index bff6c267..1911744a 100644
--- a/metadata.json
+++ b/metadata.json
@@ -47,7 +47,7 @@
     {
       "operatingsystem": "Fedora",
       "operatingsystemrelease": [
-        "36"
+        "39"
       ]
     },
     {