diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 84cf6042f6dda43939618bd01cc41c9f7c31d86b..d91be4a86a6af1dd53d17cda49694e798dc682b6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,8 @@
 stages:
 - test
 - build-review
+- quality-security # TODO
 - review
-- quality-security
 - release
 
 variables:
@@ -14,9 +14,8 @@ variables:
 include:
 - 'https://git.dbogatov.org/templates/ci-snippets/raw/master/simple-website/before-script.yml'
 
-
-- 'https://git.dbogatov.org/templates/ci-snippets/raw/master/simple-website/tidy.yml'
-- 'https://git.dbogatov.org/templates/ci-snippets/raw/master/simple-website/blc.yml'
+# - 'https://git.dbogatov.org/templates/ci-snippets/raw/master/simple-website/tidy.yml'
+# - 'https://git.dbogatov.org/templates/ci-snippets/raw/master/simple-website/blc.yml'
 
 - 'https://git.dbogatov.org/templates/ci-snippets/raw/master/simple-website/review/build-review.yml'
 
@@ -44,7 +43,8 @@ container-scan:
     - docker run -d --name db arminc/clair-db:latest
     - docker run -p 6060:6060 --link db:postgres -d --name clair --restart on-failure arminc/clair-local-scan:v2.0.1
     - apk add -U wget ca-certificates
-    - docker pull ${CI_APPLICATION_REPOSITORY}:${CI_APPLICATION_TAG}
+    - echo ${CI_APPLICATION_REPOSITORY}
+    - docker pull ${CI_APPLICATION_REPOSITORY}
     - wget https://github.com/arminc/clair-scanner/releases/download/v8/clair-scanner_linux_amd64
     - mv clair-scanner_linux_amd64 clair-scanner
     - chmod +x clair-scanner
@@ -53,7 +53,7 @@ container-scan:
     - retries=0
     - echo "Waiting for clair daemon to start"
     - while( ! wget -T 10 -q -O /dev/null http://docker:6060/v1/namespaces ) ; do sleep 1 ; echo -n "." ; if [ $retries -eq 10 ] ; then echo " Timeout, aborting." ; exit 1 ; fi ; retries=$(($retries+1)) ; done
-    - ./clair-scanner -c http://docker:6060 --ip $(hostname -i) -r gl-container-scanning-report.json -l clair.log -w clair-whitelist.yml ${CI_APPLICATION_REPOSITORY}:${CI_APPLICATION_TAG} || true
+    - ./clair-scanner -c http://docker:6060 --ip $(hostname -i) -r gl-container-scanning-report.json -l clair.log -w clair-whitelist.yml ${CI_APPLICATION_REPOSITORY} || true
   artifacts:
     reports:
       container_scanning: gl-container-scanning-report.json