diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 55d968c..f547e2c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,4 +1,4 @@
-name: Build Artifact
+name: Maven Build Artifact
 
 on:
   pull_request:
@@ -7,20 +7,4 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout Repo
-        uses: actions/checkout@v2
-
-      - name: Checkout GitHub Action Repo
-        uses: actions/checkout@v2
-        with:
-          repository: valitydev/action-jdk-build
-          ref: v1.0.17
-          path: .github/actions/action-jdk-build
-
-      - name: Run Build Java
-        uses: ./.github/actions/action-jdk-build
-        with:
-          github-pat: '${{ secrets.GH_PACKAGES_RO_PAT }}'
-          github-user: 'strug'
\ No newline at end of file
+    uses: valitydev/base-workflow/.github/workflows/maven-service-build.yml@v1
\ No newline at end of file
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 47ef39a..eb9016e 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,4 +1,4 @@
-name: Deploy Docker Image
+name: Maven Deploy Artifact
 
 on:
   push:
@@ -11,36 +11,8 @@ env:
   IMAGE_NAME: ${{ github.repository }}
 
 jobs:
-  build-and-deploy:
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout Repo
-        uses: actions/checkout@v2
-
-      - name: Checkout GitHub Action JDK Build Repo
-        uses: actions/checkout@v2
-        with:
-          repository: valitydev/action-jdk-build
-          ref: v1.0.17
-          path: .github/actions/action-jdk-build
-
-      - name: Checkout GitHub Action Deploy Docker Repo
-        uses: actions/checkout@v2
-        with:
-          repository: valitydev/action-deploy-docker
-          ref: v1.0.13
-          path: .github/actions/action-deploy-docker
-
-      - name: Run Build Java
-        uses: ./.github/actions/action-jdk-build
-        with:
-          github-pat: '${{ secrets.GH_PACKAGES_RO_PAT }}'
-          github-user: 'strug'
-
-      - name: Deploy image
-        uses: ./.github/actions/action-deploy-docker
-        with:
-          registry-username: ${{ github.actor }}
-          registry-access-token: ${{ secrets.GITHUB_TOKEN }}
-        env:
-          ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
\ No newline at end of file
+  deploy:
+    uses: valitydev/base-workflow/.github/workflows/maven-service-deploy.yml@v1
+    secrets:
+      github-token: ${{ secrets.GITHUB_TOKEN }}
+      mm-webhook-url: ${{ secrets.MATTERMOST_WEBHOOK_URL }}
\ No newline at end of file