diff --git a/bin/check.sh b/bin/check.sh
index a116baac..388688c5 100755
--- a/bin/check.sh
+++ b/bin/check.sh
@@ -157,6 +157,7 @@ function get_ip
   if [[ $? -ne 0 ]]; then
     error_helper "cannot find $1 ip on ${SCEN_CHECK_DIR}/scenario.csv" 10
   fi
+  peer_host=$(grep "$1" ${SCEN_CHECK_DIR}/scenario.csv|cut -d\; -f3| tr -d '\n')
 }
 
 # $1 sipp xml scenario file
@@ -186,6 +187,13 @@ function run_sipp
   for res in $(find ${SCEN_CHECK_DIR} -type f -name 'sipp_scenario_responder[0-9][0-9].xml'| sort); do
     base=$(basename $res .xml)
     get_ip $(basename $res)
+    if [ "${peer_host}" != "" ]; then
+      echo "$(date) - Update peer_host:${peer_host} ${ip}:${PORT} info"
+      ${BIN_DIR}/update_peer_host.pl --ip=${ip} --port=${PORT} ${peer_host} ${SCEN_CHECK_DIR}/scenario.yml
+      if [[ $? -ne 0 ]]; then
+        error_helper "$(date) - error updating peer info" 15
+      fi
+    fi
     echo "$(date) - Running ${base} $ip:${PORT}-${MPORT}"
     if [ -f ${SCEN_CHECK_DIR}/${base}_reg.xml ]; then
       echo "$(date) - Register ${base} $ip:${PORT}-${MPORT}"
diff --git a/bin/scenario.pl b/bin/scenario.pl
index 79173e64..dd8924c3 100755
--- a/bin/scenario.pl
+++ b/bin/scenario.pl
@@ -103,13 +103,16 @@ sub generate
         $csv->{scenario}->print($io_scenario, $csv_data);
         foreach (@{$_->{responders}})
         {
-            get_subs_info($data->{subscribers}, $_);
+            get_subs_info($data->{subscribers}, $_) unless defined($_->{peer_host});
+            $_->{password} = "" unless defined($_->{password});
             # by default responder is active
             $_->{active} = "yes" unless defined($_->{active});
+            # by default peer_host is empty
+            $_->{peer_host} = "" unless defined($_->{peer_host});
             $auth   = "[authentication username=$_->{username} password=$_->{password}]";
             $csv_data = [$_->{username}, $_->{number}, $auth, $_->{domain}];
             $csv->{callee}->print($io_callee, $csv_data);
-            $csv_data = ["sipp_scenario_responder".sprintf("%02i", $res_id).".xml", $_->{ip}];
+            $csv_data = ["sipp_scenario_responder".sprintf("%02i", $res_id).".xml", $_->{ip}, $_->{peer_host}];
             $csv->{scenario}->print($io_scenario, $csv_data);
             if($_->{register} eq "yes" && $_->{active} eq "yes")
             {
diff --git a/bin/update_peer_host.pl b/bin/update_peer_host.pl
new file mode 100755
index 00000000..cc99ffcc
--- /dev/null
+++ b/bin/update_peer_host.pl
@@ -0,0 +1,110 @@
+#!/usr/bin/perl
+use strict;
+use warnings;
+
+use Cwd 'abs_path';
+use YAML;
+use Getopt::Long;
+use Sipwise::Provisioning::Voip;
+use Sipwise::Provisioning::Billing;
+use Sipwise::Provisioning::Config;
+use Data::Dumper;
+
+our %CONFIG = ( admin    => 'cmd' );
+
+my $config = Sipwise::Provisioning::Config->new()->get_config();
+
+unless ($CONFIG{password} = $config->{acl}->{$CONFIG{admin}}->{password}) {
+  die "Error: No provisioning password found for user $CONFIG{admin}\n";
+}
+
+sub usage;
+sub call_prov;
+
+my $help = 0;
+my $ip;
+my $port;
+GetOptions ("h|help" => \$help,
+            "i|ip=s" => \$ip,
+            "p|port=i" => \$port)
+  or die("Error in command line arguments\n".usage());
+
+die(usage()) unless (!$help);
+die("Wrong number of arguments\n".usage()) unless ($#ARGV == 1);
+
+our $bprov = Sipwise::Provisioning::Billing->new();
+our $vprov = Sipwise::Provisioning::Voip->new();
+my $data;
+$data->{ip} = $ip unless !defined($ip);
+$data->{port} = $port unless !defined($port);
+die("ip or port option has to be set\n".usage()) unless defined($data);
+
+print Dumper($data), "\n";
+
+do_update($data);
+
+sub do_update {
+    my ($data) = @_;
+    my $filename = abs_path($ARGV[1]);
+    my $r = YAML::LoadFile($filename);
+
+    for (keys $r)
+    {
+        my $peer = $r->{$_};
+        # groups
+        my $group = {}; # name = id
+        my $result = call_prov( $vprov, 'get_peer_groups');
+        foreach (@{$result})
+        {
+            $group->{$_->{name}} = $_->{id};
+        }
+        for (keys $group)
+        {
+            $result = call_prov( $vprov, 'get_peer_group_details', { id => $group->{$_} });
+            foreach (@{$result->{peers}})
+            {
+                if ($_->{name} eq $ARGV[0])
+                {
+                    my $param = {
+                        id => $_->{id},
+                        data => $data
+                    };
+                    call_prov( $vprov, 'update_peer_host', $param);
+                }
+            }
+        }
+    }
+    exit;
+}
+
+sub call_prov {
+    #   scalar,    scalar,    hash-ref
+    my ($prov, $function, $parameter) = @_;
+    my $result;
+
+    eval {
+        $result = $prov->handle_request( $function,
+                                          {
+                                            authentication => {
+                                                                type     => 'system',
+                                                                username => $CONFIG{admin},
+                                                                password => $CONFIG{password},
+                                                              },
+                                            parameters => $parameter,
+                                        });
+    };
+
+    if($@) {
+        if(ref $@ eq 'SOAP::Fault') {
+            die "Voip\::$function failed: ". $@->faultstring;
+        } else {
+            die "Voip\::$function failed: $@";
+        }
+    }
+
+    return $result;
+}
+
+sub usage {
+    return "Usage:\n$0 [-h] [-i IP] [-p PORT] peer_host_name peer.yml\n";
+}