diff --git a/.infra/Frey-state-terraform.tfstate b/.infra/Frey-state-terraform.tfstate
index a711876..2904501 100644
--- a/.infra/Frey-state-terraform.tfstate
+++ b/.infra/Frey-state-terraform.tfstate
@@ -1,6 +1,6 @@
 {
     "version": 1,
-    "serial": 20,
+    "serial": 24,
     "modules": [
         {
             "path": [
@@ -8,37 +8,37 @@
             ],
             "outputs": {
                 "endpoint": "http://master.tus.io:80/",
-                "public_address": "ec2-54-161-247-36.compute-1.amazonaws.com",
-                "public_addresses": "ec2-54-161-247-36.compute-1.amazonaws.com"
+                "public_address": "ec2-54-166-147-2.compute-1.amazonaws.com",
+                "public_addresses": "ec2-54-166-147-2.compute-1.amazonaws.com"
             },
             "resources": {
-                "aws_instance.infra-tusd-server": {
+                "aws_instance.tusd": {
                     "type": "aws_instance",
                     "primary": {
-                        "id": "i-d59cff7e",
+                        "id": "i-16ef798d",
                         "attributes": {
                             "ami": "ami-9bce7af0",
-                            "availability_zone": "us-east-1e",
+                            "availability_zone": "us-east-1d",
                             "ebs_block_device.#": "0",
                             "ebs_optimized": "false",
                             "ephemeral_block_device.#": "0",
                             "iam_instance_profile": "",
-                            "id": "i-d59cff7e",
+                            "id": "i-16ef798d",
                             "instance_state": "running",
                             "instance_type": "c3.large",
                             "key_name": "infra-tusd",
                             "monitoring": "false",
-                            "private_dns": "ip-10-167-178-105.ec2.internal",
-                            "private_ip": "10.167.178.105",
-                            "public_dns": "ec2-54-161-247-36.compute-1.amazonaws.com",
-                            "public_ip": "54.161.247.36",
+                            "private_dns": "ip-10-99-128-27.ec2.internal",
+                            "private_ip": "10.99.128.27",
+                            "public_dns": "ec2-54-166-147-2.compute-1.amazonaws.com",
+                            "public_ip": "54.166.147.2",
                             "root_block_device.#": "1",
                             "root_block_device.0.delete_on_termination": "true",
                             "root_block_device.0.iops": "24",
                             "root_block_device.0.volume_size": "8",
                             "root_block_device.0.volume_type": "gp2",
                             "security_groups.#": "1",
-                            "security_groups.1246499019": "fw-infra-tusd-main",
+                            "security_groups.1898427277": "fw-tusd-main",
                             "source_dest_check": "true",
                             "subnet_id": "",
                             "tags.#": "1",
@@ -54,7 +54,7 @@
                 "aws_route53_record.www": {
                     "type": "aws_route53_record",
                     "depends_on": [
-                        "aws_instance.infra-tusd-server"
+                        "aws_instance.tusd"
                     ],
                     "primary": {
                         "id": "Z3IT8X6U91XY1P_master.tus.io_CNAME",
@@ -65,7 +65,7 @@
                             "id": "Z3IT8X6U91XY1P_master.tus.io_CNAME",
                             "name": "master.tus.io",
                             "records.#": "1",
-                            "records.1116730303": "ec2-54-161-247-36.compute-1.amazonaws.com",
+                            "records.3871998453": "ec2-54-166-147-2.compute-1.amazonaws.com",
                             "set_identifier": "",
                             "ttl": "300",
                             "type": "CNAME",
@@ -74,14 +74,14 @@
                         }
                     }
                 },
-                "aws_security_group.fw-infra-tusd-main": {
+                "aws_security_group.fw-tusd-main": {
                     "type": "aws_security_group",
                     "primary": {
-                        "id": "sg-2ff78c42",
+                        "id": "sg-60cc290d",
                         "attributes": {
                             "description": "Infra tusd",
                             "egress.#": "0",
-                            "id": "sg-2ff78c42",
+                            "id": "sg-60cc290d",
                             "ingress.#": "3",
                             "ingress.2214680975.cidr_blocks.#": "1",
                             "ingress.2214680975.cidr_blocks.0": "0.0.0.0/0",
@@ -106,7 +106,7 @@
                             "ingress.614077637.security_groups.#": "0",
                             "ingress.614077637.self": "false",
                             "ingress.614077637.to_port": "22",
-                            "name": "fw-infra-tusd-main",
+                            "name": "fw-tusd-main",
                             "owner_id": "402421253186",
                             "tags.#": "0",
                             "vpc_id": ""
diff --git a/.infra/Frey-state-terraform.tfstate.backup b/.infra/Frey-state-terraform.tfstate.backup
index a711876..2904501 100644
--- a/.infra/Frey-state-terraform.tfstate.backup
+++ b/.infra/Frey-state-terraform.tfstate.backup
@@ -1,6 +1,6 @@
 {
     "version": 1,
-    "serial": 20,
+    "serial": 24,
     "modules": [
         {
             "path": [
@@ -8,37 +8,37 @@
             ],
             "outputs": {
                 "endpoint": "http://master.tus.io:80/",
-                "public_address": "ec2-54-161-247-36.compute-1.amazonaws.com",
-                "public_addresses": "ec2-54-161-247-36.compute-1.amazonaws.com"
+                "public_address": "ec2-54-166-147-2.compute-1.amazonaws.com",
+                "public_addresses": "ec2-54-166-147-2.compute-1.amazonaws.com"
             },
             "resources": {
-                "aws_instance.infra-tusd-server": {
+                "aws_instance.tusd": {
                     "type": "aws_instance",
                     "primary": {
-                        "id": "i-d59cff7e",
+                        "id": "i-16ef798d",
                         "attributes": {
                             "ami": "ami-9bce7af0",
-                            "availability_zone": "us-east-1e",
+                            "availability_zone": "us-east-1d",
                             "ebs_block_device.#": "0",
                             "ebs_optimized": "false",
                             "ephemeral_block_device.#": "0",
                             "iam_instance_profile": "",
-                            "id": "i-d59cff7e",
+                            "id": "i-16ef798d",
                             "instance_state": "running",
                             "instance_type": "c3.large",
                             "key_name": "infra-tusd",
                             "monitoring": "false",
-                            "private_dns": "ip-10-167-178-105.ec2.internal",
-                            "private_ip": "10.167.178.105",
-                            "public_dns": "ec2-54-161-247-36.compute-1.amazonaws.com",
-                            "public_ip": "54.161.247.36",
+                            "private_dns": "ip-10-99-128-27.ec2.internal",
+                            "private_ip": "10.99.128.27",
+                            "public_dns": "ec2-54-166-147-2.compute-1.amazonaws.com",
+                            "public_ip": "54.166.147.2",
                             "root_block_device.#": "1",
                             "root_block_device.0.delete_on_termination": "true",
                             "root_block_device.0.iops": "24",
                             "root_block_device.0.volume_size": "8",
                             "root_block_device.0.volume_type": "gp2",
                             "security_groups.#": "1",
-                            "security_groups.1246499019": "fw-infra-tusd-main",
+                            "security_groups.1898427277": "fw-tusd-main",
                             "source_dest_check": "true",
                             "subnet_id": "",
                             "tags.#": "1",
@@ -54,7 +54,7 @@
                 "aws_route53_record.www": {
                     "type": "aws_route53_record",
                     "depends_on": [
-                        "aws_instance.infra-tusd-server"
+                        "aws_instance.tusd"
                     ],
                     "primary": {
                         "id": "Z3IT8X6U91XY1P_master.tus.io_CNAME",
@@ -65,7 +65,7 @@
                             "id": "Z3IT8X6U91XY1P_master.tus.io_CNAME",
                             "name": "master.tus.io",
                             "records.#": "1",
-                            "records.1116730303": "ec2-54-161-247-36.compute-1.amazonaws.com",
+                            "records.3871998453": "ec2-54-166-147-2.compute-1.amazonaws.com",
                             "set_identifier": "",
                             "ttl": "300",
                             "type": "CNAME",
@@ -74,14 +74,14 @@
                         }
                     }
                 },
-                "aws_security_group.fw-infra-tusd-main": {
+                "aws_security_group.fw-tusd-main": {
                     "type": "aws_security_group",
                     "primary": {
-                        "id": "sg-2ff78c42",
+                        "id": "sg-60cc290d",
                         "attributes": {
                             "description": "Infra tusd",
                             "egress.#": "0",
-                            "id": "sg-2ff78c42",
+                            "id": "sg-60cc290d",
                             "ingress.#": "3",
                             "ingress.2214680975.cidr_blocks.#": "1",
                             "ingress.2214680975.cidr_blocks.0": "0.0.0.0/0",
@@ -106,7 +106,7 @@
                             "ingress.614077637.security_groups.#": "0",
                             "ingress.614077637.self": "false",
                             "ingress.614077637.to_port": "22",
-                            "name": "fw-infra-tusd-main",
+                            "name": "fw-tusd-main",
                             "owner_id": "402421253186",
                             "tags.#": "0",
                             "vpc_id": ""