diff --git a/toci_gate_test-oooq.sh b/toci_gate_test-oooq.sh
index ea1f370e5..2bbbd5ab1 100755
--- a/toci_gate_test-oooq.sh
+++ b/toci_gate_test-oooq.sh
@@ -203,6 +203,18 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
             fi
             TAGS="build,undercloud-setup,undercloud-scripts,undercloud-install,undercloud-validate,images"
         ;;
+        standalone)
+            ENVIRONMENT="osinfra"
+            UNDERCLOUD="127.0.0.2"
+            export PLAYBOOKS=${PLAYBOOKS:-"quickstart.yml multinode-standalone.yml"}
+            FEATURESET_CONF=" --extra-vars @$LWD/config/general_config/featureset-multinode-common.yml $FEATURESET_CONF"
+            if [[ $NODEPOOL_PROVIDER == "rdo-cloud-tripleo" ]]; then
+                ENV_VARS="$ENV_VARS --extra-vars @$TRIPLEO_ROOT/tripleo-ci/toci-quickstart/config/testenv/multinode-rdocloud.yml"
+            else
+                ENV_VARS="$ENV_VARS --extra-vars @$TRIPLEO_ROOT/tripleo-ci/toci-quickstart/config/testenv/multinode.yml"
+            fi
+            TAGS="build,standalone"
+        ;;
         periodic)
             PERIODIC=1
             QUICKSTART_RELEASE="promotion-testing-hash-${QUICKSTART_RELEASE}"
diff --git a/zuul.d/multinode-jobs.yaml b/zuul.d/multinode-jobs.yaml
index 6e2082be1..d2574dcf2 100644
--- a/zuul.d/multinode-jobs.yaml
+++ b/zuul.d/multinode-jobs.yaml
@@ -22,6 +22,7 @@
         - tripleo-ci-centos-7-undercloud-containers
         - tripleo-ci-centos-7-scenario000-multinode-oooq-container-updates
         - tripleo-ci-centos-7-scenario000-multinode-oooq-container-upgrades
+        - tripleo-ci-centos-7-standalone
 
     gate:
       queue: tripleo
diff --git a/zuul.d/standalone-jobs.yaml b/zuul.d/standalone-jobs.yaml
new file mode 100644
index 000000000..ce2b72379
--- /dev/null
+++ b/zuul.d/standalone-jobs.yaml
@@ -0,0 +1,16 @@
+---
+# zuul.d/standalone-jobs.yaml
+# Zuul layout for TripleO standalone jobs.
+# It contains all the jobs related to standalone installer testing.
+
+- job:
+    name: tripleo-ci-centos-7-standalone
+    parent: tripleo-ci-dsvm
+    run: playbooks/tripleo-ci/run.yaml
+    post-run: playbooks/tripleo-ci/post.yaml
+    timeout: 10800
+    nodeset: legacy-centos-7
+    voting: false
+    branches: ^(?!stable/(newton|ocata|pike|queens)).*$
+    vars:
+      toci_jobtype: standalone-featureset052