diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 57d7194efcb817a3b0f058f9d9a0647b4d6def04..b5ffa9079dc941cb3717f7843e036a0b8cc6b0ac 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,7 +46,7 @@ pages:
     - mkdir -p public/Tests_Results && cp -r build/reports/tests/test/* public/Tests_Results/
     - mkdir -p public/Jacoco && cp -r build/jacocoHtml/* public/Jacoco/
     - mkdir -p public/Javadoc && cp -r build/docs/javadoc/* public/Javadoc/
-    - cp -r `ls -t build/libs/ImmutableComplex*.jar | head -1` public/ImmutableComplex.jar
+    - cp -r `ls -t build/libs/ImmutableComplex*.jar | head -1` public/
   artifacts:
     paths:
       - public
diff --git a/.travis.yml b/.travis.yml
index e31f939ca4bb9de294f8d95475cab008936fc920..b6997d377fa8d38201aad08956618b04f63dc25a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,11 +18,11 @@ script:
   - ./gradlew run
   - ./gradlew javadoc
   - ./gradlew jar
-  - mkdir -p public/ && cp -r index_github.html public/index.html
+  - mkdir -p public/ && cp -r index.html public/
   - mkdir -p public/Tests_Results && cp -r build/reports/tests/test/* public/Tests_Results/
   - mkdir -p public/Jacoco && cp -r build/jacocoHtml/* public/Jacoco/
   - mkdir -p public/Javadoc && cp -r build/docs/javadoc/* public/Javadoc/
-  - cp -r `ls -t build/libs/ImmutableComplex*.jar | head -1` public/ImmutableComplex.jar
+  - cp -r `ls -t build/libs/ImmutableComplex*.jar | head -1` public/
 
 branches:
   only:
diff --git a/build.gradle b/build.gradle
index 8919eef251d47e3959b0c98942f84c2d6cf14589..1a6144b3fb46372106f7bd08fd54b208c8ca69b7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -62,17 +62,17 @@ task formatIndex(type: Copy) {
   into '.'
   rename { String fileName -> fileName.replace("index_template.html", "index.html")}
   // Substitute property references in files
-  //expand(version: "${project.version}")
   def remote = "git rev-parse --abbrev-ref --symbolic-full-name @{u}".execute().text.trim().split('/')[0]
   def url = "git remote get-url $remote".execute().text.trim()
-  def pageurl = ""
   if(url.contains("github.com")){
-	pageurl = "https://darrivau.github.io/Testproject"
+	project.ext."pageurl" = "https://darrivau.github.io/Testproject"
   }
-  if(url.contains("lis-lab.fr")){
-  	pageurl = "http://denis.arrivault.pages.lis-lab.fr/Test_Project"
+  else if(url.contains("lis-lab.fr")){
+  	project.ext."pageurl" = "http://denis.arrivault.pages.lis-lab.fr/Test_Project"
+  }else{
+    project.ext."pageurl" = "${buildDir}/"
   }
-  println(pageurl)
+  expand project.properties
 }
 
 javadoc.finalizedBy formatIndex