diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa45912..044780c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## Release 2.3.1 (June 18, 2018)
+
+### Summary
+* Fix for variable ordering
+* Ensure global definitions actually work...
+
 ## Release 2.3.0 (June 18, 2018)
 
 ### Summary
diff --git a/manifests/init.pp b/manifests/init.pp
index bfa953c..ea6a138 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -176,6 +176,7 @@
   String $key_mode,
   String $owner,
   Optional[String] $service,
+  Optional[String] $source_path       = undef,
   Optional[String] $ca_content        = undef,
   Optional[String] $ca_name           = undef,
   Optional[String] $ca_source_path    = $source_path,
@@ -183,7 +184,6 @@
   Optional[String] $chain_content     = undef,
   Optional[String] $chain_name        = undef,
   Optional[String] $chain_source_path = $source_path,
-  Optional[String] $source_path       = undef,
   String $ca_ext                      = lookup('certs::cert_ext'),
   Stdlib::Absolutepath $ca_path       = lookup('certs::cert_path'),
   String $chain_ext                   = lookup('certs::cert_ext'),
diff --git a/manifests/site.pp b/manifests/site.pp
index 74a47f0..0df7053 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -214,30 +214,30 @@
 #
 define certs::site(
   Enum['present','absent'] $ensure    = 'present',
-  Optional[String] $source_path       = undef,
+  Optional[String] $source_path       = $::certs::source_path,
   Stdlib::Absolutepath $cert_path     = $::certs::cert_path,
   String $cert_dir_mode               = $::certs::cert_dir_mode,
   String $cert_ext                    = $::certs::cert_ext,
   String $cert_mode                   = $::certs::cert_mode,
-  Optional[String] $cert_content      = undef,
+  Optional[String] $cert_content      = $::certs::cert_content,
   Stdlib::Absolutepath $key_path      = $::certs::key_path,
   String $key_dir_mode                = $::certs::key_dir_mode,
   String $key_ext                     = $::certs::key_ext,
   String $key_mode                    = $::certs::key_mode,
   Boolean $merge_key                  = false,
   Optional[String] $key_content       = undef,
-  Boolean $ca_cert                    = false,
-  Optional[String] $ca_name           = undef,
-  Optional[String] $ca_source_path    = $source_path,
+  Boolean $ca_cert                    = $::certs::ca_cert,
+  Optional[String] $ca_name           = $::certs::ca_name,
+  Optional[String] $ca_source_path    = pick_default($::certs::ca_source_path, $source_path),
   Stdlib::Absolutepath $ca_path       = $::certs::ca_path,
   String $ca_ext                      = $::certs::ca_ext,
-  Optional[String] $ca_content        = undef,
-  Boolean $cert_chain                 = false,
-  Optional[String] $chain_name        = undef,
+  Optional[String] $ca_content        = $::certs::ca_content,
+  Boolean $cert_chain                 = $::certs::cert_chain,
+  Optional[String] $chain_name        = $::certs::chain_name,
   Stdlib::Absolutepath $chain_path    = $::certs::chain_path,
   String $chain_ext                   = $::certs::chain_ext,
-  Optional[String] $chain_source_path = $source_path,
-  Optional[String] $chain_content     = undef,
+  Optional[String] $chain_source_path = pick_default($::certs::chain_source_path, $source_path),
+  Optional[String] $chain_content     = $::certs::chain_content,
   Boolean $merge_chain                = false,
   Boolean $dhparam                    = false,
   Optional[String] $dhparam_content   = undef,
diff --git a/metadata.json b/metadata.json
index 9157fc3..3f28e74 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "broadinstitute-certs",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "author": "Riccardo Calixte <rcalixte@broadinstitute.org>",
   "description": "Module for SSL certificate configuration",
   "summary": "Configures and manages SSL certificate deployments, restarting services as configured.",