diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fda4ae18c308adeaa52797040011d4613546e149..8a36a00a7161b936523b20e9de02ca204983c528 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:
@@ -50,8 +47,15 @@ test-prerelease:
 
 deploy-report:
   stage: deploy
+  image: alpine:latest
   script:
-    - scp -pr target/site saref-dev@saref.etsi.org:~/snapshot/$CI_PIPELINE_ID
+    - 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:
@@ -59,8 +63,9 @@ deploy-report:
 
 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/saref4watr.ttl b/ontology/saref4watr.ttl
index 78ea31ab9581f8e3bd824a51cc9e996fd435f2d4..453833b73207a4bc8eb5b4668f6056d7709923c7 100644
--- a/ontology/saref4watr.ttl
+++ b/ontology/saref4watr.ttl
@@ -26,6 +26,7 @@
                                       dcterms:issued "2020-04-01"^^xsd:date ;
                                       dcterms:license <https://forge.etsi.org/etsi-software-license> ;
                                       dcterms:source <https://saref.etsi.org/sources/saref4watr/> ;
+                                      rdfs:seeAlso <https://www.etsi.org/deliver/etsi_ts/103400_103499/10341010/01.01.01_60/ts_10341010v010101p.pdf> ;
                                       vann:preferredNamespacePrefix "s4watr" ;
                                       vann:preferredNamespaceUri "https://saref.etsi.org/saref4watr/" .