diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
deleted file mode 100644
index fd65f9ed..00000000
--- a/.github/workflows/build-test.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-name: Build/Test
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    strategy:
-      matrix:
-        otp_version: [25, 24]
-        rebar3_version: ["3.20"]
-        os: ["ubuntu-latest"]
-        include:
-          - otp_version: 23
-            rebar3_version: "3.20"
-            os: "ubuntu-20.04"
-          - otp_version: 22
-            rebar3_version: "3.16"
-            os: "ubuntu-20.04"
-          - otp_version: 21
-            rebar3_version: "3.15"
-            os: "ubuntu-20.04"
-          - otp_version: 20
-            rebar3_version: "3.15"
-            os: "ubuntu-20.04"
-      fail-fast: false
-      max-parallel: 2
-
-    runs-on: ["${{ matrix.os }}"]
-
-    name: "OTP${{ matrix.otp_version}}, rebar3 v${{ matrix.rebar3_version }}"
-
-    steps:
-    - uses: actions/checkout@v3
-    - uses: erlef/setup-beam@v1
-      with:
-        otp-version: ${{ matrix.otp_version }}
-        install-rebar: true
-        install-hex: true
-        rebar3-version: ${{ matrix.rebar3_version }}
-
-    - name: Compile
-      run: rebar3 compile
-    - name: Run tests
-      run: rebar3 eunit
diff --git a/.github/workflows/erlang.yml b/.github/workflows/erlang.yml
new file mode 100644
index 00000000..00f944c2
--- /dev/null
+++ b/.github/workflows/erlang.yml
@@ -0,0 +1,36 @@
+name: Erlang CI
+
+on:
+  push:
+    branches:
+      - openriak-3.2
+  pull_request:
+    branches:
+      - openriak-3.2
+
+jobs:
+
+  build:
+
+    name: Test on ${{ matrix.os }} with OTP ${{ matrix.otp }}
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        otp: [24]
+        os: [ubuntu-latest]
+
+    steps:
+      - uses: lukka/get-cmake@latest
+      - uses: actions/checkout@v4
+      - name: Install Erlang/OTP
+        uses: erlef/setup-beam@v1
+        with:
+          otp-version: ${{ matrix.otp }}
+      - name: Compile
+        run: ./rebar3 compile
+      - name: Run xref and dialyzer
+        run: ./rebar3 do xref, dialyzer
+      - name: Run eunit
+        run: ./rebar3 as gha do eunit
diff --git a/rebar.config b/rebar.config
index 612c4a04..c4904f13 100644
--- a/rebar.config
+++ b/rebar.config
@@ -5,7 +5,7 @@
 
 {xref_checks, [undefined_function_calls]}.
 
-{deps, [{mochiweb, "3.2.1", {git, "https://github.com/mochi/mochiweb.git", {tag, "v3.2.1"}}}]}.
+{deps, [{mochiweb, {git, "https://github.com/OpenRiak/mochiweb.git", {branch, "openriak-3.2"}}}]}.
 
 {eunit_opts, [
               no_tty,
@@ -15,7 +15,7 @@
 {profiles,
  [{test,
    [{deps, [meck,
-            {ibrowse, "4.4.0"}
+            {ibrowse, {git, "https://github.com/OpenRiak/ibrowse.git", {branch, "openriak-3.2"}}}
            ]},
     {erl_opts, [debug_info]}
    ]}
diff --git a/rebar.lock b/rebar.lock
deleted file mode 100644
index 619e9fe5..00000000
--- a/rebar.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-[{<<"mochiweb">>,
-  {git,"https://github.com/mochi/mochiweb.git",
-       {ref,"897f22f6720cf369547d1303888b46b5a00e00b4"}},
-  0}].
diff --git a/rebar3 b/rebar3
new file mode 100755
index 00000000..a83d554a
Binary files /dev/null and b/rebar3 differ