diff --git a/ansible/roles/mrzcpd/files/helm/templates/_config.tpl b/ansible/roles/mrzcpd/files/helm/templates/_config.tpl
index 9f1dbca3..ad1bf817 100644
--- a/ansible/roles/mrzcpd/files/helm/templates/_config.tpl
+++ b/ansible/roles/mrzcpd/files/helm/templates/_config.tpl
@@ -313,7 +313,7 @@ role=4
 
 # This module handles the global configuration settings.
 [service]
-iocore=1,2,3,4
+iocore={{ range $index,$core := .Values.mrzcpd.cpu_affinity}}{{- if ne $index 0 }},{{ end -}}{{ $core }}{{- end }}
 distmode={{ .Values.mrzcpd.distmode }}
 hashmode=0
 poll_wait_throttle=512
diff --git a/ansible/roles/trex/files/helm/templates/deployment.yaml b/ansible/roles/trex/files/helm/templates/deployment.yaml
index 00469c87..f1d5b46d 100644
--- a/ansible/roles/trex/files/helm/templates/deployment.yaml
+++ b/ansible/roles/trex/files/helm/templates/deployment.yaml
@@ -23,6 +23,9 @@ spec:
           - "-ec"
           - |
             chmod +x /opt/tsg/trex/generate-trex-conf.sh
+            echo 'export PATH=$PATH:/opt/tsg/perf-bench-tool' >> ~/.bashrc
+            echo 'eval "$(register-python-argcomplete pbt)"' >> ~/.bashrc
+            source ~/.bashrc
             /opt/tsg/trex/generate-trex-conf.sh
             while true; do sleep 1024;done
         securityContext:
@@ -49,8 +52,6 @@ spec:
         - name: PYTHONPATH
           value: /opt/tsg/trex/v3.02/automation/trex_control_plane/interactive/
         volumeMounts:
-        - name: host
-          mountPath: /host
         - name: dev-vfio
           mountPath: /dev/vfio
         - name: modules
@@ -69,9 +70,6 @@ spec:
       - name: dev-vfio
         hostPath:
           path: /dev/vfio
-      - name: host
-        hostPath:
-          path: /
       - name: hugepage-1gi
         emptyDir:
           medium: HugePages-1Gi