diff --git a/hooks/build b/hooks/build
index 409db50..2e603d0 100644
--- a/hooks/build
+++ b/hooks/build
@@ -1,3 +1,4 @@
 #!/bin/bash
 docker buildx create --name multiarch --use
-docker buildx build --push --platform linux/amd64,linux/arm64 . -t 2martens/qodana-jvm-community-drone-plugin:2023.2 -t 2martens/qodana-jvm-community-drone-plugin:latest
+docker buildx build --platform linux/amd64 . -t 2martens/qodana-jvm-community-drone-plugin:2023.2-amd64
+docker buildx build --platform linux/arm64 . -t 2martens/qodana-jvm-community-drone-plugin:2023.2-arm64
diff --git a/hooks/push b/hooks/push
index a9bf588..1a0ad8e 100644
--- a/hooks/push
+++ b/hooks/push
@@ -1 +1,7 @@
 #!/bin/bash
+docker push 2martens/qodana-jvm-community-drone-plugin:2023.2-amd64
+docker push 2martens/qodana-jvm-community-drone-plugin:2023.2-arm64
+docker manifest create 2martens/qodana-jvm-community-drone-plugin:2023.2 2martens/qodana-jvm-community-drone-plugin:2023.2-amd64 2martens/qodana-jvm-community-drone-plugin:2023.2-arm64
+docker tag 2martens/qodana-jvm-community-drone-plugin:2023.2 2martens/qodana-jvm-community-drone-plugin:latest
+docker push 2martens/qodana-jvm-community-drone-plugin:2023.2
+docker push 2martens/qodana-jvm-community-drone-plugin:latest