diff --git a/nodepool/elements/nodepool-base/element-deps b/nodepool/elements/nodepool-base/element-deps
index 4ab83adafb..6e43915f81 100644
--- a/nodepool/elements/nodepool-base/element-deps
+++ b/nodepool/elements/nodepool-base/element-deps
@@ -1,4 +1,3 @@
-jenkins-slave
 package-installs
 pip-and-virtualenv
 zuul-worker
diff --git a/nodepool/elements/openstack-repos/install.d/95-chown-jenkins b/nodepool/elements/openstack-repos/install.d/95-chown-jenkins
deleted file mode 100755
index eb657e95c7..0000000000
--- a/nodepool/elements/openstack-repos/install.d/95-chown-jenkins
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-# Copyright (C) 2011-2013 OpenStack Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-#
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# dib-lint: disable=setu setpipefail
-if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
-    set -x
-fi
-set -e
-
-chown -R jenkins:jenkins /home/jenkins
diff --git a/nodepool/elements/zuul-worker/install.d/60-zuul-worker b/nodepool/elements/zuul-worker/install.d/60-zuul-worker
index 996c8eb77b..bb56718924 100755
--- a/nodepool/elements/zuul-worker/install.d/60-zuul-worker
+++ b/nodepool/elements/zuul-worker/install.d/60-zuul-worker
@@ -36,8 +36,8 @@ chown -R zuul:zuul /home/zuul
 # We've put the cache stuff into /opt/cache/files, but again, for
 # "historical" reasons, ensure this is available in /home/zuul
 #
-# We do this for zuul as well as jenkins users as relative paths to
-# the current user's homedir are used in places like devstack-gate.
+# We do this for zuul as relative paths to the current user's homedir
+# are used in places like devstack-gate.
 #
 # Check if the cache exists as we don't have a strict dependency on the
 # devstack-cache element. This allows you to build an image without
@@ -46,4 +46,6 @@ if [ -d /opt/cache/files ] ; then
     mkdir -p /home/zuul/cache
     chown zuul:zuul /home/zuul/cache
     ln -sf /opt/cache/files /home/zuul/cache/files
+    # but make sure the cache is readable by everyone
+    chmod -R a+rX /opt/cache/files/*
 fi