diff --git a/.drone.yml b/.drone.yml
index 79b48e083..4a33f0fd1 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -45,7 +45,7 @@ steps:
       - mv target/x86_64-unknown-linux-musl/debug/lemmy_server target/lemmy_server
 
   - name: run federation tests
-    image: node:15-alpine3.12
+    image: node:alpine
     environment:
       LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432
       DO_WRITE_HOSTS_FILE: 1
@@ -122,7 +122,7 @@ steps:
 
   # using https://github.com/pksunkara/cargo-workspaces
   - name: publish to crates.io
-    image: rust:1.51-buster
+    image: rust:1
     commands:
       - cargo install cargo-workspaces
       - cp -r migrations crates/db_queries/
@@ -149,7 +149,7 @@ platform:
 steps:
 
   - name: prepare repo
-    image: rust:1.51-slim-buster
+    image: rust:1-slim
     user: root
     commands:
       - chown 1000:1000 . -R
@@ -158,7 +158,7 @@ steps:
       - git fetch --tags
 
   - name: cargo test
-    image: rust:1.51-slim-buster
+    image: rust:1-slim
     environment:
       LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy
       LEMMY_CONFIG_LOCATION: ../../config/config.hjson
@@ -172,7 +172,7 @@ steps:
 
   # Using Debian here because there seems to be no official Alpine-based Rust docker image for ARM.
   - name: cargo build
-    image: rust:1.51-slim-buster
+    image: rust:1-slim
     commands:
       - apt-get update
       - apt-get -y install --no-install-recommends libssl-dev pkg-config libpq-dev
@@ -180,7 +180,7 @@ steps:
       - mv target/debug/lemmy_server target/lemmy_server
 
   - name: run federation tests
-    image: node:15-buster-slim
+    image: node:16-slim
     environment:
       LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432
       DO_WRITE_HOSTS_FILE: 1