diff --git a/all-apps/nextcloud/docker-compose.yaml b/all-apps/nextcloud/docker-compose.yaml
index 638c88c..eb03dae 100644
--- a/all-apps/nextcloud/docker-compose.yaml
+++ b/all-apps/nextcloud/docker-compose.yaml
@@ -1,10 +1,6 @@
 version: '3'
 
 secrets:
-  nextcloud_admin_password:
-    file: ./nextcloud/nextcloud_admin_password
-  nextcloud_admin_user:
-    file: ./nextcloud/nextcloud_admin_user
   nextcloud_postgres_db:
     file: ./nextcloud/postgres_db
   nextcloud_postgres_password:
@@ -64,8 +60,6 @@ services:
       - nextcloud_postgres_db
       - nextcloud_postgres_password
       - nextcloud_postgres_user
-      - nextcloud_admin_user
-      - nextcloud_admin_password
       - nextcloud_redis_password
     networks:
       - lb
diff --git a/all-apps/nextcloud/nextcloud.env.tmpl b/all-apps/nextcloud/nextcloud.env.tmpl
index 93c6c12..5d896e6 100644
--- a/all-apps/nextcloud/nextcloud.env.tmpl
+++ b/all-apps/nextcloud/nextcloud.env.tmpl
@@ -11,9 +11,6 @@ POSTGRES_HOST=nextcloud_db
 POSTGRES_DB_FILE=/run/secrets/nextcloud_postgres_db
 POSTGRES_USER_FILE=/run/secrets/nextcloud_postgres_user
 POSTGRES_PASSWORD_FILE=/run/secrets/nextcloud_postgres_password
-# admin user
-NEXTCLOUD_ADMIN_PASSWORD_FILE=/run/secrets/nextcloud_admin_password
-NEXTCLOUD_ADMIN_USER_FILE=/run/secrets/nextcloud_admin_user
 # redis
 REDIS_HOST=nextcloud_redis
 REDIS_HOST_PASSWORD_FILE=/run/secrets/nextcloud_redis_password
\ No newline at end of file
diff --git a/make-nextcloud-env.sh b/make-nextcloud-env.sh
index a6f7617..0e34df3 100755
--- a/make-nextcloud-env.sh
+++ b/make-nextcloud-env.sh
@@ -23,3 +23,9 @@ done
 # write container env file
 echo "DOMAIN=\"$nextcloud_subdomain.$ROOT_DOMAIN\"" > all-apps/nextcloud/nextcloud.env
 cat all-apps/nextcloud/nextcloud.env.tmpl >> all-apps/nextcloud/nextcloud.env
+
+# write secrets
+echo "$NEXTCLOUD_POSTGRES_DB" > all-apps/nextcloud/nextcloud_postgres_db
+echo "$NEXTCLOUD_POSTGRES_USER" > all-apps/nextcloud/nextcloud_postgres_user
+echo "$NEXTCLOUD_POSTGRES_PASSWORD" > all-apps/nextcloud/nextcloud_postgres_password
+echo "$NEXTCLOUD_REDIS_PASSWORD" > all-apps/nextcloud/nextcloud_redis_password