diff --git a/.github/DISCUSSION_TEMPLATE/surveys.yaml b/.github/DISCUSSION_TEMPLATE/surveys.yaml
index d515184b..5c6035a8 100644
--- a/.github/DISCUSSION_TEMPLATE/surveys.yaml
+++ b/.github/DISCUSSION_TEMPLATE/surveys.yaml
@@ -16,49 +16,17 @@ body:
     attributes:
       label: "Describe your overall experience with the current DIRAC web application."
       description: >
-        Focus on aspects like ease of use, reliability, and speed
-    validations:
-      required: true
-
-  - type: textarea
-    id: tasks
-    attributes:
-      label: "What tasks do you primarily use our web application for?"
-      description: >
-        Example: I monitor my jobs.
-    validations:
-      required: true
-
-  - type: markdown
-    attributes:
-      value: |
-        ## Features
-        ### For all users
-
-  - type: textarea
-    id: features-used
-    attributes:
-      label: "What features do you find most useful and why?"
-      description: >
-        Example: The possibility of monitoring my jobs in real-time.
-    validations:
-      required: true
-
-  - type: textarea
-    id: frustrating-features
-    attributes:
-      label: "Are there any features or functionalities you find frustrating or difficult to use?"
-      description: >
-        Example: I am lost with all these pages.
-    validations:
-      required: true
-
-  - type: textarea
-    id: bugs
-    attributes:
-      label: "Have you encountered any bugs or issues while using the application? If so, describe them."
-      description: >
-        Example: Sometimes I see some messages I do not understand popping up in the interface.
+        Focus on aspects like ease of use, reliability, and speed.
+        - Briefly describe how you use the web application.
+          - Example: I am a DIRAC user and I use the web application to submit and monitor my jobs.
+        - Describe features you like/dislike.
+          - Example:
+            - I like the possibility of "filtering" as I type.
+            - I dislike the fact that I need to know the beginning of the values to filter jobs.
+        - Describe features you find useful/useless.
+          - Example:
+            - I find the possibility of monitoring my jobs in real-time very useful.
+            - I find the possibility of seeing all the existing applications useless as I cannot access most of them.
     validations:
       required: true
 
@@ -67,39 +35,7 @@ body:
     attributes:
       label: "Are there any features or functionalities you wish were included in the current web application?"
       description: >
-        Example: Yes, I would like to group my job by CE type!
-    validations:
-      required: true
-
-  - type: markdown
-    attributes:
-      value: "## For Admins only"
-
-  - type: textarea
-    id: admin-features-used
-    attributes:
-      label: "As an admin, what features do you find most useful and why?"
-    validations:
-      required: false
-
-  - type: textarea
-    id: admin-frustrating-features
-    attributes:
-      label: "Are there any admin-specific features or functionalities you find frustrating or difficult to use?"
-    validations:
-      required: false
-
-  - type: textarea
-    id: admin-bugs
-    attributes:
-      label: "Have you encountered any bugs or issues while using the application? If so, describe them."
-    validations:
-      required: false
-
-  - type: textarea
-    id: admin-wishlist
-    attributes:
-      label: "Are there any admin-specific features or functionalities you wish were included in the current web application?"
+        Example: Yes, I would love to have a dark mode!
     validations:
       required: false
 
@@ -111,8 +47,10 @@ body:
     id: design-feeling
     attributes:
       label: "How do you feel about the current user interface and design? What changes, if any, would you suggest?"
+      description: >
+        Example: I would love if tabs could be actually located in a side bar.
     validations:
-      required: true
+      required: false
 
   - type: textarea
     id: mobile-experience
@@ -120,7 +58,7 @@ body:
       label: "Have you ever used the DIRAC web application on mobile devices? Would a mobile-friendly version be beneficial for you?"
       description: "The adoption of OIDC tokens will open up such possibilities"
     validations:
-      required: true
+      required: false
 
   - type: markdown
     attributes: