diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bfa14a23aacd21a9fa50f8afedab3350d86de37d..5d122f6a3409b2b05c5c19e7ac23186adccc18a9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,32 +1,18 @@
-# stages:
-#     - build
-  
-# build_and_test:
-#     image: registry.gitlab.com/rboman_docker/gmsh_python
-#     # stage: build
-#     script:
-#         - cd cxxfem
-#         - mkdir build
-#         - cd build
-#         - cmake -DFEM_USE_MKL=OFF ..
-#         - make -j 4
+
+build_and_test:
+    image: registry.gitlab.com/rboman_docker/gmsh_python
+    script:
+        - cd cxxfem
+        - mkdir build
+        - cd build
+        - cmake -DFEM_USE_MKL=OFF ..
+        - make -j 4
 
 send-snapshot:
-#   image: python:3.6
-  image: rboman/waves-py3:2020.3
+  image: registry.gitlab.com/rboman_docker/gitlab2zenodo
   script:
-    # - if [[ ! $CI_COMMIT_TAG =~ ^v?[0-9]+\.[0-9]+ ]]; then exit 0; fi
-    # - git clone https://gitlab.com/sbeniamine/gitlab2zenodo.git
-    # - cd gitlab2zenodo
-    # - python setup.py install
-    # - cd ..
-    # - rm -rf gitlab2zenodo
-    # - pip install gitlab2zenodo
-    - du -kh
-    - git --version
-    # - git lfs install
-    - git archive --format zip --output pipo.zip HEAD
-    - ls -lh pipo.zip
-    # - g2z-send -s -m .zenodo.json ${CI_COMMIT_TAG#v}.zip
-#   only:
-#     - tags
+    - if [[ ! $CI_COMMIT_TAG =~ ^v?[0-9]+\.[0-9]+ ]]; then exit 0; fi
+    - git archive --format zip --output ${CI_COMMIT_TAG#v}.zip ${CI_COMMIT_TAG}
+    - g2z-send -m .zenodo.json ${CI_COMMIT_TAG#v}.zip
+  only:
+    - tags