diff --git a/bin/check.sh b/bin/check.sh
index 7b7bcd10..9f3b109d 100755
--- a/bin/check.sh
+++ b/bin/check.sh
@@ -72,15 +72,15 @@ function create_voip_prefs
    ${BIN_DIR}/set_subscribers_speeddial.pl ${SCEN_CHECK_DIR}/speeddial.yml
   fi
 
-  if [ -f ${SCEN_CHECK_DIR}/prefs.yml ]; then
-    echo "$(date) - Setting subcribers preferences"
-    ${BIN_DIR}/set_subscribers_preferences.pl ${SCEN_CHECK_DIR}/prefs.yml
-  fi
-
   if [ -f ${SCEN_CHECK_DIR}/peer.yml ]; then
     echo "$(date) - Creating peers"
     ${BIN_DIR}/create_peers.pl ${SCEN_CHECK_DIR}/peer.yml
   fi
+
+  if [ -f ${SCEN_CHECK_DIR}/prefs.yml ]; then
+    echo "$(date) - Setting preferences"
+    ${BIN_DIR}/set_preferences.pl ${SCEN_CHECK_DIR}/prefs.yml
+  fi
 }
 
 # $1 domain
diff --git a/bin/set_preferences.pl b/bin/set_preferences.pl
new file mode 100755
index 00000000..0ef74c6d
--- /dev/null
+++ b/bin/set_preferences.pl
@@ -0,0 +1,133 @@
+#!/usr/bin/perl
+use strict;
+use warnings;
+
+use Getopt::Std;
+use Cwd 'abs_path';
+use YAML;
+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 main;
+sub usage;
+sub call_prov;
+
+die usage() unless ($#ARGV == 0);
+
+our $bprov = Sipwise::Provisioning::Billing->new();
+our $vprov = Sipwise::Provisioning::Voip->new();
+
+main();
+
+sub get_peers
+{
+    my $peers;
+    my $result = call_prov( $vprov, 'get_peer_groups');
+    foreach (@{$result})
+    {
+        my $res = call_prov( $vprov, 'get_peer_group_details', {id=>$_->{id}});
+        foreach (@{$res->{peers}})
+        {
+            $peers->{$_->{name}} = $_->{id};
+        }
+    }
+    return $peers;
+}
+
+sub get_rewrites
+{
+    my $rule_set;
+    my $result = call_prov( $vprov, 'get_rewrite_rule_sets');
+    foreach (@{$result})
+    {
+        $rule_set->{$_->{name}} = $_->{id};
+    }
+    return $rule_set;
+}
+
+sub main {
+    my $filename = abs_path($ARGV[0]);
+    my $prefs = YAML::LoadFile($filename);
+    my $peers;
+    my $rule_set;
+
+    for my $key (keys $prefs)
+    {
+        if (exists($prefs->{$key}->{rewrite_rule_set}))
+        {
+            if(!$rule_set) { $rule_set = get_rewrites($vprov); }
+            if (exists($rule_set->{$prefs->{$key}->{rewrite_rule_set}}))
+            {
+                $prefs->{$key}->{rewrite_rule_set} = $rule_set->{$prefs->{$key}->{rewrite_rule_set}};
+            }
+            else
+            {
+                die("No rewrite_rule_set:$prefs->{$key}->{rewrite_rule_set} found");
+            }
+        }
+        if ( $key =~ /@/ )
+        {
+            my @fields = split /@/, $key;
+            if (!$fields[0])
+            {
+                my $pref = { domain => $fields[1], preferences => $prefs->{$key} };
+                call_prov( $vprov, 'set_domain_preferences',  $pref);
+            }
+            else
+            {
+                my $pref = { username => $fields[0], domain => $fields[1], preferences => $prefs->{$key} };
+                call_prov( $vprov, 'set_subscriber_preferences',  $pref);
+            }
+        }
+        else
+        {
+            if (!$peers) { $peers = get_peers($vprov); }
+            my $pref = { id => $peers->{$key}, preferences => $prefs->{$key} };
+            call_prov( $vprov, 'set_peer_preferences',  $pref);
+        }
+    }
+
+    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 "Billing\::$function failed: ". $@->faultstring;
+        } else {
+            die "Billing\::$function failed: $@";
+        }
+    }
+
+    return $result;
+}
+
+sub usage {
+    die "Usage:\n$0 prefs.yml\n";
+}
diff --git a/bin/set_subscribers_preferences.pl b/bin/set_subscribers_preferences.pl
deleted file mode 100755
index 5f77275e..00000000
--- a/bin/set_subscribers_preferences.pl
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/usr/bin/perl
-use strict;
-use warnings;
-
-use Getopt::Std;
-use Cwd 'abs_path';
-use YAML;
-use Sipwise::Provisioning::Billing;
-use Sipwise::Provisioning::Config;
-
-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 main;
-sub usage;
-sub call_prov;
-
-die usage() unless ($#ARGV == 0);
-
-my $bprov = Sipwise::Provisioning::Voip->new();
-
-main;
-
-sub main {
-    my $filename = abs_path($ARGV[0]);
-    my $prefs = YAML::LoadFile($filename);
-
-    for my $key (keys $prefs)
-    {
-        my @fields = split /@/, $key;
-        my $pref = { username => $fields[0], domain => $fields[1], preferences => $prefs->{$key} };
-        call_prov( 'set_subscriber_preferences',  $pref);
-    }
-
-    exit;
-}
-
-sub call_prov {
-    #   scalar,    scalar,    hash-ref
-    my ($function, $parameter) = @_;
-    my $result;
-
-    eval {
-        $result = $bprov->handle_request( $function,
-                                          {
-                                            authentication => {
-                                                                type     => 'system',
-                                                                username => $CONFIG{admin},
-                                                                password => $CONFIG{password},
-                                                              },
-                                            parameters => $parameter,
-                                        });
-    };
-
-    if($@) {
-        if(ref $@ eq 'SOAP::Fault') {
-            die "Billing\::$function failed: ". $@->faultstring;
-        } else {
-            die "Billing\::$function failed: $@";
-        }
-    }
-
-    return $result;
-}
-
-sub usage {
-    die "Usage:\n$0 prefs.yml\n";
-}