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
@@ -46,7 +46,6 @@
 
   WRAP_DIR=$HOME/wrapped
   HOSTS="x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu"
-  CHAINS="ABC BCHN"
 
   # CMake toolchain file name differ from host name
   declare -A CMAKE_TOOLCHAIN_FILE
@@ -148,45 +147,38 @@
   popd
 
   ORIGPATH="$PATH"
-
-  for CHAIN in ${CHAINS}; do
-    mkdir -p ${OUTDIR}/${CHAIN}
-
-    # Extract the release tarball into a dir for each host and build
-    for i in ${HOSTS}; do
-      export PATH=${BASEPREFIX}/${i}/native/bin:${ORIGPATH}
-      mkdir -p ${CHAIN}/distsrc-${i}
-      cd ${CHAIN}/distsrc-${i}
-      INSTALLPATH=`pwd`/installed/${DISTNAME}
-      mkdir -p ${INSTALLPATH}
-      tar --strip-components=1 -xf ../../$SOURCEDIST
-
-      cmake -GNinja ${SOURCEDIR} \
-        -DCMAKE_TOOLCHAIN_FILE=${SOURCEDIR}/cmake/platforms/${CMAKE_TOOLCHAIN_FILE[${i}]} \
-        -DCLIENT_VERSION_IS_RELEASE=ON \
-        -DENABLE_CLANG_TIDY=OFF \
-        -DENABLE_REDUCE_EXPORTS=ON \
-        -DENABLE_STATIC_LIBSTDCXX=ON \
-        -DENABLE_GLIBC_BACK_COMPAT=ON \
-        -DCMAKE_INSTALL_PREFIX=${INSTALLPATH} \
-        -DCCACHE=OFF \
-        -DUSE_LINKER= \
-        -DNETWORK_COMPATIBILITY=${CHAIN} \
-        ${CMAKE_EXTRA_OPTIONS[${i}]}
-
-      ninja
-      ninja security-check
-      ninja symbol-check
-
-      ninja install-debug
-
-      cd installed
-      find ${DISTNAME} -not -name "*.dbg" | sort | tar --mtime="${REFERENCE_DATETIME}" --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${CHAIN}/${DISTNAME}-${i}.tar.gz
-      find ${DISTNAME} -name "*.dbg" | sort | tar --mtime="${REFERENCE_DATETIME}" --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${CHAIN}/${DISTNAME}-${i}-debug.tar.gz
-      cd ../../..
-      rm -rf ${CHAIN}/distsrc-${i}
-    done
-    mkdir -p $OUTDIR/src
+  # Extract the release tarball into a dir for each host and build
+  for i in ${HOSTS}; do
+    export PATH=${BASEPREFIX}/${i}/native/bin:${ORIGPATH}
+    mkdir -p distsrc-${i}
+    cd distsrc-${i}
+    INSTALLPATH=`pwd`/installed/${DISTNAME}
+    mkdir -p ${INSTALLPATH}
+    tar --strip-components=1 -xf ../$SOURCEDIST
+
+    cmake -GNinja .. \
+      -DCMAKE_TOOLCHAIN_FILE=${SOURCEDIR}/cmake/platforms/${CMAKE_TOOLCHAIN_FILE[${i}]} \
+      -DCLIENT_VERSION_IS_RELEASE=ON \
+      -DENABLE_CLANG_TIDY=OFF \
+      -DENABLE_REDUCE_EXPORTS=ON \
+      -DENABLE_STATIC_LIBSTDCXX=ON \
+      -DENABLE_GLIBC_BACK_COMPAT=ON \
+      -DCMAKE_INSTALL_PREFIX=${INSTALLPATH} \
+      -DCCACHE=OFF \
+      -DUSE_LINKER= \
+      ${CMAKE_EXTRA_OPTIONS[${i}]}
+
+    ninja
+    ninja security-check
+    ninja symbol-check
+
+    ninja install-debug
+
+    cd installed
+    find ${DISTNAME} -not -name "*.dbg" | sort | tar --mtime="${REFERENCE_DATETIME}" --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}.tar.gz
+    find ${DISTNAME} -name "*.dbg" | sort | tar --mtime="${REFERENCE_DATETIME}" --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}-debug.tar.gz
+    cd ../../
+    rm -rf distsrc-${i}
   done
-
+  mkdir -p $OUTDIR/src
   mv $SOURCEDIST $OUTDIR/src
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
@@ -48,7 +48,6 @@
 script: |
   WRAP_DIR=$HOME/wrapped
   HOSTS="x86_64-apple-darwin16"
-  CHAINS="ABC BCHN"
 
   # CMake toolchain file name differ from host name
   declare -A CMAKE_TOOLCHAIN_FILE
@@ -148,59 +147,52 @@
   popd
 
   ORIGPATH="$PATH"
-
-  for CHAIN in ${CHAINS}; do
-    mkdir -p ${OUTDIR}/${CHAIN}
-
-    # Extract the release tarball into a dir for each host and build
-    for i in ${HOSTS}; do
-      export PATH=${BASEPREFIX}/${i}/native/bin:${ORIGPATH}
-      mkdir -p ${CHAIN}/distsrc-${i}
-      cd ${CHAIN}/distsrc-${i}
-      INSTALLPATH=`pwd`/installed/${DISTNAME}
-      mkdir -p ${INSTALLPATH}
-      tar --strip-components=1 -xf ../../$SOURCEDIST
-
-      cmake -GNinja ${SOURCEDIR} \
-        -DCMAKE_TOOLCHAIN_FILE=${SOURCEDIR}/cmake/platforms/${CMAKE_TOOLCHAIN_FILE[${i}]} \
-        -DCLIENT_VERSION_IS_RELEASE=ON \
-        -DENABLE_CLANG_TIDY=OFF \
-        -DENABLE_REDUCE_EXPORTS=ON \
-        -DCMAKE_INSTALL_PREFIX=${INSTALLPATH} \
-        -DCCACHE=OFF \
-        -DNETWORK_COMPATIBILITY=${CHAIN} \
-        -DGENISOIMAGE_EXECUTABLE="${WRAP_DIR}/genisoimage"
-
-      ninja
-
-      ninja install/strip
-
-      export PYTHONPATH="${BASEPREFIX}/${i}/native/lib/python3/dist-packages:${PYTHONPATH}"
-      ninja osx-deploydir
-
-      OSX_VOLNAME="$(cat osx_volname)"
-      mkdir -p unsigned-app-${i}
-      cp osx_volname unsigned-app-${i}/
-      cp contrib/macdeploy/detached-sig-apply.sh unsigned-app-${i}
-      cp contrib/macdeploy/detached-sig-create.sh unsigned-app-${i}
-      cp ${BASEPREFIX}/${i}/native/bin/dmg ${BASEPREFIX}/${i}/native/bin/genisoimage unsigned-app-${i}
-      cp ${BASEPREFIX}/${i}/native/bin/${i}-codesign_allocate unsigned-app-${i}/codesign_allocate
-      cp ${BASEPREFIX}/${i}/native/bin/${i}-pagestuff unsigned-app-${i}/pagestuff
-      mv dist unsigned-app-${i}
-      pushd unsigned-app-${i}
-      find . | sort | tar --mtime="${REFERENCE_DATETIME}" --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${CHAIN}/${DISTNAME}-osx-unsigned.tar.gz
-      popd
-
-      ninja osx-dmg
-      ${WRAP_DIR}/dmg dmg "${OSX_VOLNAME}.dmg" ${OUTDIR}/${CHAIN}/${DISTNAME}-osx-unsigned.dmg
-
-      cd installed
-      find -path "*.app*" -type f -executable -exec mv {} ${DISTNAME}/bin/bitcoin-qt \;
-      find ${DISTNAME} -not -path "*.app*" | sort | tar --mtime="${REFERENCE_DATETIME}" --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${CHAIN}/${DISTNAME}-${i}.tar.gz
-      cd ../../..
-    done
-    mkdir -p $OUTDIR/src
-    mv ${OUTDIR}/${CHAIN}/${DISTNAME}-x86_64-*.tar.gz ${OUTDIR}/${CHAIN}/${DISTNAME}-osx64.tar.gz
+  # Extract the release tarball into a dir for each host and build
+  for i in ${HOSTS}; do
+    export PATH=${BASEPREFIX}/${i}/native/bin:${ORIGPATH}
+    mkdir -p distsrc-${i}
+    cd distsrc-${i}
+    INSTALLPATH=`pwd`/installed/${DISTNAME}
+    mkdir -p ${INSTALLPATH}
+    tar --strip-components=1 -xf ../$SOURCEDIST
+
+    cmake -GNinja .. \
+      -DCMAKE_TOOLCHAIN_FILE=${SOURCEDIR}/cmake/platforms/${CMAKE_TOOLCHAIN_FILE[${i}]} \
+      -DCLIENT_VERSION_IS_RELEASE=ON \
+      -DENABLE_CLANG_TIDY=OFF \
+      -DENABLE_REDUCE_EXPORTS=ON \
+      -DCMAKE_INSTALL_PREFIX=${INSTALLPATH} \
+      -DCCACHE=OFF \
+      -DGENISOIMAGE_EXECUTABLE="${WRAP_DIR}/genisoimage"
+
+    ninja
+
+    ninja install/strip
+
+    export PYTHONPATH="${BASEPREFIX}/${i}/native/lib/python3/dist-packages:${PYTHONPATH}"
+    ninja osx-deploydir
+
+    OSX_VOLNAME="$(cat osx_volname)"
+    mkdir -p unsigned-app-${i}
+    cp osx_volname unsigned-app-${i}/
+    cp contrib/macdeploy/detached-sig-apply.sh unsigned-app-${i}
+    cp contrib/macdeploy/detached-sig-create.sh unsigned-app-${i}
+    cp ${BASEPREFIX}/${i}/native/bin/dmg ${BASEPREFIX}/${i}/native/bin/genisoimage unsigned-app-${i}
+    cp ${BASEPREFIX}/${i}/native/bin/${i}-codesign_allocate unsigned-app-${i}/codesign_allocate
+    cp ${BASEPREFIX}/${i}/native/bin/${i}-pagestuff unsigned-app-${i}/pagestuff
+    mv dist unsigned-app-${i}
+    pushd unsigned-app-${i}
+    find . | sort | tar --mtime="${REFERENCE_DATETIME}" --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-osx-unsigned.tar.gz
+    popd
+
+    ninja osx-dmg
+    ${WRAP_DIR}/dmg dmg "${OSX_VOLNAME}.dmg" ${OUTDIR}/${DISTNAME}-osx-unsigned.dmg
+
+    cd installed
+    find -path "*.app*" -type f -executable -exec mv {} ${DISTNAME}/bin/bitcoin-qt \;
+    find ${DISTNAME} -not -path "*.app*" | sort | tar --mtime="${REFERENCE_DATETIME}" --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}.tar.gz
+    cd ../../
   done
-
+  mkdir -p $OUTDIR/src
   mv $SOURCEDIST $OUTDIR/src
+  mv ${OUTDIR}/${DISTNAME}-x86_64-*.tar.gz ${OUTDIR}/${DISTNAME}-osx64.tar.gz
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
@@ -41,7 +41,6 @@
 script: |
   WRAP_DIR=$HOME/wrapped
   HOSTS="x86_64-w64-mingw32"
-  CHAINS="ABC BCHN"
 
   # CMake toolchain file name differ from host name
   declare -A CMAKE_TOOLCHAIN_FILE
@@ -168,50 +167,43 @@
   CMAKE_EXTRA_OPTIONS[x86_64-w64-mingw32]="-DCPACK_PACKAGE_FILE_NAME=${DISTNAME}-win64-setup-unsigned"
 
   ORIGPATH="$PATH"
-
-  for CHAIN in ${CHAINS}; do
-    mkdir -p ${OUTDIR}/${CHAIN}
-
-    # Extract the release tarball into a dir for each host and build
-    for i in ${HOSTS}; do
-      export PATH=${BASEPREFIX}/${i}/native/bin:${WRAP_DIR}:${ORIGPATH}
-      mkdir -p ${CHAIN}/distsrc-${i}
-      cd ${CHAIN}/distsrc-${i}
-      INSTALLPATH=`pwd`/installed/${DISTNAME}
-      mkdir -p ${INSTALLPATH}
-      tar --strip-components=1 -xf ../../$SOURCEDIST
-
-      cmake -GNinja ${SOURCEDIR} \
-        -DCMAKE_TOOLCHAIN_FILE=${SOURCEDIR}/cmake/platforms/${CMAKE_TOOLCHAIN_FILE[${i}]} \
-        -DCLIENT_VERSION_IS_RELEASE=ON \
-        -DENABLE_CLANG_TIDY=OFF \
-        -DENABLE_REDUCE_EXPORTS=ON \
-        -DBUILD_BITCOIN_SEEDER=OFF \
-        -DCPACK_STRIP_FILES=ON \
-        -DCMAKE_INSTALL_PREFIX=${INSTALLPATH} \
-        -DCCACHE=OFF \
-        -DNETWORK_COMPATIBILITY=${CHAIN} \
-        ${CMAKE_EXTRA_OPTIONS[${i}]}
-
-      ninja
-      ninja security-check
-
-      ninja install-debug
-
-      ninja package
-
-      cp -f bitcoin-abc-*-setup-unsigned.exe ${OUTDIR}/${CHAIN}/
-      cd installed
-      mkdir -p ${DISTNAME}/lib
-      mv ${DISTNAME}/bin/*.dll* ${DISTNAME}/lib/
-      find ${DISTNAME} -not -name "*.dbg"  -type f | sort | zip -X@ ${OUTDIR}/${CHAIN}/${DISTNAME}-${i}.zip
-      find ${DISTNAME} -name "*.dbg"  -type f | sort | zip -X@ ${OUTDIR}/${CHAIN}/${DISTNAME}-${i}-debug.zip
-      cd ../../..
-      rm -rf ${CHAIN}/distsrc-${i}
-    done
-
-    pushd $OUTDIR
-    mv ${OUTDIR}/${CHAIN}/${DISTNAME}-x86_64-*-debug.zip ${OUTDIR}/${CHAIN}/${DISTNAME}-win64-debug.zip
-    mv ${OUTDIR}/${CHAIN}/${DISTNAME}-x86_64-*.zip ${OUTDIR}/${CHAIN}/${DISTNAME}-win64.zip
-    popd
+  # Extract the release tarball into a dir for each host and build
+  for i in ${HOSTS}; do
+    export PATH=${BASEPREFIX}/${i}/native/bin:${WRAP_DIR}:${ORIGPATH}
+    mkdir -p distsrc-${i}
+    cd distsrc-${i}
+    INSTALLPATH=`pwd`/installed/${DISTNAME}
+    mkdir -p ${INSTALLPATH}
+    tar --strip-components=1 -xf ../$SOURCEDIST
+
+    cmake -GNinja .. \
+      -DCMAKE_TOOLCHAIN_FILE=${SOURCEDIR}/cmake/platforms/${CMAKE_TOOLCHAIN_FILE[${i}]} \
+      -DCLIENT_VERSION_IS_RELEASE=ON \
+      -DENABLE_CLANG_TIDY=OFF \
+      -DENABLE_REDUCE_EXPORTS=ON \
+      -DBUILD_BITCOIN_SEEDER=OFF \
+      -DCPACK_STRIP_FILES=ON \
+      -DCMAKE_INSTALL_PREFIX=${INSTALLPATH} \
+      -DCCACHE=OFF \
+      ${CMAKE_EXTRA_OPTIONS[${i}]}
+
+    ninja
+    ninja security-check
+
+    ninja install-debug
+
+    ninja package
+
+    cp -f bitcoin-abc-*-setup-unsigned.exe ${OUTDIR}/
+    cd installed
+    mkdir -p ${DISTNAME}/lib
+    mv ${DISTNAME}/bin/*.dll* ${DISTNAME}/lib/
+    find ${DISTNAME} -not -name "*.dbg"  -type f | sort | zip -X@ ${OUTDIR}/${DISTNAME}-${i}.zip
+    find ${DISTNAME} -name "*.dbg"  -type f | sort | zip -X@ ${OUTDIR}/${DISTNAME}-${i}-debug.zip
+    cd ../../
+    rm -rf distsrc-${i}
   done
+
+  cd $OUTDIR
+  mv ${OUTDIR}/${DISTNAME}-x86_64-*-debug.zip ${OUTDIR}/${DISTNAME}-win64-debug.zip
+  mv ${OUTDIR}/${DISTNAME}-x86_64-*.zip ${OUTDIR}/${DISTNAME}-win64.zip