diff --git a/sipXconfig/etc/reset_cfkey.cf b/sipXconfig/etc/reset_cfkey.cf
index 73625e08a1..a3f2e7597b 100644
--- a/sipXconfig/etc/reset_cfkey.cf
+++ b/sipXconfig/etc/reset_cfkey.cf
@@ -33,11 +33,11 @@ bundle agent reset_cfkey_do {
 
   commands:
     have_keys_to_reset::
-      "/usr/sbin/cf-key"
+      "/usr/local/sbin/cf-key"
         comment => "Deleting cfkey for root user",
         args => "-r $(sipx.reset_cfkeys)";
 
-      "/usr/sbin/cf-key"
+      "/usr/local/sbin/cf-key"
         comment => "Deleting cfkey for $(sipx.user) user",
         args => "-r $(sipx.reset_cfkeys)",
         contain => su("$(sipx.SIPXPBXUSER)");
diff --git a/sipXsupervisor/bin/sipxagent.in b/sipXsupervisor/bin/sipxagent.in
index e0f57b3ee1..65e5ad457d 100644
--- a/sipXsupervisor/bin/sipxagent.in
+++ b/sipXsupervisor/bin/sipxagent.in
@@ -55,12 +55,12 @@ def run(verbose, is_remote, is_raw, hosts, defines, undefines, bundles)
     analyzer = (is_raw ? '' : "| #{$bindir}/sipxagent-log-reader #{vstr}")
           
     if (is_remote || Process.uid != 0)
-      ok = cmd(verbose, "/usr/sbin/cf-runagent -t #{$timeout} -v #{hstr} -f #{$cfinputs}/sipxagent.cf -o \"#{agentstr} -K\" | tee -a #{$logfile} #{analyzer}")
+      ok = cmd(verbose, "/usr/local/sbin/cf-runagent -t #{$timeout} -v #{hstr} -f #{$cfinputs}/sipxagent.cf -o \"#{agentstr} -K\" | tee -a #{$logfile} #{analyzer}")
     else 
       # Short-cut - If you're root and you're not remote, do not bother going thru 
       # sipxsupervisor.  This is handy if supervisor is dead or in the very initial
       # call to sipxecs-setup on primary when nothing is running yet
-      ok = cmd(verbose, "/usr/sbin/cf-agent #{agentstr} -IKf #{$cfinputs}/promises.cf | tee -a #{$logfile} #{analyzer}");
+      ok = cmd(verbose, "/usr/local/sbin/cf-agent #{agentstr} -IKf #{$cfinputs}/promises.cf | tee -a #{$logfile} #{analyzer}");
       FileUtils.chown($user, $group, $logfile)
     end
   end
diff --git a/sipXsupervisor/bin/sipxecs-setup.in b/sipXsupervisor/bin/sipxecs-setup.in
index 2430720a76..40d27e64d6 100644
--- a/sipXsupervisor/bin/sipxecs-setup.in
+++ b/sipXsupervisor/bin/sipxecs-setup.in
@@ -47,12 +47,12 @@ end
 
 def set_root_keys
   #harmless if re-run  
-  exit 1 unless run_command "/usr/sbin/cf-key"
+  exit 1 unless run_command "/usr/local/sbin/cf-key"
 end
 
 def set_nonroot_keys
   #harmless if re-run
-  exit 1 unless run_command "su - #{$user} sh -c '/usr/sbin/cf-key'"
+  exit 1 unless run_command "su - #{$user} sh -c '/usr/local/sbin/cf-key'"
 end
 
 def disable_selinux
diff --git a/sipXsupervisor/bin/sipxsupervisor.in b/sipXsupervisor/bin/sipxsupervisor.in
index dcfa033fc9..9d67799209 100755
--- a/sipXsupervisor/bin/sipxsupervisor.in
+++ b/sipXsupervisor/bin/sipxsupervisor.in
@@ -14,7 +14,7 @@
 . @SIPX_LIBEXECDIR@/sipx-utils.sh || { echo_failure; echo; exit $ENOENT; }
 
 config="@SIPX_CFINPUTS@/sipxsupervisord.cf"
-exec="/usr/sbin/cf-serverd"
+exec="/usr/local/sbin/cf-serverd"
 prog=$(basename $exec)
 progName="cf-serverd"
 # used to tell which config is in use.
diff --git a/sipXsupervisor/etc/commands.cf.in b/sipXsupervisor/etc/commands.cf.in
index 7693dbb29f..d8bb510be1 100644
--- a/sipXsupervisor/etc/commands.cf.in
+++ b/sipXsupervisor/etc/commands.cf.in
@@ -38,7 +38,7 @@ bundle agent last_seen_report {
 
   commands:
     any::
-      "/usr/sbin/cf-report"
+      "/usr/local/sbin/cf-report"
         args => "-IKvf @SIPX_CFINPUTS@/plugin.d/lib/commands.cf";
 }
 
diff --git a/sipXsupervisor/etc/sipxsupervisor.cf b/sipXsupervisor/etc/sipxsupervisor.cf
index 428249b343..08c2ef9db9 100644
--- a/sipXsupervisor/etc/sipxsupervisor.cf
+++ b/sipXsupervisor/etc/sipxsupervisor.cf
@@ -111,7 +111,7 @@ bundle agent sipxsupervisor_setup {
 bundle agent sipxsupervisor_running {
   vars:
     any::
-      "service_command" string => "/usr/sbin/cf-serverd";
+      "service_command" string => "/usr/local/sbin/cf-serverd";
 
   methods:
     any::
diff --git a/sipXsupervisor/etc/sipxsupervisord.cf.in b/sipXsupervisor/etc/sipxsupervisord.cf.in
index 7e32e1f0a9..6e38b6228c 100644
--- a/sipXsupervisor/etc/sipxsupervisord.cf.in
+++ b/sipXsupervisor/etc/sipxsupervisord.cf.in
@@ -40,7 +40,7 @@ body server control {
   maxconnections => "5";
   trustkeysfrom => { @(sipx.allowed_addrs) };
   logallconnections => "true";
-  cfruncommand => "/usr/sbin/cf-agent -Kvf @SIPX_CFINPUTS@/promises.cf";
+  cfruncommand => "/usr/local/sbin/cf-agent -Kvf @SIPX_CFINPUTS@/promises.cf";
   allowusers => { @(sipx.allowed_users) };
 }
 
@@ -51,7 +51,7 @@ body agent control {
 bundle server access_rules {
   vars:
     "export_dirs" slist => {
-        "/usr/sbin/cf-agent",
+        "/usr/local/sbin/cf-agent",
         "@SIPX_CFDATA@",
         "@SIPX_LOGDIR@",
         "@SIPX_VARDIR@/tmp",