diff --git a/.github/workflows/erlang.yml b/.github/workflows/erlang.yml
index aaaa205c1..17991f97a 100644
--- a/.github/workflows/erlang.yml
+++ b/.github/workflows/erlang.yml
@@ -12,7 +12,6 @@ on:
       - nhse-develop-3.2
       - nhse-develop-3.4
 
-
 jobs:
 
   build:
diff --git a/rebar.config b/rebar.config
index f5fc4cb34..7be3a097b 100644
--- a/rebar.config
+++ b/rebar.config
@@ -14,16 +14,11 @@
 
 {xref_checks,[undefined_function_calls,undefined_functions]}.
 
-%% XXX yz_kv is here becase Ryan has not yet made a generic hook interface for object modification
-%% XXX yz_stat is here for similar reasons -- we do not yet support dynamic stat hooks
-%% XXX object is here because it's a new Lager sync
-{xref_queries, [{"(XC - UC) || (XU - X - B - \"(cluster_info|dtrace|yz_kv|yz_stat|object)\" : Mod)", []}]}.
-
 {erl_first_files, [
                    "src/riak_kv_backend.erl"
                   ]}.
 
-{plugins, [{rebar3_gpb_plugin, {git, "https://github.com/nhs-riak/rebar3_gpb_plugin", {tag, "nhse-develop"}}},
+{plugins, [{rebar3_gpb_plugin, {git, "https://github.com/OpenRiak/rebar3_gpb_plugin", {tag, "nhse-develop"}}},
            {eqc_rebar, {git, "https://github.com/Quviq/eqc-rebar", {branch, "master"}}}]}.
 
 {gpb_opts, [{module_name_suffix, "_pb"},
@@ -41,16 +36,16 @@
 ]}.
 
 {deps, [
-    {riak_core, {git, "https://github.com/nhs-riak/riak_core.git", {branch, "nhse-develop-3.4"}}},
-    {sidejob, {git, "https://github.com/nhs-riak/sidejob.git", {branch, "nhse-develop"}}},
-    {bitcask, {git, "https://github.com/nhs-riak/bitcask.git", {branch, "nhse-develop"}}},
+    {riak_core, {git, "https://github.com/OpenRiak/riak_core.git", {branch, "nhse-develop-3.4"}}},
+    {sidejob, {git, "https://github.com/OpenRiak/sidejob.git", {branch, "nhse-develop"}}},
+    {bitcask, {git, "https://github.com/openRiak/bitcask.git", {branch, "nhse-develop"}}},
     {redbug, {git, "https://github.com/massemanet/redbug", {branch, "master"}}},
     {recon, {git, "https://github.com/ferd/recon", {tag, "2.5.5"}}},
     {sext, {git, "https://github.com/uwiger/sext.git", {tag, "1.8.0"}}},
-    {riak_pipe, {git, "https://github.com/nhs-riak/riak_pipe.git", {branch, "nhse-develop-3.4"}}},
-    {riak_dt, {git, "https://github.com/nhs-riak/riak_dt.git", {branch, "nhse-develop"}}},
-    {riak_api, {git, "https://github.com/nhs-riak/riak_api.git", {branch, "nhse-develop-3.4"}}},
-    {hyper, {git, "https://github.com/nhs-riak/hyper", {branch, "nhse-develop"}}},
-    {kv_index_tictactree, {git, "https://github.com/nhs-riak/kv_index_tictactree.git", {branch, "nhse-develop-3.4"}}},
-    {rhc, {git, "https://github.com/nhs-riak/riak-erlang-http-client", {branch, "nhse-develop-3.4"}}}
+    {riak_pipe, {git, "https://github.com/OpenRiak/riak_pipe.git", {branch, "nhse-develop-3.4"}}},
+    {riak_dt, {git, "https://github.com/OpenRiak/riak_dt.git", {branch, "nhse-develop"}}},
+    {riak_api, {git, "https://github.com/OpenRiak/riak_api.git", {branch, "nhse-develop-3.4"}}},
+    {hyper, {git, "https://github.com/OpenRiak/hyper", {branch, "nhse-develop"}}},
+    {kv_index_tictactree, {git, "https://github.com/OpenRiak/kv_index_tictactree.git", {branch, "nhse-develop-3.4"}}},
+    {rhc, {git, "https://github.com/OpenRiak/riak-erlang-http-client", {branch, "nhse-develop-3.4"}}}
 ]}.