diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d4360b2c771ddac5d9e721a299def7ade779d02b..8473053b82926910993684744c0912634e5a5397 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -51,15 +51,15 @@ radon:
   - source .gitlab-ci/radon.sh
 
 functional_tests36:
+  image: gitlab-registry.cern.ch/fts/fts-rest-flask:rpm
   stage: tests
   services:
     - name: centos/mariadb:latest
       alias: mariadb
   script:
-  - python --version
+  - python3 --version
   - source .gitlab-ci/db.sh
-  - coverage run --branch --source src/fts3rest/fts3rest/ --omit 'src/fts3rest/fts3rest/tests/*' -m pytest src/ -x
-  - coverage report
+  - pytest-3 src/ -x
 
 functional_tests37:
   stage: tests
diff --git a/.gitlab-ci/Dockerfile-rpm b/.gitlab-ci/Dockerfile-rpm
new file mode 100644
index 0000000000000000000000000000000000000000..4213faa098f76f6e6827f489beb67c384d68eabe
--- /dev/null
+++ b/.gitlab-ci/Dockerfile-rpm
@@ -0,0 +1,22 @@
+FROM centos:7
+
+RUN yum-config-manager --enable centos-sclo-rh  && \
+    yum clean all
+RUN yum-config-manager --add-repo http://fts-repo.web.cern.ch/fts-repo/testing/el7/x86_64/  && \
+    yum clean all
+RUN yum install --nogpgcheck epel-release centos-release-scl -y  && \
+    yum clean all
+RUN yum install --nogpgcheck fts-rest-server fts-rest-client -y && \
+    yum clean all
+
+RUN yum install --nogpgcheck python3 python36-pytest git python3-devel openssl-devel swig gcc gcc-c++ make mysql-devel mariadb \
+    -y && yum clean all
+
+RUN useradd --create-home ci
+
+# create directory for logs
+RUN chown ci /var/log/fts3rest
+
+WORKDIR /home/ci
+USER ci
+
diff --git a/.gitlab-ci/docker_push.sh b/.gitlab-ci/docker_push.sh
index 70298a0cd0f3869358f6d0a94589e4e23e08c89c..2fa08b07c4ea3336aa7e0f61f0584539817eb406 100644
--- a/.gitlab-ci/docker_push.sh
+++ b/.gitlab-ci/docker_push.sh
@@ -1,8 +1,13 @@
 #!/bin/sh
 
 # These files are needed for the docker build
+echo Building fts-rest-flask:ci ...
 cp ../pipcompile.sh ../pipsyncdev.sh ../dev-requirements.in ../requirements.in .
 docker login gitlab-registry.cern.ch/fts/fts-rest-flask
-docker build  -t gitlab-registry.cern.ch/fts/fts-rest-flask:ci .
+docker build -t gitlab-registry.cern.ch/fts/fts-rest-flask:ci .
 docker push  gitlab-registry.cern.ch/fts/fts-rest-flask:ci
 rm pipcompile.sh pipsyncdev.sh dev-requirements.in requirements.in
+
+echo Building fts-rest-flask:rpm ...
+docker build  -t gitlab-registry.cern.ch/fts/fts-rest-flask:rpm . -f ./Dockerfile-rpm
+docker push  gitlab-registry.cern.ch/fts/fts-rest-flask:rpm
\ No newline at end of file