diff --git a/.github/workflows/on_release.yml b/.github/workflows/on_release.yml
index 542b8a16..8403dfa6 100644
--- a/.github/workflows/on_release.yml
+++ b/.github/workflows/on_release.yml
@@ -76,6 +76,19 @@ jobs:
           tags: |
             permitio/opal-client:test
 
+      - name: Build client for testing
+        id: build_client
+        uses: docker/build-push-action@v4
+        with:
+          file: docker/Dockerfile
+          push: false
+          target: client-cedar
+          cache-from: type=registry,ref=permitio/opal-client-cedar:latest
+          cache-to: type=inline
+          load: true
+          tags: |
+            permitio/opal-client-cedar:test
+
       - name: Build client-standalone for testing
         id: build_client_standalone
         uses: docker/build-push-action@v4
@@ -136,6 +149,21 @@ jobs:
             permitio/opal-client:latest
             permitio/opal-client:${{ env.opal_version_tag }}
 
+      - name: Build & Push client cedar
+        if: ${{ !(github.event_name == 'workflow_dispatch' && github.event.inputs.dry_run == 'true') }}
+        id: build_push_client_cedar
+        uses: docker/build-push-action@v4
+        with:
+          file: docker/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          target: client-cedar
+          cache-from: type=registry,ref=permitio/opal-client-cedar:latest
+          cache-to: type=inline
+          tags: |
+            permitio/opal-client-cedar:latest
+            permitio/opal-client-cedar:${{ env.opal_version_tag }}
+
       - name: Build client-standalone
         if: ${{ !(github.event_name == 'workflow_dispatch' && github.event.inputs.dry_run == 'true') }}
         id: build_push_client_standalone
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 610cdd05..bcab1fe7 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -79,6 +79,19 @@ jobs:
           tags: |
             permitio/opal-client:test
 
+      - name: Build client cedar
+        id: build_client
+        uses: docker/build-push-action@v2
+        with:
+          file: docker/Dockerfile
+          push: false
+          target: client-cedar
+          cache-from: type=registry,ref=permitio/opal-client-cedar:latest
+          cache-to: type=inline
+          load: true
+          tags: |
+            permitio/opal-client-cedar:test
+
       - name: Build server
         id: build_server
         uses: docker/build-push-action@v2