diff --git a/.github/workflows/build-test-publish.yml b/.github/workflows/build-test-publish.yml
deleted file mode 100644
index 978e6f00..00000000
--- a/.github/workflows/build-test-publish.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-name: Build and Publish
-
-on:
-  push:
-    branches: [main]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Set up JDK 8
-        uses: actions/setup-java@v2
-        with:
-          distribution: 'temurin'
-          java-version: '8'
-
-      - name: Build and Test
-        run: mvn --batch-mode --update-snapshots clean package -P validator
-
-      - name: Set settings.xml
-        uses: s4u/maven-settings-action@v2.6.0
-        with:
-          servers: |
-            [{
-              "id": "mks-repo",
-              "username": "${{ secrets.NEXUS_USERNAME }}",
-              "password": "${{ secrets.NEXUS_PASSWORD }}"
-            },
-            {
-              "id": "mks-repo-snapshots",
-              "username": "${{ secrets.NEXUS_USERNAME }}",
-              "password": "${{ secrets.NEXUS_PASSWORD }}"
-            }]
-        if: ${{ github.ref == 'refs/heads/main' && github.repository_owner == 'mekomsolutions' }}
-
-      - name: Publish
-        run: mvn --batch-mode clean deploy -P validator
-        if: ${{ github.ref == 'refs/heads/main' && github.repository_owner == 'mekomsolutions' }}
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
deleted file mode 100644
index 606d87ea..00000000
--- a/.github/workflows/build-test.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-name: Build and Test
-
-on:
-  pull_request:
-    branches: [main]
-
-  push:
-    branches-ignore: [main]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-        matrix:
-          java: [ '8', '11']
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v2
-        with:
-          distribution: 'temurin'
-          java-version: ${{ matrix.java }}
-
-      - name: Build and Test
-        run: mvn --batch-mode --update-snapshots clean package -P validator
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 00000000..38d62e74
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,31 @@
+name: CI
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+  release:
+    types: [published]
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        java: [ '8', '11']
+    uses: mekomsolutions/shared-github-workflow/.github/workflows/maven-build-test.yml@main
+    with:
+      java-version: ${{ matrix.Java }}
+      maven-args: "-Pvalidator"
+    secrets:
+      NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }}
+      NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
+
+  publish:
+    if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/main') || github.event_name == 'release' }}
+    needs: build
+    uses: mekomsolutions/shared-github-workflow/.github/workflows/maven-publish.yml@main
+    secrets:
+      NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }}
+      NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
+