diff --git a/ros_buildfarm/scripts/doc/build_rosdoc2.py b/ros_buildfarm/scripts/doc/build_rosdoc2.py
index a66af9bad..f63962e79 100644
--- a/ros_buildfarm/scripts/doc/build_rosdoc2.py
+++ b/ros_buildfarm/scripts/doc/build_rosdoc2.py
@@ -49,8 +49,7 @@ def main(argv=sys.argv[1:]):
                                   '-m',
                                   'pip',
                                   'install',
-                                  '--no-warn-script-location',
-                                  '--use-deprecated=out-of-tree-build',
+                                  '--break-system-packages',
                                   '.'],
                                  cwd=args.rosdoc2_dir)
         if pip_rc:
@@ -64,7 +63,7 @@ def main(argv=sys.argv[1:]):
             env['PATH'] = ''
         else:
             env['PATH'] += ':'
-        env['PATH'] += '/home/buildfarm/.local/bin'
+        env['PATH'] += os.path.join(env['HOME'], '.local/bin')
 
         source_space = os.path.join(args.workspace_root, 'src')
         print("Crawling for packages in workspace '%s'" % (source_space))
diff --git a/ros_buildfarm/templates/doc/rosdoc2_job.xml.em b/ros_buildfarm/templates/doc/rosdoc2_job.xml.em
index d6654b91d..e10cfa004 100644
--- a/ros_buildfarm/templates/doc/rosdoc2_job.xml.em
+++ b/ros_buildfarm/templates/doc/rosdoc2_job.xml.em
@@ -167,6 +167,8 @@ else:
         'sleep 1',
         '',
         'echo "# BEGIN SECTION: Build Dockerfile - doc"',
+	'# copy rosdoc2 into image build context directory',
+	'cp -r $WORKSPACE/rosdoc2 $WORKSPACE/docker_doc/rosdoc2',
         '# build and run build_and_install Dockerfile',
         'cd $WORKSPACE/docker_doc',
         'python3 -u $WORKSPACE/ros_buildfarm/scripts/misc/docker_pull_baseimage.py',
@@ -178,7 +180,6 @@ else:
         ' --rm ' +
         ' --cidfile=$WORKSPACE/docker_doc/docker.cid' +
         ' -v $WORKSPACE/ros_buildfarm:/tmp/ros_buildfarm:ro' +
-        ' -v $WORKSPACE/rosdoc2:/tmp/rosdoc2:ro' +
         ' -v $WORKSPACE/ws:/tmp/ws' +
         ' rosdoc2.%s_%s' % (rosdistro_name, doc_repo_spec.name.lower()),
         'echo "# END SECTION"',
diff --git a/ros_buildfarm/templates/doc/rosdoc2_task.Dockerfile.em b/ros_buildfarm/templates/doc/rosdoc2_task.Dockerfile.em
index 6c1e442e3..ad2d91eb5 100644
--- a/ros_buildfarm/templates/doc/rosdoc2_task.Dockerfile.em
+++ b/ros_buildfarm/templates/doc/rosdoc2_task.Dockerfile.em
@@ -43,6 +43,7 @@ RUN echo "@today_str"
 
 RUN python3 -u /tmp/wrapper_scripts/apt.py update-install-clean -q -y -o Debug::pkgProblemResolver=yes build-essential python3-catkin-pkg-modules doxygen graphviz openssh-client python3 python3-yaml python3-pip rsync
 
+COPY --chown=@uid:@uid rosdoc2 /tmp/rosdoc2
 USER buildfarm
 ENTRYPOINT ["sh", "-c"]
 @{