diff --git a/contrib/devtools/README.md b/contrib/devtools/README.md
--- a/contrib/devtools/README.md
+++ b/contrib/devtools/README.md
@@ -95,7 +95,7 @@
 
 Example usage after a gitian build:
 
-    find ../gitian-builder/build -type f -executable | xargs python3 contrib/devtools/symbol-check.py
+    find contrib/gitian-builder/build -type f -executable | xargs python3 contrib/devtools/symbol-check.py
 
 If only supported symbols are used the return value will be 0 and the output will be empty.
 
diff --git a/contrib/devtools/symbol-check.py b/contrib/devtools/symbol-check.py
--- a/contrib/devtools/symbol-check.py
+++ b/contrib/devtools/symbol-check.py
@@ -9,7 +9,7 @@
 
 Example usage:
 
-    find ../gitian-builder/build -type f -executable | xargs python3 contrib/devtools/symbol-check.py
+    find contrib/gitian-builder/build -type f -executable | xargs python3 contrib/devtools/symbol-check.py
 '''
 import subprocess
 import re
diff --git a/contrib/gitian/provisioner.sh b/contrib/gitian/provisioner.sh
--- a/contrib/gitian/provisioner.sh
+++ b/contrib/gitian/provisioner.sh
@@ -47,10 +47,6 @@
 sudo python setup.py install
 cd ..
 
-## Install Gitian
-git clone https://github.com/devrandom/gitian-builder.git
-cd gitian-builder
-
 git config --global user.email "vagrant@vagrant.com"
 git config --global user.name "vagrant"
 
@@ -63,6 +59,6 @@
 echo "As the user ${BUILDUSER} run the following commands to produce a linux build:"
 echo "export COMMIT=v0.18.3"
 echo "export URL=https://github.com/Bitcoin-ABC/bitcoin-abc.git"
-echo "cd gitian-builder"
+echo "cd contrib/gitian-builder"
 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"
diff --git a/contrib/teamcity/gitian.sh b/contrib/teamcity/gitian.sh
--- a/contrib/teamcity/gitian.sh
+++ b/contrib/teamcity/gitian.sh
@@ -15,7 +15,12 @@
 export LXC_BRIDGE=lxcbr0
 export LXC_GUEST_IP=10.0.3.5
 
-cd ~/gitian-builder
+cd "${TOPLEVEL}/contrib/gitian-builder"
+
+# Build the base image if it doesn't already exist
+if [ ! -f "base-buster-amd64" ]; then
+  ./bin/make-base-vm --lxc --arch amd64 --distro debian --suite buster
+fi
 
 if [[ "${OS_NAME}" == "osx" ]]; then
   OSX_SDK="MacOSX10.14.sdk.tar.gz"
diff --git a/doc/gitian-building.md b/doc/gitian-building.md
--- a/doc/gitian-building.md
+++ b/doc/gitian-building.md
@@ -66,7 +66,7 @@
 It is possible to download the resulting archive directly for users that desire to do so:
 
 ```bash
-cd ~/gitian-builder
+cd bitcoin-abc/contrib/gitian-builder
 curl -LO https://storage.googleapis.com/f4936e83b2dcbca742be51fb9692b153/MacOSX10.11.sdk.tar.gz
 echo "4732b52b5ebe300c8c91cbeed6d19d59c1ff9c56c7a1dd6cfa518b9c2c72abde MacOSX10.11.sdk.tar.gz" | sha256sum -c
 mkdir -p inputs
diff --git a/doc/gitian-building/gitian-building-manual.md b/doc/gitian-building/gitian-building-manual.md
--- a/doc/gitian-building/gitian-building-manual.md
+++ b/doc/gitian-building/gitian-building-manual.md
@@ -28,7 +28,7 @@
 
 Output from `gbuild` will look something like
 
-    Initialized empty Git repository in /home/gitianuser/gitian-builder/inputs/bitcoin/.git/
+    Initialized empty Git repository in /home/gitianuser/bitcoin-abc/contrib/gitian-builder/inputs/bitcoin/.git/
     remote: Counting objects: 57959, done.
     remote: Total 57959 (delta 0), reused 0 (delta 0), pack-reused 57958
     Receiving objects: 100% (57959/57959), 53.76 MiB | 484.00 KiB/s, done.
@@ -81,16 +81,16 @@
 So, if you use LXC:
 
 ```bash
-export PATH="$PATH":${HOME}/gitian-builder/libexec
+export PATH="$PATH":${HOME}/bitcoin-abc/contrib/gitian-builder/libexec
 export USE_LXC=1
-cd ~/gitian-builder
+cd ~/bitcoin-abc/contrib/gitian-builder
 ./libexec/make-clean-vm --suite buster --arch amd64
 
 LXC_ARCH=amd64 LXC_SUITE=buster on-target -u root dpkg --add-architecture i386
 LXC_ARCH=amd64 LXC_SUITE=buster on-target -u root apt-get update
 LXC_ARCH=amd64 LXC_SUITE=buster on-target -u root \
   -e DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends -y install \
-  $( sed -ne '/^packages:/,/^[^-]/ {/^- .*/{s/"//g;s/- //;p}}' ../bitcoin-abc/contrib/gitian-descriptors/*|sort|uniq )
+  $( sed -ne '/^packages:/,/^[^-]/ {/^- .*/{s/"//g;s/- //;p}}' ../gitian-descriptors/*|sort|uniq )
 LXC_ARCH=amd64 LXC_SUITE=buster on-target -u root apt-get -q -y purge grub
 LXC_ARCH=amd64 LXC_SUITE=buster on-target -u root -e DEBIAN_FRONTEND=noninteractive apt-get -y dist-upgrade
 ```
diff --git a/doc/gitian-building/gitian-building-setup-gitian-debian.md b/doc/gitian-building/gitian-building-setup-gitian-debian.md
--- a/doc/gitian-building/gitian-building-setup-gitian-debian.md
+++ b/doc/gitian-building/gitian-building-setup-gitian-debian.md
@@ -79,10 +79,9 @@
 
 **Note**: When sudo asks for a password, enter the password for the user `gitianuser` not for `root`.
 
-Clone the git repositories for bitcoin and Gitian.
+Clone the git repository for Bitcoin ABC which contains the Gitian sources.
 
 ```bash
-git clone https://github.com/devrandom/gitian-builder.git
 git clone https://github.com/Bitcoin-ABC/bitcoin-abc.git
 ```
 
@@ -98,7 +97,7 @@
 Execute the following as user `gitianuser`:
 
 ```bash
-cd gitian-builder
+cd bitcoin-abc/contrib/gitian-builder
 bin/make-base-vm --lxc --arch amd64 --distro debian --suite buster
 ```
 
@@ -116,6 +115,6 @@
 Execute the following as user `gitianuser`:
 
 ```bash
-cd gitian-builder
-make -C ../bitcoin-abc/depends download SOURCES_PATH=`pwd`/cache/common
+cd bitcoin-abc/contrib/gitian-builder
+make -C ../../depends download SOURCES_PATH=`pwd`/cache/common
 ```
diff --git a/doc/gitian-building/gitian-building-setup-gitian-fedora.md b/doc/gitian-building/gitian-building-setup-gitian-fedora.md
--- a/doc/gitian-building/gitian-building-setup-gitian-fedora.md
+++ b/doc/gitian-building/gitian-building-setup-gitian-fedora.md
@@ -43,13 +43,10 @@
 Login as the user `gitianuser` that was created during installation.
 The rest of the steps in this guide will be performed as that user.
 
-Clone the git repositories for bitcoin and Gitian.
+Clone the git repository for Bitcoin ABC which contains the Gitian sources.
 
 ```bash
-git clone https://github.com/devrandom/gitian-builder.git
-git clone https://github.com/bitcoin/bitcoin
-git clone https://github.com/bitcoin-core/gitian.sigs.git
-git clone https://github.com/bitcoin-core/bitcoin-detached-sigs.git
+git clone https://github.com/Bitcoin-ABC/bitcoin-abc.git
 ```
 
 Setting up the Gitian image
@@ -64,7 +61,7 @@
 Execute the following as user `gitianuser`:
 
 ```bash
-cd gitian-builder
+cd bitcoin-abc/contrib/gitian-builder
 bin/make-base-vm --docker --arch amd64 --suite buster
 ```
 
diff --git a/doc/gitian-building/gitian-building-vagrant.md b/doc/gitian-building/gitian-building-vagrant.md
--- a/doc/gitian-building/gitian-building-vagrant.md
+++ b/doc/gitian-building/gitian-building-vagrant.md
@@ -60,7 +60,7 @@
 Execute the following as user `vagrant`:
 
 ```bash
-cd gitian-builder
+cd bitcoin-abc/contrib/gitian-builder
 ./bin/make-base-vm --lxc --distro debian --suite buster --arch amd64
 ```