diff --git a/.build.yml b/.build.yml
new file mode 100644
index 0000000..501571e
--- /dev/null
+++ b/.build.yml
@@ -0,0 +1,140 @@
+##########################################################
+# THE FOLLOWING LINES IS USED BY docker-build
+##########################################################
+requires:
+  archlinux:
+    # Useful URL: https://git.archlinux.org/svntogit/community.git/tree/mate-terminal
+    - autoconf-archive
+    - clang
+    - gcc
+    - git
+    - libsm
+    - make
+    - mate-common
+    - mate-desktop
+    - vte3
+    - which
+    - yelp-tools
+
+  debian:
+    # Useful URL: https://github.com/mate-desktop/debian-packages
+    # Useful URL: https://salsa.debian.org/debian-mate-team/mate-terminal
+    - autoconf-archive
+    - autopoint
+    - clang
+    - clang-tools
+    - cppcheck
+    - gcc
+    - git
+    - libdconf-dev
+    - libglib2.0-dev
+    - libgtk-3-dev
+    - libsm-dev
+    - libvte-2.91-dev
+    - libx11-dev
+    - make
+    - mate-common
+    - yelp-tools
+
+  fedora:
+    # Useful URL: https://src.fedoraproject.org/cgit/rpms/mate-terminal.git
+    - autoconf-archive
+    - clang
+    - clang-analyzer
+    - cppcheck-htmlreport
+    - gcc
+    - dconf-devel
+    - desktop-file-utils
+    - git
+    - gtk3-devel
+    - libSM-devel
+    - make
+    - mate-common
+    - redhat-rpm-config
+    - vte291-devel
+
+  ubuntu:
+    - autoconf-archive
+    - autopoint
+    - clang
+    - clang-tools
+    - git
+    - libdconf-dev
+    - libglib2.0-dev
+    - libgtk-3-dev
+    - libsm-dev
+    - libvte-2.91-dev
+    - libx11-dev
+    - make
+    - mate-common
+    - yelp-tools
+
+variables:
+  - CFLAGS="-Wall -Werror=format-security -Wredundant-decls"
+  - 'CHECKERS="
+    -enable-checker deadcode.DeadStores
+    -enable-checker alpha.deadcode.UnreachableCode
+    -enable-checker alpha.core.CastSize
+    -enable-checker alpha.core.CastToStruct
+    -enable-checker alpha.core.IdenticalExpr
+    -enable-checker alpha.core.SizeofPtr
+    -enable-checker alpha.security.ArrayBoundV2
+    -enable-checker alpha.security.MallocOverflow
+    -enable-checker alpha.security.ReturnPtrRange
+    -enable-checker alpha.unix.SimpleStream
+    -enable-checker alpha.unix.cstring.BufferOverlap
+    -enable-checker alpha.unix.cstring.NotNullTerminated
+    -enable-checker alpha.unix.cstring.OutOfBounds
+    -enable-checker alpha.core.FixedAddr
+    -enable-checker security.insecureAPI.strcpy"'
+
+before_scripts:
+  - if [ ${DISTRO_NAME} == "debian" ];then
+  -     egrep -lRZ 'G_GNUC_BEGIN_IGNORE_DEPRECATIONS' . | xargs -0 -l sed -i -e 's/G_GNUC_BEGIN_IGNORE_DEPRECATIONS/ /g'
+  -     egrep -lRZ 'G_GNUC_END_IGNORE_DEPRECATIONS' . | xargs -0 -l sed -i -e 's/G_GNUC_END_IGNORE_DEPRECATIONS/ /g'
+  - fi
+  # Install mate-common from tarball
+  - cd ${START_DIR}
+  - '[ -f mate-common-1.23.3.tar.xz ] || curl -Ls -o mate-common-1.23.3.tar.xz http://pub.mate-desktop.org/releases/1.23/mate-common-1.23.3.tar.xz'
+  - tar xf mate-common-1.23.3.tar.xz
+  - cd mate-common-1.23.3
+  - if [ ${DISTRO_NAME} == "debian" -o ${DISTRO_NAME} == "ubuntu" ];then
+  -     ./configure --prefix=/usr --libdir=/usr/lib/x86_64-linux-gnu --libexecdir=/usr/lib/x86_64-linux-gnu
+  - else
+  -     ./configure --prefix=/usr
+  - fi
+  - make
+  - make install
+
+build_scripts:
+  - ./autogen.sh --enable-compile-warnings=maximum
+  - scan-build $CHECKERS ./configure --enable-compile-warnings=maximum
+  - if [ $CPU_COUNT -gt 1 ]; then
+  -     scan-build $CHECKERS --keep-cc -o html-report make -j $CPU_COUNT
+  - else
+  -     scan-build $CHECKERS --keep-cc -o html-report make
+  - fi
+  - if [ ${DISTRO_NAME} == "debian" ];then
+  -     cppcheck --enable=warning,style,performance,portability,information,missingInclude .
+  - fi
+
+after_scripts:
+  - if [ ${DISTRO_NAME} == "fedora" ];then
+  -   cppcheck --xml --output-file=cppcheck.xml --enable=warning,style,performance,portability,information,missingInclude .
+  -   cppcheck-htmlreport --title=${REPO_NAME} --file=cppcheck.xml --report-dir=cppcheck-htmlreport
+  -   ./gen-index -l 20 -i https://github.com/${OWNER_NAME}/mate-icon-theme/raw/master/mate/16x16/apps/utilities-terminal.png
+  - fi
+  - make distcheck
+
+releases:
+  draft: false
+  prerelease: false
+  checksum: true
+  file_glob: true
+  files: mate-terminal-*.tar.xz
+  github_release:
+    tags: true
+    overwrite: true
+    base_version: 1.20.0
+    notify_servers:
+      - https://release.mate-desktop.org/release
diff --git a/.travis.yml b/.travis.yml
index 149735f..54ae69d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,10 +18,10 @@ install:
   - sudo apt-get install -y python3-pip python3-setuptools
   - sudo pip3 install --upgrade pip
   - sudo pip install PyGithub
-  - ./docker-build --name ${DISTRO} --config .travis.yml --install
+  - ./docker-build --name ${DISTRO} --config .build.yml --install
 
 script:
-  - ./docker-build --name ${DISTRO} --verbose --config .travis.yml --build scripts
+  - ./docker-build --name ${DISTRO} --verbose --config .build.yml --build scripts
 
 deploy:
   - provider: pages
@@ -35,7 +35,7 @@ deploy:
       all_branches: true
       condition: ${DISTRO} =~ ^fedora.*$
   - provider: script
-    script: ./docker-build --verbose --config .travis.yml --release github
+    script: ./docker-build --verbose --config .build.yml --release github
     skip_cleanup: true
     on:
       tags: true
@@ -57,144 +57,3 @@ env:
   - DISTRO="debian:testing"
   - DISTRO="fedora:latest"
   - DISTRO="ubuntu:19.10"
-
-##########################################################
-# THE FOLLOWING LINES IS USED BY docker-build
-##########################################################
-requires:
-  archlinux:
-    # Useful URL: https://git.archlinux.org/svntogit/community.git/tree/mate-terminal
-    - autoconf-archive
-    - clang
-    - gcc
-    - git
-    - libsm
-    - make
-    - mate-common
-    - mate-desktop
-    - vte3
-    - which
-    - yelp-tools
-
-  debian:
-    # Useful URL: https://github.com/mate-desktop/debian-packages
-    # Useful URL: https://salsa.debian.org/debian-mate-team/mate-terminal
-    - autoconf-archive
-    - autopoint
-    - clang
-    - clang-tools
-    - cppcheck
-    - gcc
-    - git
-    - libdconf-dev
-    - libglib2.0-dev
-    - libgtk-3-dev
-    - libsm-dev
-    - libvte-2.91-dev
-    - libx11-dev
-    - make
-    - mate-common
-    - yelp-tools
-
-  fedora:
-    # Useful URL: https://src.fedoraproject.org/cgit/rpms/mate-terminal.git
-    - autoconf-archive
-    - clang
-    - clang-analyzer
-    - cppcheck-htmlreport
-    - gcc
-    - dconf-devel
-    - desktop-file-utils
-    - git
-    - gtk3-devel
-    - libSM-devel
-    - make
-    - mate-common
-    - redhat-rpm-config
-    - vte291-devel
-
-  ubuntu:
-    - autoconf-archive
-    - autopoint
-    - clang
-    - clang-tools
-    - git
-    - libdconf-dev
-    - libglib2.0-dev
-    - libgtk-3-dev
-    - libsm-dev
-    - libvte-2.91-dev
-    - libx11-dev
-    - make
-    - mate-common
-    - yelp-tools
-
-variables:
-  - CFLAGS="-Wall -Werror=format-security -Wredundant-decls"
-  - 'CHECKERS="
-    -enable-checker deadcode.DeadStores
-    -enable-checker alpha.deadcode.UnreachableCode
-    -enable-checker alpha.core.CastSize
-    -enable-checker alpha.core.CastToStruct
-    -enable-checker alpha.core.IdenticalExpr
-    -enable-checker alpha.core.SizeofPtr
-    -enable-checker alpha.security.ArrayBoundV2
-    -enable-checker alpha.security.MallocOverflow
-    -enable-checker alpha.security.ReturnPtrRange
-    -enable-checker alpha.unix.SimpleStream
-    -enable-checker alpha.unix.cstring.BufferOverlap
-    -enable-checker alpha.unix.cstring.NotNullTerminated
-    -enable-checker alpha.unix.cstring.OutOfBounds
-    -enable-checker alpha.core.FixedAddr
-    -enable-checker security.insecureAPI.strcpy"'
-
-before_scripts:
-  - if [ ${DISTRO_NAME} == "debian" ];then
-  -     egrep -lRZ 'G_GNUC_BEGIN_IGNORE_DEPRECATIONS' . | xargs -0 -l sed -i -e 's/G_GNUC_BEGIN_IGNORE_DEPRECATIONS/ /g'
-  -     egrep -lRZ 'G_GNUC_END_IGNORE_DEPRECATIONS' . | xargs -0 -l sed -i -e 's/G_GNUC_END_IGNORE_DEPRECATIONS/ /g'
-  - fi
-  # Install mate-common from tarball
-  - cd ${START_DIR}
-  - '[ -f mate-common-1.23.3.tar.xz ] || curl -Ls -o mate-common-1.23.3.tar.xz http://pub.mate-desktop.org/releases/1.23/mate-common-1.23.3.tar.xz'
-  - tar xf mate-common-1.23.3.tar.xz
-  - cd mate-common-1.23.3
-  - if [ ${DISTRO_NAME} == "debian" -o ${DISTRO_NAME} == "ubuntu" ];then
-  -     ./configure --prefix=/usr --libdir=/usr/lib/x86_64-linux-gnu --libexecdir=/usr/lib/x86_64-linux-gnu
-  - else
-  -     ./configure --prefix=/usr
-  - fi
-  - make
-  - make install
-
-build_scripts:
-  - ./autogen.sh --enable-compile-warnings=maximum
-  - scan-build $CHECKERS ./configure --enable-compile-warnings=maximum
-  - if [ $CPU_COUNT -gt 1 ]; then
-  -     scan-build $CHECKERS --keep-cc -o html-report make -j $CPU_COUNT
-  - else
-  -     scan-build $CHECKERS --keep-cc -o html-report make
-  - fi
-  - if [ ${DISTRO_NAME} == "debian" ];then
-  -     cppcheck --enable=warning,style,performance,portability,information,missingInclude .
-  - fi
-
-after_scripts:
-  - if [ ${DISTRO_NAME} == "fedora" ];then
-  -   cppcheck --xml --output-file=cppcheck.xml --enable=warning,style,performance,portability,information,missingInclude .
-  -   cppcheck-htmlreport --title=${REPO_NAME} --file=cppcheck.xml --report-dir=cppcheck-htmlreport
-  -   ./gen-index -l 20 -i https://github.com/${OWNER_NAME}/mate-icon-theme/raw/master/mate/16x16/apps/utilities-terminal.png
-  - fi
-  - make distcheck
-
-releases:
-  draft: false
-  prerelease: false
-  checksum: true
-  file_glob: true
-  files: mate-terminal-*.tar.xz
-  github_release:
-    tags: true
-    overwrite: true
-    base_version: 1.20.0
-    notify_servers:
-      - https://release.mate-desktop.org/release