diff --git a/ahoy.current.yml b/ahoy.current.yml
index 8c65c4b10cbd4c0108e726900eec3ca0db9f6215..742a31ca6ecc23b64b5b1f150677f7a5e098a873 100644
--- a/ahoy.current.yml
+++ b/ahoy.current.yml
@@ -2,24 +2,22 @@ ahoyapi: v2
 commands:
   pull:
     cmd: |
-      drush sql:sync --create-db @stage.current @default.dev
+      download db ${PROJECT_BRANCH}
       drush @default.dev cr
       drush -y @default.dev config-split:import develop
-      drush rsync @stage.current:%files/ @default.dev:%files -- --chown=www-data:www-data --safe-links --max-size=20M
-      drush rsync @stage.current:%private/ @default.dev:%private -- --chown=www-data:www-data --safe-links --max-size=20M
+      download files ${PROJECT_BRANCH}
       chmod -R ugo+w files/default/files
       chmod -R ugo+w files/default/private
     usage: Pull files and DB from live site
   pull-sql:
     cmd: |
-      drush sql:sync --create-db @stage.current @default.dev
+      download db ${PROJECT_BRANCH}
       drush @default.dev cr
       drush -y @default.dev config-split:import develop
     usage: Pull DB from live site
   pull-files:
     cmd: |
-      drush rsync @stage.current:%files/ @default.dev:%files -- --chown=www-data:www-data --safe-links --max-size=20M
-      drush rsync @stage.current:%private/ @default.dev:%private -- --chown=www-data:www-data --safe-links --max-size=20M
+      download files ${PROJECT_BRANCH}
       chmod -R ugo+w files/default/files
       chmod -R ugo+w files/default/private
     usage: Pull files from live site
diff --git a/ahoy.live.yml b/ahoy.live.yml
index 18876f12e565e00506f10e50055f43ac2d9ce055..798755651a56c869fe9efe390fc6e0bea2e60dac 100644
--- a/ahoy.live.yml
+++ b/ahoy.live.yml
@@ -2,24 +2,22 @@ ahoyapi: v2
 commands:
   pull:
     cmd: |
-      drush sql:sync --create-db @default.live @default.dev
+      download db
       drush @default.dev cr
       drush -y @default.dev config-split:import develop
-      drush rsync @default.live:%files/ @default.dev:%files -- --chown=www-data:www-data --safe-links --max-size=20M
-      drush rsync @default.live:%private/ @default.dev:%private -- --chown=www-data:www-data --safe-links --max-size=20M
+      download files
       chmod -R ugo+w files/default/files
       chmod -R ugo+w files/default/private
     usage: Pull files and DB from live site
   pull-sql:
     cmd: |
-      drush sql:sync --create-db @default.live @default.dev
+      download db
       drush @default.dev cr
       drush -y @default.dev config-split:import develop
     usage: Pull DB from live site
   pull-files:
     cmd: |
-      drush rsync @default.live:%files/ @default.dev:%files -- --chown=www-data:www-data --safe-links --max-size=20M
-      drush rsync @default.live:%private/ @default.dev:%private -- --chown=www-data:www-data --safe-links --max-size=20M
+      download files
       chmod -R ugo+w files/default/files
       chmod -R ugo+w files/default/private
     usage: Pull files from live site