diff --git a/ksonnet/loki/config.libsonnet b/ksonnet/loki/config.libsonnet
index a249ccf068cc..ff8f20e4cefa 100644
--- a/ksonnet/loki/config.libsonnet
+++ b/ksonnet/loki/config.libsonnet
@@ -14,7 +14,7 @@
     s3_bucket_name: error 'must specify S3 bucket name',
 
     // December 11 is when we first launched to the public.
-    schema_start_date: '0',
+    schema_start_date: '2018-12-11',
 
     server_config: {
       http_listen_port: 80,
@@ -79,7 +79,7 @@
       object_store: 'gcs',
       schema: 'v9',
       index: {
-        prefix: 'prefix_',
+        prefix: '%s_index_' % $._config.table_prefix,
         period: '168h',
       },
     }],
diff --git a/ksonnet/loki/images.libsonnet b/ksonnet/loki/images.libsonnet
index fe34f5409166..5951737ae1a5 100644
--- a/ksonnet/loki/images.libsonnet
+++ b/ksonnet/loki/images.libsonnet
@@ -5,10 +5,9 @@
     memcachedExporter: 'prom/memcached-exporter:v0.4.1',
 
     // Our services.
-    cortex_gw: 'raintank/cortex-gw:0.9.0-93-gceff250',
-    tableManager: 'grafana/cortex-table-manager:r45-6247bbc8',
+    tableManager: 'grafana/cortex-table-manager:r47-06f3294e',
 
-    loki: 'grafana/loki:master-d5e6c60',
+    loki: 'grafana/loki:master',
 
     distributor: self.loki,
     ingester: self.loki,
diff --git a/ksonnet/loki/loki.libsonnet b/ksonnet/loki/loki.libsonnet
index 841e3f88c7b2..59ee5bf2b20b 100644
--- a/ksonnet/loki/loki.libsonnet
+++ b/ksonnet/loki/loki.libsonnet
@@ -7,4 +7,5 @@
 // Cortex services
 (import 'distributor.libsonnet') +
 (import 'ingester.libsonnet') +
-(import 'querier.libsonnet')
+(import 'querier.libsonnet') +
+(import 'table-manager.libsonnet')
diff --git a/ksonnet/loki/table-manager.libsonnet b/ksonnet/loki/table-manager.libsonnet
new file mode 100644
index 000000000000..cef85e9dd1ad
--- /dev/null
+++ b/ksonnet/loki/table-manager.libsonnet
@@ -0,0 +1,41 @@
+{
+  local container = $.core.v1.container,
+
+  table_manager_args:: {
+    'bigtable.project': $._config.bigtable_project,
+    'bigtable.instance': $._config.bigtable_instance,
+    'chunk.storage-client': $._config.storage_backend,
+
+    'dynamodb.original-table-name': '%s_index' % $._config.table_prefix,
+    'dynamodb.use-periodic-tables': true,
+    'dynamodb.periodic-table.prefix': '%s_index_' % $._config.table_prefix,
+    'dynamodb.chunk-table.prefix': '%s_chunks_' % $._config.table_prefix,
+    'dynamodb.periodic-table.from': $._config.schema_start_date,
+    'dynamodb.chunk-table.from': $._config.schema_start_date,
+    'dynamodb.v9-schema-from': $._config.schema_start_date,
+    // Cassandra / BigTable doesn't use these fields, so set them to zero
+    'dynamodb.chunk-table.inactive-read-throughput': 0,
+    'dynamodb.chunk-table.inactive-write-throughput': 0,
+    'dynamodb.chunk-table.read-throughput': 0,
+    'dynamodb.chunk-table.write-throughput': 0,
+    'dynamodb.periodic-table.inactive-read-throughput': 0,
+    'dynamodb.periodic-table.inactive-write-throughput': 0,
+    'dynamodb.periodic-table.read-throughput': 0,
+    'dynamodb.periodic-table.write-throughput': 0,
+  },
+
+  table_manager_container::
+    container.new('table-manager', $._images.tableManager) +
+    container.withPorts($.util.defaultPorts) +
+    container.withArgsMixin($.util.mapToFlags($.table_manager_args)) +
+    $.util.resourcesRequests('100m', '100Mi') +
+    $.util.resourcesLimits('200m', '200Mi'),
+
+  local deployment = $.apps.v1beta1.deployment,
+
+  table_manager_deployment:
+    deployment.new('table-manager', 1, [$.table_manager_container]),
+
+  table_manager_service:
+    $.util.serviceFor($.table_manager_deployment),
+}
diff --git a/ksonnet/promtail/promtail.libsonnet b/ksonnet/promtail/promtail.libsonnet
index 8dbcbdd027ca..0a1ee9f8b845 100644
--- a/ksonnet/promtail/promtail.libsonnet
+++ b/ksonnet/promtail/promtail.libsonnet
@@ -2,7 +2,7 @@ local k = import 'ksonnet-util/kausal.libsonnet';
 
 k {
   _images+:: {
-    promtail: 'grafana/promtail:master-5da1fde',
+    promtail: 'grafana/promtail:master',
   },
 
   _config+:: {
diff --git a/tools/promtail.sh b/tools/promtail.sh
index b05de51fbfcc..76c59fbac2d8 100644
--- a/tools/promtail.sh
+++ b/tools/promtail.sh
@@ -105,7 +105,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
-        image: grafana/promtail:master-5da1fde
+        image: grafana/promtail:master
         imagePullPolicy: IfNotPresent
         name: promtail
         ports: