diff --git a/assets/dbp-signature.html.ejs b/assets/dbp-signature.html.ejs
index bf8a725071fe6c65e78bc8c1f43748c19a75be8a..460e26bde2142bfc54de21cfc0d72f66a227ab9e 100644
--- a/assets/dbp-signature.html.ejs
+++ b/assets/dbp-signature.html.ejs
@@ -60,7 +60,8 @@
               nextcloud-web-app-password-url="<%= nextcloudWebAppPasswordURL %>"
               nextcloud-webdav-url="<%= nextcloudWebDavURL %>"
               nextcloud-name="<%= nextcloudName %>"
-              nextcloud-file-url="<%= nextcloudFileURL %>">
+              nextcloud-file-url="<%= nextcloudFileURL %>"
+              initial-file-handling-state>
     <<%= name %>
         subscribe="lang:lang,entry-point-url:entry-point-url"
         auth requested-login-status
diff --git a/src/dbp-official-signature-pdf-upload.js b/src/dbp-official-signature-pdf-upload.js
index c1f2ffff49399cce1b6cede6c3112b4e54107cb3..b461f677cba55c4c502f255cbc5a83ab4c08a15e 100644
--- a/src/dbp-official-signature-pdf-upload.js
+++ b/src/dbp-official-signature-pdf-upload.js
@@ -776,7 +776,7 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitElem
                             id="file-source"
                             context="${i18n.t('qualified-pdf-upload.upload-field-label')}"
                             allowed-mime-types="application/pdf"
-                            enabled-sources="local${this.showNextcloudFilePicker ? ",nextcloud" : ""}"
+                            enabled-targets="local${this.showNextcloudFilePicker ? ",nextcloud" : ""}"
                             nextcloud-auth-url="${this.nextcloudWebAppPasswordURL}"
                             nextcloud-web-dav-url="${this.nextcloudWebDavURL}"
                             nextcloud-name="${this.nextcloudName}"
@@ -919,9 +919,8 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitElem
             <dbp-file-sink id="file-sink"
                 context="${i18n.t('qualified-pdf-upload.save-field-label', {count: this.signedFilesToDownload})}"
                 filename="signed-documents.zip"
-                nextcloud-default="${this.nextcloudDefaultDir}"
-                default-sink="${this.fileSource}"
-                enabled-destinations="local${this.showNextcloudFilePicker ? ",nextcloud" : ""}"
+                subscribe="initial-file-handling-state:initial-file-handling-state"
+                enabled-targets="local${this.showNextcloudFilePicker ? ",nextcloud" : ""}"
                 nextcloud-auth-url="${this.nextcloudWebAppPasswordURL}"
                 nextcloud-web-dav-url="${this.nextcloudWebDavURL}"
                 nextcloud-name="${this.nextcloudName}"
diff --git a/src/dbp-qualified-signature-pdf-upload.js b/src/dbp-qualified-signature-pdf-upload.js
index 04625ec48bbe3adc5ca3148056f12bbb0d779731..378edeb1082e5195de8cfcf4bc4e9f17c11a55b9 100644
--- a/src/dbp-qualified-signature-pdf-upload.js
+++ b/src/dbp-qualified-signature-pdf-upload.js
@@ -942,7 +942,7 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitEle
                             id="file-source"
                             context="${i18n.t('qualified-pdf-upload.upload-field-label')}"
                             allowed-mime-types="application/pdf"
-                            enabled-sources="local${this.showNextcloudFilePicker ? ",nextcloud" : ""}"
+                            enabled-targets="local${this.showNextcloudFilePicker ? ",nextcloud" : ""}"
                             nextcloud-auth-url="${this.nextcloudWebAppPasswordURL}"
                             nextcloud-web-dav-url="${this.nextcloudWebDavURL}"
                             nextcloud-name="${this.nextcloudName}"
@@ -1097,9 +1097,8 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitEle
             <dbp-file-sink id="file-sink"
                 context="${i18n.t('qualified-pdf-upload.save-field-label', {count: this.signedFilesToDownload})}"
                 filename="signed-documents.zip"
-                nextcloud-default="${this.nextcloudDefaultDir}"
-                default-sink="${this.fileSource}"
-                enabled-destinations="local${this.showNextcloudFilePicker ? ",nextcloud" : ""}"
+                subscribe="initial-file-handling-state:initial-file-handling-state"
+                enabled-targets="local${this.showNextcloudFilePicker ? ",nextcloud" : ""}"
                 nextcloud-auth-url="${this.nextcloudWebAppPasswordURL}"
                 nextcloud-web-dav-url="${this.nextcloudWebDavURL}"
                 nextcloud-name="${this.nextcloudName}"
diff --git a/vendor/toolkit b/vendor/toolkit
index e86f826479612647cf9b945c987d87f5a165beb6..92221ca704aee21048c86904702b42074a633a32 160000
--- a/vendor/toolkit
+++ b/vendor/toolkit
@@ -1 +1 @@
-Subproject commit e86f826479612647cf9b945c987d87f5a165beb6
+Subproject commit 92221ca704aee21048c86904702b42074a633a32