diff --git a/contrib/teamcity/gitian.sh b/contrib/teamcity/gitian.sh
--- a/contrib/teamcity/gitian.sh
+++ b/contrib/teamcity/gitian.sh
@@ -28,7 +28,7 @@
   mv MacOSX10.11.sdk.tar.gz inputs
 fi
 
-./bin/make-base-vm --lxc --suite xenial --arch amd64
+./bin/make-base-vm --lxc --distro debian --suite stretch --arch amd64
 ./bin/gbuild --commit bitcoin=${COMMIT} --url bitcoin=${URL} ../contrib/gitian-descriptors/gitian-${OS_NAME}.yml
 
 cd ..
diff --git a/doc/gitian-building.md b/doc/gitian-building.md
--- a/doc/gitian-building.md
+++ b/doc/gitian-building.md
@@ -88,7 +88,7 @@
 
 ```bash
 cd gitian-builder
-bin/make-base-vm --lxc --arch amd64 --suite xenial
+./bin/make-base-vm --lxc --distro debian --suite stretch --arch amd64
 ```
 
 There will be a lot of warnings printed during the build of the image. These