diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ebe349d31f5c7a0863c8e5d451eb09d6d44cfd8e..96608d21385099c2b839b10b2e7133050171a097 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -166,6 +166,8 @@ build-metadata-service:
     paths:
       - ./dbrepo-metadata-service/oai/target/classes
       - ./dbrepo-metadata-service/repositories/target/classes
+      - ./dbrepo-metadata-service/repositories/target/classes
+      - ./dbrepo-metadata-service/repositories/target/generated-sources
       - ./dbrepo-metadata-service/rest-service/target/classes
       - ./dbrepo-metadata-service/services/target/classes
     expire_in: 1 days
@@ -229,9 +231,11 @@ build-data-service:
   artifacts:
     when: always
     paths:
-      - ./dbrepo-data-service/services/target/classes
-      - ./dbrepo-data-service/rest-service/target/classes
       - ./dbrepo-data-service/querystore/target/classes
+      - ./dbrepo-data-service/rest-service/target/classes
+      - ./dbrepo-data-service/rest-service/target/test-classes
+      - ./dbrepo-data-service/services/target/classes
+      - ./dbrepo-data-service/services/target/generated-sources
     expire_in: 1 days
 
 build-ui: