diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
--- a/contrib/gitian-descriptors/gitian-linux.yml
+++ b/contrib/gitian-descriptors/gitian-linux.yml
@@ -1,8 +1,9 @@
 ---
 name: "bitcoin-abc-0.18-linux"
 enable_cache: true
+distro: "debian"
 suites:
-- "xenial"
+- "stretch"
 architectures:
 - "amd64"
 multiarch:
@@ -11,19 +12,14 @@
 - "curl"
 - "gperf"
 - "g++-aarch64-linux-gnu"
-- "g++-5-aarch64-linux-gnu"
 - "gcc-aarch64-linux-gnu"
-- "gcc-5-aarch64-linux-gnu"
 - "binutils-aarch64-linux-gnu"
 - "g++-arm-linux-gnueabihf"
-- "g++-5-arm-linux-gnueabihf"
 - "gcc-arm-linux-gnueabihf"
-- "gcc-5-arm-linux-gnueabihf"
 - "binutils-arm-linux-gnueabihf"
-- "g++-5-multilib"
-- "gcc-5-multilib"
 - "binutils-gold"
-- "git-core"
+- "build-essential"
+- "git"
 - "pkg-config"
 - "autoconf"
 - "libtool"
@@ -32,8 +28,8 @@
 - "bsdmainutils"
 - "ca-certificates"
 - "python"
+- "lib32stdc++-6-dev"
 - "libc6-dev:i386"
-- "libstdc++6:i386"
 remotes:
 - "url": "https://github.com/Bitcoin-ABC/bitcoin-abc.git"
   "dir": "bitcoin"
diff --git a/contrib/gitian-descriptors/gitian-osx-signer.yml b/contrib/gitian-descriptors/gitian-osx-signer.yml
--- a/contrib/gitian-descriptors/gitian-osx-signer.yml
+++ b/contrib/gitian-descriptors/gitian-osx-signer.yml
@@ -1,7 +1,8 @@
 ---
 name: "bitcoin-dmg-signer"
+distro: "debian"
 suites:
-- "xenial"
+- "stretch"
 architectures:
 - "amd64"
 packages:
diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml
--- a/contrib/gitian-descriptors/gitian-osx.yml
+++ b/contrib/gitian-descriptors/gitian-osx.yml
@@ -1,15 +1,16 @@
 ---
 name: "bitcoin-abc-0.18-osx"
 enable_cache: true
+distro: "debian"
 suites:
-- "xenial"
+- "stretch"
 architectures:
 - "amd64"
 packages:
 - "ca-certificates"
 - "curl"
 - "g++"
-- "git-core"
+- "git"
 - "pkg-config"
 - "autoconf"
 - "librsvg2-bin"
diff --git a/contrib/gitian-descriptors/gitian-win-signer.yml b/contrib/gitian-descriptors/gitian-win-signer.yml
--- a/contrib/gitian-descriptors/gitian-win-signer.yml
+++ b/contrib/gitian-descriptors/gitian-win-signer.yml
@@ -1,7 +1,8 @@
 ---
 name: "bitcoin-win-signer"
+distro: "debian"
 suites:
-- "xenial"
+- "stretch"
 architectures:
 - "amd64"
 packages:
diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml
--- a/contrib/gitian-descriptors/gitian-win.yml
+++ b/contrib/gitian-descriptors/gitian-win.yml
@@ -1,14 +1,15 @@
 ---
 name: "bitcoin-abc-0.18-win"
 enable_cache: true
+distro: "debian"
 suites:
-- "xenial"
+- "stretch"
 architectures:
 - "amd64"
 packages:
 - "curl"
 - "g++"
-- "git-core"
+- "git"
 - "pkg-config"
 - "autoconf"
 - "libtool"
@@ -21,24 +22,16 @@
 - "zip"
 - "ca-certificates"
 - "python"
-alternatives:
-- "package" : "i686-w64-mingw32-gcc"
-  "path" : "/usr/bin/i686-w64-mingw32-gcc-posix"
-- "package" : "i686-w64-mingw32-g++"
-  "path" : "/usr/bin/i686-w64-mingw32-g++-posix"
-- "package" : "x86_64-w64-mingw32-gcc"
-  "path" : "/usr/bin/x86_64-w64-mingw32-gcc-posix"
-- "package" : "x86_64-w64-mingw32-g++"
-  "path" : "/usr/bin/x86_64-w64-mingw32-g++-posix"
+- "rename"
 remotes:
 - "url": "https://github.com/Bitcoin-ABC/bitcoin-abc.git"
   "dir": "bitcoin"
 files: []
 script: |
   WRAP_DIR=$HOME/wrapped
-  HOSTS="x86_64-w64-mingw32 i686-w64-mingw32"
+  HOSTS="i686-w64-mingw32 x86_64-w64-mingw32"
   CONFIGFLAGS="--enable-reduce-exports --disable-bench --disable-gui-tests --without-seeder"
-  FAKETIME_HOST_PROGS="g++ ar ranlib nm windres strip objcopy"
+  FAKETIME_HOST_PROGS="ar ranlib nm windres strip objcopy"
   FAKETIME_PROGS="date makensis zip"
   HOST_CFLAGS="-O2 -g"
   HOST_CXXFLAGS="-O2 -g"
@@ -93,8 +86,8 @@
         chmod +x ${WRAP_DIR}/${i}/${prog}
     done
     for prog in gcc g++; do
-        echo '#!/bin/bash' > ${WRAP_DIR}/${i}-${prog}
-        echo "REAL=\`which -a ${i}-${prog} | grep -v ${WRAP_DIR}/${i}-${prog} | head -1\`" >> ${WRAP_DIR}/${i}-${prog}
+        echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${i}-${prog}
+        echo "REAL=\`which -a ${i}-${prog}-posix | grep -v ${WRAP_DIR}/${i}-${prog} | head -1\`" >> ${WRAP_DIR}/${i}-${prog}
         echo 'export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${i}-${prog}
         echo "export FAKETIME=\"$1\"" >> ${WRAP_DIR}/${i}-${prog}
         echo "export COMPILER_PATH=${WRAP_DIR}/${i}" >> ${WRAP_DIR}/${i}-${prog}
diff --git a/contrib/gitian/provisioner.sh b/contrib/gitian/provisioner.sh
--- a/contrib/gitian/provisioner.sh
+++ b/contrib/gitian/provisioner.sh
@@ -43,10 +43,6 @@
 git clone https://github.com/devrandom/gitian-builder.git
 cd gitian-builder
 
-# This is required for multiarch support.  Once the associated pull-requests
-# are merged, these should be removed.
-git remote add deadalnix https://github.com/devrandom/gitian-builder.git
-git fetch deadalnix
 git config --global user.email "vagrant@vagrant.com"
 git config --global user.name "vagrant"
 
@@ -57,8 +53,8 @@
 echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 echo 
 echo "As the user ${BUILDUSER} run the following commands to produce a linux build:"
-echo "export COMMIT=v0.16.0"
+echo "export COMMIT=v0.18.3"
 echo "export URL=https://github.com/Bitcoin-ABC/bitcoin-abc.git"
 echo "cd gitian-builder"
-echo './bin/make-base-vm --lxc --suite xenial --arch amd64'
-echo './bin/gbuild --commit bitcoin=${COMMIT} --url bitcoin=${URL} /vagrant/contrib/gitian-descriptors/gitian-linux.yml'
\ No newline at end of file
+echo './bin/make-base-vm --lxc --distro debian --suite stretch --arch amd64'
+echo './bin/gbuild --commit bitcoin=${COMMIT} --url bitcoin=${URL} /vagrant/contrib/gitian-descriptors/gitian-linux.yml'