diff --git a/.gitlab-ci/container/debian/x86_64_test-android.sh b/.gitlab-ci/container/debian/x86_64_test-android.sh
index 8f76e61a335..41f82e53585 100755
--- a/.gitlab-ci/container/debian/x86_64_test-android.sh
+++ b/.gitlab-ci/container/debian/x86_64_test-android.sh
@@ -95,7 +95,7 @@ popd
 
 ############### Building and installing Debian package ...
 
-ANDROID_CUTTLEFISH_VERSION=f6494d9fbeaa9974b56923e3029909e5d5f440dd
+ANDROID_CUTTLEFISH_VERSION=v1.0.1
 
 mkdir android-cuttlefish
 pushd android-cuttlefish
@@ -104,11 +104,9 @@ git remote add origin https://github.com/google/android-cuttlefish.git
 git fetch --depth 1 origin "$ANDROID_CUTTLEFISH_VERSION"
 git checkout FETCH_HEAD
 
-pushd base
-dpkg-buildpackage -uc -us
-popd
+./tools/buildutils/build_packages.sh
 
-apt-get install -y ./cuttlefish-base_*.deb
+apt-get install -y ./cuttlefish-base_*.deb ./cuttlefish-user_*.deb
 
 popd
 rm -rf android-cuttlefish