diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index a9ff23e..b194321 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -8,17 +8,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # Not testing i386 and RISCV
-        # Currently there are no docker-cli images for these architectures
         include:
           - platform: linux/amd64
             runner: ubuntu-latest
+          - platform: linux/386
+            runner: ubuntu-latest
           - platform: linux/arm/v6
             runner: ubuntu-24.04-arm
           - platform: linux/arm/v7
             runner: ubuntu-24.04-arm
           - platform: linux/arm64
             runner: ubuntu-24.04-arm
+          - platform: linux/riscv64
+            runner: ubuntu-24.04-arm
     steps:
     - name: Checkout Repo
       uses: actions/checkout@v4