diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8d588bfbd8811b84be02212fd228a3381fb4849d..c9ab18cd46a6b94bebc035f1e86ae141093994a1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,15 @@
 image: node
 
 before_script:
+  - apt-get update
+
+
+stages:
+  - build
+  - test
 
 test_frontend:
+  stage: test
   script:
     - cd frontend-js
     - npm install  
@@ -10,17 +17,30 @@ test_frontend:
 
 build_war:
   image: debian
+  stage: build
   only:
     - tags
   artifacts:
     paths:
       - minerva.war
   script:
-    - apt-get update
-    - apt-get install -y curl sudo gnupg git
+    - apt-get install -y curl sudo gnupg git openjdk-8-jdk ant maven
     - curl -sL https://deb.nodesource.com/setup_9.x | sudo -E bash -
     - sudo apt-get install -y nodejs
-    - apt-get install -y openjdk-8-jdk ant maven
     - ant maven-build
     - cp web/target/web-1.0.war minerva.war
 
+build_debian_package:
+  image: debian
+  stage: build
+  only:
+    - tags
+  artifacts:
+    paths:
+      - "debian/*.deb"
+  script:
+    - apt-get install -y curl sudo gnupg git openjdk-8-jdk ant maven dh-make
+    - curl -sL https://deb.nodesource.com/setup_9.x | sudo -E bash -
+    - sudo apt-get install -y nodejs
+    - ant debian-pkg
+
diff --git a/CHANGELOG b/CHANGELOG
index 1f1020106ed7fc6f93ef5829c8218d36723e85c5..23f682142be771adf7bdd821d793d104544ec423 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+minerva (12.0.0) stable; urgency=medium
+  * STUB CHANGLELOG ENTRY
+
+ -- Piotr Gawron <piotr.gawron@uni.lu>  Thu, 14 Dec 2017 16:00:00 +0200
+
 minerva (11.0.6) stable; urgency=medium
   * Bug fix: fix a bug when entering invalid mirna id