diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fda4ae18c308adeaa52797040011d4613546e149..8eb754add957115001807157a3c2597844d66126 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,24 +1,20 @@
-image: openjdk:8-jdk
-
 variables:
+    GIT_STRATEGY: fetch
+    GIT_DEPTH: 0
     SAREF_DEV_KEY: <my_private_key>
     SAREF_PORTAL_KEY: <my_private_key>
 
-before_script:
-  - eval $(ssh-agent -s)
-  - ssh-add <(echo "$SAREF_DEV_KEY")
-  - mkdir -p ~/.ssh
-  - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
-
 stages:
   - test
   - build
   - deploy
 
+
 test-develop:
   stage: test
+  image: openjdk:11-jre
   script:
-    - curl -L -o saref-pipeline.jar "https://labs.etsi.org/rep/saref/saref-pipeline/-/jobs/artifacts/master/raw/target/saref-pipeline.jar?job=build"
+    - curl -L -o saref-pipeline.jar "https://labs.etsi.org/rep/saref/saref-pipeline/-/releases/permalink/latest/downloads/saref-pipeline.jar"
     - java -jar saref-pipeline.jar develop -s && touch target/success
   allow_failure: true
   except:
@@ -34,8 +30,9 @@ test-develop:
 
 test-prerelease:
   stage: test
+  image: openjdk:11-jre
   script:
-    - curl -L -o saref-pipeline.jar "https://labs.etsi.org/rep/saref/saref-pipeline/-/jobs/artifacts/master/raw/target/saref-pipeline.jar?job=build"
+    - curl -L -o saref-pipeline.jar "https://labs.etsi.org/rep/saref/saref-pipeline/-/releases/permalink/latest/downloads/saref-pipeline.jar"
     - java -jar saref-pipeline.jar release -t && touch target/success
   allow_failure: true
   only:
@@ -48,19 +45,27 @@ test-prerelease:
     reports:
       junit: target/report_output.xml
 
-deploy-report:
-  stage: deploy
-  script:
-    - scp -pr target/site saref-dev@saref.etsi.org:~/snapshot/$CI_PIPELINE_ID
-    - echo "SAREF pipeline report  https://saref.etsi.org/snapshot/$CI_PIPELINE_ID/report.html" 
-    - exit $(test -f target/success) $?
-  except:
-    - /^release-v/
+# deploy-report:
+#   stage: deploy
+#   image: alpine:latest
+#   script:
+#     - apk update
+#     - apk add openssh
+#     - eval $(ssh-agent -s)
+#     - ssh-add <(echo "$SAREF_DEV_KEY")
+#     - mkdir -p ~/.ssh
+#     - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
+#     - scp -P 29419 -pr target/site saref-dev@saref.etsi.org:~/snapshot/$CI_PIPELINE_ID
+#     - echo "SAREF pipeline report  https://saref.etsi.org/snapshot/$CI_PIPELINE_ID/report.html" 
+#     - exit $(test -f target/success) $?
+#   except:
+#     - /^release-v/
 
 test-release:
   stage: test
+  image: openjdk:11-jre
   script:
-    - curl -L -o saref-pipeline.jar "https://labs.etsi.org/rep/saref/saref-pipeline/-/jobs/artifacts/master/raw/target/saref-pipeline.jar?job=build"
+    - curl -L -o saref-pipeline.jar "https://labs.etsi.org/rep/saref/saref-pipeline/-/releases/permalink/latest/downloads/saref-pipeline.jar"
     - java -jar saref-pipeline.jar release -t
   only:
     - /^release-v/
diff --git a/ontology/saref4ehaw.ttl b/ontology/saref4ehaw.ttl
index 3c4ed38c60fef01b95908cd911badcd653f74a1b..4f33c18b37d2b6cfe97de9f6c156856ebd6e2a30 100644
--- a/ontology/saref4ehaw.ttl
+++ b/ontology/saref4ehaw.ttl
@@ -13,23 +13,24 @@
 @base <https://saref.etsi.org/saref4ehaw/> .
 
 <https://saref.etsi.org/saref4ehaw/> rdf:type owl:Ontology ;
-                                      owl:imports <https://saref.etsi.org/core/v3.1.1/> ;
-				      dcterms:creator <http://www-public.imtbs-tsp.eu/~girodgen/> ;
-                                      dcterms:contributor <https://www.linkedin.com/in/lina-nachabe-2b292457/> ,
-						          <https://research.utwente.nl/en/persons/jo%C3%A3o-luiz-moreira> ,
-                                                          <https://pdi.fbk.eu/people/profile/dragoni> ,
-                                                          <http://www.maxime-lefrancois.info/> ;
-				      dcterms:publisher <https://www.etsi.org/> ;
-				      dcterms:license <https://forge.etsi.org/etsi-software-license> ;
-                                      dcterms:source <https://saref.etsi.org/sources/saref4ehaw/> ;
-                                      owl:versionIRI <https://saref.etsi.org/saref4ehaw/v1.1.1/> ;
-                                      owl:versionInfo "v1.1.1" ;
-                                      vann:preferredNamespacePrefix "s4ehaw" ;
-                                      vann:preferredNamespaceUri "https://saref.etsi.org/saref4ehaw/" ;
-                                      dcterms:issued "2020-02-01"^^xsd:date ;
-				      dcterms:modified "2020-05-01"^^xsd:date ;
-                                      dcterms:title "SAREF4EHAW: an extension of SAREF for eHealth Ageing Well domain"@en ;
-                                      dcterms:description """The objective of SAREF4EHAW is to extend SAREF ontology for the eHealth/Ageing-well (EHAW) vertical. Clause 4.1 of the present document shortly introduces a high level view of the envisioned SAREF4EHAW semantic model and modular ontology, with the retained concepts (i.e. classes) and their relations. 
+  owl:imports <https://saref.etsi.org/core/v3.1.1/> ;
+  dcterms:creator <http://www-public.imtbs-tsp.eu/~girodgen/> ;
+  dcterms:contributor <https://www.linkedin.com/in/lina-nachabe-2b292457/> ,
+    <https://research.utwente.nl/en/persons/jo%C3%A3o-luiz-moreira> ,
+    <https://pdi.fbk.eu/people/profile/dragoni> ,
+    <http://www.maxime-lefrancois.info/> ;
+  dcterms:publisher <https://www.etsi.org/> ;
+  dcterms:license <https://forge.etsi.org/etsi-software-license> ;
+  dcterms:source <https://saref.etsi.org/sources/saref4ehaw/> ;
+  owl:versionIRI <https://saref.etsi.org/saref4ehaw/v1.1.1/> ;
+  owl:versionInfo "v1.1.1" ;
+  vann:preferredNamespacePrefix "s4ehaw" ;
+  vann:preferredNamespaceUri "https://saref.etsi.org/saref4ehaw/" ;
+  dcterms:issued "2020-02-01"^^xsd:date ;
+  dcterms:modified "2020-05-01"^^xsd:date ;
+  rdfs:seeAlso <https://www.etsi.org/deliver/etsi_ts/103400_103499/10341008/01.01.01_60/ts_10341008v010101p.pdf> ;
+  dcterms:title "SAREF4EHAW: an extension of SAREF for eHealth Ageing Well domain"@en ;
+  dcterms:description """The objective of SAREF4EHAW is to extend SAREF ontology for the eHealth/Ageing-well (EHAW) vertical. Clause 4.1 of the present document shortly introduces a high level view of the envisioned SAREF4EHAW semantic model and modular ontology, with the retained concepts (i.e. classes) and their relations. 
 SAREF4EHAW extension has been specified and formalised by investigating EHAW domain related resources, as reported in ETSI TR 103 509, such as: potential stakeholders, standardization initiatives, alliances/associations, European projects, EC directives, existing ontologies, and data repositories. Therefore, SAREF4EHAW modular ontology shall both:
  - Allow the implementation of a limited set of typical EHAW related use cases already identified in ETSI TR 103 509, i.e.
  - Use case 1 “elderly at home monitoring and support”,