diff --git a/terraform/provision/ecs.tf b/terraform/provision/ecs.tf
index fa5b4f4..c46d12f 100644
--- a/terraform/provision/ecs.tf
+++ b/terraform/provision/ecs.tf
@@ -3,6 +3,23 @@ data "aws_caller_identity" "current" {}
 
 resource "aws_ecs_cluster" "solr-cluster" {
   name = "solr-cluster"
+
+  setting {
+    name  = "containerInsights"
+    value = "enabled"
+  }
+
+  configuration {
+    execute_command_configuration {
+      kms_key_id = aws_kms_key.ecs-log-key.arn
+      logging    = "OVERRIDE"
+
+      log_configuration {
+        cloud_watch_encryption_enabled = true
+        cloud_watch_log_group_name     = aws_cloudwatch_log_group.ecs-logs.name
+      }
+    }
+  }
 }
 
 resource "aws_ecs_cluster_capacity_providers" "fargate" {
@@ -18,11 +35,13 @@ resource "aws_ecs_cluster_capacity_providers" "fargate" {
 }
 
 resource "aws_ecs_task_definition" "solr" {
-  family = "service"
+  family = "solr-service"
   requires_compatibilities = ["FARGATE"]
   network_mode             = "awsvpc"
   cpu                      = 2048
   memory                   = 14336
+  task_role_arn            = "${aws_iam_role.solr-task-execution.arn}"
+  execution_role_arn       = "${aws_iam_role.solr-task-execution.arn}"
   container_definitions = jsonencode([
     {
       name      = "solr"
@@ -30,39 +49,44 @@ resource "aws_ecs_task_definition" "solr" {
       cpu       = 2048
       memory    = 14336
       essential = true
+      # command   = ["wget -o start.sh", "https://gist.githubusercontent.com/FuhuXia/91cac09b23ef29e5f219ba83df8b808e/raw/76de04dd7edf0faef2c04d8a8bbd51ee2cef237f/solr-setup-for-catalog.sh", "&&", "./start.sh"]
       portMappings = [
         {
           containerPort = 8983
           hostPort      = 8983
         }
       ]
-      # mountPoints = [
-      #   {
-      #     containerPath = "/var/solr/data",
-      #     sourceVolume = "solr-data"
-      #   }
-      # ]
+      logConfiguration = {
+        logDriver = "awslogs",
+        options = {
+          awslogs-group = aws_cloudwatch_log_group.ecs-logs.name,
+          awslogs-region = "us-west-2",
+          awslogs-stream-prefix = "application"
+        }
+      }
+      mountPoints = [
+        {
+          containerPath = "/var/solr/data",
+          sourceVolume = "solr-data",
+          readOnly = false
+        }
+      ]
     },
   ])
 
-  # volume {
-  #   name      = "solr-data"
-  #   efs_volume_configuration {
-  #     file_system_id          = aws_efs_file_system.solr-data.id
-  #     root_directory          = "/"
-  #     # transit_encryption      = "ENABLED"
-  #     # transit_encryption_port = 2999
-  #     # authorization_config {
-  #     #   access_point_id = aws_efs_access_point.solr-data-access.id
-  #     #   iam             = "ENABLED"
-  #     # }
-  #   }
-  # }
-
-  # placement_constraints {
-  #   type       = "memberOf"
-  #   expression = "attribute:ecs.availability-zone in [us-west-2a]"
-  # }
+  volume {
+    name      = "solr-data"
+    efs_volume_configuration {
+      file_system_id          = aws_efs_file_system.solr-data.id
+      root_directory          = "/"
+      transit_encryption      = "ENABLED"
+      transit_encryption_port = 2049
+      authorization_config {
+        access_point_id = aws_efs_access_point.solr-data-ap.id
+        iam             = "ENABLED"
+      }
+    }
+  }
 }
 
 resource "aws_ecs_service" "solr" {
@@ -77,9 +101,4 @@ resource "aws_ecs_service" "solr" {
     subnets = module.vpc.public_subnets
     assign_public_ip = true
   }
-
-  # placement_constraints {
-  #   type       = "memberOf"
-  #   expression = "attribute:ecs.availability-zone in [us-west-2a, us-west-2b]"
-  # }
 }
diff --git a/terraform/provision/efs.tf b/terraform/provision/efs.tf
index 58539c0..ebf9249 100644
--- a/terraform/provision/efs.tf
+++ b/terraform/provision/efs.tf
@@ -1,15 +1,21 @@
 
-
 resource "aws_efs_file_system" "solr-data" {
   creation_token = "solr-data"
 
+  # encryption-at-rest
+  encrypted = true
   tags = {
     Name = "SolrData"
   }
 }
 
-resource "aws_efs_access_point" "solr-data-access" {
+resource "aws_efs_access_point" "solr-data-ap" {
   file_system_id = aws_efs_file_system.solr-data.id
+  # EFS needs to be mounted as root to be able to write-to/create files
+  posix_user {
+    gid = "0"
+    uid = "0"
+  }
 }
 
 resource "aws_efs_mount_target" "all" {
@@ -17,3 +23,45 @@ resource "aws_efs_mount_target" "all" {
   file_system_id = aws_efs_file_system.solr-data.id
   subnet_id      = module.vpc.public_subnets[count.index]
 }
+
+resource "aws_efs_file_system_policy" "policy" {
+  file_system_id = aws_efs_file_system.solr-data.id
+
+  # encryption-in-transit
+  policy = <<-POLICY
+  {
+    "Version": "2012-10-17",
+    "Id": "efs-policy",
+    "Statement": [
+      {
+        "Effect": "Allow",
+        "Principal": {
+          "AWS": "*"
+        },
+        "Action": [
+          "elasticfilesystem:ClientRootAccess",
+          "elasticfilesystem:ClientWrite",
+          "elasticfilesystem:ClientMount"
+        ],
+        "Condition": {
+          "Bool": {
+            "elasticfilesystem:AccessedViaMountTarget": "true"
+          }
+        }
+      },
+      {
+        "Effect": "Deny",
+        "Principal": {
+          "AWS": "*"
+        },
+        "Action": "*",
+        "Condition": {
+          "Bool": {
+            "aws:SecureTransport": "false"
+          }
+        }
+      }
+    ]
+  }
+  POLICY
+}
diff --git a/terraform/provision/iam.tf b/terraform/provision/iam.tf
index 8648c5f..9aea937 100644
--- a/terraform/provision/iam.tf
+++ b/terraform/provision/iam.tf
@@ -1,9 +1,7 @@
 
-resource "aws_iam_role" "solr" {
-  name = "solr_role"
+resource "aws_iam_role" "solr-task-execution" {
+  name = "solr_task_role"
 
-  # Terraform's "jsonencode" function converts a
-  # Terraform expression result to valid JSON syntax.
   assume_role_policy = jsonencode({
     Version = "2012-10-17"
     Statement = [
@@ -12,7 +10,7 @@ resource "aws_iam_role" "solr" {
         Effect = "Allow"
         Sid    = ""
         Principal = {
-          Service = "ec2.amazonaws.com"
+          Service = "ecs-tasks.amazonaws.com"
         }
       },
     ]
@@ -21,17 +19,27 @@ resource "aws_iam_role" "solr" {
 
 resource "aws_iam_policy_attachment" "solr-efs-ecs" {
   name       = "solr-efs-ecs-attachment"
-  roles      = [aws_iam_role.solr.name]
+  roles      = [aws_iam_role.solr-task-execution.name]
   policy_arn = aws_iam_policy.ecs-solr-efs.arn
 }
 
+# resource "aws_iam_policy_attachment" "solr-ecs-basic" {
+#   name       = "solr-efs-ecs-attachment"
+#   roles      = [aws_iam_role.solr-task-execution.name]
+#   policy_arn = aws_iam_policy.ecs-basic.arn
+# }
+
+resource "aws_iam_policy_attachment" "solr-ecs-execution-role" {
+  name       = "solr-ecs-execution-role-attachment"
+  roles      = [aws_iam_role.solr-task-execution.name]
+  policy_arn = aws_iam_policy.ecs-tasks.arn
+}
+
 resource "aws_iam_policy" "ecs-solr-efs" {
   name        = "efs-policy"
   path        = "/"
-  description = "Solr EFS ECS Policy"
+  description = "Allow ECS to talk to EFS"
 
-  # Terraform's "jsonencode" function converts a
-  # Terraform expression result to valid JSON syntax.
   policy = jsonencode({
     Version = "2012-10-17"
     Statement = [
@@ -47,3 +55,52 @@ resource "aws_iam_policy" "ecs-solr-efs" {
     ]
   })
 }
+
+# resource "aws_iam_policy" "ecs-basic" {
+#   name        = "ecs-basic-policy"
+#   path        = "/"
+#   description = "Allow solr to run on ecs"
+# 
+#   policy = jsonencode({
+#     Version = "2012-10-17"
+#     Statement = [
+#       {
+#         Action = [
+#           "ec2:AttachNetworkInterface",
+#           "ec2:CreateNetworkInterface",
+#           "ec2:CreateNetworkInterfacePermission",
+#           "ec2:DeleteNetworkInterface",
+#           "ec2:DeleteNetworkInterfacePermission",
+#           "ec2:Describe*",
+#           "ec2:DetachNetworkInterface",
+#         ]
+#         Effect   = "Allow"
+#         Resource = "*"
+#       },
+#     ]
+#   })
+# }
+
+resource "aws_iam_policy" "ecs-tasks" {
+  name        = "ecs-tasks"
+  path        = "/"
+  description = "Allow solr task role to run on ecs"
+
+  policy = jsonencode({
+    Version = "2012-10-17"
+    Statement = [
+      {
+        Action = [
+          "logs:CreateLogGroup",
+          "logs:CreateLogStream",
+          "logs:PutLogEvents",
+          "ecr:*",
+          # "s3:*",
+          # "efs:*"
+        ]
+        Effect   = "Allow"
+        Resource = "*"
+      },
+    ]
+  })
+}
diff --git a/terraform/provision/logging.tf b/terraform/provision/logging.tf
new file mode 100644
index 0000000..cbdbd6b
--- /dev/null
+++ b/terraform/provision/logging.tf
@@ -0,0 +1,9 @@
+
+resource "aws_kms_key" "ecs-log-key" {
+  description             = "ecs log key"
+  deletion_window_in_days = 7
+}
+
+resource "aws_cloudwatch_log_group" "ecs-logs" {
+  name = "ecs-logs-solr"
+}
diff --git a/terraform/provision/vpc.tf b/terraform/provision/vpc.tf
index 431b7f8..a56f870 100644
--- a/terraform/provision/vpc.tf
+++ b/terraform/provision/vpc.tf
@@ -8,7 +8,6 @@ data "aws_availability_zones" "available" {
 module "vpc" {
   source  = "terraform-aws-modules/vpc/aws"
   version = "3.11.4"
-  # insert the 23 required variables here
   name = "eks-vpc"
   cidr = "10.31.0.0/16"
 
@@ -30,3 +29,19 @@ module "vpc" {
   # })
 }
 
+resource "aws_security_group_rule" "allow-efs" {
+  type              = "ingress"
+  from_port         = 2049
+  to_port           = 2049
+  protocol          = "tcp"
+  cidr_blocks       = module.vpc.private_subnets_cidr_blocks
+  security_group_id = module.vpc.default_security_group_id
+}
+resource "aws_security_group_rule" "allow-efs-b" {
+  type              = "egress"
+  from_port         = 2049
+  to_port           = 2049
+  protocol          = "tcp"
+  cidr_blocks       = module.vpc.private_subnets_cidr_blocks
+  security_group_id = module.vpc.default_security_group_id
+}