diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 87cc9916..bebf2238 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -48,13 +48,14 @@ jobs:
           sleep 10
 
           # Set root password and allow password-based root access
-          sudo mysql -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY 'root_password';"
+          sudo mysql -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY 'root';"
           sudo mysql -e "FLUSH PRIVILEGES;"
 
           # Create database and user
-          mysql -u root -proot_password -e 'CREATE DATABASE edx_notes_api;'
-          mysql -u root -proot_password -e "CREATE USER 'notes001'@'localhost' IDENTIFIED BY 'secret';"
-          mysql -u root -proot_password -e "GRANT ALL PRIVILEGES ON edx_notes_api.* TO 'notes001'@'localhost';"
+          echo "CREATE DATABASE IF NOT EXISTS edx_notes_api;" | sudo mysql -u root -proot
+          echo "CREATE USER IF NOT EXISTS 'notes001'@'localhost' IDENTIFIED BY 'secret';" | sudo mysql -u root -proot
+          echo "GRANT ALL PRIVILEGES ON edx_notes_api.* TO 'notes001'@'localhost';" | sudo mysql -u root -proot
+          echo "FLUSH PRIVILEGES;" | sudo mysql -u root -proot
 
       - name: Install Elasticsearch
         run: |