diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9afe1c1..a5dc31b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -52,9 +52,11 @@ jobs:
           docker push --all-tags gotify/server
           docker push --all-tags gotify/server-arm7
           docker push --all-tags gotify/server-arm64
+          docker push --all-tags gotify/server-riscv64
           docker push --all-tags ghcr.io/gotify/server
           docker push --all-tags ghcr.io/gotify/server-arm7
           docker push --all-tags ghcr.io/gotify/server-arm64
+          docker push --all-tags ghcr.io/gotify/server-riscv64
         env:
           DOCKER_USER: ${{ secrets.DOCKER_USER }}
           DOCKER_PASS: ${{ secrets.DOCKER_PASS }}
diff --git a/Makefile b/Makefile
index 14f884d..0b83f5d 100644
--- a/Makefile
+++ b/Makefile
@@ -110,7 +110,21 @@ build-docker-arm64: require-version
 		-t ghcr.io/gotify/server-arm64:$(shell echo $(VERSION) | cut -d '.' -f -1) .
 	rm ${DOCKER_DIR}gotify-app
 
-build-docker: build-docker-amd64 build-docker-arm-7 build-docker-arm64
+build-docker-riscv64: require-version
+	cp ${BUILD_DIR}/gotify-linux-riscv64 ./docker/gotify-app
+	cd ${DOCKER_DIR} && \
+		docker build -f Dockerfile.riscv64 \
+		-t gotify/server-riscv64:latest \
+		-t gotify/server-riscv64:${VERSION} \
+		-t gotify/server-riscv64:$(shell echo $(VERSION) | cut -d '.' -f -2) \
+		-t gotify/server-riscv64:$(shell echo $(VERSION) | cut -d '.' -f -1) \
+		-t ghcr.io/gotify/server-riscv64:latest \
+		-t ghcr.io/gotify/server-riscv64:${VERSION} \
+		-t ghcr.io/gotify/server-riscv64:$(shell echo $(VERSION) | cut -d '.' -f -2) \
+		-t ghcr.io/gotify/server-riscv64:$(shell echo $(VERSION) | cut -d '.' -f -1) .
+	rm ${DOCKER_DIR}gotify-app
+
+build-docker: build-docker-amd64 build-docker-arm-7 build-docker-arm64 build-docker-riscv64
 
 build-js:
 	(cd ui && yarn build)
@@ -127,12 +141,15 @@ build-linux-arm-7:
 build-linux-arm64:
 	${DOCKER_RUN} ${DOCKER_BUILD_IMAGE}:$(GO_VERSION)-linux-arm64 ${DOCKER_GO_BUILD} -o ${BUILD_DIR}/gotify-linux-arm64 ${DOCKER_WORKDIR}
 
+build-linux-riscv64:
+	${DOCKER_RUN} ${DOCKER_BUILD_IMAGE}:$(GO_VERSION)-linux-riscv64 ${DOCKER_GO_BUILD} -o ${BUILD_DIR}/gotify-linux-riscv64 ${DOCKER_WORKDIR}
+
 build-windows-amd64:
 	${DOCKER_RUN} ${DOCKER_BUILD_IMAGE}:$(GO_VERSION)-windows-amd64 ${DOCKER_GO_BUILD} -o ${BUILD_DIR}/gotify-windows-amd64.exe ${DOCKER_WORKDIR}
 
 build-windows-386:
 	${DOCKER_RUN} ${DOCKER_BUILD_IMAGE}:$(GO_VERSION)-windows-386 ${DOCKER_GO_BUILD} -o ${BUILD_DIR}/gotify-windows-386.exe ${DOCKER_WORKDIR}
 
-build: build-linux-arm-7 build-linux-amd64 build-linux-386 build-linux-arm64 build-windows-amd64 build-windows-386
+build: build-linux-arm-7 build-linux-amd64 build-linux-386 build-linux-arm64 build-linux-riscv64 build-windows-amd64 build-windows-386
 
 .PHONY: test-race test-coverage test check-go check-js verify-swagger check download-tools update-swagger package-zip build-docker build-js build
diff --git a/docker/Dockerfile.riscv64 b/docker/Dockerfile.riscv64
new file mode 100644
index 0000000..5044a10
--- /dev/null
+++ b/docker/Dockerfile.riscv64
@@ -0,0 +1,5 @@
+FROM riscv64/debian:sid-slim
+WORKDIR /app
+ADD gotify-app /app/
+EXPOSE 80
+ENTRYPOINT ["./gotify-app"]