diff --git a/.github/workflows/docker_dbus_service.yml b/.github/workflows/docker_dbus_service.yml
index 27fb166f..b1eab4b7 100644
--- a/.github/workflows/docker_dbus_service.yml
+++ b/.github/workflows/docker_dbus_service.yml
@@ -61,7 +61,7 @@ jobs:
         with:
           context: .
           file: docker/dbus_service/Dockerfile
-          platforms: linux/amd64, linux/arm64, linux/arm/v7, linux/arm/v6
+          platforms: linux/amd64, linux/arm64, linux/arm/v7, linux/arm/v6, linux/riscv64
           push: true
           build-args: GATEWAY_BUILD_SHA1= ${{ github.sha }}
           tags: |
diff --git a/.github/workflows/docker_sink_service.yml b/.github/workflows/docker_sink_service.yml
index ec1f403c..8aafbd65 100644
--- a/.github/workflows/docker_sink_service.yml
+++ b/.github/workflows/docker_sink_service.yml
@@ -64,7 +64,7 @@ jobs:
         with:
           context: .
           file: docker/sink_service/Dockerfile
-          platforms: linux/amd64, linux/arm64, linux/arm/v7, linux/arm/v6
+          platforms: linux/amd64, linux/arm64, linux/arm/v7, linux/arm/v6, linux/riscv64
           push: true
           build-args: GATEWAY_BUILD_SHA1= ${{ github.sha }}
           tags: |
diff --git a/.github/workflows/docker_transport_service.yml b/.github/workflows/docker_transport_service.yml
index 8fcb53d6..f604ddb9 100644
--- a/.github/workflows/docker_transport_service.yml
+++ b/.github/workflows/docker_transport_service.yml
@@ -61,7 +61,7 @@ jobs:
         with:
           context: .
           file: docker/transport_service/Dockerfile
-          platforms: linux/amd64, linux/arm64, linux/arm/v7, linux/arm/v6
+          platforms: linux/amd64, linux/arm64, linux/arm/v7, linux/arm/v6, linux/riscv64
           push: true
           build-args: GATEWAY_BUILD_SHA1= ${{ github.sha }}
           tags: |