diff --git a/.github/workflows/ci-unwelcome-words.yml b/.github/workflows/ci-unwelcome-words.yml
index cd7adcf..b1e592b 100644
--- a/.github/workflows/ci-unwelcome-words.yml
+++ b/.github/workflows/ci-unwelcome-words.yml
@@ -5,13 +5,13 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         ref: ${{ github.sha }}
     - name: Checkout tool
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         repository: exactpro-th2/ci-github-action
         ref: master
diff --git a/.github/workflows/dev-java-publish-sonatype.yml b/.github/workflows/dev-java-publish-sonatype.yml
deleted file mode 100644
index a617196..0000000
--- a/.github/workflows/dev-java-publish-sonatype.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: Dev build and publish Java distributions to sonatype snapshot repository
-
-on:
-  push:
-    branches-ignore:
-    - master
-    - version-*
-    paths-ignore:
-      - README.md
-
-jobs:
-  build-job:
-    uses: th2-net/.github/.github/workflows/compound-java-dev.yml@main
-    with:
-      build-target: 'Sonatype'
-      runsOn: ubuntu-latest
-    secrets:
-      sonatypeUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
-      sonatypePassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
-      sonatypeSigningKey: ${{ secrets.SONATYPE_GPG_ARMORED_KEY }}
-      sonatypeSigningPassword: ${{ secrets.SONATYPE_SIGNING_PASSWORD }}
-      nvd-api-key: ${{ secrets.NVD_APIKEY }}
diff --git a/.github/workflows/dev-release-java-publish-sonatype.yml b/.github/workflows/dev-release-java-publish-sonatype.yml
deleted file mode 100644
index 09d8030..0000000
--- a/.github/workflows/dev-release-java-publish-sonatype.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: Build and publish dev-release Java distributions to sonatype.
-
-on:
-  workflow_dispatch:
-
-jobs:
-  build:
-    uses: th2-net/.github/.github/workflows/compound-java.yml@main
-    with:
-      build-target: 'Sonatype'
-      runsOn: ubuntu-latest
-      devRelease: true
-      createTag: true
-    secrets:
-      sonatypeUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
-      sonatypePassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
-      sonatypeSigningKey: ${{ secrets.SONATYPE_GPG_ARMORED_KEY }}
-      sonatypeSigningPassword: ${{ secrets.SONATYPE_SIGNING_PASSWORD }}
-      nvd-api-key: ${{ secrets.NVD_APIKEY }}
\ No newline at end of file
diff --git a/.github/workflows/dev-release-grpc-service-pypi-publish.yml b/.github/workflows/dev-release.yml
similarity index 50%
rename from .github/workflows/dev-release-grpc-service-pypi-publish.yml
rename to .github/workflows/dev-release.yml
index 0cdb8d1..1f465c8 100644
--- a/.github/workflows/dev-release-grpc-service-pypi-publish.yml
+++ b/.github/workflows/dev-release.yml
@@ -1,11 +1,22 @@
-name: Dev release and publish Python distributions to PyPI. New gRPC generator
+name: Build and publish dev-release Java distributions to sonatype.
 
 on:
-  push:
-    tags:
-      - \d+.\d+.\d+-dev
+  workflow_dispatch:
 
 jobs:
+  build:
+    uses: th2-net/.github/.github/workflows/compound-java.yml@main
+    with:
+      build-target: 'Sonatype'
+      runsOn: ubuntu-latest
+      devRelease: true
+      createTag: true
+    secrets:
+      sonatypeUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
+      sonatypePassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
+      sonatypeSigningKey: ${{ secrets.SONATYPE_GPG_ARMORED_KEY }}
+      sonatypeSigningPassword: ${{ secrets.SONATYPE_SIGNING_PASSWORD }}
+      nvd-api-key: ${{ secrets.NVD_APIKEY }}
   collect-version:
     name: Get version from gradle.properties
     uses: th2-net/.github/.github/workflows/compound-prebuild-java-dev-workflow.yml@main
diff --git a/.github/workflows/dev-grpc-services-pypi-publish.yml b/.github/workflows/dev-snapshot-build.yml
similarity index 52%
rename from .github/workflows/dev-grpc-services-pypi-publish.yml
rename to .github/workflows/dev-snapshot-build.yml
index cb48334..f578034 100644
--- a/.github/workflows/dev-grpc-services-pypi-publish.yml
+++ b/.github/workflows/dev-snapshot-build.yml
@@ -1,14 +1,20 @@
-name: Dev build and publish Python distributions to PyPI. New gRPC generator
+name: Dev build and publish Java distributions to sonatype snapshot repository
 
 on:
-  push:
-    branches-ignore:
-    - master
-    - version-*
-    paths-ignore:
-      - README.md
+  workflow_dispatch:
 
 jobs:
+  build-job:
+    uses: th2-net/.github/.github/workflows/compound-java-dev.yml@main
+    with:
+      build-target: 'Sonatype'
+      runsOn: ubuntu-latest
+    secrets:
+      sonatypeUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
+      sonatypePassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
+      sonatypeSigningKey: ${{ secrets.SONATYPE_GPG_ARMORED_KEY }}
+      sonatypeSigningPassword: ${{ secrets.SONATYPE_SIGNING_PASSWORD }}
+      nvd-api-key: ${{ secrets.NVD_APIKEY }}
   collect-version:
     name: Get version from gradle.properties
     uses: th2-net/.github/.github/workflows/compound-prebuild-java-dev-workflow.yml@main
diff --git a/.github/workflows/grpc-services-pypi-publish.yml b/.github/workflows/grpc-services-pypi-publish.yml
deleted file mode 100644
index cb71ab0..0000000
--- a/.github/workflows/grpc-services-pypi-publish.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: Build and publish Python distributions to PyPI. New gRPC generator
-
-on:
-  push:
-    branches:
-      - master
-      - version-*
-    paths:
-      - package_info.json
-
-jobs:
-  build-n-publish:
-    name: Build and Python distributions to PyPI
-    uses: th2-net/.github/.github/workflows/compaund-python-grpc-pypi-publication.yml@main
-    secrets:
-      pypi_password: ${{ secrets.PYPI_PASSWORD }}
-  scan:
-    name: Vulnerabilities scan
-    uses: th2-net/.github/.github/workflows/python-scan.yml@main
diff --git a/.github/workflows/java-publish-sonatype.yml b/.github/workflows/release.yml
similarity index 60%
rename from .github/workflows/java-publish-sonatype.yml
rename to .github/workflows/release.yml
index b8862ad..d201272 100644
--- a/.github/workflows/java-publish-sonatype.yml
+++ b/.github/workflows/release.yml
@@ -1,12 +1,7 @@
 name: Build and release Java distributions to sonatype.
 
 on:
-  push:
-    branches:
-    - master
-    - version-*
-    paths:
-    - gradle.properties
+  workflow_dispatch:
 
 jobs:
   build:
@@ -14,6 +9,7 @@ jobs:
     with:
       build-target: 'Sonatype'
       runsOn: ubuntu-latest
+      devRelease: false
       createTag: true
     secrets:
       sonatypeUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
@@ -21,3 +17,11 @@ jobs:
       sonatypeSigningKey: ${{ secrets.SONATYPE_GPG_ARMORED_KEY }}
       sonatypeSigningPassword: ${{ secrets.SONATYPE_SIGNING_PASSWORD }}
       nvd-api-key: ${{ secrets.NVD_APIKEY }}
+  build-n-publish:
+    name: Build and Python distributions to PyPI
+    uses: th2-net/.github/.github/workflows/compaund-python-grpc-pypi-publication.yml@main
+    secrets:
+      pypi_password: ${{ secrets.PYPI_PASSWORD }}
+  scan:
+    name: Vulnerabilities scan
+    uses: th2-net/.github/.github/workflows/python-scan.yml@main