2 files changed, 1 insertions, 7 deletions
diff --git a/templates/base/agl-base-defaults.jinja2 b/templates/base/agl-base-defaults.jinja2
index 01589e1..3d3409b 100644
--- a/templates/base/agl-base-defaults.jinja2
+++ b/templates/base/agl-base-defaults.jinja2
@@ -4,7 +4,7 @@
 {%- set action_timeout = action_timeout|default(30) %}
 {%- set boot_timeout = boot_timeout|default(20) %}
 {%- set build_type = build_type|default("default") %}
-{%- set connection_timeout = connection_timeout|default(15) %}
+{%- set connection_timeout = connection_timeout|default(150) %}
 {%- set deploy_timeout = deploy_timeout|default(90) %}
 {%- set device_type = device_type|default(yocto_machine+"-uboot") %}
 {%- set image_type = image_type|default("AGL") %}
diff --git a/templates/base/agl-base.jinja2 b/templates/base/agl-base.jinja2
index 346de32..2b4299c 100644
--- a/templates/base/agl-base.jinja2
+++ b/templates/base/agl-base.jinja2
@@ -1,11 +1,5 @@
 {%- extends 'base/agl-base-defaults.jinja2' %}
 {%- block job %}
-{%- block metadata %}
-{% include 'base/agl-metadata.jinja2' %}
-{% endblock %}
-{% if do_callback %}
-{% include 'base/agl-callback-section.jinja2' %}
-{% endif %}
 {%- block main %}
 device_type: {{ device_type }}
 {%- if DEVICE_TAGS %}