diff --git a/pom.xml b/pom.xml
index 5011a5d9658..e298c3ebb02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,6 +24,7 @@
     <properties>
         <otp.serialization.version.id>55</otp.serialization.version.id>
         <!-- Lib versions - keep list sorted on property name -->
+        <aws.sdk.version>2.15.0</aws.sdk.version>
         <geotools.version>27.0</geotools.version>
         <google.dagger.version>2.42</google.dagger.version>
         <jackson.version>2.13.3</jackson.version>
@@ -463,6 +464,14 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <!-- This make sure all s3 libraries are using compatible versions. -->
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>bom</artifactId>
+                <version>${aws.sdk.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <dependency>
                 <!-- This make sure all google libraries are using compatible versions. -->
                 <groupId>com.google.cloud</groupId>
@@ -720,6 +729,12 @@
             <version>${jackson.version}</version>
         </dependency>
 
+        <!-- Amazon AWS sdk -->
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>s3</artifactId>
+        </dependency>
+
         <!--
           Google library imports
           The version is imported using google libraries-bom, see dep.management
diff --git a/src/ext/java/org/opentripplanner/ext/datastore/aws/AbstractAwsDataSource.java b/src/ext/java/org/opentripplanner/ext/datastore/aws/AbstractAwsDataSource.java
new file mode 100644
index 00000000000..345a2e3f6d9
--- /dev/null
+++ b/src/ext/java/org/opentripplanner/ext/datastore/aws/AbstractAwsDataSource.java
@@ -0,0 +1,51 @@
+package org.opentripplanner.ext.datastore.aws;
+
+import org.opentripplanner.datastore.api.DataSource;
+import org.opentripplanner.datastore.api.FileType;
+import software.amazon.awssdk.services.s3.S3Client;
+
+abstract class AbstractAwsDataSource implements DataSource {
+
+  private final S3Client s3Client;
+
+  private final S3Object object;
+  private final FileType type;
+
+  AbstractAwsDataSource(S3Client s3Client, S3Object object, FileType type) {
+    this.s3Client = s3Client;
+    this.object = object;
+    this.type = type;
+  }
+
+  @Override
+  public final String name() {
+    return object.name();
+  }
+
+  @Override
+  public final String path() {
+    return object.toUriString();
+  }
+
+  @Override
+  public final FileType type() {
+    return type;
+  }
+
+  @Override
+  public final String toString() {
+    return type + " " + path();
+  }
+
+  S3Client s3Client() {
+    return s3Client;
+  }
+
+  S3Object object() {
+    return object;
+  }
+
+  String bucketName() {
+    return object.bucket();
+  }
+}
diff --git a/src/ext/java/org/opentripplanner/ext/datastore/aws/AwsDataSourceModule.java b/src/ext/java/org/opentripplanner/ext/datastore/aws/AwsDataSourceModule.java
new file mode 100644
index 00000000000..2bc41e56e9c
--- /dev/null
+++ b/src/ext/java/org/opentripplanner/ext/datastore/aws/AwsDataSourceModule.java
@@ -0,0 +1,30 @@
+package org.opentripplanner.ext.datastore.aws;
+
+import dagger.Module;
+import dagger.Provides;
+import javax.annotation.Nullable;
+import javax.inject.Singleton;
+import org.opentripplanner.datastore.api.AmazonS3DSRepository;
+import org.opentripplanner.datastore.api.OtpDataStoreConfig;
+import org.opentripplanner.datastore.base.DataSourceRepository;
+import org.opentripplanner.util.OTPFeature;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@Module
+public class AwsDataSourceModule {
+
+  private static final Logger LOG = LoggerFactory.getLogger(AwsDataSourceModule.class);
+
+  @Provides
+  @Singleton
+  @Nullable
+  @AmazonS3DSRepository
+  DataSourceRepository provideGoogleStorageDataSourceRepository(OtpDataStoreConfig c) {
+    if (OTPFeature.AmazonAwsS3Storage.isOff()) {
+      return null;
+    }
+    LOG.info("Amazon AWS S3 Storage Support enabled - S3 resources detected.");
+    return new AwsDataSourceRepository(c.s3Region(), c.s3CredentialsProfile());
+  }
+}
diff --git a/src/ext/java/org/opentripplanner/ext/datastore/aws/AwsDataSourceRepository.java b/src/ext/java/org/opentripplanner/ext/datastore/aws/AwsDataSourceRepository.java
new file mode 100644
index 00000000000..9323e657524
--- /dev/null
+++ b/src/ext/java/org/opentripplanner/ext/datastore/aws/AwsDataSourceRepository.java
@@ -0,0 +1,108 @@
+package org.opentripplanner.ext.datastore.aws;
+
+import static org.opentripplanner.ext.datastore.aws.S3Object.S3_SCHEMA_PREFIX;
+
+import java.net.URI;
+import javax.annotation.Nonnull;
+import org.opentripplanner.datastore.api.CompositeDataSource;
+import org.opentripplanner.datastore.api.DataSource;
+import org.opentripplanner.datastore.api.FileType;
+import org.opentripplanner.datastore.base.DataSourceRepository;
+import org.opentripplanner.datastore.base.ZipStreamDataSourceDecorator;
+import org.opentripplanner.util.lang.StringUtils;
+import software.amazon.awssdk.auth.credentials.ProfileCredentialsProvider;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.S3Client;
+
+/**
+ * This data store uses the local file system to access in-/out- data files.
+ */
+public class AwsDataSourceRepository implements DataSourceRepository {
+
+  private static final String DEFAULT_CREDENTIALS_PROFILE = "DEFAULT";
+
+  private final Region region;
+
+  private final String credentialsProfile;
+  private S3Client s3Client;
+
+  public AwsDataSourceRepository(String region, String credentialsProfile) {
+    this.region = Region.of(region);
+    this.credentialsProfile = credentialsProfile;
+  }
+
+  @Override
+  public String description() {
+    return "Google Cloud Storage";
+  }
+
+  @Override
+  public void open() {
+    this.s3Client = connectToStorage();
+  }
+
+  @Override
+  public DataSource findSource(@Nonnull URI uri, @Nonnull FileType type) {
+    if (skipUri(uri)) {
+      return null;
+    }
+    S3Object object = S3Object.toS3Object(uri);
+    return createSource(object, type);
+  }
+
+  @Override
+  public CompositeDataSource findCompositeSource(@Nonnull URI uri, @Nonnull FileType type) {
+    if (skipUri(uri)) {
+      return null;
+    }
+    return createCompositeSource(S3Object.toS3Object(uri), type);
+  }
+
+  /* private methods */
+
+  private static boolean skipUri(URI uri) {
+    return !S3_SCHEMA_PREFIX.equals(uri.getScheme());
+  }
+
+  private DataSource createSource(S3Object object, FileType type) {
+    /* TODO Check if object exist */
+    boolean exist = true;
+
+    if (exist) {
+      return new AwsFileDataSource(s3Client, object, type);
+    } else {
+      return new AwsOutFileDataSource(s3Client, object, type);
+    }
+  }
+
+  private CompositeDataSource createCompositeSource(S3Object object, FileType type) {
+    if (object.isRoot()) {
+      return new AwsDirectoryDataSource(s3Client, object, type);
+    }
+
+    if (object.name().endsWith(".zip")) {
+      /* TODO */
+      boolean exist = true;
+
+      if (exist) {
+        throw new IllegalArgumentException(type.text() + " not found: " + object.toUriString());
+      }
+      DataSource gsSource = new AwsFileDataSource(s3Client, object, type);
+      return new ZipStreamDataSourceDecorator(gsSource);
+    }
+    return new AwsDirectoryDataSource(s3Client, object, type);
+  }
+
+  private S3Client connectToStorage() {
+    var builder = S3Client.builder().region(region);
+
+    if (StringUtils.hasValue(credentialsProfile)) {
+      if (DEFAULT_CREDENTIALS_PROFILE.equals(credentialsProfile)) {
+        builder.credentialsProvider(ProfileCredentialsProvider.create());
+      } else {
+        builder.credentialsProvider(ProfileCredentialsProvider.create(credentialsProfile));
+      }
+    }
+    return builder.build();
+  }
+}
diff --git a/src/ext/java/org/opentripplanner/ext/datastore/aws/AwsDirectoryDataSource.java b/src/ext/java/org/opentripplanner/ext/datastore/aws/AwsDirectoryDataSource.java
new file mode 100644
index 00000000000..a82eea9a859
--- /dev/null
+++ b/src/ext/java/org/opentripplanner/ext/datastore/aws/AwsDirectoryDataSource.java
@@ -0,0 +1,54 @@
+package org.opentripplanner.ext.datastore.aws;
+
+import java.util.Collection;
+import java.util.List;
+import org.opentripplanner.datastore.api.CompositeDataSource;
+import org.opentripplanner.datastore.api.DataSource;
+import org.opentripplanner.datastore.api.FileType;
+import software.amazon.awssdk.services.s3.S3Client;
+
+/**
+ * This is a an adapter to to simulate a file directory on a GCS. Files created using an instance of
+ * this class wil have a common namespace. It does only support creating new output sources, it can
+ * not be used to list files with the common namespace (directory path).
+ */
+public class AwsDirectoryDataSource extends AbstractAwsDataSource implements CompositeDataSource {
+
+  AwsDirectoryDataSource(S3Client s3Client, S3Object object, FileType type) {
+    super(s3Client, object, type);
+  }
+
+  @Override
+  public boolean exists() {
+    // TODO
+    return super.exists();
+  }
+
+  @Override
+  public Collection<DataSource> content() {
+    // TODO
+    return List.of();
+  }
+
+  @Override
+  public DataSource entry(String name) {
+    S3Object child = object().child(name);
+
+    // TODO
+    boolean exists = true;
+    // If file exist
+    if (exists) {
+      return new AwsFileDataSource(s3Client(), child, type());
+    }
+    // New file
+    return new AwsOutFileDataSource(s3Client(), child, type());
+  }
+
+  @Override
+  public void delete() {
+    // TODO
+  }
+
+  @Override
+  public void close() {}
+}
diff --git a/src/ext/java/org/opentripplanner/ext/datastore/aws/AwsFileDataSource.java b/src/ext/java/org/opentripplanner/ext/datastore/aws/AwsFileDataSource.java
new file mode 100644
index 00000000000..d6371978b68
--- /dev/null
+++ b/src/ext/java/org/opentripplanner/ext/datastore/aws/AwsFileDataSource.java
@@ -0,0 +1,75 @@
+package org.opentripplanner.ext.datastore.aws;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.zip.GZIPInputStream;
+import org.opentripplanner.datastore.api.DataSource;
+import org.opentripplanner.datastore.api.FileType;
+import org.opentripplanner.datastore.file.DirectoryDataSource;
+import org.opentripplanner.datastore.file.ZipFileDataSource;
+import software.amazon.awssdk.services.s3.S3Client;
+
+/**
+ * This class is a wrapper around and EXISTING Google Cloud Store bucket blob. It can be read and
+ * overwritten.
+ * <p>
+ * Reading compressed blobs is supported. The only format supported is gzip (extension .gz).
+ */
+class AwsFileDataSource extends AbstractAwsDataSource implements DataSource {
+
+  /**
+   * Create a data source wrapper around a file. This wrapper handles GZIP(.gz) compressed files as
+   * well as normal files. It does not handle directories({@link DirectoryDataSource}) or zip-files
+   * {@link ZipFileDataSource} which contain multiple files.
+   */
+  AwsFileDataSource(S3Client s3Client, S3Object object, FileType type) {
+    super(s3Client, object, type);
+  }
+
+  @Override
+  public long size() {
+    /*TODO*/
+    return super.size();
+  }
+
+  @Override
+  public long lastModified() {
+    /*TODO*/
+    return super.lastModified();
+  }
+
+  @Override
+  public boolean exists() {
+    /*TODO*/
+    return super.exists();
+  }
+
+  @Override
+  public boolean isWritable() {
+    return true;
+  }
+
+  @Override
+  public InputStream asInputStream() {
+    InputStream in = null;
+    /* TODO */
+
+    // We support both gzip and unzipped files when reading.
+    if (object().name().endsWith(".gz")) {
+      try {
+        return new GZIPInputStream(in);
+      } catch (IOException e) {
+        throw new IllegalStateException(e.getLocalizedMessage(), e);
+      }
+    } else {
+      return in;
+    }
+  }
+
+  @Override
+  public OutputStream asOutputStream() {
+    /* TODO */
+    return null;
+  }
+}
diff --git a/src/ext/java/org/opentripplanner/ext/datastore/aws/AwsOutFileDataSource.java b/src/ext/java/org/opentripplanner/ext/datastore/aws/AwsOutFileDataSource.java
new file mode 100644
index 00000000000..1515eb4f4ac
--- /dev/null
+++ b/src/ext/java/org/opentripplanner/ext/datastore/aws/AwsOutFileDataSource.java
@@ -0,0 +1,30 @@
+package org.opentripplanner.ext.datastore.aws;
+
+import java.io.OutputStream;
+import org.opentripplanner.datastore.api.DataSource;
+import org.opentripplanner.datastore.api.FileType;
+import org.opentripplanner.datastore.file.DirectoryDataSource;
+import org.opentripplanner.datastore.file.ZipFileDataSource;
+import software.amazon.awssdk.services.s3.S3Client;
+
+class AwsOutFileDataSource extends AbstractAwsDataSource implements DataSource {
+
+  /**
+   * Create a data source wrapper around a file. This wrapper handles GZIP(.gz) compressed files as
+   * well as normal files. It does not handle directories({@link DirectoryDataSource}) or zip-files
+   * {@link ZipFileDataSource} which contain multiple files.
+   */
+  AwsOutFileDataSource(S3Client s3Client, S3Object object, FileType type) {
+    super(s3Client, object, type);
+  }
+
+  @Override
+  public boolean exists() {
+    return false;
+  }
+
+  @Override
+  public OutputStream asOutputStream() {
+    return new AwsOutputStream(s3Client(), object()).open();
+  }
+}
diff --git a/src/ext/java/org/opentripplanner/ext/datastore/aws/AwsOutputStream.java b/src/ext/java/org/opentripplanner/ext/datastore/aws/AwsOutputStream.java
new file mode 100644
index 00000000000..8847184673a
--- /dev/null
+++ b/src/ext/java/org/opentripplanner/ext/datastore/aws/AwsOutputStream.java
@@ -0,0 +1,79 @@
+package org.opentripplanner.ext.datastore.aws;
+
+import com.esotericsoftware.kryo.io.ByteBufferOutputStream;
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import software.amazon.awssdk.core.sync.RequestBody;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.CompleteMultipartUploadRequest;
+import software.amazon.awssdk.services.s3.model.CompletedMultipartUpload;
+import software.amazon.awssdk.services.s3.model.CompletedPart;
+import software.amazon.awssdk.services.s3.model.CreateMultipartUploadRequest;
+import software.amazon.awssdk.services.s3.model.UploadPartRequest;
+
+class AwsOutputStream extends ByteBufferOutputStream implements Closeable {
+
+  private final S3Client s3;
+  private final S3Object object;
+  private final List<CompletedPart> completedParts = new ArrayList<>();
+  private String uploadId;
+  private int partNumber = 0;
+
+  public AwsOutputStream(S3Client s3, S3Object object) {
+    super(8192);
+    this.s3 = s3;
+    this.object = object;
+  }
+
+  public AwsOutputStream open() {
+    var request = CreateMultipartUploadRequest
+      .builder()
+      .bucket(object.bucket())
+      .key(object.name())
+      .build();
+    this.uploadId = s3.createMultipartUpload(request).uploadId();
+    return this;
+  }
+
+  @Override
+  public void close() throws IOException {
+    var completedMultipartUpload = CompletedMultipartUpload.builder().parts(completedParts).build();
+
+    var completeRequest = CompleteMultipartUploadRequest
+      .builder()
+      .bucket(object.bucket())
+      .key(object.name())
+      .uploadId(uploadId)
+      .multipartUpload(completedMultipartUpload)
+      .build();
+
+    s3.completeMultipartUpload(completeRequest);
+
+    super.close();
+  }
+
+  @Override
+  public void flush() {
+    int partNumber = nextPartNumber();
+    var uploadPartRequest1 = UploadPartRequest
+      .builder()
+      .bucket(object.bucket())
+      .key(object.name())
+      .uploadId(uploadId)
+      .partNumber(partNumber)
+      .build();
+
+    var etag = s3
+      .uploadPart(uploadPartRequest1, RequestBody.fromByteBuffer(getByteBuffer()))
+      .eTag();
+    completedParts.add(CompletedPart.builder().partNumber(partNumber).eTag(etag).build());
+
+    getByteBuffer().clear();
+  }
+
+  private int nextPartNumber() {
+    return ++partNumber;
+  }
+}
diff --git a/src/ext/java/org/opentripplanner/ext/datastore/aws/S3Object.java b/src/ext/java/org/opentripplanner/ext/datastore/aws/S3Object.java
new file mode 100644
index 00000000000..f1a8cf791f6
--- /dev/null
+++ b/src/ext/java/org/opentripplanner/ext/datastore/aws/S3Object.java
@@ -0,0 +1,75 @@
+package org.opentripplanner.ext.datastore.aws;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public record S3Object(String bucket, String name) {
+  static final String S3_SCHEMA_PREFIX = "s3";
+
+  private static final Pattern GS_URL_PATTERN = Pattern.compile(
+    "//([\\p{Lower}\\d.-]{3,63})/([^\\p{Cntrl}]+)?"
+  );
+
+  public String toUriString() {
+    return toUriString(bucket, name);
+  }
+
+  public S3Object child(String childName) {
+    return new S3Object(bucket, name + '/' + childName);
+  }
+
+  static String toUriString(String bucket, String objectName) {
+    return S3_SCHEMA_PREFIX + "://" + bucket + "/" + objectName;
+  }
+
+  static URI toUri(String bucket, String objectName) {
+    try {
+      return new URI(toUriString(bucket, objectName));
+    } catch (URISyntaxException e) {
+      throw new IllegalArgumentException(e.getLocalizedMessage(), e);
+    }
+  }
+
+  boolean isRoot() {
+    return "".equals(name);
+  }
+
+  /**
+   * GCS URL pattern for the Scheme Specific Part, without the 'gs:' prefix Not all rules are
+   * validated here, but the following is:
+   * <ul>
+   *     <li>Bucket names must contain only lowercase letters, numbers, dashes (-),
+   *     underscores (_), and dots (.)
+   *     <li>Bucket names must contain 3 to 63 characters.
+   *     <li>Object names must be at least one character.
+   *     <li>Object names should avoid using control characters
+   *     this is enforced here, and is strictly just a strong recommendation.
+   * </ul>
+   * One exception is allowed, the object name may be an empty string({@code ""}), this is used to
+   * create a virtual root directory.
+   */
+
+  static S3Object toS3Object(URI uri) {
+    Matcher m = GS_URL_PATTERN.matcher(uri.getSchemeSpecificPart());
+
+    if (m.matches()) {
+      return new S3Object(m.group(1), dirName(m.group(2)));
+    }
+    throw new IllegalArgumentException(
+      "The '" +
+      uri +
+      "' is not a legal Google Cloud Storage " +
+      "URL on format: '" +
+      S3_SCHEMA_PREFIX +
+      "://bucket-name/object-name'."
+    );
+  }
+
+  /* private methods */
+
+  private static String dirName(String objectDir) {
+    return objectDir == null ? "" : objectDir;
+  }
+}
diff --git a/src/ext/java/org/opentripplanner/ext/datastore/aws/package-info.java b/src/ext/java/org/opentripplanner/ext/datastore/aws/package-info.java
new file mode 100644
index 00000000000..23cdd93f547
--- /dev/null
+++ b/src/ext/java/org/opentripplanner/ext/datastore/aws/package-info.java
@@ -0,0 +1,8 @@
+/**
+ * Add support for Amazon S3 cloud storage, getting all input files and storing the graph.obj in the
+ * cloud.
+ * <p>
+ * This implementation will use the existing {@link org.opentripplanner.standalone.config.ConfigLoader}
+ * to load config from the local disk.
+ */
+package org.opentripplanner.ext.datastore.aws;
diff --git a/src/main/java/org/opentripplanner/datastore/api/AmazonS3DSRepository.java b/src/main/java/org/opentripplanner/datastore/api/AmazonS3DSRepository.java
new file mode 100644
index 00000000000..ad70f0945d6
--- /dev/null
+++ b/src/main/java/org/opentripplanner/datastore/api/AmazonS3DSRepository.java
@@ -0,0 +1,15 @@
+package org.opentripplanner.datastore.api;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+import javax.inject.Qualifier;
+
+/**
+ * This qualifier is used to inject the Google Storage Data Source Repository. Enable the
+ * {@link org.opentripplanner.util.OTPFeature#GoogleCloudStorage} and the repository
+ * is initialized automatically.
+ */
+@Qualifier
+@Target({ ElementType.METHOD, ElementType.PARAMETER })
+public @interface AmazonS3DSRepository {
+}
diff --git a/src/main/java/org/opentripplanner/datastore/api/OtpDataStoreConfig.java b/src/main/java/org/opentripplanner/datastore/api/OtpDataStoreConfig.java
index 1c9716e91f7..9e1a1761e2c 100644
--- a/src/main/java/org/opentripplanner/datastore/api/OtpDataStoreConfig.java
+++ b/src/main/java/org/opentripplanner/datastore/api/OtpDataStoreConfig.java
@@ -39,6 +39,17 @@ public interface OtpDataStoreConfig {
    */
   URI reportDirectory();
 
+  /**
+   * Amazon AWS Region for accessing S3 Storage
+   */
+  String s3Region();
+
+  /**
+   * Amazon AWS Credentials Profile for accessing S3 Storage. Use "DEFAULT" to use default
+   * Credentials, in empty no profile is set.
+   */
+  String s3CredentialsProfile();
+
   /**
    * Local file system path to Google Cloud Platform service accounts credentials file. The
    * credentials is used to access GCS urls. When using GCS from outside of the bucket cluster you
diff --git a/src/main/java/org/opentripplanner/datastore/configure/DataStoreModule.java b/src/main/java/org/opentripplanner/datastore/configure/DataStoreModule.java
index ee093a7849a..9095286bb2c 100644
--- a/src/main/java/org/opentripplanner/datastore/configure/DataStoreModule.java
+++ b/src/main/java/org/opentripplanner/datastore/configure/DataStoreModule.java
@@ -8,6 +8,7 @@
 import javax.annotation.Nullable;
 import javax.inject.Singleton;
 import org.opentripplanner.datastore.OtpDataStore;
+import org.opentripplanner.datastore.api.AmazonS3DSRepository;
 import org.opentripplanner.datastore.api.CompositeDataSource;
 import org.opentripplanner.datastore.api.FileType;
 import org.opentripplanner.datastore.api.GoogleStorageDSRepository;
@@ -50,10 +51,14 @@ public static CompositeDataSource compositeSource(File file, FileType type) {
   public static OtpDataStore provideDataStore(
     @OtpBaseDirectory File baseDirectory,
     OtpDataStoreConfig config,
+    @Nullable @AmazonS3DSRepository DataSourceRepository s3Repository,
     @Nullable @GoogleStorageDSRepository DataSourceRepository gsRepository
   ) {
     List<DataSourceRepository> repositories = new ArrayList<>();
 
+    if (s3Repository != null) {
+      repositories.add(s3Repository);
+    }
     if (gsRepository != null) {
       repositories.add(gsRepository);
     }
diff --git a/src/main/java/org/opentripplanner/standalone/config/StorageConfig.java b/src/main/java/org/opentripplanner/standalone/config/StorageConfig.java
index 2d13b38052e..277fa6fefdf 100644
--- a/src/main/java/org/opentripplanner/standalone/config/StorageConfig.java
+++ b/src/main/java/org/opentripplanner/standalone/config/StorageConfig.java
@@ -173,8 +173,11 @@ public class StorageConfig implements OtpDataStoreConfig {
    */
   public final URI buildReportDir;
 
+  public final String s3Region;
+
+  public final String s3CredentialsProfile;
+
   StorageConfig(NodeAdapter config) {
-    this.gsCredentials = config.asText("gsCredentials", null);
     this.graph = config.asUri("graph", null);
     this.streetGraph = config.asUri("streetGraph", null);
     this.osm.addAll(config.asUris("osm"));
@@ -189,6 +192,9 @@ public class StorageConfig implements OtpDataStoreConfig {
       this.osmLocalFilePattern = c.asPattern("osm", DEFAULT_OSM_PATTERN);
       this.demLocalFilePattern = c.asPattern("dem", DEFAULT_DEM_PATTERN);
     }
+    this.gsCredentials = config.asText("gsCredentials", null);
+    this.s3Region = config.asText("s3Region", null);
+    this.s3CredentialsProfile = config.asText("s3CredentialsProfile", null);
   }
 
   @Override
@@ -196,11 +202,6 @@ public URI reportDirectory() {
     return buildReportDir;
   }
 
-  @Override
-  public String gsCredentials() {
-    return gsCredentials;
-  }
-
   @Override
   public List<URI> osmFiles() {
     return osm;
@@ -250,4 +251,19 @@ public Pattern osmLocalFilePattern() {
   public Pattern demLocalFilePattern() {
     return demLocalFilePattern;
   }
+
+  @Override
+  public String gsCredentials() {
+    return gsCredentials;
+  }
+
+  @Override
+  public String s3Region() {
+    return s3Region;
+  }
+
+  @Override
+  public String s3CredentialsProfile() {
+    return s3CredentialsProfile;
+  }
 }
diff --git a/src/main/java/org/opentripplanner/standalone/configure/LoadApplicationFactory.java b/src/main/java/org/opentripplanner/standalone/configure/LoadApplicationFactory.java
index cc069d1223e..d13a4b870e3 100644
--- a/src/main/java/org/opentripplanner/standalone/configure/LoadApplicationFactory.java
+++ b/src/main/java/org/opentripplanner/standalone/configure/LoadApplicationFactory.java
@@ -5,6 +5,7 @@
 import javax.inject.Singleton;
 import org.opentripplanner.datastore.OtpDataStore;
 import org.opentripplanner.datastore.configure.DataStoreModule;
+import org.opentripplanner.ext.datastore.aws.AwsDataSourceModule;
 import org.opentripplanner.ext.datastore.gs.GsDataSourceModule;
 import org.opentripplanner.graph_builder.GraphBuilderDataSources;
 import org.opentripplanner.routing.graph.Graph;
@@ -17,7 +18,14 @@
  * Dagger dependency injection Factory to create components for the OTP load application phase.
  */
 @Singleton
-@Component(modules = { LoadConfigModule.class, DataStoreModule.class, GsDataSourceModule.class })
+@Component(
+  modules = {
+    LoadConfigModule.class,
+    DataStoreModule.class,
+    GsDataSourceModule.class,
+    AwsDataSourceModule.class,
+  }
+)
 public interface LoadApplicationFactory {
   OtpDataStore datastore();
 
diff --git a/src/main/java/org/opentripplanner/util/OTPFeature.java b/src/main/java/org/opentripplanner/util/OTPFeature.java
index ed6e1067630..03e2781e321 100644
--- a/src/main/java/org/opentripplanner/util/OTPFeature.java
+++ b/src/main/java/org/opentripplanner/util/OTPFeature.java
@@ -32,6 +32,7 @@ public enum OTPFeature {
 
   // Sandbox extension features - Must be turned OFF by default
   ActuatorAPI(false),
+  AmazonAwsS3Storage(false),
   DataOverlay(false),
   FlexRouting(false),
   GoogleCloudStorage(false),
diff --git a/src/test/java/org/opentripplanner/datastore/OtpDataStoreTest.java b/src/test/java/org/opentripplanner/datastore/OtpDataStoreTest.java
index aa7986c6e28..8ad82df2c6c 100644
--- a/src/test/java/org/opentripplanner/datastore/OtpDataStoreTest.java
+++ b/src/test/java/org/opentripplanner/datastore/OtpDataStoreTest.java
@@ -68,7 +68,7 @@ public void tearDown() {
 
   @Test
   public void readEmptyDir() {
-    OtpDataStore store = DataStoreModule.provideDataStore(baseDir, config(), null);
+    OtpDataStore store = DataStoreModule.provideDataStore(baseDir, config(), null, null);
 
     assertNoneExistingFile(store.getGraph(), GRAPH_FILENAME, GRAPH);
     assertNoneExistingFile(store.getStreetGraph(), STREET_GRAPH_FILENAME, GRAPH);
@@ -96,7 +96,7 @@ public void readDirWithEverything() throws IOException {
     write(baseDir, GRAPH_FILENAME, "Data");
     writeToDir(baseDir, REPORT_FILENAME, "index.json");
 
-    OtpDataStore store = DataStoreModule.provideDataStore(baseDir, config(), null);
+    OtpDataStore store = DataStoreModule.provideDataStore(baseDir, config(), null, null);
 
     assertExistingGraph(store.getGraph(), GRAPH_FILENAME);
     assertExistingGraph(store.getStreetGraph(), STREET_GRAPH_FILENAME);
@@ -168,7 +168,7 @@ public void testResolvingFileUris() throws IOException {
     var confLoader = new ConfigLoader(baseDir);
     var buildConfig = confLoader.loadBuildConfig();
 
-    OtpDataStore store = DataStoreModule.provideDataStore(baseDir, buildConfig.storage, null);
+    OtpDataStore store = DataStoreModule.provideDataStore(baseDir, buildConfig.storage, null, null);
 
     // Collect result and prepare it for assertion
     List<String> filenames = listFilesByRelativeName(store, baseDir, tempDataDir);