diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b6bf4858b97068488b069297326a1ec70aeaa19b..9a97bf3e6dbe1752abf57e6b559c7f2b07b1018e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,43 +1,18 @@
 stages:
 - build
 - test
-- jar
 
 build:
   image: openjdk:8
   stage: build
   script:
-    - ./gradlew --console=plain --build-cache assemble
-  cache:
-    key: "$CI_COMMIT_REF_NAME"
-    policy: push
+    - ./gradlew --console=plain assemble jar
+  artifacts:
     paths:
-      - build
-      - .gradle
+      - "/builds/jastadd/relational-rags/build/libs/*relast*.jar"
 
 test:
   image: openjdk:8
   stage: test
   script:
-    - ./gradlew --continue --console=plain --info check
-  cache:
-    key: "$CI_COMMIT_REF_NAME"
-    policy: pull
-    paths:
-      - build
-      - .gradle
-
-jar:
-  image: openjdk:8
-  stage: jar
-  script:
-    - ./gradlew --continue --console=plain --info jar
-  cache:
-    key: "$CI_COMMIT_REF_NAME"
-    policy: pull
-    paths:
-      - build
-      - .gradle
-  artifacts:
-    paths:
-      - "/builds/jastadd/*/build/libs/*relast*.jar"
+    - ./gradlew --console=plain --info test