diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dec3fc052d62a8d06b383d7ea78590bfbcc77a40..9d4ecf5e966123be05ad530a093c1dd2a175bae6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,12 +54,21 @@ build_docker:
         - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
         - docker build -t $CI_REGISTRY_IMAGE:$LAST_RELEASE .
         - docker push $CI_REGISTRY_IMAGE:$LAST_RELEASE
+        # Save docker image into a tar file to be uploaded in next stage
+        - docker save -o Docker_$CI_PROJECT_NAME_$LAST_RELEASE.tar $CI_REGISTRY_IMAGE:$LAST_RELEASE
+        - cd .. && mkdir -p build && cp Docker/*.tar build
+        - ls build
+    artifacts:
+      paths:
+        - build/Docker_*.tar
     only:
         - tags
 
 deploy_zenodo:
   stage: zenodo
-  image: gitlab-registry.in2p3.fr/escape2020/wp3/eossr:v0.1
+  image: gitlab-registry.in2p3.fr/escape2020/wp3/eossr:v0.2
+  dependencies:
+    - build_docker
   before_script:
     - eossr-check-connection-zenodo --token $ZENODO_TOKEN --sandbox False -p $CI_PROJECT_DIR
   script:
diff --git a/codemeta.json b/codemeta.json
index 90848ca6469e98c81fe9f1b97f2cf722638eec4b..cbfee1d64e87575df92bc86a4c2ed6817ebcd0b1 100644
--- a/codemeta.json
+++ b/codemeta.json
@@ -7,7 +7,6 @@
   "softwareVersion": "v0.2",
   "codeRepository": "https://gitlab.in2p3.fr/escape2020/wp3/eossr",
   "developmentStatus": "active",
-  "dateCreated": "2021-08-31",
   "isAccessibleForFree": true,
   "isPartOf": [
     "https://gitlab.in2p3.fr/escape2020",
@@ -43,9 +42,9 @@
   "downloadUrl": "",
   "installUrl": "",
   "releaseNotes": "",
-  "dateCreated": "",
-  "datePublished": "2021-08-31",
-  "dateModified": "2021-09-22",
+  "dateCreated": "2021-08-31",
+  "datePublished": "2021-09-23",
+  "dateModified": "2021-09-23",
   "operatingSystem":  "",
   "maintainer": {
     "@type": "Person",
diff --git a/examples/CI_code_snippets/5.ex_CI_build_image_and_upload_OSSR.md b/examples/CI_code_snippets/5.ex_CI_build_image_and_upload_OSSR.md
index e392a029d94f635a56fd620d0a0b2c3f7c456ad4..2cce2dc839627e77b44d806636867c24412f4fc0 100644
--- a/examples/CI_code_snippets/5.ex_CI_build_image_and_upload_OSSR.md
+++ b/examples/CI_code_snippets/5.ex_CI_build_image_and_upload_OSSR.md
@@ -48,12 +48,12 @@ build_docker_image:
     - docker push $CI_REGISTRY_IMAGE:$LAST_RELEASE
 
     # Save docker image into a file to be uploaded in next stage
-    - docker save -o Docker_image_ESCAPE_template_project_$LAST_RELEASE.tar $CI_REGISTRY_IMAGE:$LAST_RELEASE
+    - docker save -o Docker_$CI_PROJECT_NAME_$LAST_RELEASE.tar $CI_REGISTRY_IMAGE:$LAST_RELEASE
     - cd .. && mkdir -p build && cp Docker/*.tar build
     - ls build
   artifacts:
     paths:
-      - build/Docker_image_ESCAPE_template_project_*.tar
+      - build/Docker_*.tar
   only:
     - tags