diff --git a/templates/compose/orangehrm.yaml b/templates/compose/orangehrm.yaml
index f93f229d1..6e47c4e15 100644
--- a/templates/compose/orangehrm.yaml
+++ b/templates/compose/orangehrm.yaml
@@ -1,49 +1,49 @@
 # documentation: https://starterhelp.orangehrm.com/hc/en-us
-# slogan: Host OrangeHRM on your own infrastructure. This deployment option provides the greatest level of flexibility and control.
+# slogan: OrangeHRM open source HR management software.
 # tags: HR, HRIS, HRMS, human resource management, OrangeHRM, HR management
 # logo: svgs/orangehrm.svg
 # port: 80
 
 services:
   orangehrm:
-    image: 'orangehrm/orangehrm:latest'
+    image: orangehrm/orangehrm:latest
     platform: linux/amd64
     environment:
       - SERVICE_FQDN_ORANGEHRM_80
       - ORANGEHRM_DATABASE_HOST=mariadb
-      - ORANGEHRM_DATABASE_USER=${SERVICE_USER_ORANGEHRM}
-      - ORANGEHRM_DATABASE_PASSWORD=${SERVICE_PASSWORD_ORANGEHRM}
-      - ORANGEHRM_DATABASE_NAME=${MARIADB_DATABASE:-orangehrm}
+      - ORANGEHRM_DATABASE_USER=${SERVICE_USER_MYSQL}
+      - ORANGEHRM_DATABASE_PASSWORD=${SERVICE_PASSWORD_MYSQL}
+      - ORANGEHRM_DATABASE_NAME=${MYSQL_DATABASE:-orangehrm-db}
     volumes:
-      - 'orangehrm-data:/orangehrm'
+      - orangehrm-data:/orangehrm
     depends_on:
-      - mariadb
-    links:
-      - 'mariadb:mariadb'
+      mariadb:
+        condition: service_healthy
     healthcheck:
       test:
         - CMD
         - curl
-        - '-f'
-        - 'http://127.0.0.1'
+        - "-f"
+        - "http://127.0.0.1"
       interval: 2s
       timeout: 10s
       retries: 10
+
   mariadb:
-    image: 'mariadb:10.11'
+    image: mariadb:11
     volumes:
-      - 'mariadb-data:/var/lib/mysql'
+      - orangehrm_mariadb_data:/var/lib/mysql
     environment:
-      - MARIADB_ROOT_PASSWORD=${SERVICE_PASSWORD_ROOT}
-      - MARIADB_DATABASE=${MARIADB_DATABASE:-orangehrm}
-      - MARIADB_USER=${SERVICE_USER_ORANGEHRM}
-      - MARIADB_PASSWORD=${SERVICE_PASSWORD_ORANGEHRM}
+      - MYSQL_ROOT_PASSWORD=${SERVICE_PASSWORD_MYSQLROOT}
+      - MYSQL_DATABASE=${MYSQL_DATABASE:-orangehrm-db}
+      - MYSQL_USER=${SERVICE_USER_MYSQL}
+      - MYSQL_PASSWORD=${SERVICE_PASSWORD_MYSQL}
     healthcheck:
       test:
         - CMD
         - healthcheck.sh
-        - '--connect'
-        - '--innodb_initialized'
+        - "--connect"
+        - "--innodb_initialized"
       interval: 5s
       timeout: 20s
       retries: 10