diff --git a/.gitpod.yml b/.gitpod.yml
index 9891d09bdb7..356ba7a9826 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -18,7 +18,7 @@ tasks:
     # this is run in the prebuild state and should be ready when launching a new workspace
     - init: |
           gp await-port 3306 && ./db/downloadAndCreateDatabase.sh
-          mysql -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY '';"
+          mysql -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH caching_sha2_password BY '';"
           nvm install
           npm install -g yarn
           git clone https://github.com/owid/owid-content
diff --git a/docker-compose.dbtests.yml b/docker-compose.dbtests.yml
index 2f386b072e0..82fccd15b75 100644
--- a/docker-compose.dbtests.yml
+++ b/docker-compose.dbtests.yml
@@ -2,7 +2,7 @@ services:
     # Stock mysql database. Root password is hardcoded for now
     db:
         image: mysql/mysql-server:latest
-        command: --default-authentication-plugin=mysql_native_password --log-bin-trust-function-creators=ON
+        command: --log-bin-trust-function-creators=ON
         restart: always
         volumes:
             - mysql_data_testing:/var/lib/mysql
diff --git a/docker-compose.devcontainer.yml b/docker-compose.devcontainer.yml
index 54352e9b1b7..eb072173cb7 100644
--- a/docker-compose.devcontainer.yml
+++ b/docker-compose.devcontainer.yml
@@ -43,7 +43,6 @@ services:
     # Stock mysql database. Used for grapher database. Root password is hardcoded for now
     db:
         image: mysql/mysql-server:latest
-        command: --default-authentication-plugin=mysql_native_password
         restart: always
         volumes:
             - mysql_data:/var/lib/mysql
diff --git a/docker-compose.grapher.yml b/docker-compose.grapher.yml
index b046c7b955c..05180a6e898 100644
--- a/docker-compose.grapher.yml
+++ b/docker-compose.grapher.yml
@@ -28,7 +28,6 @@ services:
     # Stock mysql database. Root password is hardcoded for now
     db:
         image: mysql/mysql-server:latest
-        command: --default-authentication-plugin=mysql_native_password
         restart: always
         volumes:
             - ./devTools/docker/my.cnf:/etc/my.cnf:ro
diff --git a/docs/local-database-setup.md b/docs/local-database-setup.md
index 603949248e2..dc1f1b5d656 100644
--- a/docs/local-database-setup.md
+++ b/docs/local-database-setup.md
@@ -7,7 +7,7 @@ If you want to develop on your local system without any Docker containers then y
 Remove the password for root by opening the MySQL shell with `mysql` and running:
 
 ```sql
-ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY '';
+ALTER USER 'root'@'localhost' IDENTIFIED WITH caching_sha2_password BY '';
 ```
 
 We do this for convenience so we can run `mysql` commands without providing a password each time. You can also set a password, just make sure you include it in your `.env` file later.