diff --git a/vars/functions.groovy b/vars/functions.groovy
index f0479f8..f686479 100644
--- a/vars/functions.groovy
+++ b/vars/functions.groovy
@@ -2,15 +2,7 @@
 
 def initSourceTree(boardName, needsNative = false) {
     sh """
-       apt-get update
-       apt-get -y install make python curl git qemu-user-static sudo python3 python3-pip
-       curl https://storage.googleapis.com/git-repo-downloads/repo > /usr/local/bin/repo
-       chmod a+x /usr/local/bin/repo
-
-       pip3 install aptly-ctl==0.9
-
-       git clone https://gerrit.googlesource.com/gcompute-tools /tmp/gcompute-tools
-       /tmp/gcompute-tools/git-cookie-authdaemon
+       /opt/gcompute-tools/git-cookie-authdaemon
 
        git config --global url.https://aiyprojects.googlesource.com/.insteadOf sso://aiyprojects/
 
@@ -71,12 +63,8 @@
 
         for (file in filenames) {
             sh """
-               echo Uploading ${file.path}
-               /usr/local/bin/aptly-ctl -C url=http://aptly-api/api \
-                                        -C signing.gpgkey=none \
-                                        -C signing.passphrase=none \
-                                        put --force \
-                                        unstable-${repoName} ${file.path}
+               #echo Uploading ${file.path}
+               #aptly put --force unstable-${repoName} ${file.path}
                """
         }
     }
@@ -91,7 +79,8 @@
     def jnlpContainer = containerTemplate(name: 'jnlp',
                                           image: 'jenkins/jnlp-slave:alpine')
     def debianContainer = containerTemplate(name: 'debian',
-                                            image: 'debian:buster-slim',
+                                            image: 'gcr.io/mendel-linux-cloud-infra/mendel-builder:latest',
+                                            volumes: [persistentVolumeClaim(claimName: 'aptly-state', mountPath: '/var/lib/aptly')],
                                             command: 'cat',
                                             args: '',
                                             ttyEnabled: true,