diff --git a/congress/values.yaml b/congress/values.yaml
index 7ad70f96f0..d783f53e71 100644
--- a/congress/values.yaml
+++ b/congress/values.yaml
@@ -314,11 +314,11 @@ pod:
     congress:
       uid: 42424
   affinity:
-      anti:
-        type:
-          default: preferredDuringSchedulingIgnoredDuringExecution
-        topologyKey:
-          default: kubernetes.io/hostname
+    anti:
+      type:
+        default: preferredDuringSchedulingIgnoredDuringExecution
+      topologyKey:
+        default: kubernetes.io/hostname
   replicas:
     api: 1
     policy_engine: 1
diff --git a/gnocchi/values.yaml b/gnocchi/values.yaml
index e97068ecda..4b421e857e 100644
--- a/gnocchi/values.yaml
+++ b/gnocchi/values.yaml
@@ -138,11 +138,11 @@ pod:
     gnocchi:
       uid: 1000
   affinity:
-      anti:
-        type:
-          default: preferredDuringSchedulingIgnoredDuringExecution
-        topologyKey:
-          default: kubernetes.io/hostname
+    anti:
+      type:
+        default: preferredDuringSchedulingIgnoredDuringExecution
+      topologyKey:
+        default: kubernetes.io/hostname
   mounts:
     gnocchi_api:
       init_container: null
diff --git a/mistral/values.yaml b/mistral/values.yaml
index c6ae5ef26c..8beef44adf 100644
--- a/mistral/values.yaml
+++ b/mistral/values.yaml
@@ -312,11 +312,11 @@ pod:
     mistral:
       uid: 1000
   affinity:
-      anti:
-        type:
-          default: preferredDuringSchedulingIgnoredDuringExecution
-        topologyKey:
-          default: kubernetes.io/hostname
+    anti:
+      type:
+        default: preferredDuringSchedulingIgnoredDuringExecution
+      topologyKey:
+        default: kubernetes.io/hostname
   mounts:
     mistral_api:
       init_container: null
diff --git a/tools/deployment/multinode/170-senlin.sh b/tools/deployment/multinode/170-senlin.sh
new file mode 100755
index 0000000000..fd33d33572
--- /dev/null
+++ b/tools/deployment/multinode/170-senlin.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# Copyright 2017 The Openstack-Helm Authors.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+set -xe
+
+#NOTE: Deploy command
+helm upgrade --install senlin ./senlin \
+  --namespace=openstack \
+  --set pod.replicas.api=2 \
+  --set pod.replicas.engine=2
+
+#NOTE: Wait for deploy
+./tools/deployment/common/wait-for-pods.sh openstack
+
+#NOTE: Validate Deployment info
+export OS_CLOUD=openstack_helm
+openstack service list
diff --git a/tools/deployment/multinode/180-mistral.sh b/tools/deployment/multinode/180-mistral.sh
new file mode 100755
index 0000000000..b32a5b2000
--- /dev/null
+++ b/tools/deployment/multinode/180-mistral.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+# Copyright 2017 The Openstack-Helm Authors.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+set -xe
+
+#NOTE: Deploy command
+helm upgrade --install mistral ./mistral \
+  --namespace=openstack \
+  --set pod.replicas.api=2 \
+  --set pod.replicas.engine=2 \
+  --set pod.replicas.event_engine=2 \
+  --set pod.replicas.executor=2
+
+#NOTE: Wait for deploy
+./tools/deployment/common/wait-for-pods.sh openstack
+
+#NOTE: Validate Deployment info
+export OS_CLOUD=openstack_helm
+openstack service list
diff --git a/tools/deployment/multinode/190-magnum.sh b/tools/deployment/multinode/190-magnum.sh
new file mode 100755
index 0000000000..855d9792f9
--- /dev/null
+++ b/tools/deployment/multinode/190-magnum.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# Copyright 2017 The Openstack-Helm Authors.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+set -xe
+
+#NOTE: Deploy command
+helm upgrade --install magnum ./magnum \
+  --namespace=openstack \
+  --set pod.replicas.api=2 \
+  --set pod.replicas.conductor=2
+
+#NOTE: Wait for deploy
+./tools/deployment/common/wait-for-pods.sh openstack
+
+#NOTE: Validate Deployment info
+export OS_CLOUD=openstack_helm
+openstack service list
diff --git a/tools/deployment/multinode/200-congress.sh b/tools/deployment/multinode/200-congress.sh
new file mode 100755
index 0000000000..7c3b354788
--- /dev/null
+++ b/tools/deployment/multinode/200-congress.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+# Copyright 2017 The Openstack-Helm Authors.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+set -xe
+
+#NOTE: Deploy command
+# dont scale out ds node
+# only one node per environment should be in active state
+# https://docs.openstack.org/congress/latest/admin/ha-overview.html#ha-overview
+helm upgrade --install congress ./congress \
+  --namespace=openstack \
+  --set pod.replicas.api=2 \
+  --set pod.replicas.policy_engine=2 \
+  --set pod.replicas.datasource=1
+
+#NOTE: Wait for deploy
+./tools/deployment/common/wait-for-pods.sh openstack
+
+#NOTE: Validate Deployment info
+export OS_CLOUD=openstack_helm
+openstack service list
diff --git a/tools/deployment/multinode/210-postgresql.sh b/tools/deployment/multinode/210-postgresql.sh
new file mode 100755
index 0000000000..64a8abbe89
--- /dev/null
+++ b/tools/deployment/multinode/210-postgresql.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# Copyright 2017 The Openstack-Helm Authors.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+set -xe
+
+#NOTE: Wait for deploy
+helm upgrade --install postgresql ./postgresql \
+  --namespace=openstack
+
+#NOTE: Wait for deploy
+./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/multinode/220-gnocchi.sh b/tools/deployment/multinode/220-gnocchi.sh
new file mode 100755
index 0000000000..7381dd35f0
--- /dev/null
+++ b/tools/deployment/multinode/220-gnocchi.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# Copyright 2017 The Openstack-Helm Authors.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+set -xe
+
+#NOTE: Wait for deploy
+helm upgrade --install gnocchi ./gnocchi \
+  --namespace=openstack \
+  --set pod.replicas.api=2
+
+#NOTE: Wait for deploy
+./tools/deployment/common/wait-for-pods.sh openstack
+
+#NOTE: Validate Deployment info
+export OS_CLOUD=openstack_helm
+openstack service list
diff --git a/tools/deployment/multinode/230-mongodb.sh b/tools/deployment/multinode/230-mongodb.sh
new file mode 100755
index 0000000000..59ca716e0a
--- /dev/null
+++ b/tools/deployment/multinode/230-mongodb.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# Copyright 2017 The Openstack-Helm Authors.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+set -xe
+
+#NOTE: Wait for deploy
+helm upgrade --install mongodb ./mongodb \
+  --namespace=openstack
+
+#NOTE: Wait for deploy
+./tools/deployment/common/wait-for-pods.sh openstack
diff --git a/tools/deployment/multinode/240-ceilometer.sh b/tools/deployment/multinode/240-ceilometer.sh
new file mode 100755
index 0000000000..aadf0580c7
--- /dev/null
+++ b/tools/deployment/multinode/240-ceilometer.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+# Copyright 2017 The Openstack-Helm Authors.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+set -xe
+
+#NOTE: Wait for deploy
+helm upgrade --install ceilometer ./ceilometer \
+  --namespace=openstack \
+  --set pod.replicas.api=2 \
+  --set pod.replicas.central=2 \
+  --set pod.replicas.collector=2 \
+  --set pod.replicas.notification=2
+
+#NOTE: Wait for deploy
+./tools/deployment/common/wait-for-pods.sh openstack
+
+#NOTE: Validate Deployment info
+export OS_CLOUD=openstack_helm
+openstack service list
diff --git a/tools/gate/playbooks/multinode-deploy.yaml b/tools/gate/playbooks/multinode-deploy.yaml
index a11a4a7866..7be1f78410 100644
--- a/tools/gate/playbooks/multinode-deploy.yaml
+++ b/tools/gate/playbooks/multinode-deploy.yaml
@@ -110,3 +110,51 @@
         ./tools/deployment/multinode/160-barbican.sh
       args:
         chdir: "{{ zuul.project.src_dir }}"
+    - name: Deploy Senlin
+      shell: |
+        set -xe;
+        ./tools/deployment/multinode/170-senlin.sh
+      args:
+        chdir: "{{ zuul.project.src_dir }}"
+    - name: Deploy Mistral
+      shell: |
+        set -xe;
+        ./tools/deployment/multinode/180-mistral.sh
+      args:
+        chdir: "{{ zuul.project.src_dir }}"
+    - name: Deploy Magnum
+      shell: |
+        set -xe;
+        ./tools/deployment/multinode/190-magnum.sh
+      args:
+        chdir: "{{ zuul.project.src_dir }}"
+    - name: Deploy Congress
+      shell: |
+        set -xe;
+        ./tools/deployment/multinode/200-congress.sh
+      args:
+        chdir: "{{ zuul.project.src_dir }}"
+    - name: Deploy Postgresql
+      shell: |
+        set -xe;
+        ./tools/deployment/multinode/210-postgresql.sh
+      args:
+        chdir: "{{ zuul.project.src_dir }}"
+    - name: Deploy Gnocchi
+      shell: |
+        set -xe;
+        ./tools/deployment/multinode/220-gnocchi.sh
+      args:
+        chdir: "{{ zuul.project.src_dir }}"
+    - name: Deploy MongoDB
+      shell: |
+        set -xe;
+        ./tools/deployment/multinode/230-mongodb.sh
+      args:
+        chdir: "{{ zuul.project.src_dir }}"
+    - name: Deploy Ceilometer
+      shell: |
+        set -xe;
+        ./tools/deployment/multinode/240-ceilometer.sh
+      args:
+        chdir: "{{ zuul.project.src_dir }}"