diff --git a/basic/apps/do-test/vikunja-values-configmap.yaml b/basic/apps/do-test/vikunja-values-configmap.yaml
index 422c86b..a55565a 100644
--- a/basic/apps/do-test/vikunja-values-configmap.yaml
+++ b/basic/apps/do-test/vikunja-values-configmap.yaml
@@ -9,10 +9,10 @@ data:
   values.yaml: |
     additionalContainers:
       api:
-        image: vikunja/api:unstable
+        image: vikunja/api:0.18.1
         imagePullPolicy: Always
       frontend:
-        image: vikunja/frontend:unstable
+        image: vikunja/frontend:0.18.2
         imagePullPolicy: Always
     vikunja:
       config: |-
diff --git a/basic/apps/people/suitecrm-values-configmap.yaml b/basic/apps/people/suitecrm-values-configmap.yaml
index 78f8eca..c8a7a9f 100644
--- a/basic/apps/people/suitecrm-values-configmap.yaml
+++ b/basic/apps/people/suitecrm-values-configmap.yaml
@@ -7,6 +7,7 @@ data:
   values.yaml: |
     ingress:
       enabled: true
+      primary: false
       hostname: "people.${domain}"
       tls: true
       certManager: true
diff --git a/basic/overrides/stackspin-nextcloud-override.yaml b/basic/overrides/stackspin-nextcloud-override.yaml
index 90cfe1a..3936d02 100644
--- a/basic/overrides/stackspin-nextcloud-override.yaml
+++ b/basic/overrides/stackspin-nextcloud-override.yaml
@@ -23,6 +23,8 @@ data:
             );
     apps:
       # Basics
+      - name: bruteforcesettings
+        enabled: false
       - name: password_policy
         enabled: false
       - name: photos
@@ -88,16 +90,20 @@ data:
         enabled: true
       - name: workflow_pdf_converter
         enabled: true
-      - name: files_accesscontrol
-        enabled: true
-      - name: files_automatedtagging
-        enabled: true
-      - name: workflow_media_converter
-        enabled: true
-      - name: workflow_ocr
-        enabled: true
+        #- name: files_accesscontrol
+        #  enabled: false
+        #- name: files_automatedtagging
+        #  enabled: false
+        #- name: workflow_media_converter
+        #  enabled: false
+        #- name: workflow_ocr
+        #  enabled: false
       # Testing
+      - name: calendar_resource_management
+        enabled: true
       - name: event_update_notification
-        enabled: true
-      - name: integration_google
-        enabled: true
+        enabled: false
+      # TODO disabling user status, files_comments, support, event_update_notification (Notifications for calendar event updates), bruteforcesettings
+      # need to disable tasks soon
+      # configure firstrunwizard
+      # preconfigured: share by mail - https://apps.nextcloud.com/apps/socialsharing_email