diff --git a/.github/workflows/_test.yml b/.github/workflows/_test.yml
new file mode 100644
index 0000000..a998fb9
--- /dev/null
+++ b/.github/workflows/_test.yml
@@ -0,0 +1,30 @@
+name: Unit Tests
+on: workflow_call
+jobs:
+  unit-tests:
+    runs-on: '${{ matrix.os }}'
+    strategy:
+      matrix:
+        os:
+          - ubuntu-22.04
+        node-version: [ 18.x, 20.x, 22.x ]
+        go-version:
+        - 1.16.x
+    steps:
+      - uses: actions/checkout@v4
+      - name: 'Install node.js ${{ matrix.node-version }}'
+        uses: actions/setup-node@v4
+        with:
+          node-version: '${{ matrix.node-version }}'
+      - name: 'Install Golang ${{ matrix.go-version }}'
+        uses: actions/setup-go@v5
+        with:
+          go-version: '${{ matrix.go-version }}'
+      - name: Run Go unit tests
+        run: go test ./...
+      - name: Install npm dependencies
+        run: npm install
+      - name: Run JS unit tests
+        run: npm test
+      - name: Run JS end-to-end tests
+        run: npm run end-to-end
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
new file mode 100644
index 0000000..c9533fc
--- /dev/null
+++ b/.github/workflows/pull_request.yml
@@ -0,0 +1,7 @@
+name: Continuous Integration
+on: pull_request
+jobs:
+  unit-tests:
+    # only run this job for forks
+    if: github.event.pull_request.head.repo.full_name != github.repository
+    uses: ./.github/workflows/_test.yml
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 1bc5088..8c1f929 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -2,51 +2,17 @@ name: Continuous Integration
 on: push
 jobs:
   unit-tests:
-    runs-on: '${{ matrix.os }}'
-    strategy:
-      matrix:
-        os:
-          - ubuntu-20.04
-        node-version:
-          - 12.x
-          - 14.x
-          - 16.x
-        go-version:
-          - 1.16.x
-    steps:
-      - uses: actions/checkout@v2
-      - name: 'Install Golang ${{ matrix.go-version }}'
-        uses: actions/setup-go@v2
-        with:
-          go-version: '${{ matrix.go-version }}'
-      - name: Run Go unit tests
-        run: go test ./...
-      - name: 'Install node.js ${{ matrix.node-version }}'
-        uses: actions/setup-node@v2-beta
-        with:
-          node-version: '${{ matrix.node-version }}'
-      - name: Install npm dependencies
-        run: npm install
-      - name: Run JS unit tests
-        run: npm test
-      - name: Run JS end-to-end tests
-        run: npm run end-to-end
+    uses: ./.github/workflows/_test.yml
   npm-publish:
     needs: unit-tests
-    if: github.ref == 'refs/heads/master' && github.event_name == 'push'
-    runs-on: ubuntu-20.04
+    if: github.ref == 'refs/heads/master' && needs.unit-tests.result == 'success'
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2
-      - name: 'Install Golang 1.16.x'
-        uses: actions/setup-go@v2
+      - uses: actions/checkout@v4
+      - name: Install Node.js
+        uses: actions/setup-node@v4
         with:
-          go-version: '1.16.x'
-      - name: 'Install node.js 16.x'
-        uses: actions/setup-node@v2-beta
-        with:
-          node-version: '16.x'
-      - name: Install npm dependencies
-        run: npm install
+          node-version: 20.x
       - name: Run semantic-release
         env:
           GH_TOKEN: ${{ secrets.GH_SEMANTIC_RELEASE_TOKEN }}
@@ -55,3 +21,17 @@ jobs:
           if [[ -n "$GH_TOKEN" && -n "$NPM_TOKEN" ]]; then
             curl "https://raw.githubusercontent.com/pelias/ci-tools/master/semantic-release.sh" | bash -
           fi
+  build-docker-images:
+    # run this job if the unit tests passed and the npm-publish job was a success or was skipped
+    # note: github actions won't run a job if you don't call one of the status check functions, so `always()` is called since it evalutes to `true`
+    if: ${{ always() && needs.unit-tests.result == 'success' && (needs.npm-publish.result == 'success' || needs.npm-publish.result == 'skipped') }}
+    needs: [unit-tests, npm-publish]
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build Docker images
+        env:
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+        run: |
+          curl "https://raw.githubusercontent.com/pelias/ci-tools/master/build-docker-images.sh" | bash -