diff --git a/compose/services.yml b/compose/services.yml
index b91dead..2d530c1 100644
--- a/compose/services.yml
+++ b/compose/services.yml
@@ -117,10 +117,13 @@ services:
   s3:
     extends:
       file: ./common.yml
-      service: system
+      service: component
     image: balena/open-balena-s3:${OPENBALENA_S3_VERSION_TAG:-master}
     volumes:
       - s3:/export
+    environment:
+      S3_MINIO_ACCESS_KEY: abcdef1234
+      S3_MINIO_SECRET_KEY: "1234567890"
 
   redis:
     extends:
diff --git a/compose/versions b/compose/versions
index cfd8318..9078274 100644
--- a/compose/versions
+++ b/compose/versions
@@ -1,5 +1,5 @@
 export OPENBALENA_API_VERSION_TAG=v0.11.8
 export OPENBALENA_DB_VERSION_TAG=v2.0.3
 export OPENBALENA_REGISTRY_VERSION_TAG=v2.5.0
-export OPENBALENA_S3_VERSION_TAG=v2.5.0
+export OPENBALENA_S3_VERSION_TAG=v2.6.2
 export OPENBALENA_VPN_VERSION_TAG=v8.10.0