diff --git a/apache.cf b/apache.cf
index 3ab3059..8952acd 100644
--- a/apache.cf
+++ b/apache.cf
@@ -173,7 +173,7 @@ files:
 
 	"$(apache.main_cfg)"
 		create => "true",
-		edit_template => "$(sys.workdir)/inputs/$(def.mfdomain)/templates/httpd.conf.mustache",
+		edit_template => "$(sys.workdir)/inputs/$(def.wmde_libdir)/templates/httpd.conf.mustache",
 		template_method => "mustache",
 		handle => "apache_main_cfg_crreated",
 		classes => if_repaired(apache_changed);
@@ -222,7 +222,7 @@ vars:
 
 	"template_file" 
 	string => 
-		"$(sys.workdir)/inputs/$(def.mfdomain)/templates/httpd-vhost.conf.mustache";
+		"$(sys.workdir)/inputs/$(def.wmde_libdir)/templates/httpd-vhost.conf.mustache";
 
 	"domain_file" string => "$(apache.cfg_dir)/Vhosts/$(site[domain]).conf";
 	"domain_dir" string => "$(apache.www_dir)/$(site[domain])/";
diff --git a/certbot.cf b/certbot.cf
index 364cc77..ce2beaf 100644
--- a/certbot.cf
+++ b/certbot.cf
@@ -44,7 +44,7 @@ files:
 	freebsd::
 		"/etc/cron.d/certbot"
 			create => "true",
-			copy_from => local_cp("$(sys.workdir)/inputs/$(def.mfdomain)/templates/certbot-cron.mustache");
+			copy_from => local_cp("$(sys.workdir)/inputs/$(def.wmde_libdir)/templates/certbot-cron.mustache");
 	
 #			content => '# 
 # Managed by CFEngine
diff --git a/vim.cf b/vim.cf
index da49df8..70f49e3 100644
--- a/vim.cf
+++ b/vim.cf
@@ -37,7 +37,7 @@ packages:
 files:
   "$(vimrc)"
         create => "true",
-        copy_from => local_dcp("$(sys.workdir)/inputs/$(def.mfdomain)/templates/vimrc.mustache");
+        copy_from => local_dcp("$(sys.workdir)/inputs/$(def.wmde_libdir)/templates/vimrc.mustache");
 
 reports: