diff --git a/.circleci/config.yml b/.circleci/config.yml
index d802f4e..c1ff0f8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -8,7 +8,11 @@ jobs:
         environment:
           POSTGRES_DB: django
           POSTGRES_PASSWORD: postgres
-      - image: girder/minio-nonroot:latest
+      - image: minio/minio:latest
+        command: server /data
+        environment:
+          MINIO_ACCESS_KEY: minioAccessKey
+          MINIO_SECRET_KEY: minioSecretKey
     steps:
       - checkout
       - run:
@@ -23,8 +27,8 @@ jobs:
           environment:
             DJANGO_DATABASE_URL: postgres://postgres:postgres@localhost:5432/django
             DJANGO_MINIO_STORAGE_ENDPOINT: localhost:9000
-            DJANGO_MINIO_STORAGE_ACCESS_KEY: minioUserAccessKey
-            DJANGO_MINIO_STORAGE_SECRET_KEY: minioUserSecretKey
+            DJANGO_MINIO_STORAGE_ACCESS_KEY: minioAccessKey
+            DJANGO_MINIO_STORAGE_SECRET_KEY: minioSecretKey
           working_directory: my-new-project
 workflows:
   version: 2
diff --git a/{{ cookiecutter.project_slug }}/.circleci/config.yml b/{{ cookiecutter.project_slug }}/.circleci/config.yml
index 9cf3bbb..a7ff66e 100644
--- a/{{ cookiecutter.project_slug }}/.circleci/config.yml	
+++ b/{{ cookiecutter.project_slug }}/.circleci/config.yml	
@@ -8,7 +8,11 @@ jobs:
         environment:
           POSTGRES_DB: django
           POSTGRES_PASSWORD: postgres
-      - image: girder/minio-nonroot:latest
+      - image: minio/minio:latest
+        command: server /data
+        environment:
+          MINIO_ACCESS_KEY: minioAccessKey
+          MINIO_SECRET_KEY: minioSecretKey
     steps:
       - checkout
       - run:
@@ -20,8 +24,8 @@ jobs:
           environment:
             DJANGO_DATABASE_URL: postgres://postgres:postgres@localhost:5432/django
             DJANGO_MINIO_STORAGE_ENDPOINT: localhost:9000
-            DJANGO_MINIO_STORAGE_ACCESS_KEY: minioUserAccessKey
-            DJANGO_MINIO_STORAGE_SECRET_KEY: minioUserSecretKey
+            DJANGO_MINIO_STORAGE_ACCESS_KEY: minioAccessKey
+            DJANGO_MINIO_STORAGE_SECRET_KEY: minioSecretKey
 workflows:
   version: 2
   ci:
diff --git a/{{ cookiecutter.project_slug }}/dev/.env.docker-compose b/{{ cookiecutter.project_slug }}/dev/.env.docker-compose
index eb3ce3d..2eddc36 100644
--- a/{{ cookiecutter.project_slug }}/dev/.env.docker-compose	
+++ b/{{ cookiecutter.project_slug }}/dev/.env.docker-compose	
@@ -2,7 +2,7 @@ DJANGO_CONFIGURATION=DevelopmentConfiguration
 DJANGO_DATABASE_URL=postgres://postgres:postgres@postgres:5432/django
 DJANGO_CELERY_BROKER_URL=amqp://rabbitmq:5672/
 DJANGO_MINIO_STORAGE_ENDPOINT=minio:9000
-DJANGO_MINIO_STORAGE_ACCESS_KEY=minioUserAccessKey
-DJANGO_MINIO_STORAGE_SECRET_KEY=minioUserSecretKey
+DJANGO_MINIO_STORAGE_ACCESS_KEY=minioAccessKey
+DJANGO_MINIO_STORAGE_SECRET_KEY=minioSecretKey
 DJANGO_STORAGE_BUCKET_NAME=django-storage
 DJANGO_MINIO_STORAGE_MEDIA_URL=http://localhost:9000/django-storage
diff --git a/{{ cookiecutter.project_slug }}/dev/.env.docker-compose-native b/{{ cookiecutter.project_slug }}/dev/.env.docker-compose-native
index 255e923..7c57700 100644
--- a/{{ cookiecutter.project_slug }}/dev/.env.docker-compose-native	
+++ b/{{ cookiecutter.project_slug }}/dev/.env.docker-compose-native	
@@ -2,6 +2,6 @@ DJANGO_CONFIGURATION=DevelopmentConfiguration
 DJANGO_DATABASE_URL=postgres://postgres:postgres@localhost:5432/django
 DJANGO_CELERY_BROKER_URL=amqp://localhost:5672/
 DJANGO_MINIO_STORAGE_ENDPOINT=localhost:9000
-DJANGO_MINIO_STORAGE_ACCESS_KEY=minioUserAccessKey
-DJANGO_MINIO_STORAGE_SECRET_KEY=minioUserSecretKey
+DJANGO_MINIO_STORAGE_ACCESS_KEY=minioAccessKey
+DJANGO_MINIO_STORAGE_SECRET_KEY=minioSecretKey
 DJANGO_STORAGE_BUCKET_NAME=django-storage
diff --git a/{{ cookiecutter.project_slug }}/docker-compose.yml b/{{ cookiecutter.project_slug }}/docker-compose.yml
index 3e4a5f4..254a83a 100644
--- a/{{ cookiecutter.project_slug }}/docker-compose.yml	
+++ b/{{ cookiecutter.project_slug }}/docker-compose.yml	
@@ -14,8 +14,12 @@ services:
       - ${DOCKER_RABBITMQ_PORT-5672}:5672
 
   minio:
-    image: girder/minio-nonroot:latest
+    image: minio/minio:latest
     # When run with a TTY, minio prints credentials on startup
     tty: true
+    command: ["server", "/data"]
+    environment:
+      MINIO_ACCESS_KEY: minioAccessKey
+      MINIO_SECRET_KEY: minioSecretKey
     ports:
       - ${DOCKER_MINIO_PORT-9000}:9000