diff --git a/playbooks/tripleo-ci/run.yaml b/playbooks/tripleo-ci/run.yaml
index c18ea24f4..3633020ce 100644
--- a/playbooks/tripleo-ci/run.yaml
+++ b/playbooks/tripleo-ci/run.yaml
@@ -30,6 +30,8 @@
           set -e
           set -x
           export TOCI_JOBTYPE={{ toci_jobtype }}
+          export DISTRIBUTION={{ ansible_distribution }}
+          export DISTRIBUTION_MAJOR_VERSION={{ ansible_distribution_major_version }}
 
           # ZUUL does not set these for periodic jobs
           export ZUUL_BRANCH=${ZUUL_BRANCH:-master}
diff --git a/playbooks/tripleo-ci/templates/toci_quickstart.sh.j2 b/playbooks/tripleo-ci/templates/toci_quickstart.sh.j2
index ab92976e4..ff297f737 100755
--- a/playbooks/tripleo-ci/templates/toci_quickstart.sh.j2
+++ b/playbooks/tripleo-ci/templates/toci_quickstart.sh.j2
@@ -46,7 +46,7 @@ QUICKSTART_INSTALL_CMD="
 QUICKSTART_COLLECTLOGS_CMD="$LOCAL_WORKING_DIR/bin/ansible-playbook \
     $LOCAL_WORKING_DIR/playbooks/collect-logs.yml \
     -vv \
-    --extra-vars @$LOCAL_WORKING_DIR/config/release/tripleo-ci/$QUICKSTART_RELEASE.yml \
+    --extra-vars @$LOCAL_WORKING_DIR/config/release/tripleo-ci/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}/$QUICKSTART_RELEASE.yml \
     {{ featureset_conf }} \
     {{ env_vars }} \
     {{ extra_vars }} \
@@ -56,7 +56,7 @@ QUICKSTART_COLLECTLOGS_CMD="$LOCAL_WORKING_DIR/bin/ansible-playbook \
     --tags all \
 "
 
-export QUICKSTART_DEFAULT_RELEASE_ARG="--extra-vars @$LOCAL_WORKING_DIR/config/release/tripleo-ci/$QUICKSTART_RELEASE.yml"
+export QUICKSTART_DEFAULT_RELEASE_ARG="--extra-vars @$LOCAL_WORKING_DIR/config/release/tripleo-ci/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}/$QUICKSTART_RELEASE.yml"
 
 declare -A RELEASE_ARGS=()
 
diff --git a/scripts/bighammer.sh b/scripts/bighammer.sh
index 4c6d0688c..4e2e43def 100755
--- a/scripts/bighammer.sh
+++ b/scripts/bighammer.sh
@@ -56,7 +56,7 @@ function tapper(){
         sudo chown centos /opt/stack/new
         git clone https://git.openstack.org/openstack-infra/tripleo-ci /opt/stack/new/tripleo-ci
         cd /opt/stack/new/tripleo-ci
-        OVERRIDE_ZUUL_BRANCH= ZUUL_BRANCH=master WORKSPACE=/tmp TOCI_JOBTYPE=nonha DEVSTACK_GATE_TIMEOUT=180 ./toci_gate_test.sh
+        DISTRIBUTION=CentOS DISTRIBUTION_MAJOR_VERSION=7 OVERRIDE_ZUUL_BRANCH= ZUUL_BRANCH=master WORKSPACE=/tmp TOCI_JOBTYPE=nonha DEVSTACK_GATE_TIMEOUT=180 ./toci_gate_test.sh
         exit 0
 EOF
     set +x
diff --git a/toci_quickstart.sh b/toci_quickstart.sh
index 2629c076f..1ce9dd3ac 100755
--- a/toci_quickstart.sh
+++ b/toci_quickstart.sh
@@ -57,7 +57,7 @@ QUICKSTART_COLLECTLOGS_CMD="$LOCAL_WORKING_DIR/bin/ansible-playbook \
     --tags all \
 "
 
-export QUICKSTART_DEFAULT_RELEASE_ARG="--extra-vars @$LOCAL_WORKING_DIR/config/release/tripleo-ci/$QUICKSTART_RELEASE.yml"
+export QUICKSTART_DEFAULT_RELEASE_ARG="--extra-vars @$LOCAL_WORKING_DIR/config/release/tripleo-ci/${DISTRIBUTION:-CentOS}-${DISTRIBUTION_MAJOR_VERSION:-7}/$QUICKSTART_RELEASE.yml"
 
 declare -A RELEASE_ARGS=()