diff --git a/.github/workflows/check-changes.yml b/.github/workflows/check-changes.yml
new file mode 100644
index 0000000..78e7bf7
--- /dev/null
+++ b/.github/workflows/check-changes.yml
@@ -0,0 +1,36 @@
+name: "Check Changes"
+
+on:
+  workflow_call:
+  # Map the workflow outputs to job outputs
+    outputs:
+      packages:
+        description: "Packages output string"
+        value: ${{ jobs.changes.outputs.packages }}
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  changes:
+    runs-on: ubuntu-latest
+    # Required permissions
+    permissions:
+      pull-requests: read
+    outputs:
+      # Expose matched filters as job 'packages' output variable
+      packages: ${{ steps.filter.outputs.changes }}
+    steps:
+    # For pull requests it's not necessary to checkout the code
+    - uses: dorny/paths-filter@v3
+      id: filter
+      with:
+        filters: |
+          subscriptions_holder: subscriptions_holder/src
+          t_coubs_initiator: t_coubs_initiator/src
+          coub_smart_searcher: coub_smart_searcher/src
+          kafka_message_producer: kafka_message_producer/src
+          kafka_message_consumer: kafka_message_consumer/src
+          telegram_bot: telegram_bot/src
+          subscriptions_scheduler: subscriptions_scheduler/src
\ No newline at end of file
diff --git a/.github/workflows/codeql-advanced-pull.yml b/.github/workflows/codeql-advanced-pull.yml
new file mode 100644
index 0000000..7b7931c
--- /dev/null
+++ b/.github/workflows/codeql-advanced-pull.yml
@@ -0,0 +1,29 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL Advanced Pull Requests"
+
+on:
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  changes:
+    permissions:
+      pull-requests: read
+    uses: ./.github/workflows/check-changes.yml
+  analyze:
+    permissions:
+      security-events: write
+    needs: changes
+    if: needs.changes.outputs.packages != '[]'
+    uses: ./.github/workflows/codeql-advanced.yml
+  
\ No newline at end of file
diff --git a/.github/workflows/codeql-advanced-scheduled.yml b/.github/workflows/codeql-advanced-scheduled.yml
new file mode 100644
index 0000000..0fd4c9a
--- /dev/null
+++ b/.github/workflows/codeql-advanced-scheduled.yml
@@ -0,0 +1,22 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL Advanced Scheduled"
+
+on:
+  schedule:
+    - cron: '22 3 * * 0'
+
+jobs:
+  analyze:
+    permissions:
+      security-events: write
+    uses: ./.github/workflows/codeql-advanced.yml
diff --git a/.github/workflows/codeql-advanced.yml b/.github/workflows/codeql-advanced.yml
new file mode 100644
index 0000000..1f7db68
--- /dev/null
+++ b/.github/workflows/codeql-advanced.yml
@@ -0,0 +1,98 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL Advanced"
+
+on:
+  workflow_call:
+  workflow_dispatch:
+  push:
+    branches: [ "main" ]
+
+jobs:
+  analyze:
+    name: Analyze (${{ matrix.language }})
+    # Runner size impacts CodeQL analysis time. To learn more, please see:
+    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+    #   - https://gh.io/supported-runners-and-hardware-resources
+    #   - https://gh.io/using-larger-runners (GitHub.com only)
+    # Consider using larger runners or machines with greater resources for possible analysis time improvements.
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    permissions:
+      # required for all workflows
+      security-events: write
+
+      # required to fetch internal or private CodeQL packs
+      #packages: read
+
+      # only required for workflows in private repositories
+      #actions: read
+      #contents: read
+
+    strategy:
+      fail-fast: false
+      matrix:
+        # analyze only if java changed
+        include:
+        - language: java-kotlin
+          build-mode: none # This mode only analyzes Java. Set this to 'autobuild' or 'manual' to analyze Kotlin too.
+        # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
+        # Use `c-cpp` to analyze code written in C, C++ or both
+        # Use 'java-kotlin' to analyze code written in Java, Kotlin or both
+        # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
+        # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
+        # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
+        # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
+        # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+    - name: Set up JDK 21
+      uses: actions/setup-java@v4
+      with:
+        java-version: '21'
+        distribution: 'temurin'
+        cache: gradle
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: ${{ matrix.language }}
+        build-mode: ${{ matrix.build-mode }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+    # If the analyze step fails for one of the languages you are analyzing with
+    # "We were unable to automatically build your code", modify the matrix above
+    # to set the build mode to "manual" for that language. Then modify this step
+    # to build your code.
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+    
+    - if: matrix.build-mode == 'manual'
+      shell: bash
+      run: |
+        echo 'If you are using a "manual" build mode for one or more of the' \
+          'languages you are analyzing, replace this with the commands to build' \
+          'your code, for example:'
+        echo '  make bootstrap'
+        echo '  make release'
+        exit 1
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3
+      with:
+        category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/docker_build.yml b/.github/workflows/docker_build.yml
deleted file mode 100644
index 99c303a..0000000
--- a/.github/workflows/docker_build.yml
+++ /dev/null
@@ -1,88 +0,0 @@
-name: Docker build using matrix
-
-on:
-  pull_request:
-    branches: [ "main" ]
-
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    strategy:
-      matrix:
-        projects: [
-          "subscriptions_holder", "t_coubs_initiator", "coub_smart_searcher",
-          "kafka_message_producer", "kafka_message_consumer", "telegram_bot",
-          "subscriptions_scheduler"
-        ]
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK 21
-        uses: actions/setup-java@v4
-        with:
-          java-version: '21'
-          distribution: 'temurin'
-          cache: gradle
-
-      - name: tests
-        run: gradle ${{ matrix.projects }}:clean ${{ matrix.projects }}:test
-
-  build:
-    needs: [ test ]
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    strategy:
-      matrix:
-        docker-file: [ "coub_smart_searcher",
-                       "kafka_message_consumer",
-                       "kafka_message_producer",
-                       "spring_eureka_registry",
-                       "spring_gateway",
-                       "subscriptions_holder",
-                       "t_coubs_initiator",
-                       "coub_forwarder_telegram_bot",
-                       "subscriptions_scheduler"
-        ]
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK 21
-        uses: actions/setup-java@v4
-        with:
-          java-version: '21'
-          distribution: 'temurin'
-          cache: gradle
-
-      - name: Retrieve Version
-        run: echo "VERSION_NAME=$(${{ github.workspace }}/gradlew -q printVersion)" >> "$GITHUB_OUTPUT"
-        id: project_version
-
-      - name: Get version
-        run: echo "version_name=${{steps.project_version.outputs.VERSION_NAME}}" >> "$GITHUB_ENV"
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      # https://docs.github.com/en/actions/security-guides/using-secrets-in-github-actions#using-secrets-in-a-workflow
-      # Except GITHUB_TOKEN,
-      # secrets are not passed to the runner when
-      # a workflow is triggered from a forked repository.
-      - name: docker build
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          build-args: |
-            JAR_VERSION=${{ env.version_name }}
-          file: ./Dockerfile.${{ matrix.docker-file }}
-          platforms: linux/amd64,linux/arm64
-          tags: ${{ secrets.DOCKERHUB_USERNAME || 'docker.io' }}/${{ matrix.docker-file }}:${{ env.version_name }}
-          push: false
diff --git a/.github/workflows/main.yml b/.github/workflows/publish.yml
similarity index 100%
rename from .github/workflows/main.yml
rename to .github/workflows/publish.yml
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 0000000..f2ccf22
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,34 @@
+name: Gradle tests using matrix
+
+on:
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  changes:
+    permissions:
+      pull-requests: read
+    uses: ./.github/workflows/check-changes.yml
+  test:
+    needs: changes
+    if: needs.changes.outputs.packages != '[]'
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    strategy:
+      matrix:
+        # test only changed projects
+        projects: ${{ fromJSON(needs.changes.outputs.packages) }}  
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+          cache: gradle
+
+      - name: tests
+        run: gradle ${{ matrix.projects }}:clean ${{ matrix.projects }}:test