diff --git a/lib/mcollective/pluginpackager/forge_packager.rb b/lib/mcollective/pluginpackager/forge_packager.rb
index ca8ff4b5..3602459e 100644
--- a/lib/mcollective/pluginpackager/forge_packager.rb
+++ b/lib/mcollective/pluginpackager/forge_packager.rb
@@ -191,7 +191,7 @@ def render_templates
       end
 
       def render_template(infile, outfile)
-        erb = ERB.new(File.read(infile), safe_level:0, trim_mode:"-")
+        erb = ERB.new(File.read(infile), :safe_level => 0, :trim_mode => "-")
         File.open(outfile, "w") do |f|
           f.puts erb.result(binding)
         end
diff --git a/lib/mcollective/util/choria.rb b/lib/mcollective/util/choria.rb
index 521453b1..76031756 100644
--- a/lib/mcollective/util/choria.rb
+++ b/lib/mcollective/util/choria.rb
@@ -127,12 +127,13 @@ def facter_domain
 
       # Determines the domain to do SRV lookups in
       #
-      # This is settable using choria.srv_domain and defaults
+      # This is settable using the environment variable
+      # CHORIA_SRV_DOMAIN or choria.srv_domain and defaults
       # to the domain as reported by facter
       #
       # @return [String]
       def srv_domain
-        get_option("choria.srv_domain", nil) || facter_domain
+        env_fetch("CHORIA_SRV_DOMAIN", nil) || get_option("choria.srv_domain", nil) || facter_domain
       end
 
       # Determines the SRV records to look up