diff --git a/.github/workflows/publish_builder.yml b/.github/workflows/publish_builder.yml
index bd8020b61..75c4dd6f4 100644
--- a/.github/workflows/publish_builder.yml
+++ b/.github/workflows/publish_builder.yml
@@ -5,11 +5,15 @@ on:
     branches: [master, main]
 
 env:
-  DEPS_IMAGE_NAME: "hstreamdb/hstream-builder"
+  IMAGE_NAME: "hstreamdb/hstream-builder"
 
 jobs:
   build:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        hs_tag: ["latest", "rqlite_8.10.7"]
     steps:
       - uses: actions/checkout@v3
         with:
@@ -17,7 +21,7 @@ jobs:
 
       - name: Build
         run: |
-          docker build . -f docker/Dockerfile.deps -t ${DEPS_IMAGE_NAME}:latest
+          docker build . -f docker/Dockerfile.deps --build-arg HS_TAG=${{ matrix.hs_tag }} -t ${IMAGE_NAME}:${{ matrix.hs_tag }}
 
       - name: Login to Docker Hub
         uses: docker/login-action@v1
@@ -26,4 +30,4 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Push image to dockerhub
-        run: docker push ${DEPS_IMAGE_NAME}:latest
+        run: docker push ${IMAGE_NAME}:${{ matrix.hs_tag }}
diff --git a/docker/Dockerfile.deps b/docker/Dockerfile.deps
index 2d78ffb8b..6ca2df5c1 100644
--- a/docker/Dockerfile.deps
+++ b/docker/Dockerfile.deps
@@ -1,4 +1,5 @@
-FROM hstreamdb/haskell
+ARG HS_TAG=latest
+FROM hstreamdb/haskell:${HS_TAG}
 
 ARG CABAL_MIRROR_NAME="hackage.haskell.org"
 ARG CABAL_MIRROR_URL="http://hackage.haskell.org/"