diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 719d505..a12392f 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -2,7 +2,7 @@ name: Build pull request
 
 on:
   pull_request:
-    branches: [ "master" , "3.*", "4.*" ]
+    branches: [ "master", "3.*", "4.*" ]
 
 jobs:
   build:
@@ -17,5 +17,6 @@ jobs:
       openhab: true
       server_id: co7io-public-snapshots
       deploy: true
-      master_branch: 3
-      additional_profiles: 'openhab'
\ No newline at end of file
+      skip_test_publish: false
+      additional_profiles: 'thing4,openhab'
+      master_branch: '3'
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 833e205..7cc093c 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -2,7 +2,7 @@ name: Build pushed commit
 
 on:
   push:
-    branches: [ "master" , "3.*", "4.*" ]
+    branches: [ "master", "3.*", "4.*" ]
 
 jobs:
   build:
@@ -17,5 +17,7 @@ jobs:
       openhab: true
       server_id: co7io-public-snapshots
       deploy: true
-      master_branch: 3
-      additional_profiles: 'openhab'
+      skip_test_publish: false
+      additional_profiles: 'thing4,openhab'
+      master_branch: '3'
+
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3bd7e03..e6851db 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -31,9 +31,9 @@ jobs:
       CI_RELEASE_PASSWORD: ${{ secrets.CI_RELEASE_PASSWORD }}
     with:
       openhab: true
-      server_id: co7io-public-releases
-      additional_profiles: 'openhab'
+      server_id: 'co7io-public-releases'
       release_version: ${{ inputs.release_version }}
       development_version: ${{ inputs.development_version }}
       perform_version: ${{ inputs.perform_version }}
-      dry_run: ${{ inputs.dry_run }}
\ No newline at end of file
+      dry_run: ${{ inputs.dry_run }}
+      additional_profiles: 'thing4,openhab'
diff --git a/bundles/org.connectorio.cloud.device.auth.nimbus/src/main/java/org/connectorio/cloud/device/auth/nimbus/internal/NimbusDeviceAuthenticator.java b/bundles/org.connectorio.cloud.device.auth.nimbus/src/main/java/org/connectorio/cloud/device/auth/nimbus/internal/NimbusDeviceAuthenticator.java
index f9847f2..9be0a26 100644
--- a/bundles/org.connectorio.cloud.device.auth.nimbus/src/main/java/org/connectorio/cloud/device/auth/nimbus/internal/NimbusDeviceAuthenticator.java
+++ b/bundles/org.connectorio.cloud.device.auth.nimbus/src/main/java/org/connectorio/cloud/device/auth/nimbus/internal/NimbusDeviceAuthenticator.java
@@ -263,7 +263,8 @@ private void sleep() {
         logger.trace("Sleep a bit");
         Thread.sleep(TimeUnit.SECONDS.toMillis(interval));
       } catch (InterruptedException e) {
-        throw new RuntimeException("Could not complete operation", e);
+        logger.warn("Could not complete operation", e);
+        Thread.currentThread().interrupt();
       }
     }
   }
diff --git a/bundles/org.connectorio.cloud.device.auth.setup/src/main/java/org/connectorio/cloud/device/auth/setup/internal/SetupTokenListener.java b/bundles/org.connectorio.cloud.device.auth.setup/src/main/java/org/connectorio/cloud/device/auth/setup/internal/SetupTokenListener.java
index 232e7b3..201840b 100644
--- a/bundles/org.connectorio.cloud.device.auth.setup/src/main/java/org/connectorio/cloud/device/auth/setup/internal/SetupTokenListener.java
+++ b/bundles/org.connectorio.cloud.device.auth.setup/src/main/java/org/connectorio/cloud/device/auth/setup/internal/SetupTokenListener.java
@@ -61,7 +61,9 @@ protected void createConfiguration(Map<String, String> properties) throws IOExce
     File file = new File(new File(System.getProperty("karaf.etc")), factoryPid + ".cfg");
 
     props.putAll(properties);
-    props.store(new FileOutputStream(file), "Generated at " + new Date());
+    try (FileOutputStream fos = new FileOutputStream(file)) {
+      props.store(fos, "Generated at " + new Date());
+    }
   }
 
 }
diff --git a/bundles/org.connectorio.cloud.service.mqtt.aws/src/main/java/org/connectorio/cloud/service/mqtt/aws/internal/servlet/AwsStatusServlet.java b/bundles/org.connectorio.cloud.service.mqtt.aws/src/main/java/org/connectorio/cloud/service/mqtt/aws/internal/servlet/AwsStatusServlet.java
index 18ff377..334f8e1 100644
--- a/bundles/org.connectorio.cloud.service.mqtt.aws/src/main/java/org/connectorio/cloud/service/mqtt/aws/internal/servlet/AwsStatusServlet.java
+++ b/bundles/org.connectorio.cloud.service.mqtt.aws/src/main/java/org/connectorio/cloud/service/mqtt/aws/internal/servlet/AwsStatusServlet.java
@@ -39,7 +39,7 @@ public class AwsStatusServlet extends HttpServlet {
 
   public static final String AWS_SVC_FILTER = "(" + Constants.SERVICE_PID + "=" + AwsMqttService.SERVICE_PID + ")";
 
-  private CloudService service;
+  private CloudService service; // NOSONAR
   private final HttpService httpService;
 
   @Activate
diff --git a/parent/pom.xml b/parent/pom.xml
index 6d8d554..6f734bc 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -430,6 +430,33 @@
         </pluginRepository>
       </pluginRepositories>
     </profile>
+
+    <profile>
+      <id>sonar</id>
+
+      <activation>
+        <property>
+          <name>cicd</name>
+        </property>
+      </activation>
+
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.sonarsource.scanner.maven</groupId>
+            <artifactId>sonar-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <phase>verify</phase>
+                <goals>
+                  <goal>sonar</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 1779c6f..9a2ca2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,14 @@
     <release.repository-id>co7io-public-releases</release.repository-id>
     <release.repository-name>ConnectorIO Public Releases</release.repository-name>
     <release.repository-url>https://repository.connectorio.cloud/repository/co7io-public-releases/</release.repository-url>
+
+    <sonar.projectKey>ConnectorIO_connectorio-cloud</sonar.projectKey>
+    <sonar.moduleKey>${project.artifactId}</sonar.moduleKey>
+    <sonar.organization>connectorio</sonar.organization>
+    <sonar.host.url>https://sonarcloud.io</sonar.host.url>
+    <!-- keeps sonar happy with java 11 -->
+    <sonar.scanner.force-deprecated-java-version>true</sonar.scanner.force-deprecated-java-version>
+    <sonar.scanner.force-deprecated-java-version-grace-period>true</sonar.scanner.force-deprecated-java-version-grace-period>
   </properties>
 
   <modules>