diff --git a/README.md b/README.md
index 95cacbc9f..e824971e9 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,14 @@
-# hawkbit-update-server
+Build: [![Circle CI](https://circleci.com/gh/eclipse/hawkbit.svg?style=svg)](https://circleci.com/gh/eclipse/hawkbit)
 
-Want to chat with the team behind hawkBit? [![Join the chat at https://gitter.im/eclipse/hawkbit](https://badges.gitter.im/eclipse/hawkbit.svg)](https://gitter.im/eclipse/hawkbit?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+# Eclipse.IoT hawkBit - Update Server
 
 [hawkBit](https://projects.eclipse.org/projects/iot.hawkbit) is an domain independent back end solution for rolling out software updates to constrained edge devices as well as more powerful controllers and gateways connected to IP based networking infrastructure.
 
+# Contact us
+
+* Want to chat with the team behind hawkBit? [![Join the chat at https://gitter.im/eclipse/hawkbit](https://badges.gitter.im/eclipse/hawkbit.svg)](https://gitter.im/eclipse/hawkbit?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+* You can also check out our [Project Homepage](https://projects.eclipse.org/projects/iot.hawkbit) for further contact options.
+
 
 # Compile
 ```
@@ -12,7 +17,7 @@ mvn install
 
 # Run and use
 
-We are not providing an off the shelf production ready hawkBit server. However, we recommend to check out the [Example Application](examples/hawkbit-example-app) for a runtime ready Spring Boot based update server that is empowered by hawkBit.
+We are not providing an off the shelf installation ready hawkBit update server. However, we recommend to check out the [Example Application](examples/hawkbit-example-app) for a runtime ready Spring Boot based update server that is empowered by hawkBit.
 
 # Releases and Roadmap
 
diff --git a/pom.xml b/pom.xml
index 84a223b64..a9d303782 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,31 +94,33 @@
 
       <!-- Sonar -->
       <sonar.host.url>https://sonar.eu-gb.mybluemix.net</sonar.host.url>
-      <sonar.github.repository>bsinno/hawkbit-update-server</sonar.github.repository>
+      <sonar.github.repository>eclipse/hawkbit</sonar.github.repository>
       <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
+      <sonar.links.homepage>https://projects.eclipse.org/projects/iot.hawkbit</sonar.links.homepage>
+      <sonar.links.ci>https://circleci.com/gh/eclipse/hawkbit</sonar.links.ci>
       <!-- Jacoco version to use -->
       <jacoco.version>0.7.2.201409121644</jacoco.version>
-      <!-- The Sonar Jacoco Listener for JUnit to extract coverage details 
+      <!-- The Sonar Jacoco Listener for JUnit to extract coverage details
          per test -->
       <sonar-jacoco-listeners.version>1.4</sonar-jacoco-listeners.version>
       <!-- Don't let Sonar execute tests. We will ask it to Maven -->
       <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
-      <!-- The system property jacoco.outputDir needs to be override on the 
-         command line with an absolute path if you want to merge results from all 
-         modules. Example in a Jenkisn build where ${WORKSPACE} is defined and your 
-         project in the root directory of the workspace : mvn clean install -Prun-its,coverage 
-         -Djacoco.outputDir=${WORKSPACE}/target Note that unfortunately using the 
-         following does not work because of http://jira.codehaus.org/browse/SONAR-3427: 
+      <!-- The system property jacoco.outputDir needs to be override on the
+         command line with an absolute path if you want to merge results from all
+         modules. Example in a Jenkisn build where ${WORKSPACE} is defined and your
+         project in the root directory of the workspace : mvn clean install -Prun-its,coverage
+         -Djacoco.outputDir=${WORKSPACE}/target Note that unfortunately using the
+         following does not work because of http://jira.codehaus.org/browse/SONAR-3427:
          <jacoco.outputDir>${session.executionRootDirectory}/target/</jacoco.outputDir> -->
       <jacoco.outputDir>${project.basedir}/../target/</jacoco.outputDir>
       <!-- Jacoco output file for UTs -->
       <jacoco.out.ut.file>jacoco-ut.exec</jacoco.out.ut.file>
-      <!-- Tells Sonar where the Jacoco coverage result file is located for 
+      <!-- Tells Sonar where the Jacoco coverage result file is located for
          Unit Tests -->
       <sonar.jacoco.reportPath>${jacoco.outputDir}/${jacoco.out.ut.file}</sonar.jacoco.reportPath>
       <!-- Jacoco output file for ITs -->
       <jacoco.out.it.file>jacoco-it.exec</jacoco.out.it.file>
-      <!-- Tells Sonar where the Jacoco coverage result file is located for 
+      <!-- Tells Sonar where the Jacoco coverage result file is located for
          Integration Tests -->
       <sonar.jacoco.itReportPath>${jacoco.outputDir}/${jacoco.out.it.file}</sonar.jacoco.itReportPath>
       <guava.version>19.0</guava.version>
@@ -360,9 +362,9 @@
             <artifactId>vaadin-push</artifactId>
             <version>${vaadin.version}</version>
          </dependency>
-         <!-- Needed when using the widgetset optimizer (custom ConnectorBundleLoaderFactory). 
-            For widgetset compilation, vaadin-client-compiler is automatically added 
-            on the compilation classpath by vaadin-maven-plugin so normally there is 
+         <!-- Needed when using the widgetset optimizer (custom ConnectorBundleLoaderFactory).
+            For widgetset compilation, vaadin-client-compiler is automatically added
+            on the compilation classpath by vaadin-maven-plugin so normally there is
             no need for an explicit dependency. -->
          <dependency>
             <groupId>com.vaadin</groupId>
@@ -501,7 +503,7 @@
                </exclusion>
             </exclusions>
          </dependency>
-         <!-- Override of classmate version, that is a hibernate validator 
+         <!-- Override of classmate version, that is a hibernate validator
             dependency. allow PB of CQ -->
          <dependency>
             <groupId>com.fasterxml</groupId>