diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index be578f1d890bca7b55e5cd8b8e8dde5ab0f7a40b..3a3be4cc8f985a10b8d682c3b80e972ea1c4294f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,9 +18,24 @@ stages:
   - build
   - deploy
 
+stages:
+  - setup
+  - build
+  - deploy
+
+setup-workspace:
+  stage: setup
+  script: ./gradlew -i setupDecompWorkspace
+  cache:
+    key: "$CI_COMMIT_REF_NAME"
+    policy: push
+    paths:
+      - build
+      - .gradle
+
 build-jar:
   stage: build
-  script: ./gradlew -i setupDecompWorkspace && ./gradlew -i build -Pmaven_pass=$MAVEN_PASS
+  script: ./gradlew build -Pmaven_pass=$MAVEN_PASS
   cache:
     key: "$CI_COMMIT_REF_NAME"
     policy: push
diff --git a/README.md b/README.md
index 1aab1c0e29d7afb4ba82534766c8ffe25263f19b..ad90162ae0ac520765e41ce17f907e20f10df846 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 AMCore
 ======
 
-<a href='http://ci.zsinfo.nl/job/AMCore/'><img src='http://ci.zsinfo.nl/job/AMCore/badge/icon'></a>
+<a href="http://git.zsinfo.nl/AdvancedMods/AMCore/commits/master"><img src="http://git.zsinfo.nl/AdvancedMods/AMCore/badges/master/pipeline.svg"></a>
 
 Core mod for all AdvancedMods mods.<br>
 Requires Forge version 10.13.4.1614.<br>