diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f609759859f36bc3fab3bc68a34c58f30d4ad29e..0da873910ce9f702c6fc5cb459a828ee45371e7b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,37 +1,49 @@
- include:
+include:
    local: 'docker.gitlab-ci.yml'
 
- variables:
-   DOCKER_HOST: tcp://localhost:2375
-   DOCKER_DRIVER: overlay2
+variables:
+  DOCKER_HOST: tcp://localhost:2375
+  DOCKER_DRIVER: overlay2
 
- stages:
-   - version
-   - build
-   - deploy
+stages:
+  - version
+  - build
+  - deploy
 
- versioning:
+.versioning_template:
    stage: version
    image: docker:19.03.4
    artifacts:
      paths:
        - shared-vars.sh
-     expire_in: 1 day
+     expire_in: 1 week
    script:
-     - echo "export VERSION=$(cat sga-daemon-*.rockspec | grep 'version[[:space:]]=[[:space:]]' | awk '{print $3}' | sed -e s/[\",]//g)" >> shared-vars.sh
-   only:
-     - master
-     - tags
+     - echo $SGA_VERSION
+     - echo "export VERSION=$SGA_VERSION" >> shared-vars.sh
 
- static_check:
-   stage: build
-   image: repo.tecgraf.puc-rio.br:18089/soma/ubuntu:16.04-sga-posix
-   script:
-     - mkdir sgarest-daemon
-     - curl -L https://git.tecgraf.puc-rio.br/csbase-dev/sgarest-daemon/-/archive/master/sgarest-daemon-master.tar.gz | tar xzf - -C sgarest-daemon --strip-components 1
-     - cd sgarest-daemon
-     - export errors=$(luac5.3 -p sgad | find . -regex ".*\.lua"  | awk '{print "luac5.3 -p "$1}' | sh -) 
-     - ([ -z "$errors" ] && exit 0 || exit 1)
-   only:
-     - master
-     - tags
+versioning_master:
+  extends: .versioning_template
+  before_script:
+    - export SGA_VERSION="latest"
+  only:
+    - master
+
+versioning_tag:
+  extends: .versioning_template
+  before_script:
+    - export SGA_VERSION=$(cat sga-daemon-*.rockspec | grep 'version[[:space:]]=[[:space:]]' | awk '{print $3}' | sed -E s/-[0-9]+//g | sed -E s/\"//g)
+  only:
+    - tags
+
+static_check:
+  stage: build
+  image: repo.tecgraf.puc-rio.br:18089/soma/ubuntu:16.04-sga-posix
+  script:
+    - mkdir sgarest-daemon
+    - curl -L https://git.tecgraf.puc-rio.br/csbase-dev/sgarest-daemon/-/archive/${CI_COMMIT_REF_NAME}/sgarest-daemon-${CI_COMMIT_REF_NAME}.tar.gz | tar xzf - -C sgarest-daemon --strip-components 1
+    - cd sgarest-daemon
+    - export errors=$(luac5.3 -p sgad | find . -regex ".*\.lua"  | awk '{print "luac5.3 -p "$1}' | sh -) 
+    - ([ -z "$errors" ] && exit 0 || exit 1)
+  only:
+    - master
+    - tags