diff --git a/docker-compose.yml b/docker-compose.yml
index 4875583..9790490 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,16 +2,18 @@
 
 services:
   nextcloud-main:
-    image: nextcloud:
+    image: nextcloud:fpm
     restart: always
     mem_limit: 1g
     depends_on:
       - nextcloud-database
     environment:
-      - NEXTCLOUD_DATABASE_HOST=cloud
-      - NEXTCLOUD_DATABASE_NAME=${NEXTCLOUD_DATABASE_NAME}
-      - NEXTCLOUD_DATABASE_USER=${NEXTCLOUD_DATABASE_USER}
-      - NEXTCLOUD_DATABASE_PASSWORD=${NEXTCLOUD_DATABASE_PASSWORD}
+      - MYSQL_HOST=cloud
+      - MYSQL_DATABASE=${NEXTCLOUD_DATABASE_NAME}
+      - MYSQL_USER=${NEXTCLOUD_DATABASE_USER}
+      - MYSQL_PASSWORD=${NEXTCLOUD_DATABASE_PASSWORD}
+      - NEXTCLOUD_ADMIN_USER=${NEXTCLOUD_ADMIN_USER}
+      - NEXTCLOUD_ADMIN_PASSWORD=${NEXTCLOUD_ADMIN_PASSWORD}
       - TZ=${TZ}
     tmpfs:
       - /tmp
diff --git a/generate_password.sh b/generate_password.sh
old mode 100644
new mode 100755
index 83b1e15..4270c58
--- a/generate_password.sh
+++ b/generate_password.sh
@@ -2,6 +2,8 @@
 
 pw1=$(</dev/urandom tr -dc A-Za-z0-9 | head -c 28)
 pw2=$(</dev/urandom tr -dc A-Za-z0-9 | head -c 28)
+pw3=$(</dev/urandom tr -dc A-Za-z0-9 | head -c 28)
 
 sed -i "/^NEXTCLOUD_DATABASE_ROOT/c\\\NEXTCLOUD_DATABASE_ROOT=${pw1}" nextcloud.conf
 sed -i "/^NEXTCLOUD_DATABASE_PASSWORD/c\\\NEXTCLOUD_DATABASE_PASSWORD=${pw2}" nextcloud.conf
+sed -i "/^NEXTCLOUD_ADMIN_PASSWORD/c\\\NEXTCLOUD_ADMIN_PASSWORD=${pw3}" nextcloud.conf