diff --git a/ansible/roles/baselayout/vars/main.yml b/ansible/roles/baselayout/vars/main.yml
index e142ebabb..84a79e46e 100644
--- a/ansible/roles/baselayout/vars/main.yml
+++ b/ansible/roles/baselayout/vars/main.yml
@@ -51,7 +51,7 @@ packages: {
   ],
 
   ibmi: [
-    'autoconf,automake,ca-certificates-mozilla,tar-gnu,gzip,ccache,cmake,coreutils-gnu,gcc12,gcc12-cplusplus,gcc12-cpp,libstdcplusplus6-12-devel,gcc10,gcc10-cplusplus,gcc10-cpp,git,libstdcplusplus6-10-devel,m4-gnu,openssl-devel,python2-setuptools,python3,python3-pip,python39,python39-pip,python39-setuptools,sed-gnu,zlib-devel,icu-devel,c-ares-devel,brotli-devel,grep-gnu,pkg-config,xz',
+    'autoconf,automake,ca-certificates-mozilla,tar-gnu,gzip,ccache,cmake,coreutils-gnu,gcc12,gcc12-cplusplus,gcc12-cpp,libstdcplusplus6-12-devel,gcc10,gcc10-cplusplus,gcc10-cpp,git,libstdcplusplus6-10-devel,m4-gnu,openssl-devel,python2-setuptools,python3,python3-pip,python39,python39-pip,python39-setuptools,python3.13,python3.13-pip,python3.13-setuptools,sed-gnu,zlib-devel,icu-devel,c-ares-devel,brotli-devel,grep-gnu,pkg-config,xz',
   ],
 
   debian11: [
diff --git a/ansible/roles/jenkins-worker/tasks/partials/tap2junit/ibmi.yml b/ansible/roles/jenkins-worker/tasks/partials/tap2junit/ibmi.yml
index d41f9a7e8..5b3762e1e 100644
--- a/ansible/roles/jenkins-worker/tasks/partials/tap2junit/ibmi.yml
+++ b/ansible/roles/jenkins-worker/tasks/partials/tap2junit/ibmi.yml
@@ -5,8 +5,7 @@
 #
 
 - name: install tap2junit
-  ansible.builtin.pip:
-    executable: /QOpenSys/pkgs/bin/pip3.9
-    name: tap2junit
-    state: present
-    version: "{{ tap2junit_version }}"
+  pip:
+    name: tap2junit=={{ tap2junit_version }}
+    virtualenv: /home/{{ server_user|upper }}/venv
+    virtualenv_command: python3.13 -m venv
diff --git a/ansible/roles/jenkins-worker/templates/ibmi_start.j2 b/ansible/roles/jenkins-worker/templates/ibmi_start.j2
index b9a7750a7..0ae930e03 100644
--- a/ansible/roles/jenkins-worker/templates/ibmi_start.j2
+++ b/ansible/roles/jenkins-worker/templates/ibmi_start.j2
@@ -2,9 +2,9 @@
 CIJOBNAME="JENKINS_CI"
 SBMJOB_OPTS="JOB($CIJOBNAME) USER(IOJS) JOBQ(QUSRNOMAX)"
 
-export PATH=/QOpenSys/pkgs/lib/ccache:/QOpenSys/pkgs/bin:/QOpenSys/usr/bin:/usr/ccs/bin:/QOpenSys/usr/bin/X11:/usr/sbin:.:/usr/bin
-export PASE_PATH=$PATH
 export HOME={{ home }}/{{ server_user|upper }}
+export PATH=$HOME/venv/bin:/QOpenSys/pkgs/lib/ccache:/QOpenSys/pkgs/bin:/QOpenSys/usr/bin:/usr/ccs/bin:/QOpenSys/usr/bin/X11:/usr/sbin:.:/usr/bin
+export PASE_PATH=$PATH
 export NODE_COMMON_PIPE="$HOME/test.pipe"
 export NODE_TEST_DIR="$HOME/tmp"
 export JOBS=$(qsh -c "db2 -s 'SELECT configured_cpus*8 as cpus FROM TABLE(qsys2.system_status()) x'" | egrep "^\s*[0-9]+\s*$" | tr -d ' ')