diff --git a/custom-modules/mailhog/manifests/init.pp b/custom-modules/mailhog/manifests/init.pp
index c56595c..04039b4 100644
--- a/custom-modules/mailhog/manifests/init.pp
+++ b/custom-modules/mailhog/manifests/init.pp
@@ -1,5 +1,7 @@
 class mailhog {
 
+$php_version = $::php::globals::php_version
+
   package { 'postfix':
     ensure => 'absent',
   }->
@@ -67,13 +69,13 @@
 
   file_line { 'mhsendmail php.ini':
     ensure  => present,
-    path    => '/etc/php/7.1/fpm/php.ini',
+    path    => "/etc/php/${php_version}/fpm/php.ini",
     line    => 'sendmail_path = /usr/local/bin/mhsendmail',
     match   => '^;?sendmail_path',
     require => Class['drupal_php::fpm'],
     notify  => [
       Service['httpd'],
-      Service['php7.1-fpm'],
+      Service["php${php_version}-fpm"],
       Class['::php::fpm::service'],
     ],
   }
diff --git a/custom-modules/wp_cli/manifests/init.pp b/custom-modules/wp_cli/manifests/init.pp
index 8d8cbd4..087776e 100644
--- a/custom-modules/wp_cli/manifests/init.pp
+++ b/custom-modules/wp_cli/manifests/init.pp
@@ -5,7 +5,6 @@
     destination => '/usr/local/bin/wp',
     timeout     => 0,
     verbose     => false,
-    source_hash => '179fc8dacbfe3ebc2d00ba57a333c982',
   }->
 
   file { '/usr/local/bin/wp':