diff --git a/.github/workflows/iacdeploy.yaml b/.github/workflows/iacdeploy.yaml
index 7f1672f3..5d8054a9 100644
--- a/.github/workflows/iacdeploy.yaml
+++ b/.github/workflows/iacdeploy.yaml
@@ -28,7 +28,7 @@ jobs:
       - uses: hashicorp/setup-terraform@v2
       - name: Replace bucket name
         run: |
-          sed -i "s|bucket = \"NON-EXISTING-BUCKET\"|bucket = \"$IAC_BUCKET_NAME\"|g" main.tf
+          sed -i "s|t = \"NON-EXISTING-BUCKET\"|t = \"$IAC_BUCKET_NAME\"|g" main.tf
       - run: terraform init
       - name: Select workspace and apply app
         run: |
diff --git a/.github/workflows/iactest.yaml b/.github/workflows/iactest.yaml
deleted file mode 100644
index c425b413..00000000
--- a/.github/workflows/iactest.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: Test terraform
-
-on:
-  pull_request:
-    branches:
-      - main
-    paths:
-      - "iac/**"
-      - ".github/workflows/iactest.yaml"
-
-env:
-  STAGE: prod
-  AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
-  AWS_ACCESS_KEY_ID: ${{ secrets.CI_CD_AWS_ACCESS_KEY_ID }}
-  AWS_SECRET_ACCESS_KEY: ${{ secrets.CI_CD_AWS_SECRET_ACCESS_KEY }}
-  IAC_BUCKET_NAME: ${{ vars.IAC_BUCKET_NAME }}
-
-defaults:
-  run:
-    working-directory: iac
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v3
-      - uses: hashicorp/setup-terraform@v2
-      - name: Replace bucket name
-        run: |
-          sed -i "s|bucket = \"NON-EXISTING-BUCKET\"|bucket = \"$IAC_BUCKET_NAME\"|g" main.tf
-      - run: terraform init
-      - name: Plan
-        run: |
-          terraform workspace select $STAGE || terraform workspace new $STAGE
-          terraform plan -out tfapply
diff --git a/iac/.gitignore b/iac/.gitignore
index 1c99dc13..c0f72210 100644
--- a/iac/.gitignore
+++ b/iac/.gitignore
@@ -1 +1,2 @@
 .terraform/
+app-spec/
diff --git a/iac/.terraform.lock.hcl b/iac/.terraform.lock.hcl
index c8f1951e..e5f8a33a 100644
--- a/iac/.terraform.lock.hcl
+++ b/iac/.terraform.lock.hcl
@@ -23,3 +23,22 @@ provider "registry.terraform.io/hashicorp/aws" {
     "zh:fb3ec60ea72144f480f495634c6d3e7a7638d7061a77c228a30768c1ae0b91f6",
   ]
 }
+
+provider "registry.terraform.io/hashicorp/local" {
+  version = "2.4.0"
+  hashes = [
+    "h1:ZUEYUmm2t4vxwzxy1BvN1wL6SDWrDxfH7pxtzX8c6d0=",
+    "zh:53604cd29cb92538668fe09565c739358dc53ca56f9f11312b9d7de81e48fab9",
+    "zh:66a46e9c508716a1c98efbf793092f03d50049fa4a83cd6b2251e9a06aca2acf",
+    "zh:70a6f6a852dd83768d0778ce9817d81d4b3f073fab8fa570bff92dcb0824f732",
+    "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
+    "zh:82a803f2f484c8b766e2e9c32343e9c89b91997b9f8d2697f9f3837f62926b35",
+    "zh:9708a4e40d6cc4b8afd1352e5186e6e1502f6ae599867c120967aebe9d90ed04",
+    "zh:973f65ce0d67c585f4ec250c1e634c9b22d9c4288b484ee2a871d7fa1e317406",
+    "zh:c8fa0f98f9316e4cfef082aa9b785ba16e36ff754d6aba8b456dab9500e671c6",
+    "zh:cfa5342a5f5188b20db246c73ac823918c189468e1382cb3c48a9c0c08fc5bf7",
+    "zh:e0e2b477c7e899c63b06b38cd8684a893d834d6d0b5e9b033cedc06dd7ffe9e2",
+    "zh:f62d7d05ea1ee566f732505200ab38d94315a4add27947a60afa29860822d3fc",
+    "zh:fa7ce69dde358e172bd719014ad637634bbdabc49363104f4fca759b4b73f2ce",
+  ]
+}
diff --git a/iac/alb.tf b/iac/alb.tf
index 0f7bab6f..d09342d8 100644
--- a/iac/alb.tf
+++ b/iac/alb.tf
@@ -1,8 +1,8 @@
 resource "aws_alb" "statistics_server_load_balancer" {
-  name               = "statistics-server-alb-${terraform.workspace}"
-  subnets            = [aws_default_subnet.default_az1.id, aws_default_subnet.default_az2.id]
-  security_groups    = [aws_security_group.http_security_group.id]
-  load_balancer_type = "application"
+  name            = "statistics-server-alb-${terraform.workspace}"
+  subnets         = [aws_default_subnet.default_az1.id, aws_default_subnet.default_az2.id]
+  security_groups = [aws_security_group.http_security_group.id, aws_security_group.allow_tomcat.id]
+  idle_timeout    = 300
 }
 
 resource "aws_alb_target_group" "statistics_server_target_group" {
diff --git a/iac/batch.tf b/iac/batch.tf
index 44ace0c1..f701e6b8 100644
--- a/iac/batch.tf
+++ b/iac/batch.tf
@@ -59,7 +59,7 @@ resource "aws_batch_job_definition" "statistics_cron_job_definition" {
     statistics_port = "8080"
     db_port         = "3306"
     db_host         = aws_db_instance.dumped_db.address
-    db_name         = "wca_development"
+    db_name         = var.dumped_db_name
     db_username     = data.aws_ssm_parameter.dumped_db_write_user.value
     db_password     = data.aws_ssm_parameter.dumped_db_write_password.value
     execution_role  = aws_iam_role.ecs_task_execution_role.arn
@@ -69,4 +69,24 @@ resource "aws_batch_job_definition" "statistics_cron_job_definition" {
 resource "aws_iam_role" "ecs_task_execution_role" {
   name               = "ecs-task-execution-role-${terraform.workspace}"
   assume_role_policy = templatefile("${path.module}/templates/policies/assume-role-ecs.json", {})
+
+  inline_policy {
+    name = "statistics-task-execution-role-policy-${terraform.workspace}"
+
+    policy = jsonencode({
+      Version = "2012-10-17"
+      Statement = [
+        {
+          Action   = ["logs:*"]
+          Effect   = "Allow"
+          Resource = "*"
+        },
+        {
+          Action   = ["ecr:*"]
+          Effect   = "Allow"
+          Resource = "*"
+        }
+      ]
+    })
+  }
 }
diff --git a/iac/code-deploy.tf b/iac/code-deploy.tf
new file mode 100644
index 00000000..6c2dd940
--- /dev/null
+++ b/iac/code-deploy.tf
@@ -0,0 +1,99 @@
+resource "aws_iam_role" "statistics_server_code_deploy_role" {
+  name = "statistics-server-code-deploy-role-${terraform.workspace}"
+
+  inline_policy {
+    name = "statistics-inline-cd-${terraform.workspace}"
+    policy = templatefile("${path.module}/templates/policies/code-deploy-statistics.json", {
+      bucket_name     = var.bucket_name
+      aws_region      = var.aws_region
+      app_spec_folder = var.app_spec_folder
+      cluster_name    = aws_ecs_cluster.statistics_server_cluster.name
+      service_name    = aws_ecs_service.statistics_server_service.name
+    })
+  }
+
+  assume_role_policy = templatefile("${path.module}/templates/policies/assume-role-code-deploy.json", {})
+}
+
+resource "aws_iam_role_policy_attachment" "statistics_server_code_deploy_role" {
+  policy_arn = "arn:aws:iam::aws:policy/service-role/AWSCodeDeployRole"
+  role       = aws_iam_role.statistics_server_code_deploy_role.name
+}
+
+resource "aws_codedeploy_app" "statistics_server_code_deploy_app" {
+  name             = "statistics-server-code-deploy-app-${terraform.workspace}"
+  compute_platform = "ECS"
+}
+
+resource "aws_codedeploy_deployment_group" "statistics_server_code_deployment_group" {
+  app_name               = aws_codedeploy_app.statistics_server_code_deploy_app.name
+  deployment_config_name = "CodeDeployDefault.ECSAllAtOnce"
+  deployment_group_name  = "statistics-server-code-deployment-group-${terraform.workspace}"
+  service_role_arn       = aws_iam_role.statistics_server_code_deploy_role.arn
+
+  auto_rollback_configuration {
+    enabled = true
+    events  = ["DEPLOYMENT_FAILURE"]
+  }
+
+  blue_green_deployment_config {
+    deployment_ready_option {
+      action_on_timeout = "CONTINUE_DEPLOYMENT"
+    }
+
+    terminate_blue_instances_on_deployment_success {
+      action                           = "TERMINATE"
+      termination_wait_time_in_minutes = 5
+    }
+  }
+
+  deployment_style {
+    deployment_option = "WITH_TRAFFIC_CONTROL"
+    deployment_type   = "BLUE_GREEN"
+  }
+
+  ecs_service {
+    cluster_name = aws_ecs_cluster.statistics_server_cluster.name
+    service_name = aws_ecs_service.statistics_server_service.name
+  }
+
+  load_balancer_info {
+    target_group_pair_info {
+      prod_traffic_route {
+        listener_arns = [aws_alb_listener.statistics_server_https_listener.arn]
+      }
+
+      target_group {
+        name = aws_alb_target_group.statistics_server_target_group.name
+      }
+
+      target_group {
+        name = aws_alb_target_group.statistics_server_target_group_blue_green.name
+      }
+    }
+  }
+}
+
+resource "local_file" "statistics_app_spec" {
+  content  = <<EOF
+version: 0.0
+Resources:
+  - TargetService:
+      Type: AWS::ECS::Service
+      Properties:
+        TaskDefinition: "${replace(aws_ecs_task_definition.statistics_server_task_definition.arn, "/:[0-9]+$/", "")}"
+        LoadBalancerInfo:
+          ContainerName: "${var.container_name}"
+          ContainerPort: "${var.default_tomcat_port}"
+        PlatformVersion: "LATEST"
+EOF
+  filename = "${var.app_spec_folder}/statistics-spec-${terraform.workspace}.yaml"
+}
+
+resource "aws_s3_object" "api_app_spec_file" {
+  bucket = var.bucket_name
+  key    = local_file.statistics_app_spec.filename
+  source = local_file.statistics_app_spec.filename
+
+  etag = md5(local_file.statistics_app_spec.content)
+}
diff --git a/iac/ecs.tf b/iac/ecs.tf
index e36355f5..a7755358 100644
--- a/iac/ecs.tf
+++ b/iac/ecs.tf
@@ -12,21 +12,22 @@ resource "aws_ecs_task_definition" "statistics_server_task_definition" {
   family                   = "statistics-server-family-${terraform.workspace}"
   network_mode             = "awsvpc"
   requires_compatibilities = ["FARGATE"]
-  cpu                      = 1024 // 1 vCPU = 1024 CPU units
-  memory                   = 2048
+  cpu                      = var.statistics_fargate_cpu
+  memory                   = var.statistics_fargate_memory
   execution_role_arn       = aws_iam_role.ecs_task_execution_role.arn
 
   container_definitions = templatefile("./templates/ecs/statistics_server_app.json.tpl", {
     app_image      = aws_ecr_repository.statistics_server.repository_url
-    app_port       = 8080
-    fargate_cpu    = 1024
-    fargate_memory = 2048
+    container_name = var.container_name
+    app_port       = var.default_tomcat_port
+    fargate_cpu    = var.statistics_fargate_cpu
+    fargate_memory = var.statistics_fargate_memory
     aws_region     = var.aws_region
     spring_profile = terraform.workspace
     app_id         = data.aws_ssm_parameter.statistics_app_id.value
-    db_port        = "3306"
+    db_port        = var.default_mysql_port
     db_host        = aws_db_instance.dumped_db.address
-    db_name        = "wca_development"
+    db_name        = var.dumped_db_name
     db_username    = data.aws_ssm_parameter.dumped_db_read_user.value
     db_password    = data.aws_ssm_parameter.dumped_db_read_password.value
   })
@@ -41,7 +42,7 @@ resource "aws_ecs_service" "statistics_server_service" {
 
   network_configuration {
     subnets          = [aws_default_subnet.default_az1.id, aws_default_subnet.default_az2.id]
-    security_groups  = [aws_security_group.http_security_group.id]
+    security_groups  = [aws_security_group.http_security_group.id, aws_security_group.allow_tomcat.id]
     assign_public_ip = true
   }
 
@@ -54,6 +55,4 @@ resource "aws_ecs_service" "statistics_server_service" {
   deployment_controller {
     type = "CODE_DEPLOY"
   }
-
-  #   depends_on = [aws_iam_role_policy_attachment.ecs_task_execution_role]
 }
diff --git a/iac/eventbridge.tf b/iac/eventbridge.tf
new file mode 100644
index 00000000..9966f016
--- /dev/null
+++ b/iac/eventbridge.tf
@@ -0,0 +1,42 @@
+resource "aws_cloudwatch_event_rule" "statistics_cron" {
+  name                = "statistics-cron-${terraform.workspace}"
+  description         = "Statistics cron"
+  schedule_expression = "cron(0 5 ? * TUE,FRI *)" # Tuesday, Friday. Kind of before competitions and after results posted
+}
+
+resource "aws_cloudwatch_event_target" "statistics_cron" {
+  rule      = aws_cloudwatch_event_rule.statistics_cron.name
+  target_id = "SubmitStatisticsJob"
+  arn       = aws_batch_job_queue.statistics_cron_job_queue.arn
+  role_arn  = aws_iam_role.event_bus_invoke_remote_event_bus.arn
+  batch_target {
+    job_definition = aws_batch_job_definition.statistics_cron_job_definition.arn
+    job_name       = "statistics-cron-${terraform.workspace}"
+  }
+}
+
+resource "aws_iam_role" "event_bus_invoke_remote_event_bus" {
+  name               = "event-bus-statistics-${terraform.workspace}"
+  assume_role_policy = templatefile("${path.module}/templates/policies/assume-role-events.json", {})
+}
+
+data "aws_iam_policy_document" "event_bus_invoke_remote_event_bus" {
+  statement {
+    effect  = "Allow"
+    actions = ["batch:SubmitJob"]
+    resources = [
+      aws_batch_job_definition.statistics_cron_job_definition.arn,
+      aws_batch_job_queue.statistics_cron_job_queue.arn
+    ]
+  }
+}
+
+resource "aws_iam_policy" "event_bus_invoke_remote_event_bus" {
+  name   = "event-bus-invoke-statistics-${terraform.workspace}"
+  policy = data.aws_iam_policy_document.event_bus_invoke_remote_event_bus.json
+}
+
+resource "aws_iam_role_policy_attachment" "event_bus_invoke_remote_event_bus" {
+  role       = aws_iam_role.event_bus_invoke_remote_event_bus.name
+  policy_arn = aws_iam_policy.event_bus_invoke_remote_event_bus.arn
+}
diff --git a/iac/main.tf b/iac/main.tf
index d8a67a19..5c03d69f 100644
--- a/iac/main.tf
+++ b/iac/main.tf
@@ -6,6 +6,10 @@ terraform {
   }
 }
 
+variable "bucket_name" {
+  default = "NON-EXISTING-BUCKET"
+}
+
 terraform {
   required_providers {
     aws = {
diff --git a/iac/output.tf b/iac/output.tf
new file mode 100644
index 00000000..73798e93
--- /dev/null
+++ b/iac/output.tf
@@ -0,0 +1,3 @@
+output "access_url" {
+  value = aws_alb.statistics_server_load_balancer.dns_name
+}
\ No newline at end of file
diff --git a/iac/rds.tf b/iac/rds.tf
index 86a2723d..eb1eef9d 100644
--- a/iac/rds.tf
+++ b/iac/rds.tf
@@ -4,7 +4,7 @@ resource "aws_db_instance" "dumped_db" {
   engine                 = "mysql"
   engine_version         = "8.0.33"
   storage_type           = "gp2"
-  instance_class         = "db.t3.small"
+  instance_class         = "db.t3.medium"
   db_name                = "dumped_db"
   username               = data.aws_ssm_parameter.dumped_db_write_user.value
   password               = data.aws_ssm_parameter.dumped_db_write_password.value
diff --git a/iac/security-group.tf b/iac/security-group.tf
index d9eb23c1..59841044 100644
--- a/iac/security-group.tf
+++ b/iac/security-group.tf
@@ -67,3 +67,25 @@ resource "aws_security_group" "http_security_group" {
     (var.type) = var.type_sg
   }
 }
+
+resource "aws_security_group" "allow_tomcat" {
+  name        = "default-tomcat-${terraform.workspace}}"
+  description = "Default tomcat"
+  vpc_id      = aws_default_vpc.default.id
+
+  ingress {
+    description = "HTTP"
+    from_port   = var.default_tomcat_port
+    to_port     = var.default_tomcat_port
+    protocol    = "tcp"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+
+  egress {
+    from_port        = 0
+    to_port          = 0
+    protocol         = "-1"
+    cidr_blocks      = ["0.0.0.0/0"]
+    ipv6_cidr_blocks = ["::/0"]
+  }
+}
diff --git a/iac/templates/ecs/statistics_server_app.json.tpl b/iac/templates/ecs/statistics_server_app.json.tpl
index 201aab01..c9786651 100644
--- a/iac/templates/ecs/statistics_server_app.json.tpl
+++ b/iac/templates/ecs/statistics_server_app.json.tpl
@@ -1,14 +1,14 @@
 [
   {
-    "name": "statistics-server-app",
-    "image": "${app_image}:latest",
+    "name": "${container_name}",
+    "image": "${app_image}",
     "cpu": ${fargate_cpu},
     "memory": ${fargate_memory},
     "networkMode": "awsvpc",
     "logConfiguration": {
       "logDriver": "awslogs",
       "options": {
-        "awslogs-group": "/ecs/statistics-server-app",
+        "awslogs-group": "/ecs/${container_name}",
         "awslogs-region": "${aws_region}",
         "awslogs-stream-prefix": "ecs"
       }
diff --git a/iac/templates/policies/assume-role-code-deploy.json b/iac/templates/policies/assume-role-code-deploy.json
new file mode 100644
index 00000000..2a83b6f9
--- /dev/null
+++ b/iac/templates/policies/assume-role-code-deploy.json
@@ -0,0 +1,13 @@
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Sid": "",
+      "Effect": "Allow",
+      "Principal": {
+        "Service": "codedeploy.amazonaws.com"
+      },
+      "Action": "sts:AssumeRole"
+    }
+  ]
+}
diff --git a/iac/templates/policies/assume-role-events.json b/iac/templates/policies/assume-role-events.json
new file mode 100644
index 00000000..ea342460
--- /dev/null
+++ b/iac/templates/policies/assume-role-events.json
@@ -0,0 +1,12 @@
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Action": "sts:AssumeRole",
+      "Effect": "Allow",
+      "Principal": {
+        "Service": "events.amazonaws.com"
+      }
+    }
+  ]
+}
diff --git a/iac/templates/policies/code-deploy-statistics.json b/iac/templates/policies/code-deploy-statistics.json
new file mode 100644
index 00000000..838f2eaf
--- /dev/null
+++ b/iac/templates/policies/code-deploy-statistics.json
@@ -0,0 +1,15 @@
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Action": ["ecs:DescribeServices"],
+      "Effect": "Allow",
+      "Resource": "arn:aws:ecs:${aws_region}:*:service/${cluster_name}/${service_name}"
+    },
+    {
+      "Action": ["s3:GetObject"],
+      "Effect": "Allow",
+      "Resource": "arn:aws:s3:::${bucket_name}/${app_spec_folder}/*"
+    }
+  ]
+}
diff --git a/iac/variable.tf b/iac/variable.tf
index 0f0f7da4..cddc9a35 100644
--- a/iac/variable.tf
+++ b/iac/variable.tf
@@ -1,12 +1,3 @@
-variable "environment_to_suffix_map" {
-  type = map(any)
-  default = {
-    dev     = "-dev"
-    staging = "-stg"
-    prod    = ""
-  }
-}
-
 variable "aws_region" {
   default = "us-west-2"
 }
@@ -44,5 +35,26 @@ variable "https_port" {
 }
 
 variable "default_tomcat_port" {
-  default = 8080
+  default = "8080"
+}
+
+variable "statistics_fargate_cpu" {
+  default = "1024"
+}
+
+variable "statistics_fargate_memory" {
+  default = "2048"
+}
+
+variable "dumped_db_name" {
+  default = "wca_development"
+}
+
+variable "container_name" {
+  default = "statistics-server-app"
+}
+
+variable "app_spec_folder" {
+  default = "app-spec"
+
 }