diff --git a/deployment/modules/tileserver/alb_listeners.tf b/deployment/modules/tileserver/alb_listeners.tf
index afd6829..a1a5610 100644
--- a/deployment/modules/tileserver/alb_listeners.tf
+++ b/deployment/modules/tileserver/alb_listeners.tf
@@ -1,5 +1,5 @@
 resource "aws_alb_listener" "this_alb_listener" {
-  # depends_on = ["aws_autoscaling_group.autoscalinggroup"]
+  depends_on = ["aws_autoscaling_group.autoscalinggroup"]
   load_balancer_arn = "${data.terraform_remote_state.mono_alb.this_alb_arn}"
   port = 80
   protocol = "HTTP"
diff --git a/deployment/modules/tileserver/data.tf b/deployment/modules/tileserver/data.tf
index cffd0bd..a449967 100644
--- a/deployment/modules/tileserver/data.tf
+++ b/deployment/modules/tileserver/data.tf
@@ -8,7 +8,7 @@ data "aws_ami" "amazon_linux" {
 
   filter {
     name   = "name"
-    values = ["ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-*"]
+    values = ["ubuntu/images/hvm-ssd/ubuntu-*-16.04-amd64-server-*"]
   }
 
   filter {