diff --git a/voltha/extensions/omci/omci_cc.py b/voltha/extensions/omci/omci_cc.py
index 7d0874c..c978280 100644
--- a/voltha/extensions/omci/omci_cc.py
+++ b/voltha/extensions/omci/omci_cc.py
@@ -36,8 +36,8 @@
     return ''.join('%02x' % ord(c) for c in buffer)
 
 
-DEFAULT_OMCI_TIMEOUT = 3                         # Seconds
-MAX_OMCI_REQUEST_AGE = 60                        # Seconds
+DEFAULT_OMCI_TIMEOUT = 300                         # Seconds
+MAX_OMCI_REQUEST_AGE = 6000                        # Seconds
 DEFAULT_OMCI_DOWNLOAD_SECTION_SIZE = 31          # Bytes
 
 CONNECTED_KEY = 'connected'
diff --git a/voltha/extensions/omci/tasks/task.py b/voltha/extensions/omci/tasks/task.py
index 36020c0..6e2435b 100644
--- a/voltha/extensions/omci/tasks/task.py
+++ b/voltha/extensions/omci/tasks/task.py
@@ -41,9 +41,9 @@
     DEFAULT_PRIORITY = 128
     MIN_PRIORITY = 0
     MAX_PRIORITY = 255
-    DEFAULT_WATCHDOG_SECS = 10          # 10 seconds
-    MIN_WATCHDOG_SECS = 3               # 3 seconds
-    MAX_WATCHDOG_SECS = 60              # 60 seconds
+    DEFAULT_WATCHDOG_SECS = 1000          # 10 seconds
+    MIN_WATCHDOG_SECS = 300               # 3 seconds
+    MAX_WATCHDOG_SECS = 6000              # 60 seconds
 
     _next_task_id = 0