diff --git a/.sqa/docker-compose-build-S1.yml b/.sqa/docker-compose-build-S1.yml
index f4eba2c7afb542bc02f0972f855e2cd8a4bd6b4a..f8d937a364770af4f4bb8be81281c55163f6a7d5 100644
--- a/.sqa/docker-compose-build-S1.yml
+++ b/.sqa/docker-compose-build-S1.yml
@@ -26,9 +26,10 @@ services:
       - SYS_ADMIN
     #  - DAC_READ_SEARCH
   fair_eva:
-    image: ferag/fair_eva:latest
-    command: sleep 900
+    #image: ferag/fair_eva:latest
     #image: ferag/fair_eva:fair
+    image: lagocollaboration/fair_eva:9f4440903e14
+    command: bash -lc 'cd /FAIR_eva; /FAIR_eva/start.sh'
     volumes:
     - source: ./
       target: /sqaaas-build
@@ -36,8 +37,11 @@ services:
     working_dir: /sqaaas-build
     #command: /FAIR_eva/start.sh
     #command: apt-get install -y curl && /FAIR_eva/fair.py && /FAIR_eva/web.py
+    #command: apt-get install -y curl && /FAIR_eva/fair.py && /FAIR_eva/web.py && sleep 900
   fair_uji:
-    image: steinsteiny/fuji:fair
+    #image: steinsteiny/fuji:fair
+    #image: steinsteiny/fuji:v1.4.9-noauth
+    image: lagocollaboration/fuji:v1.4.9-noauth
     volumes:
     - source: ./
       target: /sqaaas-build