diff --git a/Docker/posix/Dockerfile b/Docker/posix/Dockerfile
index e6acdfa4ad4b530cceb12ff4fcf4b6c14722842d..6f712f7b2b7620ed9f2701c9f8140b773c1ab350 100755
--- a/Docker/posix/Dockerfile
+++ b/Docker/posix/Dockerfile
@@ -2,7 +2,7 @@ FROM repo.tecgraf.puc-rio.br:18089/soma/ubuntu:16.04-sga-posix
 
 ENV LUA_VERSION 5.3.3
 ENV LUAROCKS_VERSION 2.4.2
-
+ARG TAG=master
 # RUN curl -L http://www.lua.org/ftp/lua-${LUA_VERSION}.tar.gz | tar xzf - && \
 #     cd /lua-$LUA_VERSION && \
 #     make linux test && \
@@ -17,11 +17,11 @@ RUN curl -L http://luarocks.github.io/luarocks/releases/luarocks-${LUAROCKS_VERS
     cd .. && rm -rf /lua-$LUAROCKS_VERSION
 
 RUN 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 && \
+    curl -L https://git.tecgraf.puc-rio.br/csbase-dev/sgarest-daemon/-/archive/${TAG}/sgarest-daemon-${TAG}.tar.gz | tar xzf - -C sgarest-daemon --strip-components 1 && \
     cd sgarest-daemon && \
-    luarocks install lua-schema-scm-1.rockspec && \
-    luarocks make sga-daemon-scm-1.rockspec && \
-    luarocks make sga-driver-posix-scm-1.rockspec
+    luarocks install lua-schema-*.rockspec && \
+    luarocks make sga-daemon-*.rockspec && \
+    luarocks make sga-driver-posix-*.rockspec
 
 WORKDIR /sgad
 
diff --git a/docker.gitlab-ci.yml b/docker.gitlab-ci.yml
index 340818cb3b0293866d28b2b706361c47caa61cd0..af0d3a5c4de225bec31c5574025e1d6caa5ee26d 100644
--- a/docker.gitlab-ci.yml
+++ b/docker.gitlab-ci.yml
@@ -17,7 +17,7 @@ variables:
     - docker pull $DOCKER_REGISTRY$DOCKER_REGISTRY_IMAGE_DIND:$LAST || true   
     - cd Docker/posix/
     - | 
-      docker build --cache-from $DOCKER_REGISTRY$CI_REGISTRY_IMAGE:$LAST \
+      docker build $BUILD_ARGS --cache-from $DOCKER_REGISTRY$CI_REGISTRY_IMAGE:$LAST \
       --tag $DOCKER_REGISTRY$CI_REGISTRY_IMAGE:$VERSION \
       --tag $DOCKER_REGISTRY$CI_REGISTRY_IMAGE:$LAST \
       --tag $DOCKER_REGISTRY$CI_REGISTRY_IMAGE:latest .
@@ -46,6 +46,7 @@ docker_release:
   extends: .docker_deploy
   before_script:
     - export LAST="stable"
+    - export BUILD_ARGS="--build-arg TAG=${CI_COMMIT_TAG}"
   when: manual
   only:
     - tags
diff --git a/release-prepare.sh b/release-prepare.sh
index 0c22c700b7d972bf3b24c2e5bc0be82c2e35dd3f..5985ba40f853865d4c44f37cb0173fd08c660148 100755
--- a/release-prepare.sh
+++ b/release-prepare.sh
@@ -7,14 +7,13 @@ set -e
 # Uso: ./release-prepare-npm.sh VERSION_TO_RELEASE NEXT_SNAPSHOT_VERSION
 ###############################################################################
 
-if [ "$#" != 2 ]
+if [ "$#" != 1 ]
 then
-    echo "Uso: $0 <VERSION_TO_RELEASE> <NEXT_SNAPSHOT_VERSION>"
+    echo "Uso: $0 <VERSION_TO_RELEASE>"
     exit
 fi
 
 RELEASE=$1
-SNAPSHOT=$2
 ROCKSPEC_REVISION=1
 
 checkIsMaster()
@@ -79,11 +78,12 @@ releaseVersion()
 
 nextSnapshotVersion()
 {
-   echo "[..] prepare for next development $SNAPSHOT..."
-   changeRockSpecs $SNAPSHOT
-   renameRockSpecs $SNAPSHOT
+   developmentVersion="scm-1"
+   echo "[..] prepare for next development $developmentVersion..."
+   changeRockSpecs $developmentVersion
+   renameRockSpecs $developmentVersion
    stageRockSpecs
-   git commit -m "[sgarest-daemon release] prepare for next development $SNAPSHOT" && \
+   git commit -m "[sgarest-daemon release] prepare for next development $developmentVersion" && \
    git push && \
    echo "[ok]"
 }
diff --git a/sga-daemon-1.7.2-SNAPSHOT.rockspec b/sga-daemon-scm-1.rockspec
similarity index 97%
rename from sga-daemon-1.7.2-SNAPSHOT.rockspec
rename to sga-daemon-scm-1.rockspec
index e6846052132e16176b8ba57fa84e8fb1e723ac8a..aa19176eb539e3bedf1f56881aa232c1eaf526b3 100644
--- a/sga-daemon-1.7.2-SNAPSHOT.rockspec
+++ b/sga-daemon-scm-1.rockspec
@@ -1,6 +1,6 @@
 
 package = "sga-daemon"
-version = "1.7.2-SNAPSHOT"
+version = "scm-1"
 
 source = {
    -- url = "git://git.tecgraf.puc-rio.br/csbase-dev/sgarest-daemon.git",
diff --git a/sga-driver-pbs-1.7.2-SNAPSHOT.rockspec b/sga-driver-pbs-scm-1.rockspec
similarity index 94%
rename from sga-driver-pbs-1.7.2-SNAPSHOT.rockspec
rename to sga-driver-pbs-scm-1.rockspec
index 46f9f92e0f24fcc4af60b6ce31d02f60d666ec93..2ba071b61579e79ff60013c1c4b5d9221e51674a 100644
--- a/sga-driver-pbs-1.7.2-SNAPSHOT.rockspec
+++ b/sga-driver-pbs-scm-1.rockspec
@@ -1,6 +1,6 @@
 
 package = "sga-driver-pbs"
-version = "1.7.2-SNAPSHOT"
+version = "scm-1"
 
 source = {
    -- url = "git://git.tecgraf.puc-rio.br/csbase-dev/sgarest-daemon.git",
diff --git a/sga-driver-posix-1.7.2-SNAPSHOT.rockspec b/sga-driver-posix-scm-1.rockspec
similarity index 95%
rename from sga-driver-posix-1.7.2-SNAPSHOT.rockspec
rename to sga-driver-posix-scm-1.rockspec
index d26a009470c1613f27ab02e708921d8cbc8abe24..dd8cded559bf59668f24b2148f83ca558b147c36 100644
--- a/sga-driver-posix-1.7.2-SNAPSHOT.rockspec
+++ b/sga-driver-posix-scm-1.rockspec
@@ -1,6 +1,6 @@
 
 package = "sga-driver-posix"
-version = "1.7.2-SNAPSHOT"
+version = "scm-1"
 
 source = {
    -- url = "git://git.tecgraf.puc-rio.br/csbase-dev/sgarest-daemon.git",
diff --git a/sga-driver-slurm-1.7.2-SNAPSHOT.rockspec b/sga-driver-slurm-scm-1.rockspec
similarity index 94%
rename from sga-driver-slurm-1.7.2-SNAPSHOT.rockspec
rename to sga-driver-slurm-scm-1.rockspec
index 91ae6a7f957ad38dab6236c9919a0b92e387ab1a..774ade34e7ec2f1ba86d1d23259cd91c3d558d2a 100644
--- a/sga-driver-slurm-1.7.2-SNAPSHOT.rockspec
+++ b/sga-driver-slurm-scm-1.rockspec
@@ -1,5 +1,5 @@
 package = "sga-driver-slurm"
-version = "1.7.2-SNAPSHOT"
+version = "scm-1"
 
 source = {
    -- url = "git://git.tecgraf.puc-rio.br/csbase-dev/sgarest-daemon.git",
diff --git a/sga-exec-1.7.2-SNAPSHOT.rockspec b/sga-exec-scm-1.rockspec
similarity index 95%
rename from sga-exec-1.7.2-SNAPSHOT.rockspec
rename to sga-exec-scm-1.rockspec
index e8159813cf182ec28503d204bc0a2602c9be3608..4e72c1a4c9b39e0a347ea9ac0570346224e9d592 100644
--- a/sga-exec-1.7.2-SNAPSHOT.rockspec
+++ b/sga-exec-scm-1.rockspec
@@ -1,6 +1,6 @@
 
 package = "sga-exec"
-version = "1.7.2-SNAPSHOT"
+version = "scm-1"
 
 source = {
    -- url = "git://git.tecgraf.puc-rio.br/csbase-dev/sgarest-daemon.git",