diff --git a/data.tf b/data.tf
index 8a43576..251c6c6 100644
--- a/data.tf
+++ b/data.tf
@@ -19,25 +19,25 @@ data "template_file" "default-container" {
 
   template = file("${path.module}/templates/containers.json")
   vars = {
-    region                        = data.aws_region.current.name
-    log_group                     = var.aws_cloudwatch_log_group_name
-    cpu                           = var.default_container_cpu
-    memory                        = var.default_container_memory
-    container_port                = var.default_container_port
-    dockerLabels                  = local.dockerLabels == "{}" ? "null" : local.dockerLabels
-    default_container_task_role   = aws_iam_role.ecs_task_execution_role.arn
-    name                          = "${var.app_name}-${var.environment}"
-    image                         = "${var.ecr_repo_url}:${split("-", var.environment)[0]}"
-    environment                   = local.default_container_environment == "[]" ? "null" : local.default_container_environment
-    secret                        = "/infra/${var.app_name}-${var.environment}/db-host"
-    awslogs-stream-prefix         = "awslogs-${var.app_name}-pref"
-    create_datadog                = var.create_datadog
-    dd_cpu                        = var.datadog_container_cpu
-    dd_memory                     = var.datadog_container_memory
-    dd_container_port             = var.datadog_container_port
-    dd_name                       = var.datadog_container_name
-    dd_image                      = var.datadog_container_image
-    dd_api_key                    = "/${data.aws_caller_identity.current.account_id}/datadog/api-key"
-    dd_environment                = local.dd_environment == "[]" ? "null" : local.dd_environment
+    region                      = data.aws_region.current.name
+    log_group                   = var.aws_cloudwatch_log_group_name
+    cpu                         = var.default_container_cpu
+    memory                      = var.default_container_memory
+    container_port              = var.default_container_port
+    dockerLabels                = local.dockerLabels == "{}" ? "null" : local.dockerLabels
+    default_container_task_role = aws_iam_role.ecs_task_execution_role.arn
+    name                        = "${var.app_name}-${var.environment}"
+    image                       = "${var.ecr_repo_url}:${split("-", var.environment)[0]}"
+    environment                 = local.default_container_environment == "[]" ? "null" : local.default_container_environment
+    secret                      = "/infra/${var.app_name}-${var.environment}/db-host"
+    awslogs-stream-prefix       = "awslogs-${var.app_name}-pref"
+    create_datadog              = var.create_datadog
+    dd_cpu                      = var.datadog_container_cpu
+    dd_memory                   = var.datadog_container_memoryreservation
+    dd_container_port           = var.datadog_container_port
+    dd_name                     = var.datadog_container_name
+    dd_image                    = var.datadog_container_image
+    dd_api_key                  = "/${data.aws_caller_identity.current.account_id}/datadog/api-key"
+    dd_environment              = local.dd_environment == "[]" ? "null" : local.dd_environment
   }
 }
diff --git a/main.tf b/main.tf
index 6bd8e0e..29d50c1 100644
--- a/main.tf
+++ b/main.tf
@@ -28,7 +28,7 @@ resource "aws_ecs_service" "main" {
     content {
       target_group_arn = var.aws_alb_target_group_arn
       container_name   = "${var.app_name}-${var.environment}"
-      container_port   = 80
+      container_port   = var.default_container_port
     }
   }
 
diff --git a/templates/containers.json b/templates/containers.json
index f12b81e..d49758f 100644
--- a/templates/containers.json
+++ b/templates/containers.json
@@ -41,7 +41,7 @@
         },
         "name": "${dd_name}",
         "image": "${dd_image}",
-        "memory": ${dd_memory},
+        "memoryReservation": ${dd_memory},
         "cpu": ${dd_cpu},
         "environment" : ${dd_environment},
         "portMappings" : [
diff --git a/variables.tf b/variables.tf
index 2a62760..27646ae 100644
--- a/variables.tf
+++ b/variables.tf
@@ -50,14 +50,14 @@ variable "iam_role_additional_policies" {
 
 variable "task_definition_cpu" {
   description = "Task definition CPU"
-  type = number
-  default = 512
+  type        = number
+  default     = 2048
 }
 
 variable "task_definition_memory" {
   description = "Task definition memory"
-  type = number
-  default = 2048
+  type        = number
+  default     = 4096
 }
 
 # Default container related variables
@@ -70,7 +70,7 @@ variable "default_container_cpu" {
 variable "default_container_memory" {
   description = "Default container memory"
   type        = number
-  default     = 2048
+  default     = 4096
 }
 
 variable "default_container_port" {
@@ -109,7 +109,7 @@ variable "datadog_container_cpu" {
   default     = 10
 }
 
-variable "datadog_container_memory" {
+variable "datadog_container_memoryreservation" {
   description = "Datadog container memory"
   type        = number
   default     = 256