diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8699e32..e236c8f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.2.0] - TBD
+### Added
+- Support for Docker Auth.
+- Ability to store credentials for Docker auth in AWS secrets manager.
+- Cloudwatch dashboard.
+- Cloudwatch alerts.
+- SQS queue permissions.
+
+### Changed
+- `selected_tables` variable is now a list.
+
 ## [1.1.0] - 2019-02-08
 ### Added
 - New variable for passing Circus Train common configurations to Shunting Yard. eg. Graphite.
diff --git a/README.md b/README.md
index 301e01c..94865c4 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 
 Terraform module for setting up infrastructure for [Shunting Yard](https://github.com/HotelsDotCom/shunting-yard).
 
-For more information please refer to the main [Apiary](https://github.com/ExpediaInc/apiary) project page.
+For more information please refer to the main [Apiary](https://github.com/ExpediaGroup/apiary) project page.
 
 ## Variables
 | Name | Description | Type | Default | Required |
@@ -14,13 +14,16 @@ For more information please refer to the main [Apiary](https://github.com/Expedi
 | ct\_common\_config\_yaml | Common Circus Train configuration to be passed to internal Circus Train instance. It can be used, for example to configure Graphite for Circus Train. Refer to [Circus Train README](https://github.com/HotelsDotCom/circus-train/blob/master/README.md) for an exhaustive list of options supported by Circus Train. | string | n/a | yes |
 | docker\_image | Full path of Shunting Yard Docker image. | string | n/a | yes |
 | docker\_version | Shunting Yard Docker image version. | string | n/a | yes |
+| docker\_registry\_auth\_secret\_name | Docker Registry authentication SecretManager secret name. | string | `` | no |
 | instance\_name | Shunting Yard instance name to identify resources in multi-instance deployments. | string | `""` | no |
 | memory | The amount of memory (in MiB) allocated to the Shunting Yard container. Valid values: https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-cpu-memory-error.html | string | `"4096"` | no |
 | metastore\_events\_sns\_topic | SNS Topic for Hive Metastore events. | string | n/a | yes |
-| selected\_tables | Tables selected for Shunting Yard Replication. Supported Format: `database_1.table_1, database_2.table_2` | string | n/a | yes |
+| shuntingyard\_sqs\_queue\_wait\_timeout | Shunting Yard SQS queue wait timeout (in seconds) | string | 15 | no |
+| shuntingyard\_sqs\_queue\_stale\_messages\_timeout | Shunting Yard SQS queue stale messages alert timeout (in seconds) | string | 300 | no |
+| selected\_tables | Tables selected for Shunting Yard Replication. Supported Format: `[ "database_1.table_1", "database_2.table_2" ]` | list | [] | no |
 | source\_metastore\_uri | Source Metastore URI for Shunting Yard. | string | n/a | yes |
 | subnets | ECS container subnets. | list | n/a | yes |
-| tags | A map of tags to apply to resources. | map | `<map>` | no |
+| shuntingyard\_tags | A map of tags to apply to resources. | map | `<map>` | no |
 | target\_metastore\_uri | Target Metastore URI for Shunting Yard. | string | n/a | yes |
 | vpc\_id | VPC ID. | string | n/a | yes |
 
@@ -29,26 +32,23 @@ For more information please refer to the main [Apiary](https://github.com/Expedi
 Example module invocation:
 ```
 module "apiary-shuntingyard" {
-  source             = "git::https://github.com/ExpediaInc/apiary-replication.git?ref=master"
-  instance_name      = "shuntingyard-test"
-  aws_region         = "us-west-2"
-  vpc_id             = "vpc-1"
-  subnets            = ["subnet-1", "subnet-2"]
-  allowed_s3_buckets = ["bucket-1", "bucket-2"]
-
-  tags = {
-    Name = "Apiary-Shuntingyard"
-    Team = "Operations"
-  }
-
-  source_metastore_uri               = "thrift://ip-address:9083"
-  target_metastore_uri               = "thrift://ip-address:9083"
-  metastore_events_sns_topic         = "arn:aws:sns:us-west-2:1234567:metastore-events-sns-topic"
-  selected_tables                    = "database_1.table_1, database_2.table_2"
-  ct_common_config_yaml              = "${data.template_file.ct_common_config_yaml.rendered}"
-
-  docker_image                       = "your.docker.repo/apiary-shuntingyard"
-  docker_version                     = "latest"
+  source                      = "git::https://github.com/ExpediaGroup/apiary-replication.git"
+  aws_region                  = "us-west-2"
+  vpc_id                      = "vpc-1"
+  subnets                     = ["subnet-1", "subnet-2"]
+  instance_name               = "shuntingyard-test"
+  docker_image                = "your.docker.repo/apiary-shuntingyard"
+  docker_version              = "latest"
+  ct_common_config_yaml       = "${data.template_file.ct_common_config_yaml.rendered}"  
+  source_metastore_uri        = "thrift://ip-address:9083"
+  target_metastore_uri        = "thrift://ip-address:9083"
+  metastore_events_sns_topic  = "arn:aws:sns:us-west-2:1234567:metastore-events-sns-topic"
+  selected_tables             = [ "database_1.table_1", "database_2.table_2" ]
+  allowed_s3_buckets          = [ "bucket-1", "bucket-2" ]
+  shuntingyard_tags           = {
+                                    Name = "Apiary Replication"
+                                    Team = "Operations"
+                                }
 }
 ```
 
diff --git a/cloudwatch.tf b/cloudwatch.tf
new file mode 100644
index 0000000..ccd397a
--- /dev/null
+++ b/cloudwatch.tf
@@ -0,0 +1,169 @@
+/**
+ * Copyright (C) 2019 Expedia, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ */
+
+data "template_file" "ecs_widgets" {
+  template = <<EOF
+       {
+          "type":"metric",
+          "width":12,
+          "height":6,
+          "properties":{
+             "metrics":[
+                [ "AWS/ECS", "CPUUtilization", "ServiceName", "${local.instance_alias}-service", "ClusterName", "${local.instance_alias}" ]
+             ],
+             "period":300,
+             "stat":"Average",
+             "region":"${var.aws_region}",
+             "title":"Shunting Yard ECS CPU Utilization"
+          }
+       },
+       {
+          "type":"metric",
+          "width":12,
+          "height":6,
+          "properties":{
+             "metrics":[
+                [ "AWS/ECS", "MemoryUtilization", "ServiceName", "${local.instance_alias}-service", "ClusterName", "${local.instance_alias}" ]
+             ],
+             "period":300,
+             "stat":"Average",
+             "region":"${var.aws_region}",
+             "title":"Shunting Yard ECS Memory Utilization"
+          }
+       },
+EOF
+}
+
+data "template_file" "sqs_widgets" {
+  template = <<EOF
+       {
+          "type":"metric",
+          "width":12,
+          "height":6,
+          "properties":{
+             "metrics": [
+                 [ "AWS/SQS", "NumberOfMessagesSent", "QueueName", "${local.instance_alias}-sqs-queue" ],
+                 [ "AWS/SQS", "NumberOfMessagesReceived", "QueueName", "${local.instance_alias}-sqs-queue" ]
+             ],
+             "period":300,
+             "stat":"Average",
+             "region": "${var.aws_region}",
+             "title": "Shunting Yard SQS Sent & Received Messages"
+           }
+       },
+       {
+          "type":"metric",
+          "width":12,
+          "height":6,
+          "properties":{
+        	 "metrics": [
+               [ "AWS/SQS", "ApproximateNumberOfMessagesVisible", "QueueName", "${local.instance_alias}-sqs-queue" ],
+               [ "AWS/SQS", "ApproximateNumberOfMessagesDelayed", "QueueName", "${local.instance_alias}-sqs-queue" ],
+               [ "AWS/SQS", "ApproximateNumberOfMessagesNotVisible", "QueueName", "${local.instance_alias}-sqs-queue" ]
+              ],
+             "period":300,
+             "stat":"Average",
+             "region": "${var.aws_region}",
+             "title": "Shunting Yard SQS Queue Size Metrics"
+           }
+       },
+       {
+          "type":"metric",
+          "width":12,
+          "height":6,
+          "properties":{
+             "metrics": [
+               [ "AWS/SQS", "NumberOfMessagesDeleted", "QueueName", "${local.instance_alias}-sqs-queue" ]
+             ],
+             "period":300,
+             "stat":"Average",
+             "region": "${var.aws_region}",
+             "title": "Shunting Yard SQS Deleted Messages"
+          }
+       },
+       {
+          "type":"metric",
+          "width":12,
+          "height":6,
+          "properties":{
+             "metrics": [
+                 [ "AWS/SQS", "ApproximateAgeOfOldestMessage", "QueueName", "${local.instance_alias}-sqs-queue" ]
+             ],
+             "period":300,
+             "stat":"Average",
+             "view": "singleValue",
+             "region": "${var.aws_region}",
+             "title": "Shunting Yard SQS Age of Oldest Message (s)"
+           }
+       }  
+EOF
+}
+
+resource "aws_cloudwatch_dashboard" "shuntingyard" {
+  dashboard_name = "${local.instance_alias}-${var.aws_region}"
+
+  dashboard_body = <<EOF
+ {
+   "widgets": [
+${join("", data.template_file.ecs_widgets.*.rendered)}
+${join("", data.template_file.sqs_widgets.*.rendered)}
+   ]
+ }
+ EOF
+}
+
+locals {
+  alerts = [
+    {
+      alarm_name  = "${local.instance_alias}-cpu"
+      namespace   = "AWS/ECS"
+      metric_name = "CPUUtilization"
+      threshold   = "90"
+    },
+    {
+      alarm_name  = "${local.instance_alias}-memory"
+      namespace   = "AWS/ECS"
+      metric_name = "MemoryUtilization"
+      threshold   = "80"
+    },
+    {
+      alarm_name  = "${local.instance_alias}-stale-messages"
+      namespace   = "AWS/SQS"
+      metric_name = "ApproximateAgeOfOldestMessage"
+      threshold   = "${var.shuntingyard_sqs_queue_stale_messages_timeout}"
+    },
+  ]
+
+  dimensions = [
+    {
+      ClusterName = "${local.instance_alias}"
+      ServiceName = "${local.instance_alias}-service"
+    },
+    {
+      ClusterName = "${local.instance_alias}"
+      ServiceName = "${local.instance_alias}-service"
+    },
+    {
+      QueueName = "${local.instance_alias}-sqs-queue"
+    },
+  ]
+}
+
+resource "aws_cloudwatch_metric_alarm" "shuntingyard_alert" {
+  count               = "${length(local.alerts)}"
+  alarm_name          = "${lookup(local.alerts[count.index], "alarm_name")}"
+  comparison_operator = "${lookup(local.alerts[count.index], "comparison_operator", "GreaterThanOrEqualToThreshold")}"
+  metric_name         = "${lookup(local.alerts[count.index], "metric_name")}"
+  namespace           = "${lookup(local.alerts[count.index], "namespace")}"
+  period              = "${lookup(local.alerts[count.index], "period", "120")}"
+  evaluation_periods  = "${lookup(local.alerts[count.index], "evaluation_periods", "2")}"
+  statistic           = "Average"
+  threshold           = "${lookup(local.alerts[count.index], "threshold")}"
+
+  insufficient_data_actions = []
+  dimensions                = "${local.dimensions[count.index]}"
+  alarm_actions             = ["${aws_sns_topic.shuntingyard_ops_sns.arn}"]
+}
diff --git a/common.tf b/common.tf
index db94538..3b9ecca 100644
--- a/common.tf
+++ b/common.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2019 Expedia Inc.
+ * Copyright (C) 2019 Expedia, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  */
@@ -11,3 +11,8 @@ locals {
 data "aws_vpc" "shuntingyard_vpc" {
   id = "${var.vpc_id}"
 }
+
+data "aws_secretsmanager_secret" "docker_registry" {
+  count = "${var.docker_registry_auth_secret_name == "" ? 0 : 1}"
+  name  = "${var.docker_registry_auth_secret_name}"
+}
diff --git a/ecs.tf b/ecs.tf
new file mode 100644
index 0000000..7a7cc42
--- /dev/null
+++ b/ecs.tf
@@ -0,0 +1,40 @@
+/**
+ * Copyright (C) 2019 Expedia, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ */
+
+resource "aws_ecs_cluster" "shuntingyard" {
+  name = "${local.instance_alias}"
+  tags = "${var.shuntingyard_tags}"
+}
+
+resource "aws_cloudwatch_log_group" "shuntingyard_ecs" {
+  name = "${local.instance_alias}"
+  tags = "${var.shuntingyard_tags}"
+}
+
+resource "aws_ecs_task_definition" "shuntingyard" {
+  family                   = "${local.instance_alias}"
+  task_role_arn            = "${aws_iam_role.shuntingyard_task.arn}"
+  execution_role_arn       = "${aws_iam_role.shuntingyard_task_exec.arn}"
+  network_mode             = "awsvpc"
+  memory                   = "${var.memory}"
+  cpu                      = "${var.cpu}"
+  requires_compatibilities = ["EC2", "FARGATE"]
+  container_definitions    = "${data.template_file.shuntingyard.rendered}"
+  tags                     = "${var.shuntingyard_tags}"
+}
+
+resource "aws_ecs_service" "shuntingyard_service" {
+  name            = "${local.instance_alias}-service"
+  launch_type     = "FARGATE"
+  cluster         = "${aws_ecs_cluster.shuntingyard.id}"
+  task_definition = "${aws_ecs_task_definition.shuntingyard.arn}"
+  desired_count   = "1"
+
+  network_configuration {
+    security_groups = ["${aws_security_group.shuntingyard_sg.id}"]
+    subnets         = ["${var.subnets}"]
+  }
+}
diff --git a/iam-policy-s3-buckets.tf b/iam-policy-s3-buckets.tf
new file mode 100644
index 0000000..33b043b
--- /dev/null
+++ b/iam-policy-s3-buckets.tf
@@ -0,0 +1,39 @@
+/**
+ * Copyright (C) 2019 Expedia, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ */
+
+resource "aws_iam_role_policy" "s3_for_shuntingyard" {
+  name = "s3"
+  role = "${aws_iam_role.shuntingyard_task.id}"
+
+  policy = <<EOF
+{
+    "Version": "2012-10-17",
+    "Statement": [
+        {
+            "Effect": "Allow",
+            "Action": [
+                "s3:DeleteObject",
+                "s3:DeleteObjectVersion",
+                "s3:Get*",
+                "s3:List*",
+                "s3:PutBucketLogging",
+                "s3:PutBucketNotification",
+                "s3:PutBucketVersioning",
+                "s3:PutObject",
+                "s3:PutObjectAcl",
+                "s3:PutObjectTagging",
+                "s3:PutObjectVersionAcl",
+                "s3:PutObjectVersionTagging"
+            ],
+            "Resource": [
+                          "${join("\",\"", formatlist("arn:aws:s3:::%s",var.allowed_s3_buckets))}",
+                          "${join("\",\"", formatlist("arn:aws:s3:::%s/*",var.allowed_s3_buckets))}"
+                        ]
+        }
+    ]
+}
+EOF
+}
diff --git a/iam-policy-secretsmanager.tf b/iam-policy-secretsmanager.tf
new file mode 100644
index 0000000..8524a03
--- /dev/null
+++ b/iam-policy-secretsmanager.tf
@@ -0,0 +1,22 @@
+/**
+ * Copyright (C) 2019 Expedia, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ */
+
+resource "aws_iam_role_policy" "secretsmanager_for_ecs_task_exec" {
+  count = "${var.docker_registry_auth_secret_name != "" ? 1 : 0}"
+  name  = "secretsmanager-exec"
+  role  = "${aws_iam_role.shuntingyard_task_exec.id}"
+
+  policy = <<EOF
+{
+    "Version": "2012-10-17",
+    "Statement": {
+        "Effect": "Allow",
+        "Action": "secretsmanager:GetSecretValue",
+        "Resource": [ "${join("\",\"", concat(data.aws_secretsmanager_secret.docker_registry.*.arn))}" ]
+    }
+}
+EOF
+}
diff --git a/iam-policy-sqs.tf b/iam-policy-sqs.tf
new file mode 100644
index 0000000..7c2c04a
--- /dev/null
+++ b/iam-policy-sqs.tf
@@ -0,0 +1,25 @@
+/**
+ * Copyright (C) 2019 Expedia, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ */
+
+resource "aws_iam_role_policy" "sqs_for_shuntingyard" {
+  name = "sqs"
+  role = "${aws_iam_role.shuntingyard_task.id}"
+
+  policy = <<EOF
+{
+    "Version": "2012-10-17",
+    "Statement": {
+        "Effect": "Allow",
+        "Action": [
+          "sqs:SendMessage",
+          "sqs:ReceiveMessage",
+          "sqs:DeleteMessage"
+        ],
+        "Resource": "${aws_sqs_queue.shuntingyard_sqs_queue.arn}"
+    }
+}
+EOF
+}
diff --git a/iam.tf b/iam.tf
new file mode 100644
index 0000000..6e55b6c
--- /dev/null
+++ b/iam.tf
@@ -0,0 +1,50 @@
+/**
+ * Copyright (C) 2019 Expedia, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ */
+
+resource "aws_iam_role" "shuntingyard_task_exec" {
+  name = "${local.instance_alias}-ecs-task-exec-${var.aws_region}"
+
+  assume_role_policy = <<EOF
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Sid": "",
+      "Effect": "Allow",
+      "Principal": {
+        "Service": "ecs-tasks.amazonaws.com"
+      },
+      "Action": "sts:AssumeRole"
+    }
+  ]
+}
+EOF
+}
+
+resource "aws_iam_role_policy_attachment" "task_exec_managed" {
+  role       = "${aws_iam_role.shuntingyard_task_exec.id}"
+  policy_arn = "arn:aws:iam::aws:policy/service-role/AmazonECSTaskExecutionRolePolicy"
+}
+
+resource "aws_iam_role" "shuntingyard_task" {
+  name = "${local.instance_alias}-ecs-task-${var.aws_region}"
+
+  assume_role_policy = <<EOF
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Sid": "",
+      "Effect": "Allow",
+      "Principal": {
+        "Service": "ecs-tasks.amazonaws.com"
+      },
+      "Action": "sts:AssumeRole"
+    }
+  ]
+}
+EOF
+}
diff --git a/main.tf b/main.tf
deleted file mode 100644
index b9cddec..0000000
--- a/main.tf
+++ /dev/null
@@ -1,192 +0,0 @@
-/**
- * Copyright (C) 2019 Expedia Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- */
-
-resource "aws_sqs_queue" "shuntingyard_sqs_queue" {
-  name = "${local.instance_alias}-sqs-queue"
-}
-
-resource "aws_sns_topic_subscription" "sqs_hive_metastore_sns_subscription" {
-  topic_arn = "${var.metastore_events_sns_topic}"
-  protocol  = "sqs"
-  endpoint  = "${aws_sqs_queue.shuntingyard_sqs_queue.arn}"
-}
-
-resource "aws_ecs_cluster" "shuntingyard" {
-  name = "${local.instance_alias}"
-}
-
-resource "aws_iam_role" "shuntingyard_task_exec" {
-  name = "${local.instance_alias}-ecs-task-exec-${var.aws_region}"
-
-  assume_role_policy = <<EOF
-{
-  "Version": "2012-10-17",
-  "Statement": [
-    {
-      "Sid": "",
-      "Effect": "Allow",
-      "Principal": {
-        "Service": "ecs-tasks.amazonaws.com"
-      },
-      "Action": "sts:AssumeRole"
-    }
-  ]
-}
-EOF
-}
-
-resource "aws_iam_role_policy_attachment" "task_exec_managed" {
-  role       = "${aws_iam_role.shuntingyard_task_exec.id}"
-  policy_arn = "arn:aws:iam::aws:policy/service-role/AmazonECSTaskExecutionRolePolicy"
-}
-
-resource "aws_iam_role" "shuntingyard_task" {
-  name = "${local.instance_alias}-ecs-task-${var.aws_region}"
-
-  assume_role_policy = <<EOF
-{
-  "Version": "2012-10-17",
-  "Statement": [
-    {
-      "Sid": "",
-      "Effect": "Allow",
-      "Principal": {
-        "Service": "ecs-tasks.amazonaws.com"
-      },
-      "Action": "sts:AssumeRole"
-    }
-  ]
-}
-EOF
-}
-
-resource "aws_iam_role_policy" "s3_for_shuntingyard" {
-  name = "s3"
-  role = "${aws_iam_role.shuntingyard_task.id}"
-
-  policy = <<EOF
-{
-    "Version": "2012-10-17",
-    "Statement": [
-        {
-            "Effect": "Allow",
-            "Action": [
-                "s3:DeleteObject",
-                "s3:DeleteObjectVersion",
-                "s3:Get*",
-                "s3:List*",
-                "s3:PutBucketLogging",
-                "s3:PutBucketNotification",
-                "s3:PutBucketVersioning",
-                "s3:PutObject",
-                "s3:PutObjectAcl",
-                "s3:PutObjectTagging",
-                "s3:PutObjectVersionAcl",
-                "s3:PutObjectVersionTagging"
-            ],
-            "Resource": [
-                          "${join("\",\"", formatlist("arn:aws:s3:::%s",var.allowed_s3_buckets))}",
-                          "${join("\",\"", formatlist("arn:aws:s3:::%s/*",var.allowed_s3_buckets))}"
-                        ]
-        }
-    ]
-}
-EOF
-}
-
-resource "aws_iam_role_policy" "sqs_for_shuntingyard" {
-  name = "sqs"
-  role = "${aws_iam_role.shuntingyard_task.id}"
-
-  policy = <<EOF
-{
-    "Version": "2012-10-17",
-    "Statement": {
-        "Effect": "Allow",
-        "Action": [
-          "sqs:SendMessage",
-          "sqs:ReceiveMessage",
-          "sqs:DeleteMessage"
-        ],
-        "Resource": "${aws_sqs_queue.shuntingyard_sqs_queue.arn}"
-    }
-}
-EOF
-}
-
-resource "aws_cloudwatch_log_group" "shuntingyard_ecs" {
-  name = "${local.instance_alias}"
-  tags = "${var.tags}"
-}
-
-data "template_file" "shuntingyard_config_yaml" {
-  template = "${file("${path.module}/templates/shuntingyard-config.yml.tmpl")}"
-
-  vars {
-    source_metastore_uri    = "${var.source_metastore_uri}"
-    target_metastore_uri    = "${var.target_metastore_uri}"
-    shuntingyard_sqs_queue  = "${aws_sqs_queue.shuntingyard_sqs_queue.id}"
-    selected_tables         = "${var.selected_tables}"
-  }
-}
-
-data "template_file" "shuntingyard" {
-  template = "${file("${path.module}/templates/shuntingyard.json")}"
-
-  vars {
-    heapsize                 = "${var.memory}"
-    docker_image             = "${var.docker_image}"
-    docker_version           = "${var.docker_version}"
-    region                   = "${var.aws_region}"
-    loggroup                 = "${aws_cloudwatch_log_group.shuntingyard_ecs.name}"
-    shuntingyard_config_yaml = "${base64encode(data.template_file.shuntingyard_config_yaml.rendered)}"
-    ct_common_config_yaml    = "${base64encode(var.ct_common_config_yaml)}"
-  }
-}
-
-resource "aws_ecs_task_definition" "shuntingyard" {
-  family                   = "${local.instance_alias}"
-  task_role_arn            = "${aws_iam_role.shuntingyard_task.arn}"
-  execution_role_arn       = "${aws_iam_role.shuntingyard_task_exec.arn}"
-  network_mode             = "awsvpc"
-  memory                   = "${var.memory}"
-  cpu                      = "${var.cpu}"
-  requires_compatibilities = ["EC2", "FARGATE"]
-  container_definitions    = "${data.template_file.shuntingyard.rendered}"
-}
-
-resource "aws_security_group" "sy_sg" {
-  name   = "${local.instance_alias}-sg"
-  vpc_id = "${var.vpc_id}"
-  tags   = "${var.tags}"
-
-  ingress {
-    from_port   = 0
-    to_port     = 0
-    protocol    = "-1"
-    cidr_blocks = ["${data.aws_vpc.shuntingyard_vpc.cidr_block}"]
-  }
-
-  egress {
-    from_port   = 0
-    to_port     = 0
-    protocol    = "-1"
-    cidr_blocks = ["0.0.0.0/0"]
-  }
-}
-
-resource "aws_ecs_service" "shuntingyard_service" {
-  name            = "${local.instance_alias}-service"
-  launch_type     = "FARGATE"
-  cluster         = "${aws_ecs_cluster.shuntingyard.id}"
-  task_definition = "${aws_ecs_task_definition.shuntingyard.arn}"
-  desired_count   = "1"
-
-  network_configuration {
-    security_groups = ["${aws_security_group.sy_sg.id}"]
-    subnets         = ["${var.subnets}"]
-  }
-}
diff --git a/sg.tf b/sg.tf
new file mode 100644
index 0000000..c0b2e15
--- /dev/null
+++ b/sg.tf
@@ -0,0 +1,29 @@
+/**
+ * Copyright (C) 2019 Expedia, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ */
+
+resource "aws_security_group" "shuntingyard_sg" {
+  name   = "${local.instance_alias}-sg"
+  vpc_id = "${var.vpc_id}"
+  tags   = "${var.shuntingyard_tags}"
+
+  ingress {
+    from_port   = 0
+    to_port     = 0
+    protocol    = "-1"
+    cidr_blocks = ["${data.aws_vpc.shuntingyard_vpc.cidr_block}"]
+  }
+
+  egress {
+    from_port   = 0
+    to_port     = 0
+    protocol    = "-1"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+
+  lifecycle {
+    create_before_destroy = true
+  }
+}
diff --git a/sns.tf b/sns.tf
new file mode 100644
index 0000000..723dc5d
--- /dev/null
+++ b/sns.tf
@@ -0,0 +1,9 @@
+/**
+ * Copyright (C) 2019 Expedia, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ */
+
+resource "aws_sns_topic" "shuntingyard_ops_sns" {
+  name = "${local.instance_alias}-operational-events"
+}
diff --git a/sqs.tf b/sqs.tf
new file mode 100644
index 0000000..de21c5b
--- /dev/null
+++ b/sqs.tf
@@ -0,0 +1,40 @@
+/**
+ * Copyright (C) 2019 Expedia, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ */
+
+resource "aws_sqs_queue" "shuntingyard_sqs_queue" {
+  name = "${local.instance_alias}-sqs-queue"
+}
+
+resource "aws_sqs_queue_policy" "shuntingyard_sqs_queue_policy" {
+  queue_url = "${aws_sqs_queue.shuntingyard_sqs_queue.id}"
+
+  policy = <<POLICY
+{
+  "Version": "2012-10-17",
+  "Id": "AllowSNSSendMessage",
+  "Statement": [
+    {
+      "Sid": "Allow Apiary Metadata Events",
+      "Effect": "Allow",
+      "Principal": "*",
+      "Action": "sqs:SendMessage",
+      "Resource": "${aws_sqs_queue.shuntingyard_sqs_queue.arn}",
+      "Condition": {
+        "ArnEquals": {
+          "aws:SourceArn": "${var.metastore_events_sns_topic}"
+        }
+      }
+    }
+  ]
+}
+POLICY
+}
+
+resource "aws_sns_topic_subscription" "sqs_hive_metastore_sns_subscription" {
+  topic_arn = "${var.metastore_events_sns_topic}"
+  protocol  = "sqs"
+  endpoint  = "${aws_sqs_queue.shuntingyard_sqs_queue.arn}"
+}
diff --git a/templates.tf b/templates.tf
new file mode 100644
index 0000000..c794299
--- /dev/null
+++ b/templates.tf
@@ -0,0 +1,34 @@
+/**
+ * Copyright (C) 2019 Expedia, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ */
+
+data "template_file" "shuntingyard_config_yaml" {
+  template = "${file("${path.module}/templates/shuntingyard-config.yml.tmpl")}"
+
+  vars {
+    source_metastore_uri                = "${var.source_metastore_uri}"
+    target_metastore_uri                = "${var.target_metastore_uri}"
+    shuntingyard_sqs_queue              = "${aws_sqs_queue.shuntingyard_sqs_queue.id}"
+    shuntingyard_sqs_queue_wait_timeout = "${var.shuntingyard_sqs_queue_wait_timeout}"
+    selected_tables                     = "${join("\n", formatlist("    - %s", var.selected_tables))}"
+  }
+}
+
+data "template_file" "shuntingyard" {
+  template = "${file("${path.module}/templates/shuntingyard.json")}"
+
+  vars {
+    heapsize                 = "${var.memory}"
+    docker_image             = "${var.docker_image}"
+    docker_version           = "${var.docker_version}"
+    region                   = "${var.aws_region}"
+    loggroup                 = "${aws_cloudwatch_log_group.shuntingyard_ecs.name}"
+    shuntingyard_config_yaml = "${base64encode(data.template_file.shuntingyard_config_yaml.rendered)}"
+    ct_common_config_yaml    = "${base64encode(var.ct_common_config_yaml)}"
+
+    #to instruct ECS to use repositoryCredentials for private docker registry
+    docker_auth = "${var.docker_registry_auth_secret_name == "" ? "" : format("\"repositoryCredentials\" :{\n \"credentialsParameter\":\"%s\"\n},", join("", data.aws_secretsmanager_secret.docker_registry.*.arn))}"
+  }
+}
diff --git a/templates/shuntingyard-config.yml.tmpl b/templates/shuntingyard-config.yml.tmpl
index 740ea8c..e71305d 100644
--- a/templates/shuntingyard-config.yml.tmpl
+++ b/templates/shuntingyard-config.yml.tmpl
@@ -1,5 +1,5 @@
 ---
-# Copyright (C) 2019 Expedia Inc.
+# Copyright (C) 2019 Expedia, Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 
 source-catalog:
@@ -9,9 +9,10 @@ replica-catalog:
   name: aws-target
   hive-metastore-uris: ${target_metastore_uri}
 event-receiver:
-  message-reader-factory-class: com.hotels.shunting.yard.receiver.sqs.messaging.SqsMessageReaderFactory
+  message-reader-factory-class: com.expediagroup.shunting.yard.receiver.sqs.messaging.SqsMessageReaderFactory
   configuration-properties:
-    com.hotels.shunting.yard.event.receiver.sqs.queue: ${shuntingyard_sqs_queue}
-    com.hotels.shunting.yard.event.receiver.sqs.wait.time.seconds: 15
+    sqs.queue: ${shuntingyard_sqs_queue}
+    sqs.wait.time.seconds: ${shuntingyard_sqs_queue_wait_timeout}
 source-table-filter:
-  table-names: ${selected_tables}
+  table-names: 
+${selected_tables}
diff --git a/templates/shuntingyard.json b/templates/shuntingyard.json
index 98e0fa8..adc4dfa 100644
--- a/templates/shuntingyard.json
+++ b/templates/shuntingyard.json
@@ -2,6 +2,7 @@
   {
     "name": "shuntingyard",
     "image": "${docker_image}:${docker_version}",
+    ${docker_auth}
     "essential": true,
     "logConfiguration": {
         "logDriver": "awslogs",
diff --git a/variables.tf b/variables.tf
index 53032cf..5e38859 100644
--- a/variables.tf
+++ b/variables.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2019 Expedia Inc.
+ * Copyright (C) 2019 Expedia, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  */
@@ -26,15 +26,9 @@ variable "subnets" {
 }
 
 # Tags
-variable "tags" {
+variable "shuntingyard_tags" {
   description = "A map of tags to apply to resources."
   type        = "map"
-
-  default = {
-    Environment = ""
-    Application = ""
-    Team        = ""
-  }
 }
 
 variable "memory" {
@@ -93,7 +87,31 @@ variable "metastore_events_sns_topic" {
   type        = "string"
 }
 
+variable "shuntingyard_sqs_queue_wait_timeout" {
+  description = "Wait timeout for connecting to the Shunting Yard SQS queue (in seconds)"
+  type        = "string"
+  default     = 15
+}
+
+variable "shuntingyard_sqs_queue_stale_messages_timeout" {
+  description = "Shunting Yard SQS Queue Cloudwatch Alert timeout for messages older than this number of seconds."
+  type        = "string"
+  default     = 300
+}
+
 variable "selected_tables" {
-  description = "Tables selected for Shunting Yard Replication. Supported Format: `database_1.table_1, database_2.table_2`"
+  description = <<EOF
+Tables selected for Shunting Yard Replication. 
+Supported Format: [ "database_1.table_1", "database_2.table_2" ]
+Wildcards are not supported, i.e. you need to specify each table explicitly.
+EOF
+
+  type    = "list"
+  default = []
+}
+
+variable "docker_registry_auth_secret_name" {
+  description = "Docker Registry authentication SecretManager secret name."
   type        = "string"
+  default     = ""
 }
diff --git a/version.tf b/version.tf
index d570be0..e871fa7 100644
--- a/version.tf
+++ b/version.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2019 Expedia Inc.
+ * Copyright (C) 2019 Expedia, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  */