diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..3644cb85507e913fad8bbc1fe3053c35cd43ddc7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+_site
+.sass-cache
+.jekyll-cache
+.jekyll-metadata
+vendor
+.directory
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0ae5b8652b25adae16e403f00fe3f373d180b288..596a403216a79a48c7fe54e741d3fbd36c8ce53c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,11 @@
-image: ruby:2.3
+image: ruby:latest
 
 variables:
   JEKYLL_ENV: production
+  LC_ALL: C.UTF-8
 
 before_script:
+  - gem install bundler
   - bundle install
 
 test:
diff --git a/Gemfile b/Gemfile
index 498735635552dd08a7e051a002bf626a91298095..fcb7de5b484f1f677b9da6137b7d0a80355fb5ac 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,25 @@
 source "https://rubygems.org"
 ruby RUBY_VERSION
-# This will help ensure the proper Jekyll version is running.
-gem "jekyll", "3.4.0"
-# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+
+# This will help ensure the proper Jekyll version is running (i.e. the latest version available that match the major version we define)
+gem "jekyll", "~> 4"
+
+# Jekyll plugins
+# Includes useful plugins for SEO and for RSS feed
+group :jekyll_plugins do
+    gem "jekyll-sitemap"
+    gem "jekyll-feed"
+    gem "jekyll-seo-tag"
+end
+
+# We don't include a Jekyll theme
+
+# Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
+# and associated library.
+platforms :mingw, :x64_mingw, :mswin, :jruby do
+    gem "tzinfo", "~> 1.2"
+    gem "tzinfo-data"
+end 
+
+# Performance-booster for watching directories on Windows
+gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin]
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 0000000000000000000000000000000000000000..92cebbbdcfc7d805eb5585b25a1012e88abe9e30
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,82 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    colorator (1.1.0)
+    concurrent-ruby (1.1.7)
+    em-websocket (0.5.1)
+      eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0.6.0)
+    eventmachine (1.2.7)
+    ffi (1.13.1)
+    forwardable-extended (2.6.0)
+    http_parser.rb (0.6.0)
+    i18n (1.8.5)
+      concurrent-ruby (~> 1.0)
+    jekyll (4.1.1)
+      addressable (~> 2.4)
+      colorator (~> 1.0)
+      em-websocket (~> 0.5)
+      i18n (~> 1.0)
+      jekyll-sass-converter (~> 2.0)
+      jekyll-watch (~> 2.0)
+      kramdown (~> 2.1)
+      kramdown-parser-gfm (~> 1.0)
+      liquid (~> 4.0)
+      mercenary (~> 0.4.0)
+      pathutil (~> 0.9)
+      rouge (~> 3.0)
+      safe_yaml (~> 1.0)
+      terminal-table (~> 1.8)
+    jekyll-feed (0.15.0)
+      jekyll (>= 3.7, < 5.0)
+    jekyll-sass-converter (2.1.0)
+      sassc (> 2.0.1, < 3.0)
+    jekyll-seo-tag (2.6.1)
+      jekyll (>= 3.3, < 5.0)
+    jekyll-sitemap (1.4.0)
+      jekyll (>= 3.7, < 5.0)
+    jekyll-watch (2.2.1)
+      listen (~> 3.0)
+    kramdown (2.3.0)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    liquid (4.0.3)
+    listen (3.2.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    mercenary (0.4.0)
+    pathutil (0.16.2)
+      forwardable-extended (~> 2.6)
+    public_suffix (4.0.6)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    rexml (3.2.4)
+    rouge (3.23.0)
+    safe_yaml (1.0.5)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    unicode-display_width (1.7.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  jekyll (~> 4)
+  jekyll-feed
+  jekyll-seo-tag
+  jekyll-sitemap
+  tzinfo (~> 1.2)
+  tzinfo-data
+  wdm (~> 0.1.1)
+
+RUBY VERSION
+   ruby 2.5.5p157
+
+BUNDLED WITH
+   2.1.4
diff --git a/_config.yml b/_config.yml
index 2296447e4423f4f25033bda25d26569208ba7d18..207f7b6eec51eecc5fbe75e1108b73fa12d0eaaf 100644
--- a/_config.yml
+++ b/_config.yml
@@ -6,14 +6,24 @@
 # 'jekyll serve'. If you change this file, please restart the server process.
 
 # Site settings
-title: Lorem ipsum
-email: your-email@domain.com
+title: OW2 template
+email: no-reply@ow2.org
 description: > # this means to ignore newlines until "baseurl:"
-  Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Neque aliquam vestibulum morbi blandit cursus risus at. Cum sociis natoque penatibus et magnis dis. A erat nam at lectus urna duis convallis convallis tellus.
+  Purpose of this static website generated
+  using Jekyll is to demonstrate the rendering of OW2 template.
+# To better understand URL see offical GitLab documentation: https://docs.gitlab.com/ee/user/project/pages/getting_started_part_one.html
 baseurl: "" # the subpath of your site, e.g. /blog
 url: "http://ow2-lifecycle.ow2.io" # the base hostname & protocol for your site
-twitter_username: jekyllrb
-github_username:  jekyll
+twitter_username: ow2
+github_username:  ow2
+# linkedin_username is only usable for individual profile not company profile
+#linkedin_username: 
 
 # Build settings
 markdown: kramdown
+
+# Useful plugins for SEO and to have RSS feed
+plugins:
+  - jekyll-sitemap
+  - jekyll-feed
+  - jekyll-seo-tag
\ No newline at end of file
diff --git a/index.md b/index.md
index 8ded6e85ab84af886274aabbadc5a4af876e5722..9a8b24d8025b06209df5859edaf36088069a9b39 100644
--- a/index.md
+++ b/index.md
@@ -5,8 +5,9 @@ layout: default
 # {{ site.title }}
 ----
 
-## Lorem ipsum
+## Home page
 
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Neque aliquam vestibulum morbi blandit cursus risus at. Cum sociis natoque penatibus et magnis dis. A erat nam at lectus urna duis convallis convallis tellus. Volutpat odio facilisis mauris sit amet massa vitae tortor. Vitae tempus quam pellentesque nec nam. Aliquam vestibulum morbi blandit cursus risus at ultrices. Vel eros donec ac odio. Nulla posuere sollicitudin aliquam ultrices sagittis orci a scelerisque purus. Lobortis scelerisque fermentum dui faucibus in ornare. Id aliquet lectus proin nibh nisl. Ullamcorper velit sed ullamcorper morbi tincidunt ornare. Purus viverra accumsan in nisl. Lectus magna fringilla urna porttitor. Duis convallis convallis tellus id. Duis convallis convallis tellus id interdum velit laoreet. Quisque id diam vel quam elementum. Enim ut tellus elementum sagittis. Platea dictumst vestibulum rhoncus est pellentesque elit ullamcorper dignissim. Enim ut tellus elementum sagittis vitae et leo.
+This is the site index page.
 
-Interdum varius sit amet mattis vulputate enim nulla aliquet. Ac orci phasellus egestas tellus rutrum tellus. Eget sit amet tellus cras adipiscing enim eu turpis egestas. Eu facilisis sed odio morbi quis commodo odio. Rhoncus est pellentesque elit ullamcorper dignissim cras tincidunt lobortis. Erat nam at lectus urna duis convallis convallis tellus. Volutpat ac tincidunt vitae semper quis lectus nulla at. Massa massa ultricies mi quis hendrerit dolor. Volutpat ac tincidunt vitae semper quis. Scelerisque felis imperdiet proin fermentum leo vel orci porta non. Facilisi etiam dignissim diam quis enim. Sagittis purus sit amet volutpat consequat. Sed adipiscing diam donec adipiscing tristique. Egestas tellus rutrum tellus pellentesque eu tincidunt tortor aliquam.
+This is only a demo site with some OW2 look and feel.  
+Note that this is not a Jekyll OW2 theme but rather a site with a customized layout and style. Potential improvement would be to package the layout and style as a Jekyll theme.
\ No newline at end of file