diff --git a/.gitlab/cdrouter/arcadyan-mozart.yml b/.gitlab/cdrouter/arcadyan-mozart.yml
index 74e8f495e4..a1effc2f81 100644
--- a/.gitlab/cdrouter/arcadyan-mozart.yml
+++ b/.gitlab/cdrouter/arcadyan-mozart.yml
@@ -52,8 +52,7 @@ CDRouter-Wireless Mozart initramfs:
 
 CDRouter-UPnP-IPv46 Mozart initramfs:
   <<: *arcadyan_mozart_ipv6
-  timeout: 70 minutes
-  allow_failure: true
+  timeout: 60 minutes
   variables:
     CDROUTER_TEST_CONFIG: generic-ipv6-upnp
     DUT_INIT_SCRIPTS: |
@@ -126,4 +125,4 @@ prplWare-Smoke-Test-Suite Mozart initramfs:
       .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh
       .gitlab/scripts/dut-init/cdrouter-tr181-mockups.sh
       .gitlab/scripts/dut-init/cdrouter-dut-configure-dyndns.sh
-      .gitlab/scripts/dut-init/cdrouter-dut-configure-prplmesh-controller.sh
\ No newline at end of file
+      .gitlab/scripts/dut-init/cdrouter-dut-configure-prplmesh-controller.sh
diff --git a/.gitlab/cdrouter/mxl25641-hdk-6.yml b/.gitlab/cdrouter/mxl25641-hdk-6.yml
index 24f40b04ec..70d16bb7eb 100644
--- a/.gitlab/cdrouter/mxl25641-hdk-6.yml
+++ b/.gitlab/cdrouter/mxl25641-hdk-6.yml
@@ -52,8 +52,7 @@ CDRouter-Wireless MXL25641-HDK-6 eMMC:
 
 CDRouter-UPnP-IPv46 MXL25641-HDK-6 eMMC:
   <<: *mxl25641_cdrouter_ipv6
-  timeout: 70 minutes
-  allow_failure: true
+  timeout: 60 minutes
   variables:
     CDROUTER_TEST_CONFIG: generic-ipv6-upnp
     DUT_INIT_SCRIPTS: |
diff --git a/.gitlab/cdrouter/prpl-haze.yml b/.gitlab/cdrouter/prpl-haze.yml
index 6715cf46a2..564027dff9 100644
--- a/.gitlab/cdrouter/prpl-haze.yml
+++ b/.gitlab/cdrouter/prpl-haze.yml
@@ -54,7 +54,7 @@ CDRouter-Wireless Haze initramfs:
 
 CDRouter-UPnP-IPv46 Haze initramfs:
   <<: *prpl_haze_ipv6
-  timeout: 70 minutes
+  timeout: 60 minutes
   variables:
     CDROUTER_TEST_CONFIG: generic-ipv6-upnp
     DUT_INIT_SCRIPTS: |
diff --git a/.gitlab/cdrouter/turris-omnia.yml b/.gitlab/cdrouter/turris-omnia.yml
index ca4493fe0b..07199ca462 100644
--- a/.gitlab/cdrouter/turris-omnia.yml
+++ b/.gitlab/cdrouter/turris-omnia.yml
@@ -54,7 +54,7 @@ CDRouter-Wireless Turris initramfs:
 
 CDRouter-UPnP-IPv46 Turris initramfs:
   <<: *turris_cdrouter_ipv6
-  timeout: 70 minutes
+  timeout: 60 minutes
   variables:
     CDROUTER_TEST_CONFIG: generic-ipv6-upnp
     DUT_INIT_SCRIPTS: |
diff --git a/.gitlab/cdrouter/urx851-hdk-3.yml b/.gitlab/cdrouter/urx851-hdk-3.yml
index ec79b4b6d7..ac857b94af 100644
--- a/.gitlab/cdrouter/urx851-hdk-3.yml
+++ b/.gitlab/cdrouter/urx851-hdk-3.yml
@@ -50,8 +50,7 @@ CDRouter-Wireless-OSPv1 URX851-HDK-3 eMMC:
 
 CDRouter-UPnP-IPv46 URX851-HDK-3 eMMC:
   <<: *urx851_cdrouter_ipv6
-  timeout: 70 minutes
-  allow_failure: true
+  timeout: 60 minutes
   variables:
     CDROUTER_TEST_CONFIG: generic-ipv6-upnp
     DUT_INIT_SCRIPTS: |
diff --git a/.gitlab/cdrouter/wnc-freedom.yml b/.gitlab/cdrouter/wnc-freedom.yml
index 18eae84831..8b74fc8c01 100644
--- a/.gitlab/cdrouter/wnc-freedom.yml
+++ b/.gitlab/cdrouter/wnc-freedom.yml
@@ -52,8 +52,7 @@ CDRouter-Wireless Freedom initramfs:
 
 CDRouter-UPnP-IPv46 Freedom initramfs:
   <<: *wnc_freedom_ipv6
-  timeout: 70 minutes
-  allow_failure: true
+  timeout: 60 minutes
   variables:
     CDROUTER_TEST_CONFIG: generic-ipv6-upnp
     DUT_INIT_SCRIPTS: |
diff --git a/.testbed/cdrouter/packages/CDRouter-UPnP-IPv46.gz b/.testbed/cdrouter/packages/CDRouter-UPnP-IPv46.gz
index a2deec72c6..4870dcd3b7 100644
Binary files a/.testbed/cdrouter/packages/CDRouter-UPnP-IPv46.gz and b/.testbed/cdrouter/packages/CDRouter-UPnP-IPv46.gz differ