diff --git a/docs/pom.xml b/docs/pom.xml
index d75c69785..7879d0fe2 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -21,6 +21,10 @@
    <description>Documenation for hawkBit</description>
 
 
+   <properties>
+    <jekyll.config>localconfig.yml</jekyll.config>
+   </properties>
+
 
    <!-- Jekyll Linux Build -->
    <profiles>
@@ -59,7 +63,7 @@
                         <phase>generate-resources</phase>
                         <configuration>
                            <file>${project.build.directory}/rubygems/bin/jekyll</file>
-                           <execArgs>build --trace --source ${project.basedir}/src/main/resources --destination ${project.build.outputDirectory}</execArgs>
+                           <execArgs>build --trace --source ${project.basedir}/src/main/resources --destination ${project.build.outputDirectory} --config ${project.basedir}/src/main/resources/${jekyll.config}</execArgs>
                         </configuration>
                      </execution>
                      <execution>
@@ -70,7 +74,7 @@
                         </goals>
                         <configuration>
                            <file>${project.build.directory}/rubygems/bin/jekyll</file>
-                           <execArgs>serve --trace --source ${project.basedir}/src/main/resources --destination ${project.build.outputDirectory}</execArgs>
+                           <execArgs>serve --trace --source ${project.basedir}/src/main/resources --destination ${project.build.outputDirectory} --config ${project.basedir}/src/main/resources/${jekyll.config}</execArgs>
                         </configuration>
                         <phase>none</phase>
                      </execution>
@@ -124,6 +128,8 @@
                               <argument>${project.basedir}/src/main/resources</argument>
                               <argument>--destination</argument>
                               <argument>${project.build.outputDirectory}</argument>
+                              <argument>--config</argument>
+                              <argument>${project.basedir}/src/main/resources/${jekyll.config}</argument>
                            </arguments>
                         </configuration>
                      </execution>
@@ -142,6 +148,8 @@
                               <argument>${project.basedir}/src/main/resources</argument>
                               <argument>--destination</argument>
                               <argument>${project.build.outputDirectory}</argument>
+                              <argument>--config</argument>
+                              <argument>${project.basedir}/src/main/resources/${jekyll.config}</argument>
                            </arguments>
                         </configuration>
                         <phase>none</phase>
diff --git a/docs/src/main/resources/_config.yml b/docs/src/main/resources/_config.yml
deleted file mode 100644
index 1d59ebcef..000000000
--- a/docs/src/main/resources/_config.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-# Site settings
-title: Eclipse hawkBit
-email: hawkbit-dev@eclipse.org
-description: Eclipse hawkBit - IoT Software Update
-baseurl: "" # the subpath of your site, e.g. /blog/
-
-# Build settings
-markdown: kramdown
-paginate: 3
-paginate_path: '/blog/page:num/'
\ No newline at end of file
diff --git a/docs/src/main/resources/css/hawkbit.css b/docs/src/main/resources/css/hawkbit.css
index 716c9584c..875341d57 100644
--- a/docs/src/main/resources/css/hawkbit.css
+++ b/docs/src/main/resources/css/hawkbit.css
@@ -44,7 +44,7 @@ code {
 }
 
 .navbar-inverse .navbar-brand-logo {
-	background-image: url("/img/hawkbit_flower.png");
+	background-image: url("../img/hawkbit_flower.png");
 	background-size: 250px;
 	background-repeat: no-repeat;
 	position: absolute;
@@ -68,7 +68,7 @@ code {
 }
 
 .navbar-lp .navbar-brand-logo {
-	background-image: url("/img/hawkbit_flower.png");
+	background-image: url("../img/hawkbit_flower.png");
 	background-size: 250px;
 	background-repeat: no-repeat;
 	position: absolute;
@@ -99,7 +99,7 @@ code {
 }
 
 .navbar-lp.scroll .navbar-brand-logo {
-	background-image: url("/img/hawkbit_flower.png");
+	background-image: url("../img/hawkbit_flower.png");
 	background-size: 80px;
 	background-repeat: no-repeat;
 	position: absolute;
@@ -266,7 +266,7 @@ footer {
         padding-top: 20px;
     }
 	.navbar-inverse .navbar-brand-logo {
-		background-image: url("/img/hawkbit_flower.png");
+		background-image: url("../img/hawkbit_flower.png");
 		background-size: 100px;
 		background-repeat: no-repeat;
 		position: absolute;
diff --git a/docs/src/main/resources/eclipseconfig.yml b/docs/src/main/resources/eclipseconfig.yml
new file mode 100644
index 000000000..eb7dbe17b
--- /dev/null
+++ b/docs/src/main/resources/eclipseconfig.yml
@@ -0,0 +1,5 @@
+# Site settings
+title: Eclipse hawkBit
+email: hawkbit-dev@eclipse.org
+description: Eclipse hawkBit - IoT Software Update
+baseurl: "" # the subpath of your site, e.g. /blog/
\ No newline at end of file
diff --git a/docs/src/main/resources/localconfig.yml b/docs/src/main/resources/localconfig.yml
new file mode 100644
index 000000000..914a86ab6
--- /dev/null
+++ b/docs/src/main/resources/localconfig.yml
@@ -0,0 +1,5 @@
+# Site settings
+title: Eclipse hawkBit
+email: hawkbit-dev@eclipse.org
+description: Eclipse hawkBit - IoT Software Update
+baseurl: "/hawkbit/" # the subpath of your site, e.g. /blog/
\ No newline at end of file