diff --git a/bundles.yml b/bundles.yml
index 53b970a..7783fa0 100644
--- a/bundles.yml
+++ b/bundles.yml
@@ -1,12 +1,13 @@
 schemaVersion: "1.0"
 bundles:
-- "nevisadmin-plugin-base-generation:8.2405.2.0"
-- "nevisadmin-plugin-oauth:8.2405.2.0"
-- "nevisadmin-plugin-nevisdetect:8.2405.2.0"
-- "nevisadmin-plugin-nevisauth:8.2405.2.0"
-- "nevisadmin-plugin-nevisdp:8.2405.2.0"
-- "nevisadmin-plugin-nevisproxy:8.2405.2.0"
-- "nevisadmin-plugin-mobile-auth:8.2405.2.0"
-- "nevisadmin-plugin-nevisidm:8.2405.2.0"
-- "nevisadmin-plugin-fido2:8.2405.2.0"
-- "nevisadmin-plugin-authcloud:8.2405.2.0"
+- "nevisadmin-plugin-base-generation:8.2411.2.rc2"
+- "nevisadmin-plugin-nevisproxy:8.2411.2.rc2"
+- "nevisadmin-plugin-nevisauth:8.2411.2.rc2"
+- "nevisadmin-plugin-nevisidm:8.2411.2.rc2"
+- "nevisadmin-plugin-mobile-auth:8.2411.2.rc2"
+- "nevisadmin-plugin-fido2:8.2411.2.rc2"
+- "nevisadmin-plugin-nevisadapt:8.2411.2.rc2"
+- "nevisadmin-plugin-nevisdetect:8.2411.2.rc2"
+- "nevisadmin-plugin-oauth:8.2411.2.rc2"
+- "nevisadmin-plugin-authcloud:8.2411.2.rc2"
+- "nevisadmin-plugin-nevisdp:8.2411.2.rc2"
diff --git a/patterns/1f0702aaabef60a615abf41f_resources/resources.zip b/patterns/1f0702aaabef60a615abf41f_resources/resources.zip
index 77686ef..e7d8fdc 100644
Binary files a/patterns/1f0702aaabef60a615abf41f_resources/resources.zip and b/patterns/1f0702aaabef60a615abf41f_resources/resources.zip differ
diff --git a/patterns/204c22beaccdfd22727af378_labels/labels.zip b/patterns/204c22beaccdfd22727af378_labels/labels.zip
index 4f38730..12b3833 100644
Binary files a/patterns/204c22beaccdfd22727af378_labels/labels.zip and b/patterns/204c22beaccdfd22727af378_labels/labels.zip differ
diff --git a/patterns/204c22beaccdfd22727af378_template/webdata.zip b/patterns/204c22beaccdfd22727af378_template/webdata.zip
index 8c4544b..0eca79f 100644
Binary files a/patterns/204c22beaccdfd22727af378_template/webdata.zip and b/patterns/204c22beaccdfd22727af378_template/webdata.zip differ
diff --git a/patterns/4fcfadb4a5c946ead7e6e995_labels/labels.zip b/patterns/4fcfadb4a5c946ead7e6e995_labels/labels.zip
index 4f38730..12b3833 100644
Binary files a/patterns/4fcfadb4a5c946ead7e6e995_labels/labels.zip and b/patterns/4fcfadb4a5c946ead7e6e995_labels/labels.zip differ
diff --git a/patterns/4fcfadb4a5c946ead7e6e995_template/webdata.zip b/patterns/4fcfadb4a5c946ead7e6e995_template/webdata.zip
index 8c4544b..0eca79f 100644
Binary files a/patterns/4fcfadb4a5c946ead7e6e995_template/webdata.zip and b/patterns/4fcfadb4a5c946ead7e6e995_template/webdata.zip differ
diff --git a/patterns/FIDO_UAF_Instance_ca92034f995b39fde562293c.yml b/patterns/FIDO_UAF_Instance_ca92034f995b39fde562293c.yml
index df1b368..6d2ff3c 100644
--- a/patterns/FIDO_UAF_Instance_ca92034f995b39fde562293c.yml
+++ b/patterns/FIDO_UAF_Instance_ca92034f995b39fde562293c.yml
@@ -29,8 +29,9 @@ pattern:
     nevisidm:
     - "pattern://b8a36646f81c3247cdb5d90b"
     client: "var://fido_uaf_instance-client-id"
-    registrationTokenTimeout: "var://fido-uaf-out-of-band-timeout"
-    authenticationTokenTimeout: "var://fido-uaf-out-of-band-timeout"
+    registrationTokenTimeout: "var://fido-uaf-generic-token-timeout"
+    authenticationTokenTimeout: "var://fido-uaf-generic-token-timeout"
+    deviceServiceTimeout: "var://fido-uaf-device-service-timeout"
     addons:
     - "pattern://6c7076da1508f186394a3bd2"
     - "pattern://90af8358cc587f5c5aa79fec"
diff --git a/variables.yml b/variables.yml
index 557e608..23e413b 100644
--- a/variables.yml
+++ b/variables.yml
@@ -271,7 +271,13 @@ variables:
       maxAllowed: 1
     value: "adn-agov-nevisidm-01-dev-idm"
     requireOverloading: true
-  fido-uaf-out-of-band-timeout:
+  fido-uaf-device-service-timeout:
+    className: "ch.nevis.admin.v4.plugin.base.generation.property.DurationProperty"
+    parameters:
+      required: true
+    value: "10m"
+    requireOverloading: false
+  fido-uaf-generic-token-timeout:
     className: "ch.nevis.admin.v4.plugin.base.generation.property.DurationProperty"
     parameters:
       required: true