diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
new file mode 100644
index 00000000..2bb950bf
--- /dev/null
+++ b/.github/workflows/sonar.yml
@@ -0,0 +1,37 @@
+name: SonarCloud Based Analysis
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types: [opened, synchronize, reopened]
+jobs:
+  build:
+    name: Build and analyze
+    runs-on: ubuntu-latest
+    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@v3
+        with:
+          java-version: 17
+          distribution: 'zulu' # Alternative distribution options are available.
+      - name: Cache SonarCloud packages
+        uses: actions/cache@v3
+        with:
+          path: ~/.sonar/cache
+          key: ${{ runner.os }}-sonar
+          restore-keys: ${{ runner.os }}-sonar
+      - name: Cache Maven packages
+        uses: actions/cache@v3
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
+      - name: Build and analyze
+        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 -Dsonar.projectKey=PhonePe_drove
\ No newline at end of file
diff --git a/drove-controller/configs/docker.yml b/drove-controller/configs/docker.yml
index d85568c0..584992b8 100644
--- a/drove-controller/configs/docker.yml
+++ b/drove-controller/configs/docker.yml
@@ -5,13 +5,17 @@ server:
   adminConnectors:
     - type: http
       port: 4001
-  applicationContextPath: /
   requestLog:
     appenders:
       - type: console
         timeZone: ${DROVE_TIMEZONE}
-  gzip:
-    syncFlush: true
+      - type: file
+        timeZone: ${DROVE_TIMEZONE}
+        currentLogFilename: /logs/drove-controller-access.log
+        archivedLogFilenamePattern: /logs/drove-controller-access.log-%d-%i
+        archivedFileCount: 3
+        maxFileSize: 100MiB
+
 
 logging:
   level: INFO
@@ -20,8 +24,16 @@ logging:
 
   appenders:
     - type: console
-      threshold: TRACE
+      threshold: ALL
+      timeZone: ${DROVE_TIMEZONE}
+      logFormat: "%(%-5level) [%date] [%logger{0} - %X{appId}] %message%n"
+    - type: file
+      threshold: ALL
       timeZone: ${DROVE_TIMEZONE}
+      currentLogFilename: /logs/rove-controller.log
+      archivedLogFilenamePattern: /logs/drove-controller.log-%d-%i
+      archivedFileCount: 3
+      maxFileSize: 100MiB
       logFormat: "%(%-5level) [%date] [%logger{0} - %X{appId}] %message%n"
 
 zookeeper:
diff --git a/pom.xml b/pom.xml
index 4b50baf4..bff1cfcd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,6 +65,8 @@
             **com/phonepe/drove/controller/ui/Handlebars**,
         </sonar.exclusions>
         <guava.version>32.1.3-jre</guava.version>
+        <sonar.organization>phonepe</sonar.organization>
+        <sonar.host.url>https://sonarcloud.io</sonar.host.url>
     </properties>
 
     <dependencyManagement>