diff --git a/packstack/plugins/provision_700.py b/packstack/plugins/provision_700.py
index 44b1e236b..cd93bb5a5 100644
--- a/packstack/plugins/provision_700.py
+++ b/packstack/plugins/provision_700.py
@@ -71,7 +71,39 @@ def process_provision(param, process_args=None):
              "USE_DEFAULT": False,
              "NEED_CONFIRM": False,
              "CONDITION": False},
+        ],
+
+        "PROVISION_DEMO": [
+            {"CMD_OPTION": "provision-demo-floatrange",
+             "USAGE": "The CIDR network address for the floating IP subnet",
+             "PROMPT": "Enter the network address for the floating IP subnet",
+             "OPTION_LIST": False,
+             "VALIDATORS": False,
+             "DEFAULT_VALUE": "172.24.4.224/28",
+             "MASK_INPUT": False,
+             "LOOSE_VALIDATION": True,
+             "CONF_NAME": "CONFIG_PROVISION_DEMO_FLOATRANGE",
+             "USE_DEFAULT": False,
+             "NEED_CONFIRM": False,
+             "CONDITION": False},
+
+            {"CMD_OPTION": "provision-cirros-url",
+             "USAGE": "A URL or local file location for the Cirros demo image "
+                      "used for Glance",
+             "PROMPT": "Enter the URL or local file location for the Cirros "
+                       "image",
+             "OPTION_LIST": False,
+             "VALIDATORS": [validators.validate_not_empty],
+             "DEFAULT_VALUE": DEMO_CIRRUS_URL,
+             "MASK_INPUT": False,
+             "LOOSE_VALIDATION": True,
+             "CONF_NAME": "CONFIG_PROVISION_CIRROS_URL",
+             "USE_DEFAULT": False,
+             "NEED_CONFIRM": False,
+             "CONDITION": False},
+        ],
 
+        "PROVISION_TEMPEST": [
             {"CMD_OPTION": "provision-tempest-user",
              "USAGE": "The name of the Tempest Provisioning user. If you "
                       "don't provide a user name, Tempest will be configured "
@@ -103,10 +135,7 @@ def process_provision(param, process_args=None):
              "NEED_CONFIRM": True,
              "CONDITION": False},
 
-        ],
-
-        "PROVISION_DEMO": [
-            {"CMD_OPTION": "provision-demo-floatrange",
+            {"CMD_OPTION": "provision-tempest-floatrange",
              "USAGE": "The CIDR network address for the floating IP subnet",
              "PROMPT": "Enter the network address for the floating IP subnet",
              "OPTION_LIST": False,
@@ -114,28 +143,11 @@ def process_provision(param, process_args=None):
              "DEFAULT_VALUE": "172.24.4.224/28",
              "MASK_INPUT": False,
              "LOOSE_VALIDATION": True,
-             "CONF_NAME": "CONFIG_PROVISION_DEMO_FLOATRANGE",
-             "USE_DEFAULT": False,
-             "NEED_CONFIRM": False,
-             "CONDITION": False},
-
-            {"CMD_OPTION": "provision-cirros-url",
-             "USAGE": "A URL or local file location for the Cirros demo image "
-                      "used for Glance",
-             "PROMPT": "Enter the URL or local file location for the Cirros "
-                       "image",
-             "OPTION_LIST": False,
-             "VALIDATORS": [validators.validate_not_empty],
-             "DEFAULT_VALUE": DEMO_CIRRUS_URL,
-             "MASK_INPUT": False,
-             "LOOSE_VALIDATION": True,
-             "CONF_NAME": "CONFIG_PROVISION_CIRROS_URL",
+             "CONF_NAME": "CONFIG_PROVISION_TEMPEST_FLOATRANGE",
              "USE_DEFAULT": False,
              "NEED_CONFIRM": False,
              "CONDITION": False},
-        ],
 
-        "TEMPEST_GIT_REFS": [
             {"CMD_OPTION": "provision-tempest-repo-uri",
              "USAGE": "The uri of the tempest git repository to use",
              "PROMPT": "What is the uri of the Tempest git repository?",
@@ -200,12 +212,13 @@ def allow_all_in_one_ovs_bridge(config):
 
         {"GROUP_NAME": "PROVISION_DEMO",
          "DESCRIPTION": "Provisioning demo config",
+         "PRE_CONDITION": check_provisioning_demo,
          "PRE_CONDITION_MATCH": True,
          "POST_CONDITION": False,
          "POST_CONDITION_MATCH": True},
 
-        {"GROUP_NAME": "TEMPEST_GIT_REFS",
-         "DESCRIPTION": "Optional tempest git uri and branch",
+        {"GROUP_NAME": "PROVISION_TEMPEST",
+         "DESCRIPTION": "Provisioning tempest config",
          "PRE_CONDITION": check_provisioning_tempest,
          "PRE_CONDITION_MATCH": True,
          "POST_CONDITION": False,
diff --git a/packstack/puppet/templates/provision_demo.pp b/packstack/puppet/templates/provision_demo.pp
index 0d4c92186..aa87b2826 100644
--- a/packstack/puppet/templates/provision_demo.pp
+++ b/packstack/puppet/templates/provision_demo.pp
@@ -93,7 +93,7 @@
   firewall { '000 nat':
     chain    => 'POSTROUTING',
     jump     => 'MASQUERADE',
-    source   => $::openstack::provision::floating_range,
+    source   => hiera('CONFIG_PROVISION_DEMO_FLOATRANGE'),
     outiface => $::gateway_device,
     table    => 'nat',
     proto    => 'all',
diff --git a/packstack/puppet/templates/provision_tempest.pp b/packstack/puppet/templates/provision_tempest.pp
index 8920484d7..8bcb3dafb 100644
--- a/packstack/puppet/templates/provision_tempest.pp
+++ b/packstack/puppet/templates/provision_tempest.pp
@@ -197,7 +197,7 @@
     firewall { '000 nat':
       chain    => 'POSTROUTING',
       jump     => 'MASQUERADE',
-      source   => $::openstack::provision::floating_range,
+      source   => hiera('CONFIG_PROVISION_TEMPEST_FLOATRANGE'),
       outiface => $::gateway_device,
       table    => 'nat',
       proto    => 'all',