diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bb6fab780b0a411dccecb8b48c0be598b2d6d3a4..651246f4c9ce0ab84a759e2e62ae0e3cbb0d5bf1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,32 +25,18 @@ build:
       - "src/gen"
 
 ragdoc_build:
-  image: openjdk:8
+  image: git-st.inf.tu-dresden.de:4567/jastadd/ragdoc-builder
   stage: ragdoc_build
-  script:
-    - git clone --recurse-submodules git@git-st.inf.tu-dresden.de:jastadd/ragdoc-builder.git
-    - cd ragdoc-builder
-    - ./gradlew fatJar
-    - JAVA_FILES="$(find ../../src/ -name '*.java')"
-    - BOOT_CLASSPATH="/usr/local/openjdk-8/jre/lib/rt.jar"
-    - java -jar rd-builder.jar -d ../data -bootclasspath $BOOT_CLASSPATH $JAVA_FILES
   artifacts:
     paths:
       - "data/"
 
 ragdoc_view:
-  image: "node:15.6.0-buster"
+  image: "git-st.inf.tu-dresden.de:4567/jastadd/ragdoc-view"
   stage: ragdoc_view
-  script:
-    - git clone git@git-st.inf.tu-dresden.de:jastadd/ragdoc-view.git
-    - cd ragdoc-view/src
-    - ln -s ../../data
-    - cd ..
-    - npm install
-    - ng build --base-href .
   artifacts:
     paths:
-      - "ragdoc-view/dist/"
+      - "dist/"
 
 pages:
   image: python:3.7-alpine
@@ -59,7 +45,7 @@ pages:
     - pip install -U sphinx sphinx-rtd-theme recommonmark sphinxemoji sphinx-markdown-tables
   script:
     - mkdir -p pages/_static/ragdoc
-    - cp -r ragdoc-view/dist/* pages/_static/ragdoc
+    - cp -a dist/* pages/_static/ragdoc/
     - sphinx-build -b html pages/ public
   artifacts:
     paths: