diff --git a/.drone.yml b/.drone.yml
index 2d24069296..1b5f2ae700 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -222,11 +222,36 @@ type: docker
 name: php8.0-mariadb
 
 steps:
+  - name: Restore cache
+    image: meltwater/drone-cache:dev
+    settings:
+      backend: "filesystem"
+      restore: true
+      cache_key: '{{ .Repo.Name }}_php80_{{ arch }}_{{ os }}'
+      archive_format: "gzip"
+      mount:
+        - '.composer'
+    volumes:
+      - name: cache
+        path: /tmp/cache
   - name: Composer install
-    image: friendicaci/php7.4:php7.4.18
+    image: friendicaci/php8.0:php8.0.5
     commands:
-      - composer validate
-      - composer install --prefer-dist
+      - export COMPOSER_HOME=.composer
+      - ./bin/composer.phar validate
+      - ./bin/composer.phar install --prefer-dist
+  - name: Rebuild cache
+    image: meltwater/drone-cache:dev
+    settings:
+      backend: "filesystem"
+      rebuild: true
+      cache_key: '{{ .Repo.Name }}_php80_{{ arch }}_{{ os }}'
+      archive_format: "gzip"
+      mount:
+        - '.composer'
+    volumes:
+      - name: cache
+        path: /tmp/cache
   - name: Test Friendica
     image: friendicaci/php8.0:php8.0.5
     environment: