diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index 2347091dd..9c9ebc5e0 100755
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -238,7 +238,7 @@ if [ "$MULTINODE" = "1" ]; then
         # Backup current deploy args:
         CURRENT_OVERCLOUD_DEPLOY_ARGS=$OVERCLOUD_DEPLOY_ARGS
         # Set deploy args for newton deployment:
-        export OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS --templates $TRIPLEO_ROOT/$UPGRADE_RELEASE/usr/share/openstack-tripleo-heat-templates -e $TRIPLEO_ROOT/$UPGRADE_RELEASE/usr/share/openstack-tripleo-heat-templates/environments/deployed-server-environment.yaml"
+        export OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS --templates $TRIPLEO_ROOT/$UPGRADE_RELEASE/usr/share/openstack-tripleo-heat-templates -e $TRIPLEO_ROOT/$UPGRADE_RELEASE/usr/share/openstack-tripleo-heat-templates/environments/deployed-server-environment.yaml -e $TRIPLEO_ROOT/$UPGRADE_RELEASE/usr/share/openstack-tripleo-heat-templates/environments/services/sahara.yaml"
         echo_vars_to_deploy_env
         $TRIPLEO_ROOT/$UPGRADE_RELEASE/usr/share/openstack-tripleo-heat-templates/deployed-server/scripts/get-occ-config.sh 2>&1 | sudo dd of=/var/log/deployed-server-os-collect-config.log &
     else
@@ -353,7 +353,7 @@ if [ "$OVERCLOUD_MAJOR_UPGRADE" == 1 ] ; then
     # We have to use the backward compatible
     # update-from-deployed-server-newton.yaml environment when upgrading from
     # newton.
-    export OVERCLOUD_DEPLOY_ARGS="$CURRENT_OVERCLOUD_DEPLOY_ARGS -e /usr/share/openstack-tripleo-heat-templates/environments/deployed-server-environment.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/updates/update-from-deployed-server-newton.yaml"
+    export OVERCLOUD_DEPLOY_ARGS="$CURRENT_OVERCLOUD_DEPLOY_ARGS -e /usr/share/openstack-tripleo-heat-templates/environments/deployed-server-environment.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/updates/update-from-deployed-server-newton.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/services/sahara.yaml"
     echo_vars_to_deploy_env
     if [ "$MULTINODE" = "1" ]; then
         /usr/share/openstack-tripleo-heat-templates/deployed-server/scripts/get-occ-config.sh 2>&1 | sudo dd of=/var/log/deployed-server-os-collect-config-22.log &
diff --git a/scripts/tripleo.sh b/scripts/tripleo.sh
index 828e95108..9256a239c 100755
--- a/scripts/tripleo.sh
+++ b/scripts/tripleo.sh
@@ -818,6 +818,12 @@ function overcloud_sanitytest_create {
                 openstack container create ${SANITYTEST_CONTENT_NAME}
                 openstack container list
                 ;;
+            "sahara_api" )
+                # glance_api must also be enabled
+                run_cmd openstack image create sahara_${SANITYTEST_CONTENT_NAME}
+                run_cmd openstack dataprocessing image register sahara_${SANITYTEST_CONTENT_NAME} --username centos
+                run_cmd openstack dataprocessing image list
+                ;;
         esac
     done
 }
@@ -847,6 +853,9 @@ function overcloud_sanitytest_check {
             "swift_proxy" )
                 run_cmd openstack container show ${SANITYTEST_CONTENT_NAME}
                 ;;
+            "sahara_api" )
+                run_cmd openstack dataprocessing image show sahara_${SANITYTEST_CONTENT_NAME}
+                ;;
         esac
     done
 }
@@ -874,6 +883,10 @@ function overcloud_sanitytest_cleanup {
             "swift_proxy" )
                 run_cmd openstack container delete ${SANITYTEST_CONTENT_NAME}
                 ;;
+            "sahara_api" )
+                run_cmd openstack dataprocessing image unregister sahara_${SANITYTEST_CONTENT_NAME}
+                run_cmd openstack image delete sahara_${SANITYTEST_CONTENT_NAME}
+                ;;
         esac
     done
 }
diff --git a/test-environments/multinode_major_upgrade.yaml b/test-environments/multinode_major_upgrade.yaml
index 5e3aa8bd7..7de1594ff 100644
--- a/test-environments/multinode_major_upgrade.yaml
+++ b/test-environments/multinode_major_upgrade.yaml
@@ -27,6 +27,8 @@ parameter_defaults:
     - OS::TripleO::Services::SwiftProxy
     - OS::TripleO::Services::SwiftStorage
     - OS::TripleO::Services::SwiftRingBuilder
+    - OS::TripleO::Services::SaharaApi
+    - OS::TripleO::Services::SaharaEngine
     - OS::TripleO::Services::MySQL
     - OS::TripleO::Services::RabbitMQ
     - OS::TripleO::Services::HAproxy