diff --git a/.github/workflows/forms-flow-documents-cd.yml b/.github/workflows/forms-flow-documents-cd.yml
index 4c2942f504..88303e0358 100644
--- a/.github/workflows/forms-flow-documents-cd.yml
+++ b/.github/workflows/forms-flow-documents-cd.yml
@@ -78,27 +78,31 @@ jobs:
       
       - name: Build and push Docker image
         if: ${{ github.ref != 'refs/heads/master' }}
-        run: |
-          docker buildx create --name mybuilder --use
-          cd ./forms-flow-documents
-          docker buildx build \
-            --platform linux/amd64,linux/arm64 \
-            --file Dockerfile \
-            --file Dockerfile-ARM64 \
-            --tags: ${{ steps.meta.outputs.tags }}
-            --labels: ${{ steps.meta.outputs.labels }}
+        uses: docker/build-push-action@v4
+        with:
+          context: forms-flow-documents
+          push: true
+          platforms: linux/amd64
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
       - name: Build and push Docker image
         if: ${{ github.ref == 'refs/heads/master' }}
-        run: |
-          docker buildx create --name mybuilder --use
-          cd ./forms-flow-documents
-          docker buildx build \
-            --platform linux/amd64,linux/arm64 \
-            --file Dockerfile \
-            --file Dockerfile-ARM64 \
-            --tags: ${{ steps.meta.outputs.tags }}, formsflow/forms-flow-documents-api:latest
-            --labels: ${{ steps.meta.outputs.labels }}
-
+        uses: docker/build-push-action@v4
+        with:
+          context: forms-flow-documents
+          push: true
+          platforms: linux/amd64
+          tags: ${{ steps.meta.outputs.tags }}, formsflow/forms-flow-documents-api:latest
+          labels: ${{ steps.meta.outputs.labels }}
+      - name: Build and push Docker image - arm64
+        uses: docker/build-push-action@v4
+        with:
+          context: forms-flow-documents
+          file: forms-flow-documents/Dockerfile-ARM64
+          push: true
+          platforms: linux/arm64/v8
+          tags: ${{ steps.meta.outputs.tags }}-arm64
+          labels: ${{ steps.meta.outputs.labels }}
       - name: Scan Docker image 🐳
         uses: snyk/actions/docker@master
         continue-on-error: true
diff --git a/forms-flow-analytics/docker-compose.yml b/forms-flow-analytics/docker-compose.yml
index e6de8e2ebc..a6fc340821 100644
--- a/forms-flow-analytics/docker-compose.yml
+++ b/forms-flow-analytics/docker-compose.yml
@@ -2,7 +2,7 @@
 version: "3.7"
 
 x-redash-service: &redash-service
-  image: formsflow/redash:10.1.5
+  image: formsflow/redash:24.04.0
   depends_on:
       - postgres
       - redis