diff --git a/.github/workflows/build_deploy.yml b/.github/workflows/build_deploy.yml
new file mode 100644
index 0000000..606bb87
--- /dev/null
+++ b/.github/workflows/build_deploy.yml
@@ -0,0 +1,19 @@
+name: Build, Test and Deploy
+
+on:
+  push:
+    branches:
+      - 'main'
+  pull_request:
+    branches:
+      - 'main'
+
+jobs:
+  build_test:
+    uses: eclipse-daanse/.github/.github/workflows/reuse_java_build_test.yml@main
+
+  maven_deploy:
+    if: ${{ github.ref == 'refs/heads/main' && github.event_name == 'push' }}
+    needs: build_test
+    uses: eclipse-daanse/.github/.github/workflows/reuse_java_deploy.yml@main
+    secrets: inherit
diff --git a/.github/workflows/java_build_test.yml b/.github/workflows/java_build_test.yml
deleted file mode 100644
index 4491956..0000000
--- a/.github/workflows/java_build_test.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: Java Build, Test
-
-on:
-  push:
-    branches:
-      - 'main'
-  pull_request:
-    branches:
-      - 'main'
-
-jobs:
-  build:
-    uses: eclipse-daanse/.github/.github/workflows/reuse_java_build_test.yml@main
diff --git a/.github/workflows/java_deploy.yml b/.github/workflows/java_deploy.yml
deleted file mode 100644
index 71d13e7..0000000
--- a/.github/workflows/java_deploy.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-name: Deploy Maven
-
-on:
-  push:
-    branches:
-      - 'main'
-
-jobs:
-  publish:
-    uses: eclipse-daanse/.github/.github/workflows/reuse_java_deploy.yml@main
-    secrets: inherit