diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
index fa7c4381b364..6ad9e9039d16 100644
--- a/.github/workflows/backend.yml
+++ b/.github/workflows/backend.yml
@@ -1,12 +1,13 @@
 name: backend
 on:
   pull_request:
-    branches:
-      - "master"
+    paths-ignore:
+      - 'kafka-ui-react-app/**'
   push:
-    branches:
-      - "**"
-      - "!master"
+    branches-ignore:
+      - 'master'
+    paths-ignore:
+      - 'kafka-ui-react-app/**'
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -33,4 +34,4 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-      run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar    
\ No newline at end of file
+      run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 3502fe6ff013..c7fc88ead890 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -28,7 +28,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'java', 'javascript' ]
+        language: [ 'javascript' ]
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
         # Learn more:
         # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
diff --git a/.github/workflows/frontend.yaml b/.github/workflows/frontend.yaml
index 7adcdf2355f9..b8db0376d3ec 100644
--- a/.github/workflows/frontend.yaml
+++ b/.github/workflows/frontend.yaml
@@ -1,29 +1,30 @@
 name: frontend
 on:
   pull_request:
-    branches:
-      - "master"
+    paths:
+      - './kafka-ui-contract/**'
+      - './kafka-ui-react-app/**'
   push:
-    branches:
-      - "**"
-      - "!master"
+    branches-ignore:
+      - 'master'
+    paths:
+      - './kafka-ui-contract/**'
+      - './kafka-ui-react-app/**'
 jobs:
   npm-test:
-    needs: [mvn-contract-build]
     env:
       CI: true
       NODE_ENV: dev
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
+      with:
+        # Disabling shallow clone is recommended for improving relevancy of reporting
+        fetch-depth: 0
     - name: Use Node.js
       uses: actions/setup-node@v1
       with:
         node-version: "14"
-    - uses: actions/download-artifact@v2
-      with:
-        name: generated-sources
-        path: kafka-ui-react-app/src/generated-sources
     - name: Cache node dependency
       uses: actions/cache@v1
       with:
@@ -35,6 +36,10 @@ jobs:
       run: |
         cd kafka-ui-react-app/
         npm install
+    - name: Generate sources
+      run: |
+        cd kafka-ui-react-app/
+        npm run gen:sources
     - name: Linter
       run: |
         cd kafka-ui-react-app/
@@ -43,28 +48,10 @@ jobs:
       run: |
         cd kafka-ui-react-app/
         npm run test
-
-  mvn-contract-build:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Cache local Maven repository
-      uses: actions/cache@v1
-      with:
-        path: ~/.m2/repository
-        key: ${{ runner.os }}-maven-contract-${{ hashFiles('**/pom.xml') }}
-        restore-keys: |
-          ${{ runner.os }}-maven-contract-
-          ${{ runner.os }}-maven-
-    - uses: actions/checkout@v2
-    - name: Set up JDK 1.13
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.13
-    - name: Build with Maven
-      run: |
-        cd kafka-ui-contract
-        mvn clean package
-    - uses: actions/upload-artifact@v2
+    - name: SonarCloud Scan
+      uses: workshur/sonarcloud-github-action@improved_basedir
       with:
-        name: generated-sources
-        path: kafka-ui-contract/target/generated-sources/frontend
+        projectBaseDir: ./kafka-ui-react-app
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN_FRONTEND }}
diff --git a/kafka-ui-react-app/sonar-project.properties b/kafka-ui-react-app/sonar-project.properties
new file mode 100644
index 000000000000..2bf7de08e201
--- /dev/null
+++ b/kafka-ui-react-app/sonar-project.properties
@@ -0,0 +1,4 @@
+sonar.projectKey=provectus_kafka-ui_frontend
+sonar.organization=provectus
+
+sonar.sources=./src
diff --git a/sonar-project.properties b/sonar-project.properties
deleted file mode 100644
index 2848a4fd3f7b..000000000000
--- a/sonar-project.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-sonar.projectKey=provectus_kafka-ui
-sonar.organization=provectus
-
-# This is the name and version displayed in the SonarCloud UI.
-#sonar.projectName=kafka-ui
-#sonar.projectVersion=1.0
-
-# Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
-#sonar.sources=.
-
-# Encoding of the source code. Default is default system encoding
-#sonar.sourceEncoding=UTF-8