diff --git a/.travis.yml b/.travis.yml
index 9b82afb2..addb85c7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,49 +41,57 @@ jobs:
       install: skip
       script: travis_wait 30 bash _ci/source_clear.sh
 
-    - stage: Build and Test
     - name: "Core & Base Snapshot deployment" # This is to separate the snapshot deployment from the following jobs, to prevent duplication on nexus
+      stage: build and test
       if: branch = master AND type != pull_request
       before_script: travis_wait bash _ci/cache_artifacts.sh
       install: travis_wait 20 mvn -B -U -q clean install -DadditionalOption=-Xdoclint:none -DskipTests -Dmaven.javadoc.skip=true -Dmaven.wagon.http.pool=false -Pbase
       script: mvn -B -U clean deploy -DadditionalOption=-Xdoclint:none -Dmaven.javadoc.skip=true -Dmaven.wagon.http.pool=false -Pbase
 # TODO PoC for Video/Audio transforms (using FFmpeg)
     - name: "Transform Video/Audio (FFmpeg)"
+      stage: build and test
       if: branch NOT IN (company_release)
       before_script: travis_wait bash _ci/cache_artifacts.sh
       install: _ci/build.sh ffmpeg
       script: bash _ci/test.sh ffmpeg
 #    - name: "ImageMagick"
+#      stage: build and test
 #      if: branch NOT IN (company_release)
 #      before_script: travis_wait bash _ci/cache_artifacts.sh
 #      install: _ci/build.sh imagemagick
 #      script: bash _ci/test.sh imagemagick
 #    - name: "LibreOffice"
+#      stage: build and test
 #      if: branch NOT IN (company_release)
 #      before_script: travis_wait bash _ci/cache_artifacts.sh
 #      install: _ci/build.sh libreoffice
 #      script: bash _ci/test.sh libreoffice
 #    - name: "Transform Misc"
+#      stage: build and test
 #      if: branch NOT IN (company_release)
 #      before_script: travis_wait bash _ci/cache_artifacts.sh
 #      install: _ci/build.sh misc
 #      script: bash _ci/test.sh misc
 #    - name: "PDF Renderer"
+#      stage: build and test
 #      if: branch NOT IN (company_release)
 #      before_script: travis_wait bash _ci/cache_artifacts.sh
 #      install: _ci/build.sh pdf-renderer
 #      script: bash _ci/test.sh pdf-renderer
 #    - name: "Tika"
+#      stage: build and test
 #      if: branch NOT IN (company_release)
 #      before_script: travis_wait bash _ci/cache_artifacts.sh
 #      install: _ci/build.sh tika
 #      script: bash _ci/test.sh tika
 #    - name: "All in One Transformer"
+#      stage: build and test
 #      if: branch NOT IN (company_release)
 #      before_script: travis_wait bash _ci/cache_artifacts.sh
 #      install: _ci/build.sh full-build
 #      script:  travis_wait 30 bash _ci/test.sh aio-test
     # - name: "WhiteSource"
+    #   stage: build and test
     #   if: branch NOT IN (company_release)
     #   script: bash _ci/whitesource.sh
     # - name: "Source Clear Scan (SCA)"
@@ -91,6 +99,7 @@ jobs:
     #   install: skip
     #   script: travis_wait 30 bash _ci/sourceclear.sh
 #    - name: "Static Analysis (SAST)"
+#      stage: build and test
 # TODO ATS-721: comment out until it is possible to run concurrent SAST scans
 #    if: branch NOT IN (company_release) AND type != pull_request
 #      if: branch = master AND type != pull_request