diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml
index e9041601f..48da8b317 100644
--- a/.gitlab/.gitlab-ci.yml
+++ b/.gitlab/.gitlab-ci.yml
@@ -138,7 +138,7 @@ build container fb:
     # - docker login -u $DOCKER_DEPLOY_USER -p $DOCKER_DEPLOY_TOKEN $CI_REGISTRY_IMAGE
     - echo "${DOCKER_DEPLOY_TOKEN}" | docker login -u ${DOCKER_DEPLOY_USER} --password-stdin ${CI_REGISTRY}
   script:    
-    - tag=$CI_REGISTRY_IMAGE/server:$CI_COMMIT_REF_SLUG$CI_COMMIT_SHORT_SHA
+    - tag=${CI_REGISTRY_IMAGE}/server:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}
     - docker build --build-arg GO_VERSION=$GOVERSION -t $tag -f .gitlab/Dockerfile .
     - docker push $tag
     - echo Created docker featurebase image with tag "$tag"
diff --git a/.gitlab/Dockerfile b/.gitlab/Dockerfile
index 5402770ac..b22392ce1 100644
--- a/.gitlab/Dockerfile
+++ b/.gitlab/Dockerfile
@@ -6,16 +6,11 @@ LABEL org.opencontainers.image.authors="dev@molecula.com"
 WORKDIR /featurebase
 
 RUN apk add --no-cache curl jq
-RUN pwd
-RUN ls .
 
 COPY LICENSE .
 COPY NOTICE .
 COPY featurebase_linux_amd64 .
 
-ARG SHORT_SHA
-
-# RUN mv /featurebase_linux_amd64 /featurebase
 RUN chmod ugo+x .
 EXPOSE 10101
 VOLUME /data