diff --git a/compose.yml b/compose.yml
index 76f57de..0f4c88a 100644
--- a/compose.yml
+++ b/compose.yml
@@ -50,6 +50,7 @@ services:
             internal:
 
     mongodb:
+        # TODO: Set up authentication
         image: mongo:latest
         ports:
             # For connecting with mongosh or MongoDB Compass
diff --git a/environment/account.env b/environment/account.env
index 330d4c8..13158e1 100644
--- a/environment/account.env
+++ b/environment/account.env
@@ -7,6 +7,7 @@ PN_ACT_CONFIG_MONGOOSE_OPTION_useUnifiedTopology=true
 PN_ACT_CONFIG_WEBSITE_BASE=https://pretendo.network
 PN_ACT_CONFIG_REDIS_URL=redis://redis:6379
 PN_ACT_CONFIG_S3_ENDPOINT=http://minio:9000
+PN_ACT_CONFIG_S3_ACCESS_KEY=minio_pretendo
 PN_ACT_CONFIG_CDN_BASE_URL=https://cdn.pretendo.cc
 PN_ACT_CONFIG_CDN_SUBDOMAIN=cdn
 PN_ACT_CONFIG_EMAIL_HOST=maildev
diff --git a/environment/minio.env b/environment/minio.env
index 1680ce3..2d4c00e 100644
--- a/environment/minio.env
+++ b/environment/minio.env
@@ -1 +1,2 @@
 MINIO_DOMAIN=minio
+MINIO_ROOT_USER=minio_pretendo
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index c210aba..463a96e 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -19,10 +19,7 @@ account_api_key_api=$(openssl rand -base64 32)
 echo "PN_ACT_CONFIG_GRPC_MASTER_API_KEY_ACCOUNT=$account_api_key_account" >>./account.local.env
 echo "PN_ACT_CONFIG_GRPC_MASTER_API_KEY_API=$account_api_key_api" >>./account.local.env
 
-# Generate access and secret keys for MinIO
-minio_access_key=$(openssl rand -base64 32)
-echo "PN_ACT_CONFIG_S3_ACCESS_KEY=$minio_access_key" >>./account.local.env
-echo "MINIO_ROOT_USER=$minio_access_key" >>./minio.local.env
+# Generate secret key for MinIO
 minio_secret_key=$(openssl rand -base64 32)
 echo "PN_ACT_CONFIG_S3_ACCESS_SECRET=$minio_secret_key" >>./account.local.env
 echo "MINIO_ROOT_PASSWORD=$minio_secret_key" >>./minio.local.env