diff --git a/.github/workflows/mysql.yaml b/.github/workflows/mysql.yaml
index 1ba8f6b24b..fe9b7fd10f 100644
--- a/.github/workflows/mysql.yaml
+++ b/.github/workflows/mysql.yaml
@@ -11,12 +11,13 @@ jobs:
 
     services:
       mysql:
-        image: mysql:5.7
+        image: mysql:latest
         env:
-            MYSQL_ALLOW_EMPTY_PASSWORD: yes
-            MYSQL_DATABASE: inventree_test_db
-            MYSQL_USER: inventree
-            MYSQL_PASSWORD: password
+          MYSQL_ALLOW_EMPTY_PASSWORD: yes
+          MYSQL_DATABASE: inventree_test_db
+          MYSQL_USER: inventree
+          MYSQL_PASSWORD: password
+        options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
         ports:
           - 3306
       
diff --git a/.github/workflows/postgresql.yaml b/.github/workflows/postgresql.yaml
index 0c48ad8599..ac324e15f3 100644
--- a/.github/workflows/postgresql.yaml
+++ b/.github/workflows/postgresql.yaml
@@ -12,10 +12,10 @@ jobs:
     services:
       postgres:
         image: postgres
-          env:
-            POSTGRES_PASSWORD: password
+        env:
+          POSTGRES_PASSWORD: password
         ports:
-            - 5432
+          - 5432
 
     steps:
       - name: Checkout Code