diff --git a/playbooks/legacy/gerrit-buck/run.yaml b/playbooks/legacy/gerrit-buck/run.yaml
index 08fe069b..18996913 100644
--- a/playbooks/legacy/gerrit-buck/run.yaml
+++ b/playbooks/legacy/gerrit-buck/run.yaml
@@ -11,11 +11,11 @@
         cmd: |
           set -e
           set -x
-          sudo bash -c "echo 'ant' >> /usr/local/jenkins/common_data/bindep-fallback.txt"
-          sudo bash -c "echo 'ant-optional' >> /usr/local/jenkins/common_data/bindep-fallback.txt"
-          sudo bash -c "echo 'default-jdk' >> /usr/local/jenkins/common_data/bindep-fallback.txt"
-          sudo bash -c "echo 'asciidoc' >> /usr/local/jenkins/common_data/bindep-fallback.txt"
-          sudo bash -c "echo 'nodejs' >> /usr/local/jenkins/common_data/bindep-fallback.txt"
+          sudo bash -c "echo 'ant' >> /usr/local/bindep-fallback/bindep-fallback.txt"
+          sudo bash -c "echo 'ant-optional' >> /usr/local/bindep-fallback/bindep-fallback.txt"
+          sudo bash -c "echo 'default-jdk' >> /usr/local/bindep-fallback/bindep-fallback.txt"
+          sudo bash -c "echo 'asciidoc' >> /usr/local/bindep-fallback/bindep-fallback.txt"
+          sudo bash -c "echo 'nodejs' >> /usr/local/bindep-fallback/bindep-fallback.txt"
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/gerrit-package-buck/run.yaml b/playbooks/legacy/gerrit-package-buck/run.yaml
index ad6207c6..1d916416 100644
--- a/playbooks/legacy/gerrit-package-buck/run.yaml
+++ b/playbooks/legacy/gerrit-package-buck/run.yaml
@@ -11,11 +11,11 @@
         cmd: |
           set -e
           set -x
-          sudo bash -c "echo 'ant' >> /usr/local/jenkins/common_data/bindep-fallback.txt"
-          sudo bash -c "echo 'ant-optional' >> /usr/local/jenkins/common_data/bindep-fallback.txt"
-          sudo bash -c "echo 'default-jdk' >> /usr/local/jenkins/common_data/bindep-fallback.txt"
-          sudo bash -c "echo 'asciidoc' >> /usr/local/jenkins/common_data/bindep-fallback.txt"
-          sudo bash -c "echo 'nodejs' >> /usr/local/jenkins/common_data/bindep-fallback.txt"
+          sudo bash -c "echo 'ant' >> /usr/local/bindep-fallback/bindep-fallback.txt"
+          sudo bash -c "echo 'ant-optional' >> /usr/local/bindep-fallback/bindep-fallback.txt"
+          sudo bash -c "echo 'default-jdk' >> /usr/local/bindep-fallback/bindep-fallback.txt"
+          sudo bash -c "echo 'asciidoc' >> /usr/local/bindep-fallback/bindep-fallback.txt"
+          sudo bash -c "echo 'nodejs' >> /usr/local/bindep-fallback/bindep-fallback.txt"
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/its-storyboard-gerrit-plugin-stable-2.13/run.yaml b/playbooks/legacy/its-storyboard-gerrit-plugin-stable-2.13/run.yaml
index 8b8c9238..fee8ca1e 100644
--- a/playbooks/legacy/its-storyboard-gerrit-plugin-stable-2.13/run.yaml
+++ b/playbooks/legacy/its-storyboard-gerrit-plugin-stable-2.13/run.yaml
@@ -12,11 +12,11 @@
         cmd: |
           set -e
           set -x
-          sudo bash -c "echo 'ant' >> /usr/local/jenkins/common_data/bindep-fallback.txt"
-          sudo bash -c "echo 'ant-optional' >> /usr/local/jenkins/common_data/bindep-fallback.txt"
-          sudo bash -c "echo 'default-jdk' >> /usr/local/jenkins/common_data/bindep-fallback.txt"
-          sudo bash -c "echo 'asciidoc' >> /usr/local/jenkins/common_data/bindep-fallback.txt"
-          sudo bash -c "echo 'nodejs' >> /usr/local/jenkins/common_data/bindep-fallback.txt"
+          sudo bash -c "echo 'ant' >> /usr/local/bindep-fallback/bindep-fallback.txt"
+          sudo bash -c "echo 'ant-optional' >> /usr/local/bindep-fallback/bindep-fallback.txt"
+          sudo bash -c "echo 'default-jdk' >> /usr/local/bindep-fallback/bindep-fallback.txt"
+          sudo bash -c "echo 'asciidoc' >> /usr/local/bindep-fallback/bindep-fallback.txt"
+          sudo bash -c "echo 'nodejs' >> /usr/local/bindep-fallback/bindep-fallback.txt"
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/javamelody-gerrit-plugin-stable-2.13/run.yaml b/playbooks/legacy/javamelody-gerrit-plugin-stable-2.13/run.yaml
index 3cc6eb04..962f4312 100644
--- a/playbooks/legacy/javamelody-gerrit-plugin-stable-2.13/run.yaml
+++ b/playbooks/legacy/javamelody-gerrit-plugin-stable-2.13/run.yaml
@@ -12,11 +12,11 @@
         cmd: |
           set -e
           set -x
-          sudo bash -c "echo 'ant' >> /usr/local/jenkins/common_data/bindep-fallback.txt"
-          sudo bash -c "echo 'ant-optional' >> /usr/local/jenkins/common_data/bindep-fallback.txt"
-          sudo bash -c "echo 'default-jdk' >> /usr/local/jenkins/common_data/bindep-fallback.txt"
-          sudo bash -c "echo 'asciidoc' >> /usr/local/jenkins/common_data/bindep-fallback.txt"
-          sudo bash -c "echo 'nodejs' >> /usr/local/jenkins/common_data/bindep-fallback.txt"
+          sudo bash -c "echo 'ant' >> /usr/local/bindep-fallback/bindep-fallback.txt"
+          sudo bash -c "echo 'ant-optional' >> /usr/local/bindep-fallback/bindep-fallback.txt"
+          sudo bash -c "echo 'default-jdk' >> /usr/local/bindep-fallback/bindep-fallback.txt"
+          sudo bash -c "echo 'asciidoc' >> /usr/local/bindep-fallback/bindep-fallback.txt"
+          sudo bash -c "echo 'nodejs' >> /usr/local/bindep-fallback/bindep-fallback.txt"
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/roles/legacy-copy-jenkins-scripts/files/install-distro-packages.sh b/roles/legacy-copy-jenkins-scripts/files/install-distro-packages.sh
index c9e00296..aa8d9b3b 100755
--- a/roles/legacy-copy-jenkins-scripts/files/install-distro-packages.sh
+++ b/roles/legacy-copy-jenkins-scripts/files/install-distro-packages.sh
@@ -24,7 +24,7 @@ elif [ -e other-requirements.txt ] ; then
     export PACKAGES=other-requirements.txt
 else
     # use the bindep fallback list preinstalled on the worker
-    export PACKAGES=/usr/local/jenkins/common_data/bindep-fallback.txt
+    export PACKAGES=/usr/local/bindep-fallback/bindep-fallback.txt
 fi
 
 # an install loop, retrying to check that all requested packages are obtained