diff --git a/.github/workflows/api-multi-module-workflow-v2.yml b/.github/workflows/api-multi-module-workflow-v2.yml
index 9570336..f655d43 100644
--- a/.github/workflows/api-multi-module-workflow-v2.yml
+++ b/.github/workflows/api-multi-module-workflow-v2.yml
@@ -33,37 +33,6 @@ on:
         type: boolean
 
 jobs:
-  sonar-check:
-    name: SonarQube check
-    runs-on: custom
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@v1
-        with:
-          java-version: 17
-
-      - name: Build and analyze (exclude test)
-        if: ${{ !inputs.IS_TEST_ENABLED }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GH_TOKEN_CAN_READ_PACKAGES || secrets.GH_DEPBOT_TOKEN_CAN_READ_PACKAGES }}
-          GITHUB_USERNAME: ${{ secrets.GH_USER_CAN_READ_PACKAGES || secrets.GH_DEPBOT_USER_CAN_READ_PACKAGES }}
-          SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }}
-          SONAR_HOST_URL: ${{ secrets.SONARQUBE_HOST_URL }}
-        run: ./gradlew build sonar --info -x test -p ${{ inputs.MODULE_NAME }}
-
-      - name: Build and analyze (include test)
-        if: ${{ inputs.IS_TEST_ENABLED }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GH_TOKEN_CAN_READ_PACKAGES || secrets.GH_DEPBOT_TOKEN_CAN_READ_PACKAGES }}
-          GITHUB_USERNAME: ${{ secrets.GH_USER_CAN_READ_PACKAGES || secrets.GH_DEPBOT_USER_CAN_READ_PACKAGES }}
-          SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }}
-          SONAR_HOST_URL: ${{ secrets.SONARQUBE_HOST_URL }}
-        run: ./gradlew build test sonar --info -p ${{ inputs.MODULE_NAME }}
-
   api-multi-module-workflow:
     runs-on: custom
     steps:
diff --git a/.github/workflows/api-single-module-workflow-v2.yml b/.github/workflows/api-single-module-workflow-v2.yml
index c5bc52b..a6ed9bb 100644
--- a/.github/workflows/api-single-module-workflow-v2.yml
+++ b/.github/workflows/api-single-module-workflow-v2.yml
@@ -29,37 +29,6 @@ on:
         type: boolean
 
 jobs:
-  sonar-check:
-    name: SonarQube check
-    runs-on: custom
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@v1
-        with:
-          java-version: 17
-
-      - name: Build and analyze (exclude test)
-        if: ${{ !inputs.IS_TEST_ENABLED }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GH_TOKEN_CAN_READ_PACKAGES || secrets.GH_DEPBOT_TOKEN_CAN_READ_PACKAGES }}
-          GITHUB_USERNAME: ${{ secrets.GH_USER_CAN_READ_PACKAGES || secrets.GH_DEPBOT_USER_CAN_READ_PACKAGES }}
-          SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }}
-          SONAR_HOST_URL: ${{ secrets.SONARQUBE_HOST_URL }}
-        run: ./gradlew build sonar --info -x test
-
-      - name: Build and analyze (include test)
-        if: ${{ inputs.IS_TEST_ENABLED }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GH_TOKEN_CAN_READ_PACKAGES || secrets.GH_DEPBOT_TOKEN_CAN_READ_PACKAGES }}
-          GITHUB_USERNAME: ${{ secrets.GH_USER_CAN_READ_PACKAGES || secrets.GH_DEPBOT_USER_CAN_READ_PACKAGES }}
-          SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }}
-          SONAR_HOST_URL: ${{ secrets.SONARQUBE_HOST_URL }}
-        run: ./gradlew build test sonar --info
-
   api-single-module-workflow:
     runs-on: custom
     steps:
diff --git a/.github/workflows/api-sonar-qube-workflow.yml b/.github/workflows/api-sonar-qube-workflow.yml
new file mode 100644
index 0000000..448a954
--- /dev/null
+++ b/.github/workflows/api-sonar-qube-workflow.yml
@@ -0,0 +1,40 @@
+
+on:
+  workflow_call:
+    inputs:
+      IS_TEST_ENABLED:
+        description: "Using for start test before pushing to ECR if value is true."
+        required: true
+        type: boolean
+
+jobs:
+  sonar-check:
+    name: SonarQube check
+    runs-on: custom
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v1
+        with:
+          java-version: 17
+
+      - name: Build and analyze
+        if: ${{ !inputs.IS_TEST_ENABLED }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN_CAN_READ_PACKAGES || secrets.GH_DEPBOT_TOKEN_CAN_READ_PACKAGES }}
+          GITHUB_USERNAME: ${{ secrets.GH_USER_CAN_READ_PACKAGES || secrets.GH_DEPBOT_USER_CAN_READ_PACKAGES }}
+          SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }}
+          SONAR_HOST_URL: ${{ secrets.SONARQUBE_HOST_URL }}
+        run: ./gradlew build sonar --info -x test
+
+      - name: Build, test and analyze
+        if: ${{ inputs.IS_TEST_ENABLED }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN_CAN_READ_PACKAGES || secrets.GH_DEPBOT_TOKEN_CAN_READ_PACKAGES }}
+          GITHUB_USERNAME: ${{ secrets.GH_USER_CAN_READ_PACKAGES || secrets.GH_DEPBOT_USER_CAN_READ_PACKAGES }}
+          SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }}
+          SONAR_HOST_URL: ${{ secrets.SONARQUBE_HOST_URL }}
+        run: ./gradlew build test sonar --info
\ No newline at end of file