diff --git a/docs/software_requirements/threads.sdoc b/docs/software_requirements/threads.sdoc
index ef610282..57918866 100644
--- a/docs/software_requirements/threads.sdoc
+++ b/docs/software_requirements/threads.sdoc
@@ -5,6 +5,62 @@ REQ_PREFIX: ZEP-SRS-1-
 [GRAMMAR]
 IMPORT_FROM_FILE: software_requirements.sgra
 
+[REQUIREMENT]
+UID: ZEP-SRS-1-13
+STATUS: Draft
+TYPE: Functional
+COMPONENT: Threads
+TITLE: Thread definition at compile time
+STATEMENT: >>>
+The Zephyr RTOS shall provide a mechanism to define and initialize threads at compile time.
+<<<
+RELATIONS:
+- TYPE: Parent
+  VALUE: ZEP-SYRS-15
+
+[REQUIREMENT]
+UID: ZEP-SRS-1-14
+STATUS: Draft
+TYPE: Functional
+COMPONENT: Threads
+TITLE: Thread definition at run time
+STATEMENT: >>>
+The Zephyr RTOS shall provide a mechanism to define and initialize threads at run time.
+<<<
+RELATIONS:
+- TYPE: Parent
+  VALUE: ZEP-SYRS-15
+
+[REQUIREMENT]
+UID: ZEP-SRS-1-15
+STATUS: Draft
+TYPE: Functional
+COMPONENT: Threads
+TITLE: Thread stack definition at compile time
+STATEMENT: >>>
+The Zephyr RTOS shall provide a mechanism to define the thread stack at compile time.
+<<<
+
+[REQUIREMENT]
+UID: ZEP-SRS-1-16
+STATUS: Draft
+TYPE: Functional
+COMPONENT: Threads
+TITLE: Dynamic thread stack allocation
+STATEMENT: >>>
+The Zephyr RTOS shall provide a mechanism to dynamically allocate thread stack at run time.
+<<<
+
+[REQUIREMENT]
+UID: ZEP-SRS-1-17
+STATUS: Draft
+TYPE: Functional
+COMPONENT: Threads
+TITLE: Free dynamic allocated thread stack
+STATEMENT: >>>
+The Zephyr RTOS shall provide a mechanism to free dynamically allocated thread stack at run time.
+<<<
+
 [REQUIREMENT]
 UID: ZEP-SRS-1-1
 STATUS: Draft
@@ -12,7 +68,7 @@ TYPE: Functional
 COMPONENT: Threads
 TITLE: Creating threads
 STATEMENT: >>>
-The Zephyr RTOS shall provide an interface to create (start) a thread.
+The Zephyr RTOS shall provide a mechanism to create a thread.
 <<<
 RELATIONS:
 - TYPE: Parent
@@ -100,10 +156,7 @@ TYPE: Functional
 COMPONENT: Threads
 TITLE: Thread states
 STATEMENT: >>>
-Threads shall have different states to fulfill the Life-cycle of a thread
-<<<
-USER_STORY: >>>
-As a Zephyr RTOS user, I want to know in what state a specific thread is.
+Threads shall have different states during their lifetime.
 <<<
 RELATIONS:
 - TYPE: Parent
diff --git a/docs/system_requirements/index.sdoc b/docs/system_requirements/index.sdoc
index 757ee56c..5d35c01f 100644
--- a/docs/system_requirements/index.sdoc
+++ b/docs/system_requirements/index.sdoc
@@ -203,41 +203,32 @@ TITLE: Threads
 [REQUIREMENT]
 UID: ZEP-SYRS-15
 STATUS: Draft
-TYPE: High Level
+TYPE: Non-Functional
 COMPONENT: Threads
 TITLE: Thread support
 STATEMENT: >>>
 The Zephyr RTOS shall support threads.
 <<<
-USER_STORY: >>>
-As a Zephyr RTOS user, I want to be able to have support for the kernel objects named threads for processing work.
-<<<
 
 [REQUIREMENT]
 UID: ZEP-SYRS-16
 STATUS: Draft
-TYPE: High Level
+TYPE: Non-Functional
 COMPONENT: Threads
 TITLE: Thread management
 STATEMENT: >>>
 The Zephyr RTOS shall provide a framework for managing multiple threads of execution.
 <<<
-USER_STORY: >>>
-As a Zephyr RTOS user, I want to be able to manage the execute of multiple threads with different priorities.
-<<<
 
 [REQUIREMENT]
 UID: ZEP-SYRS-17
 STATUS: Draft
-TYPE: High Level
+TYPE: Non-Functional
 COMPONENT: Threads
 TITLE: Thread priority
 STATEMENT: >>>
 Threads shall have a priority.
 <<<
-USER_STORY: >>>
-As a Zephyr RTOS user, I want to be able to give my threads different priorities for execution.
-<<<
 
 [/SECTION]