diff --git a/roles/jaeger/tasks/cmoa.yaml b/roles/jaeger/tasks/cmoa.yaml
index 82d366e..97e84e3 100644
--- a/roles/jaeger/tasks/cmoa.yaml
+++ b/roles/jaeger/tasks/cmoa.yaml
@@ -2,7 +2,7 @@
 - name: host insert
   shell: |
     PG=$(kubectl get po -n imxc | grep postgres | awk '{print $1}')
-    for ip in {{ groups['containerd'] | union(groups['docker']) | union(groups['crio']) }}; do
+    for ip in {{ groups['containerd'] | map('extract', hostvars, ['ansible_host']) | union(groups['docker'] | map('extract', hostvars, ['ansible_host'])) | union(groups['crio'] | map('extract', hostvars, ['ansible_host'])) }}; do
       ip_formatted=$(echo "$ip" | sed -e 's/[][]//g' -e 's/,//g')
       kubectl exec -it -n imxc $PG -- psql -U admin postgresdb --command="INSERT INTO auth_resource3 VALUES (nextval('hibernate_sequence'), 'host|$ip_formatted:9100', false, null);"
     done
diff --git a/roles/jaeger/tasks/containerd.yaml b/roles/jaeger/tasks/containerd.yaml
index cf42aec..3e6faab 100644
--- a/roles/jaeger/tasks/containerd.yaml
+++ b/roles/jaeger/tasks/containerd.yaml
@@ -3,13 +3,13 @@
   lineinfile:
     path: /root/host-agent/nerdctl-host/metric-agent.yml
     regexp: 'targets'
-    line: "    - targets: ['{{ ansible_default_ipv4.address }}:9100']"
+    line: "    - targets: ['{{ ip }}:9100']"
   when:
     - inventory_hostname in groups['containerd']
 
 - name: host agent install setting [2] - containerd
   shell: |
-    sed -i "s/10.10.34.142/{{ hostvars[groups['cmoa-master'][0]]['ansible_default_ipv4']['address'] }}/" /root/host-agent/nerdctl-host/setup_nerdctl.sh
+    sed -i "s/10.10.34.142/{{ hostvars[groups['cmoa-master'][0]]['ip'] }}/" /root/host-agent/nerdctl-host/setup_nerdctl.sh
     sed -i "s/rel3.4.6/rel{{ VERSION }}/" /root/host-agent/nerdctl-host/setup_nerdctl.sh
   when:
     - inventory_hostname in groups['containerd']
diff --git a/roles/jaeger/tasks/delete.yaml b/roles/jaeger/tasks/delete.yaml
index 17ad5db..0220a50 100644
--- a/roles/jaeger/tasks/delete.yaml
+++ b/roles/jaeger/tasks/delete.yaml
@@ -13,27 +13,27 @@
     - delete_enabled
     - inventory_hostname in groups['containerd']
 
-- name: agent conatiner delete - podman.yaml
+- name: agent conatiner delete - podman
   shell: /root/host-agent/podman-host/stop.sh
   ignore_errors: true
   when:
     - delete_enabled
     - inventory_hostname in groups['crio']
 
-- name: jaeger tpcc delete
+- name: jspd tpcc delete
   kubernetes.core.helm:
-    chart_ref: "/root/jaeger-tpcc"
-    name: jaeger-tpcc
+    chart_ref: "/root/jspd-tpcc"
+    name: jspd-tpcc
     namespace: default
     state: absent
     wait: true
   when:
     - inventory_hostname == groups['agent-master'][0]
 
-- name: jaeger client delete
+- name: jspd client delete
   kubernetes.core.helm:
-    chart_ref: "/root/jaeger-client"
-    name: jaeger-client
+    chart_ref: "/root/jspd-client"
+    name: jspd-client
     namespace: "{{ NAMESAPCE }}"
     state: absent
     wait: true
@@ -49,19 +49,19 @@
     - delete_enabled
     - inventory_hostname in groups['docker'] or inventory_hostname in groups['containerd'] or inventory_hostname in groups['crio']
 
-- name: old jaeger-client directory delete
+- name: old jspd-client directory delete
   ignore_errors: true
   file:
-    path: /root/jaeger-client
+    path: /root/jspd-client
     state: absent
   when:
     - delete_enabled
     - inventory_hostname in groups['docker'] or inventory_hostname in groups['containerd'] or inventory_hostname in groups['crio']
 
-- name: old jaeger-tpcc directory delete
+- name: old jspd-tpcc directory delete
   ignore_errors: true
   file:
-    path: /root/jaeger-tpcc
+    path: /root/jspd-tpcc
     state: absent
   when:
     - delete_enabled
diff --git a/roles/jaeger/tasks/docker.yaml b/roles/jaeger/tasks/docker.yaml
index 82cf757..333cae0 100644
--- a/roles/jaeger/tasks/docker.yaml
+++ b/roles/jaeger/tasks/docker.yaml
@@ -3,13 +3,13 @@
   lineinfile:
     path: /root/host-agent/docker-host/metric-agent.yml
     regexp: 'targets'
-    line: "    - targets: ['{{ ansible_default_ipv4.address }}:9100']"
+    line: "    - targets: ['{{ ip }}:9100']"
   when:
     - inventory_hostname in groups['docker']
 
 - name: host agent install setting [2] - docker
   shell: |
-    sed -i "s/10.10.34.142/{{ hostvars[groups['cmoa-master'][0]]['ansible_default_ipv4']['address'] }}/" /root/host-agent/docker-host/setup.sh
+    sed -i "s/10.10.34.142/{{ hostvars[groups['cmoa-master'][0]]['ip'] }}/" /root/host-agent/docker-host/setup.sh
     sed -i "s/rel3.4.6/rel{{ VERSION }}/" /root/host-agent/docker-host/setup.sh
   when:
     - inventory_hostname in groups['docker']
diff --git a/roles/jaeger/tasks/podman.yaml b/roles/jaeger/tasks/podman.yaml
index 513aee8..6344ced 100644
--- a/roles/jaeger/tasks/podman.yaml
+++ b/roles/jaeger/tasks/podman.yaml
@@ -3,13 +3,13 @@
   lineinfile:
     path: /root/host-agent/podman-host/metric-agent.yml
     regexp: 'targets'
-    line: "    - targets: ['{{ ansible_default_ipv4.address }}:9100']"
+    line: "    - targets: ['{{ ip }}:9100']"
   when:
     - inventory_hostname in groups['crio']
 
 - name: host agent install setting [2] - crio
   shell: |
-    sed -i "s/10.10.34.142/{{ hostvars[groups['cmoa-master'][0]]['ansible_default_ipv4']['address'] }}/" /root/host-agent/podman-host/setup.sh
+    sed -i "s/10.10.34.142/{{ hostvars[groups['cmoa-master'][0]]['ip'] }}/" /root/host-agent/podman-host/setup.sh
     sed -i "s/rel3.4.6/rel{{ VERSION }}/" /root/host-agent/podman-host/setup.sh
   when:
     - inventory_hostname in groups['crio']
diff --git a/roles/jspd/tasks/delete.yaml b/roles/jspd/tasks/delete.yaml
index f37bd2b..0220a50 100644
--- a/roles/jspd/tasks/delete.yaml
+++ b/roles/jspd/tasks/delete.yaml
@@ -13,7 +13,7 @@
     - delete_enabled
     - inventory_hostname in groups['containerd']
 
-- name: agent conatiner delete
+- name: agent conatiner delete - podman
   shell: /root/host-agent/podman-host/stop.sh
   ignore_errors: true
   when: