diff --git a/roles/pfsense_upgrade/tasks/upgrade.yml b/roles/pfsense_upgrade/tasks/upgrade.yml
index 698d770..b45a4ee 100644
--- a/roles/pfsense_upgrade/tasks/upgrade.yml
+++ b/roles/pfsense_upgrade/tasks/upgrade.yml
@@ -21,7 +21,7 @@
 - name: Switch repository in config.xml
   ansible.builtin.raw: |
     php -r 'require_once("/etc/inc/config.inc"); require_once("/etc/inc/pkg-utils.inc"); config_set_path("system/pkg_repo_conf_path", "{{ upgrade_target_repo }}"); write_config("Switched to {{ upgrade_target_repo }} for upgrade");'
-  register: _repo_switch
+  register: _repo_switchtimeout: "{{ upgrade_check_timeout | default(120) }}"
   changed_when: true
   when: perform_upgrade | bool
 
@@ -56,7 +56,7 @@
   delay: 10
   ignore_errors: yes
   when: perform_upgrade | bool
-  timeout: "{{ upgrade_check_timeout | default(120) }}"
+  timeout: "{{ upgrade_timeout | default(900) }}"
 
 - name: Display upgrade command exit code
   ansible.builtin.debug: