diff --git a/.github/workflows/dev-docker-publish.yml b/.github/workflows/dev-docker-publish.yml
deleted file mode 100644
index f2d1c4de..00000000
--- a/.github/workflows/dev-docker-publish.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-name: Dev build and publish Docker distributions to Github Container Registry ghcr.io
-
-on:
-  push:
-    branches-ignore:
-      - master
-      - version-*
-      - dependabot*
-    paths-ignore:
-      - README.md
-
-jobs:
-  build:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v2
-      # Prepare custom build version
-      - name: Get branch name
-        id: branch
-        run: echo ::set-output name=branch_name::${GITHUB_REF#refs/*/}
-      - name: Get release_version
-        id: ver
-        uses: christian-draeger/read-properties@1.0.1
-        with:
-          path: gradle.properties
-          property: release_version
-      - name: Build custom release version
-        id: release_ver
-        run: echo ::set-output name=value::"${{ steps.ver.outputs.value }}-${{ steps.branch.outputs.branch_name }}-${{ github.run_id }}"
-      - name: Show custom release version
-        run: echo ${{ steps.release_ver.outputs.value }}
-      # Build and publish image
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - uses: docker/login-action@v1
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.CR_PAT }}
-      - run: echo "::set-output name=REPOSITORY_NAME::$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')"
-        id: meta
-      - name: Build and push
-        id: docker_build
-        uses: docker/build-push-action@v2
-        with:
-          push: true
-          tags: ghcr.io/${{ github.repository }}:${{ steps.release_ver.outputs.value }}
-          labels: com.exactpro.th2.${{ steps.meta.outputs.REPOSITORY_NAME }}=${{ steps.ver.outputs.value }}
\ No newline at end of file
diff --git a/.github/workflows/dev-java-publish-sonatype-and-docker.yml b/.github/workflows/dev-java-publish-sonatype-and-docker.yml
new file mode 100644
index 00000000..a9816d9c
--- /dev/null
+++ b/.github/workflows/dev-java-publish-sonatype-and-docker.yml
@@ -0,0 +1,30 @@
+name: Dev build and publish Java distributions to sonatype snapshot repository
+
+on:
+  push:
+    branches-ignore:
+      - master
+      - version-*
+      - dependabot*
+    paths-ignore:
+      - README.md
+    # paths:
+    # - gradle.properties
+
+jobs:
+  build-job:
+    uses: th2-net/.github/.github/workflows/compound-java-dev.yml@main
+    with:
+      build-target: 'Sonatype,Docker'
+      runsOn: ubuntu-latest
+      gradleVersion: '7'
+      docker-username: ${{ github.actor }}
+    secrets:
+      sonatypeUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
+      sonatypePassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
+      sonatypeSigningKey: ${{ secrets.SONATYPE_GPG_ARMORED_KEY }}
+      sonatypeSigningPassword: ${{ secrets.SONATYPE_SIGNING_PASSWORD }}
+      docker-password: ${{ secrets.GITHUB_TOKEN }}
+
+
+
diff --git a/.github/workflows/dev-java-publish-sonatype.yml b/.github/workflows/dev-java-publish-sonatype.yml
deleted file mode 100644
index f516fd9d..00000000
--- a/.github/workflows/dev-java-publish-sonatype.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-name: Dev build and publish Java distributions to sonatype snapshot repository
-
-on:
-  push:
-    branches-ignore:
-      - master
-      - version-*
-      - dependabot*
-    paths-ignore:
-      - README.md
-    # paths:
-    # - gradle.properties
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-# Prepare custom build version
-      - name: Get branch name
-        id: branch
-        run: echo ::set-output name=branch_name::${GITHUB_REF#refs/*/}
-      - name: Get release_version
-        id: ver
-        uses: christian-draeger/read-properties@1.0.1
-        with:
-          path: gradle.properties
-          property: release_version
-      - name: Build custom release version
-        id: release_ver
-        run: echo ::set-output name=value::"${{ steps.ver.outputs.value }}-${{ steps.branch.outputs.branch_name }}-${{ github.run_id }}-SNAPSHOT"
-      - name: Write custom release version to file
-        uses: christian-draeger/write-properties@1.0.1
-        with:
-          path: gradle.properties
-          property: release_version
-          value: ${{ steps.release_ver.outputs.value }}
-      - name: Show custom release version
-        run: echo ${{ steps.release_ver.outputs.value }}
-# Build and publish package
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: '11'
-      - name: Build with Gradle
-        run: ./gradlew --info clean build publish
-        env:
-          ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
-          ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
-          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SONATYPE_GPG_ARMORED_KEY }}
-          ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SONATYPE_SIGNING_PASSWORD }} 
-
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
deleted file mode 100644
index f01d7de0..00000000
--- a/.github/workflows/docker-publish.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: Build and publish Docker distributions to Github Container Registry ghcr.io
-
-on:
-  push:
-    branches:
-      - master
-      - version-*
-    paths:
-      - gradle.properties
-
-jobs:
-  build:
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1
-    - uses: docker/login-action@v1
-      with:
-        registry: ghcr.io
-        username: ${{ github.repository_owner }}
-        password: ${{ secrets.CR_PAT }}
-    - run: echo "::set-output name=REPOSITORY_NAME::$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')"
-      id: meta
-    - name: Read version from gradle.properties
-      id: read_property
-      uses: christian-draeger/read-properties@1.0.1
-      with:
-        path: ./gradle.properties
-        property: release_version
-    - name: Build and push
-      id: docker_build
-      uses: docker/build-push-action@v2
-      with:
-        push: true
-        tags: ghcr.io/${{ github.repository }}:${{ steps.read_property.outputs.value }}
-        labels: com.exactpro.th2.${{ steps.meta.outputs.REPOSITORY_NAME }}=${{ steps.read_property.outputs.value }}
diff --git a/.github/workflows/java-publish-sonatype-and-docker.yml b/.github/workflows/java-publish-sonatype-and-docker.yml
new file mode 100644
index 00000000..630b5598
--- /dev/null
+++ b/.github/workflows/java-publish-sonatype-and-docker.yml
@@ -0,0 +1,24 @@
+name: Build and release Java distributions to sonatype.
+
+on:
+  push:
+    branches:
+    - master
+    - version-*
+    paths:
+    - gradle.properties
+
+jobs:
+  build:
+    uses: th2-net/.github/.github/workflows/compound-java.yml@main
+    with:
+      build-target: 'Sonatype,Docker'
+      runsOn: ubuntu-latest
+      gradleVersion: '7'
+      docker-username: ${{ github.actor }}
+    secrets:
+      sonatypeUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
+      sonatypePassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
+      sonatypeSigningKey: ${{ secrets.SONATYPE_GPG_ARMORED_KEY }}
+      sonatypeSigningPassword: ${{ secrets.SONATYPE_SIGNING_PASSWORD }}
+      docker-password: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/java-publish-sonatype.yml b/.github/workflows/java-publish-sonatype.yml
deleted file mode 100644
index b8c36688..00000000
--- a/.github/workflows/java-publish-sonatype.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-name: Build and release Java distributions to sonatype.
-
-on:
-  push:
-    branches:
-    - master
-    - version-*
-    paths:
-    - gradle.properties
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: '11'
-      - name: Build with Gradle
-        run: ./gradlew --info clean build publish closeAndReleaseSonatypeStagingRepository
-        env:
-          ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
-          ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
-          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SONATYPE_GPG_ARMORED_KEY }}
-          ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SONATYPE_SIGNING_PASSWORD }}