diff --git a/geant/gap_ansible/roles/iptrunk_twamp/tasks/check_twamp_status.yaml b/geant/gap_ansible/roles/iptrunk_twamp/tasks/check_twamp_status.yaml
index 80f39f9c29a498b1b67366912d1c14aae198592b..8a4109257b0a025e05f4a34a70edec3c2f9beeee 100644
--- a/geant/gap_ansible/roles/iptrunk_twamp/tasks/check_twamp_status.yaml
+++ b/geant/gap_ansible/roles/iptrunk_twamp/tasks/check_twamp_status.yaml
@@ -12,7 +12,7 @@
     - name: Get TWAMP client stats
       junipernetworks.junos.junos_command:
         commands:
-          - show services rpm twamp client probe-results control-connection "{{ local_side_short_name }}--{{ remote_side_short_name }}" test-session "{{ local_side_short_name }}--{{ remote_side_short_name }}" | except "Measurement|Samples"
+          - show services rpm twamp client probe-results control-connection "{{ local_side_short_name }}--{{ remote_side_short_name }}" test-session "{{ local_side_short_name }}--{{ remote_side_short_name }}"
       register: response
 
     - name: Show stats of TWAMP client
@@ -32,7 +32,7 @@
         content: |
             <global-operations xmlns="urn:nokia.com:sros:ns:yang:sr:oper-global">
               <md-cli-raw-command>
-              <md-cli-input-line>show test-oam twamp server prefix "{{ remote_side_address }}/32"</md-cli-input-line>
+              <md-cli-input-line>show test-oam twamp server prefix "{{ subscription.iptrunk.iptrunk_ipv4_network }}"</md-cli-input-line>
               </md-cli-raw-command>
             </global-operations>
         display: json
diff --git a/geant/gap_ansible/roles/iptrunk_twamp/templates/nokia/twamp_server.j2 b/geant/gap_ansible/roles/iptrunk_twamp/templates/nokia/twamp_server.j2
index ad0a3ba41ed81b855344b97388dfee74623d6166..57bb24ec9804399cf7065a890f05c652c5af0f55 100644
--- a/geant/gap_ansible/roles/iptrunk_twamp/templates/nokia/twamp_server.j2
+++ b/geant/gap_ansible/roles/iptrunk_twamp/templates/nokia/twamp_server.j2
@@ -5,7 +5,7 @@
             <server>
                 <admin-state>enable</admin-state>
                 <prefix alu:operation="replace">
-                    <ip-prefix>{{ remote_side_address }}/32</ip-prefix>
+                    <ip-prefix>{{ subscription.iptrunk.iptrunk_ipv4_network }}</ip-prefix>
                     <description>{{ remote_side_short_name }}</description>
                     <max-connections>{{ nokia_twamp_server.max_conn }}</max-connections>
                     <max-sessions>{{ nokia_twamp_server.max_sess }}</max-sessions>