diff --git a/basic/infrastructure/kustomizations/kimai-kustomization.yaml b/basic/infrastructure/kustomizations/kimai-kustomization.yaml
index 204e699..38a54e4 100644
--- a/basic/infrastructure/kustomizations/kimai-kustomization.yaml
+++ b/basic/infrastructure/kustomizations/kimai-kustomization.yaml
@@ -17,9 +17,10 @@ spec:
   prune: true
   postBuild:
     substituteFrom:
-      #- kind: Secret
-      #  name: stackspin-kimai-variables
-      #- kind: Secret
-      #  name: stackspin-kimai-oauth-variables
+      - kind: Secret
+        name: stackspin-kimai-variables
+      - kind: Secret
+        name: stackspin-kimai-oauth-variables
+        optional: true
       - kind: Secret
         name: stackspin-cluster-variables
diff --git a/basic/overrides/stackspin-nextcloud-override.yaml b/basic/overrides/stackspin-nextcloud-override.yaml
index 3936d02..3163f50 100644
--- a/basic/overrides/stackspin-nextcloud-override.yaml
+++ b/basic/overrides/stackspin-nextcloud-override.yaml
@@ -99,10 +99,11 @@ data:
         #- name: workflow_ocr
         #  enabled: false
       # Testing
-      - name: calendar_resource_management
-        enabled: true
       - name: event_update_notification
         enabled: false
+        #- name: calendar_resource_management
+        #  enabled: true
+        # TODO install via CLI
       # TODO disabling user status, files_comments, support, event_update_notification (Notifications for calendar event updates), bruteforcesettings
       # need to disable tasks soon
       # configure firstrunwizard