diff --git a/cortex/config.libsonnet b/cortex/config.libsonnet
index 57d3fa7c..1efe6fad 100644
--- a/cortex/config.libsonnet
+++ b/cortex/config.libsonnet
@@ -224,7 +224,7 @@
           'ruler.storage.gcs.bucketname': $._config.ruler_gcs_bucket_name,
         },
         s3: {
-          's3.url': 'https://%s/%s' % [$._config.aws_region, $._config.s3_bucket_name],
+          's3.url': 'https://%s/%s' % [$._config.aws_region, $._config.ruler_s3_bucket_name],
         },
       }[$._config.ruler_client_type],
 
diff --git a/cortex/distributor.libsonnet b/cortex/distributor.libsonnet
index 24169840..bb0f5454 100644
--- a/cortex/distributor.libsonnet
+++ b/cortex/distributor.libsonnet
@@ -28,6 +28,10 @@
       'server.grpc.keepalive.max-connection-age-grace': '5m',
       'server.grpc.keepalive.max-connection-idle': '1m',
 
+      // 100MB (bumped from default of 4MB)
+      'server.grpc-max-recv-msg-size-bytes': 1024 * 1024 * 100,
+      'server.grpc-max-send-msg-size-bytes': 1024 * 1024 * 100,
+
       'distributor.ingestion-rate-limit-strategy': 'global',
       'distributor.ingestion-rate-limit': 100000,  // 100K
       'distributor.ingestion-burst-size': 1000000,  // 1M
diff --git a/cortex/ingester.libsonnet b/cortex/ingester.libsonnet
index 165fc982..67d00c23 100644
--- a/cortex/ingester.libsonnet
+++ b/cortex/ingester.libsonnet
@@ -29,6 +29,10 @@
       'ingester.max-series-per-metric': 0,  // Disabled in favour of the max global limit
       'limits.per-user-override-config': '/etc/cortex/overrides.yaml',
       'server.grpc-max-concurrent-streams': 100000,
+
+      // 100MB (bumped from default of 4MB)
+      'server.grpc-max-recv-msg-size-bytes': 1024 * 1024 * 100,
+      'server.grpc-max-send-msg-size-bytes': 1024 * 1024 * 100,
     } + (
       if $._config.memcached_index_writes_enabled then
         {
diff --git a/cortex/query-frontend.libsonnet b/cortex/query-frontend.libsonnet
index d7358182..ae95cefb 100644
--- a/cortex/query-frontend.libsonnet
+++ b/cortex/query-frontend.libsonnet
@@ -28,8 +28,9 @@
     // connections.
     'querier.compress-http-responses': true,
 
-    // So it can recieve big responses from the querier.
-    'server.grpc-max-recv-msg-size-bytes': 100 << 20,
+    // 100MB (bumped from default of 4MB)
+    'server.grpc-max-recv-msg-size-bytes': 1024 * 1024 * 100,
+    'server.grpc-max-send-msg-size-bytes': 1024 * 1024 * 100,
 
     // Limit queries to 500 days, allow this to be override per-user.
     'store.max-query-length': '12000h',  // 500 Days