diff --git a/README.md b/README.md
index 60dc8dd9..60a54517 100644
--- a/README.md
+++ b/README.md
@@ -51,8 +51,8 @@ This is the official repository for the Tipi App Store. It contains all the apps
 - [NocoDB](https://github.com/nocodb/nocodb) - Open Source Airtable Alternative
 - [Node-RED](https://github.com/node-red/node-red) - Low-code programming for event-driven applications
 - [OneDev](https://code.onedev.io/onedev/server) - Self-hosted Git Server with Kanban and CI/CD
-- [Owncloud](https://github.com/owncloud/core) - A personal cloud which runs on your own server.
 - [Overseerr](https://github.com/sct/overseerr) - Request management and media discovery tool for the Plex ecosystem
+- [Owncloud](https://github.com/owncloud/core) - A personal cloud which runs on your own server.
 - [Photoprism](https://github.com/photoprism/photoprism) - AI-Powered Photos App for the Decentralized Web. We are on a mission to protect your freedom and privacy.
 - [Pihole](https://github.com/pi-hole/pi-hole) - A black hole for Internet advertisements
 - [Plex](https://github.com/plexinc/pms-docker) - Stream Movies & TV Shows
diff --git a/apps/owncloud/config.json b/apps/owncloud/config.json
index dc3612b9..554630f8 100644
--- a/apps/owncloud/config.json
+++ b/apps/owncloud/config.json
@@ -16,25 +16,25 @@
   "form_fields": [
     {
       "type": "random",
-      "label": "MYSQL_PASSWORD",
+      "label": "OWNCLOUD_DB_PASSWORD",
       "min": 32,
-      "env_variable": "MYSQL_PASSWORD"
+      "env_variable": "OWNCLOUD_DB_PASSWORD"
     },
     {
       "type": "text",
-      "label": "Owncloud Admin Username",
+      "label": "Owncloud username",
       "max": 50,
       "min": 3,
       "required": true,
-      "env_variable": "ADMIN_USERNAME"
+      "env_variable": "OWNCLOUD_USERNAME"
     },
     {
       "type": "password",
-      "label": "Owncloud Admin Password",
+      "label": "Owncloud password",
       "max": 50,
-      "min": 3,
+      "min": 8,
       "required": true,
-      "env_variable": "OWNCLOUD_ADMIN_PASSWORD"
+      "env_variable": "OWNCLOUD_PASSWORD"
     }
   ]
 }
diff --git a/apps/owncloud/docker-compose.yml b/apps/owncloud/docker-compose.yml
index 2212da07..da9fd528 100644
--- a/apps/owncloud/docker-compose.yml
+++ b/apps/owncloud/docker-compose.yml
@@ -8,21 +8,21 @@ services:
     ports:
       - ${APP_PORT}:8080
     depends_on:
-      - mariadb
-      - redis
+      - owncloud-db
+      - owncloud-redis
     environment:
       - OWNCLOUD_DOMAIN=${APP_DOMAIN}
       - OWNCLOUD_TRUSTED_DOMAINS=${APP_DOMAIN}
       - OWNCLOUD_DB_TYPE=mysql
       - OWNCLOUD_DB_NAME=owncloud
       - OWNCLOUD_DB_USERNAME=tipi
-      - OWNCLOUD_DB_PASSWORD=${MYSQL_PASSWORD}
-      - OWNCLOUD_DB_HOST=owncloud_mariadb
-      - OWNCLOUD_ADMIN_USERNAME=${ADMIN_USERNAME}
-      - OWNCLOUD_ADMIN_PASSWORD=${ADMIN_PASSWORD}
+      - OWNCLOUD_DB_PASSWORD=${OWNCLOUD_DB_PASSWORD}
+      - OWNCLOUD_DB_HOST=owncloud-db
+      - OWNCLOUD_ADMIN_USERNAME=${OWNCLOUD_USERNAME}
+      - OWNCLOUD_ADMIN_PASSWORD=${OWNCLOUD_PASSWORD}
       - OWNCLOUD_MYSQL_UTF8MB4=true
       - OWNCLOUD_REDIS_ENABLED=true
-      - OWNCLOUD_REDIS_HOST=owncloud_redis
+      - OWNCLOUD_REDIS_HOST=owncloud-redis
     healthcheck:
       test: ["CMD", "/usr/bin/healthcheck"]
       interval: 30s
@@ -40,18 +40,18 @@ services:
       traefik.http.routers.owncloud.tls.certresolver: myresolver
       traefik.http.services.owncloud.loadbalancer.server.port: 8080
 
-  owncloud_mariadb:
+  owncloud-db:
     image: mariadb:10.6 # minimum required ownCloud version is 10.9
-    container_name: owncloud_mariadb
+    container_name: owncloud-db
     restart: unless-stopped
     environment:
-      - MYSQL_ROOT_PASSWORD=${MYSQL_PASSWORD}
+      - MYSQL_ROOT_PASSWORD=${OWNCLOUD_DB_PASSWORD}
       - MYSQL_USER=tipi
-      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
+      - MYSQL_PASSWORD=${OWNCLOUD_DB_PASSWORD}
       - MYSQL_DATABASE=owncloud
     command: ["--max-allowed-packet=128M", "--innodb-log-file-size=64M"]
     healthcheck:
-      test: ["CMD", "mysqladmin", "ping", "-u", "root", "--password=${MYSQL_PASSWORD}"]
+      test: ["CMD", "mysqladmin", "ping", "-u", "root", "--password=${OWNCLOUD_DB_PASSWORD}"]
       interval: 10s
       timeout: 5s
       retries: 5
@@ -60,9 +60,9 @@ services:
     networks:
       - tipi_main_network
 
-  owncloud_redis:
+  owncloud-redis:
     image: redis:6
-    container_name: owncloud_redis
+    container_name: owncloud-redis
     restart: unless-stopped
     command: ["--databases", "1"]
     healthcheck:
diff --git a/apps/owncloud/metadata/description.md b/apps/owncloud/metadata/description.md
index e1464c1c..e82eac45 100644
--- a/apps/owncloud/metadata/description.md
+++ b/apps/owncloud/metadata/description.md
@@ -1,20 +1,18 @@
 # ownCloud Core
 
-[![Build Status](https://camo.githubusercontent.com/97e0aae46cdd7a08fd19eede0343cbe079b0aa974a5385a79e9223f956bfac69/68747470733a2f2f64726f6e652e6f776e636c6f75642e636f6d2f6170692f6261646765732f6f776e636c6f75642f636f72652f7374617475732e7376673f6272616e63683d6d6173746572)](https://drone.owncloud.com/owncloud/core) [![Quality Gate Status](https://camo.githubusercontent.com/23ee60eecab2581d251cf0541ab3cb41a82fd06a574b216898156ea7be95491d/68747470733a2f2f736f6e6172636c6f75642e696f2f6170692f70726f6a6563745f6261646765732f6d6561737572653f70726f6a6563743d6f776e636c6f75645f636f7265266d65747269633d616c6572745f737461747573)](https://sonarcloud.io/dashboard?id=owncloud_core) [![Security Rating](https://camo.githubusercontent.com/938a4d116800c9c690e25c45a7543d8ebdffd3ce2c7058b6e5013858b075ff09/68747470733a2f2f736f6e6172636c6f75642e696f2f6170692f70726f6a6563745f6261646765732f6d6561737572653f70726f6a6563743d6f776e636c6f75645f636f7265266d65747269633d73656375726974795f726174696e67)](https://sonarcloud.io/dashboard?id=owncloud_core) [![Coverage](https://camo.githubusercontent.com/220dcace7a545cef54f6a1c29df832d38ad41e6d5affa0a48dbf2eb7c29e1d9a/68747470733a2f2f736f6e6172636c6f75642e696f2f6170692f70726f6a6563745f6261646765732f6d6561737572653f70726f6a6563743d6f776e636c6f75645f636f7265266d65747269633d636f766572616765)](https://sonarcloud.io/dashboard?id=owncloud_core) [![Design](https://camo.githubusercontent.com/4bc6b8df75c52b6dc7c83a1cf8ec4645f697e17e4a74e94dec2a1c1d7bb29311/68747470733a2f2f636f6e747269627574652e64657369676e2f6170692f736869656c642f6f776e636c6f75642f636f7265)](https://contribute.design/owncloud/core)
-
 **[ownCloud](http://ownCloud.com) gives you freedom and control over your own data. A personal cloud which runs on your own server.**
 
 [![](https://github.com/owncloud/screenshots/raw/master/files/sidebar_1.png)](https://github.com/owncloud/screenshots/blob/master/files/sidebar_1.png)
 
 ## [](https://github.com/owncloud/core/blob/master/README.md#why-is-this-so-awesome)Why Is This so Awesome?
 
--   📁 **Access your Data** You can store your files, contacts, calendars and more on a server of your choosing.
--   📦 **Sync your Data** You keep your files, contacts, calendars and more synchronized amongst your devices.
--   🔄 **Share your Data** You share your data with others, and give them access to your latest photo galleries, your calendar or anything else you want them to see.
--   🚀 **Expandable with dozens of Apps** ...like Calendar, Contacts, Mail or News.
--   ☁️ **All Benefits of the Cloud** ...on your own Server.
--   🔒 **Encryption** You can encrypt data in transit with secure https connections. You can enable the encryption app to encrypt data on storage for improved security and privacy.
--   ...
+- 📁 **Access your Data** You can store your files, contacts, calendars and more on a server of your choosing.
+- 📦 **Sync your Data** You keep your files, contacts, calendars and more synchronized amongst your devices.
+- 🔄 **Share your Data** You share your data with others, and give them access to your latest photo galleries, your calendar or anything else you want them to see.
+- 🚀 **Expandable with dozens of Apps** ...like Calendar, Contacts, Mail or News.
+- ☁️ **All Benefits of the Cloud** ...on your own Server.
+- 🔒 **Encryption** You can encrypt data in transit with secure https connections. You can enable the encryption app to encrypt data on storage for improved security and privacy.
+- ...
 
 ## [](https://github.com/owncloud/core/blob/master/README.md#installation-instructions)Installation Instructions
 
@@ -36,13 +34,13 @@ Learn about the different ways you can get support for ownCloud: [https://ownclo
 
 ## [](https://github.com/owncloud/core/blob/master/README.md#get-in-touch)Get in Touch
 
--   📋 [Forum](https://central.owncloud.org)
--   #️⃣ [IRC channel](https://web.libera.chat/?channels=#owncloud)
--   👥 [Facebook](https://facebook.com/ownclouders)
--   🐣 [Twitter](https://twitter.com/ownCloud)
+- 📋 [Forum](https://central.owncloud.org)
+- #️⃣ [IRC channel](https://web.libera.chat/?channels=#owncloud)
+- 👥 [Facebook](https://facebook.com/ownclouders)
+- 🐣 [Twitter](https://twitter.com/ownCloud)
 
 ## [](https://github.com/owncloud/core/blob/master/README.md#important-notice-on-translations)Important Notice on Translations
 
 Please submit translations via Transifex: [https://explore.transifex.com/owncloud-org/](https://explore.transifex.com/owncloud-org/)
 
-See the detailed information about [translations](https://doc.owncloud.com/server/latest/developer_manual/core/translation.html) here.
\ No newline at end of file
+See the detailed information about [translations](https://doc.owncloud.com/server/latest/developer_manual/core/translation.html) here.