diff --git a/deployment/modules/tileserver/data.tf b/deployment/modules/tileserver/data.tf
index 3a9994b..cffd0bd 100644
--- a/deployment/modules/tileserver/data.tf
+++ b/deployment/modules/tileserver/data.tf
@@ -40,6 +40,8 @@ data "template_file" "shell-script" {
     mono_region = "${var.mono_region}"
     repo_version = "${var.repo_version}"
     environment = "${var.environment}"
+    aws_access_key = "${var.aws_access_key}"
+    aws_secret_key = "${var.aws_secret_key}"
   }
 }
 
diff --git a/deployment/modules/tileserver/files/user-data.sh b/deployment/modules/tileserver/files/user-data.sh
index e22f2b5..ca21f09 100644
--- a/deployment/modules/tileserver/files/user-data.sh
+++ b/deployment/modules/tileserver/files/user-data.sh
@@ -5,6 +5,8 @@ REGION=${region}
 ENVIRONMENT=${environment}
 MONO_REGION=${mono_region}
 REPO_VERSION=${repo_version}
+AWS_ACCESS_KEY=${aws_access_key}
+AWS_SECRET_KEY=${aws_secret_key}
 BUCKET="mono-deployment-$ENVIRONMENT"
 DEPLOYABLE="tileserver-gl-$REPO_VERSION.tar.gz"
 FULL_BUCKET_URI="s3://$BUCKET/tileserver-gl/$DEPLOYABLE"
@@ -23,6 +25,9 @@ REGION=$REGION
 ENVIRONMENT=$ENVIRONMENT
 MONO_REGION=$MONO_REGION
 EOL
+aws configure set aws_access_key_id "$AWS_ACCESS_KEY"
+aws configure set aws_secret_access_key "$AWS_SECRET_KEY"
+aws configure set region "$REGION"
 sudo rm /etc/apt/sources.list.d/microsoft.list
 sudo groupadd nginx
 sudo useradd nginx -g nginx
diff --git a/deployment/modules/tileserver/target_groups.tf b/deployment/modules/tileserver/target_groups.tf
index 4ad2546..05ed1df 100644
--- a/deployment/modules/tileserver/target_groups.tf
+++ b/deployment/modules/tileserver/target_groups.tf
@@ -1,5 +1,5 @@
 resource "aws_alb_target_group" "target_group_this" {
-  name = "maps"
+  name = "maps-test"
   port = "80"
   protocol = "HTTP"
   vpc_id = "${data.terraform_remote_state.mono_vpc.vpc_id[0]}"
diff --git a/deployment/modules/tileserver/variables.tf b/deployment/modules/tileserver/variables.tf
index abbdadd..e71d1bb 100644
--- a/deployment/modules/tileserver/variables.tf
+++ b/deployment/modules/tileserver/variables.tf
@@ -53,4 +53,14 @@ variable "mono_alb_remote_state" {
 variable "repo_version" {
   type = "string"
   description = "Version of repo to fetch and setup from S3"
+}
+
+variable "aws_access_key" {
+  type = "string"
+  description = "AWS access creds to fetch artifact"
+}
+
+variable "aws_secret_key" {
+  type = "string"
+  description = "AWS access secret to fetch artifact"
 }
\ No newline at end of file