diff --git a/roles/_exit/tasks/main.yml b/roles/_exit/tasks/main.yml
index e6a844f4d..14f1f7eb6 100644
--- a/roles/_exit/tasks/main.yml
+++ b/roles/_exit/tasks/main.yml
@@ -49,6 +49,24 @@
   become: true
   when: inventory_hostname != "localhost"
 
+- name: Save server info on our infra.
+  delegate_to: localhost
+  block:
+    - name: Make sure path exist.
+      ansible.builtin.file:
+        path: "/home/controller/build/clients/{{ _aws_profile }}"
+        recurse: true
+        state: directory
+        mode: 0644
+
+    - name: Copy server details into clients folder.
+      ansible.builtin.template:
+      src: server_details.j2
+      dest: "/home/controller/build/clients/{{ _aws_profile }}/{{ _aws_resource_name }}"
+      mode: "0755"
+      owner: controller
+      group: controller
+
 - name: Delete the lock file.
   ansible.builtin.file:
     path: "{{ _init.lock_file }}"
diff --git a/roles/_exit/templates/server_details.j2 b/roles/_exit/templates/server_details.j2
new file mode 100644
index 000000000..bb3fa6c85
--- /dev/null
+++ b/roles/_exit/templates/server_details.j2
@@ -0,0 +1,5 @@
+Environment: {{ _env_type }}
+
+{{ _host_details.stdout }}
+
+Last successful build was on {{ _last_build.stdout }}
diff --git a/roles/aws/aws_ec2_autoscale_cluster/tasks/main.yml b/roles/aws/aws_ec2_autoscale_cluster/tasks/main.yml
index bf55ccc68..937e26349 100644
--- a/roles/aws/aws_ec2_autoscale_cluster/tasks/main.yml
+++ b/roles/aws/aws_ec2_autoscale_cluster/tasks/main.yml
@@ -348,7 +348,7 @@
       Port: "{{ aws_ec2_autoscale_cluster.alb_http_port }}"
       DefaultActions:
         - Type: forward
-          TargetGroupArn: "{{ _aws_ec2_target_group_created.target_group_arn }}"
+          TargetGroupName: "{{ aws_ec2_autoscale_cluster.name }}"
       Rules: "{{ aws_ec2_autoscale_cluster.listeners_http.rules }}"
     _aws_ec2_autoscale_cluster_listeners_redirect:
       Protocol: HTTP
@@ -370,7 +370,7 @@
         - CertificateArn: "{{ _ssl_certificate_ARN }}"
       DefaultActions:
         - Type: forward
-          TargetGroupArn: "{{ _aws_ec2_target_group_created.target_group_arn }}"
+          TargetGroupName: "{{ aws_ec2_autoscale_cluster.name }}"
       Rules: "{{ aws_ec2_autoscale_cluster.listeners_https.rules }}"
   when: aws_ec2_autoscale_cluster.create_elb