diff --git "a/cluster_product/openstack/\173\173 cookiecutter.cluster_name \175\175/openstack/aio.yml" "b/cluster_product/openstack/\173\173 cookiecutter.cluster_name \175\175/openstack/aio.yml"
index 15e7f2d..72a81e8 100755
--- "a/cluster_product/openstack/\173\173 cookiecutter.cluster_name \175\175/openstack/aio.yml"
+++ "b/cluster_product/openstack/\173\173 cookiecutter.cluster_name \175\175/openstack/aio.yml"
@@ -1,4 +1,5 @@
 classes:
+- system.defaults
 - system.linux.system.lowmem
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
@@ -18,6 +19,9 @@
 - cluster.{{ cookiecutter.cluster_name }}.openstack.networking
 - cluster.{{ cookiecutter.cluster_name }}.openstack
 parameters:
+  _param:
+    mcp_version: {{ cookiecutter.mcp_version }}
+    openstack_control_address: {{ cookiecutter.aio_internal_address }}
   linux:
     system:
       # user and group keystone must exist before Apache state
diff --git a/workflow_definition.yml b/workflow_definition.yml
index ee5b7f0..e7170e4 100644
--- a/workflow_definition.yml
+++ b/workflow_definition.yml
@@ -149,23 +149,30 @@
       # REQUIRED BY PIPELINE - HIDDEN WITH DEFAULT
       - name: "mcp_common_scripts_repo"
         type: "TEXT"
-        initial: "https://github.com/Mirantis/mcp-common-scripts"
+        initial: "http://gerrit.mcp.mirantis.com/mcp/mcp-common-scripts"
         hidden: True
       - name: "mcp_version"
-        type: "TEXT"
-        initial: "2018.8.0"
-        hidden: True
+        initial: "nightly"
+        type: "CHOICE"
+        choices:
+        - - "nightly"
+          - "nightly"
+        - - "testing"
+          - "testing"
+        - - "proposed"
+          - "proposed"
+        hidden: False
       - name: "shared_reclass_url"
         type: "TEXT"
-        initial: "https://github.com/Mirantis/reclass-system-salt-model.git"
+        initial: "http://gerrit.mcp.mirantis.com/salt-models/reclass-system"
         hidden: True
       - name: "shared_reclass_branch"
         type: "TEXT"
-        initial: "2018.8.0"
+        initial: "master"
         hidden: True
       - name: "cookiecutter_template_url"
         type: "TEXT"
-        initial: "https://github.com/lotharkatt/cookiecutter-trymcp.git"
+        initial: "http://gerrit.mcp.mirantis.com/trymcp/cookiecutter-templates"
         hidden: true
       - name: "cookiecutter_template_branch"
         type: "TEXT"