diff --git a/.drone.yml b/.drone.yml
index b38e32b..7e4d72a 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -6,26 +6,14 @@ clone:
   depth: 50
 
 steps:
-  - name: archlinux_build
-    image: archlinux_build:latest
+  - name: archlinux_build_test
+    image: archlinux:latest
     pull: if-not-exists
     volumes:
     - name: archlinux_ccache
       path: /root/.ccache
     commands:
-    # The following command is not required, we included this in the docker 
-    # image of archlinux_build
-    # - pacman -S --noconfirm ccache openblas fftw pulseaudio pybind11
-    - git submodule update --init --recursive
-    - cmake .
-    # More than two makes ascee2 irresponsive for now
-    - make -j2
-
-  - name: archlinux_test
-    image: archlinux_build:latest
-    pull: if-not-exists
-    commands:
-      - scripts/test.sh
+    - scripts/build_archlinux.sh
 
 volumes:
   - name: archlinux_ccache
@@ -45,22 +33,15 @@ volumes:
   path: /root/.ccache
 
 steps:
-  - name: ubuntu_build
-    image: ubuntu_build:latest
+  - name: ubuntu_build_test
+    image: ubuntu:latest
     pull: if-not-exists
     volumes:
     - name: ubuntu_ccache
       path: /root/.ccache
     environment:
     commands:
-    # The following commands are not required, we included this in the docker 
-    # image of ubuntu_builud
     - scripts/build_ubuntu.sh
-  - name: ubuntu_test
-    image: ubuntu_build:latest
-    pull: if-not-exists
-    commands:
-    - scripts/test.sh
 
 volumes:
   - name: ubuntu_ccache
@@ -77,7 +58,7 @@ clone:
 
 
 steps:
-  - name: build_docker_master
+  - name: build_documentation_master
     image: plugins/docker
     settings:
       repo: ascee/lasp_ascee_nl
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index a2720e3..807cc84 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -10,7 +10,6 @@ repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v2.3.0
     hooks:
-    - id: check-yaml
     - id: end-of-file-fixer
     - id: trailing-whitespace
   - repo: https://github.com/psf/black