diff --git a/docs/assets/images/disassembly/IMG_8807.jpg b/docs/assets/images/disassembly/IMG_8807.jpg
new file mode 100644
index 0000000..f49f98c
Binary files /dev/null and b/docs/assets/images/disassembly/IMG_8807.jpg differ
diff --git a/docs/assets/images/disassembly/IMG_8828.jpg b/docs/assets/images/disassembly/IMG_8828.jpg
new file mode 100644
index 0000000..70e3e12
Binary files /dev/null and b/docs/assets/images/disassembly/IMG_8828.jpg differ
diff --git a/docs/assets/images/disassembly/IMG_8846.jpg b/docs/assets/images/disassembly/IMG_8846.jpg
new file mode 100644
index 0000000..6410a86
Binary files /dev/null and b/docs/assets/images/disassembly/IMG_8846.jpg differ
diff --git a/docs/assets/images/disassembly/IMG_8896.jpg b/docs/assets/images/disassembly/IMG_8896.jpg
new file mode 100644
index 0000000..894f9dc
Binary files /dev/null and b/docs/assets/images/disassembly/IMG_8896.jpg differ
diff --git a/docs/assets/images/disassembly/IMG_8900.jpg b/docs/assets/images/disassembly/IMG_8900.jpg
new file mode 100644
index 0000000..395d083
Binary files /dev/null and b/docs/assets/images/disassembly/IMG_8900.jpg differ
diff --git a/docs/assets/images/disassembly/IMG_8902.jpg b/docs/assets/images/disassembly/IMG_8902.jpg
new file mode 100644
index 0000000..e5356f3
Binary files /dev/null and b/docs/assets/images/disassembly/IMG_8902.jpg differ
diff --git a/docs/assets/images/disassembly/IMG_8905.jpg b/docs/assets/images/disassembly/IMG_8905.jpg
new file mode 100644
index 0000000..0a47392
Binary files /dev/null and b/docs/assets/images/disassembly/IMG_8905.jpg differ
diff --git a/docs/assets/images/disassembly/IMG_8933.jpg b/docs/assets/images/disassembly/IMG_8933.jpg
new file mode 100644
index 0000000..705dd1d
Binary files /dev/null and b/docs/assets/images/disassembly/IMG_8933.jpg differ
diff --git a/docs/assets/images/disassembly/IMG_8934.jpg b/docs/assets/images/disassembly/IMG_8934.jpg
new file mode 100644
index 0000000..052242e
Binary files /dev/null and b/docs/assets/images/disassembly/IMG_8934.jpg differ
diff --git a/docs/assets/images/disassembly/IMG_8938.jpg b/docs/assets/images/disassembly/IMG_8938.jpg
new file mode 100644
index 0000000..517355f
Binary files /dev/null and b/docs/assets/images/disassembly/IMG_8938.jpg differ
diff --git a/docs/assets/images/disassembly/IMG_8942.jpg b/docs/assets/images/disassembly/IMG_8942.jpg
new file mode 100644
index 0000000..82ce7ba
Binary files /dev/null and b/docs/assets/images/disassembly/IMG_8942.jpg differ
diff --git a/docs/assets/images/disassembly/IMG_8943.jpg b/docs/assets/images/disassembly/IMG_8943.jpg
new file mode 100644
index 0000000..a42bd67
Binary files /dev/null and b/docs/assets/images/disassembly/IMG_8943.jpg differ
diff --git a/docs/assets/images/disassembly/IMG_8957_nohand.jpg b/docs/assets/images/disassembly/IMG_8957_nohand.jpg
new file mode 100644
index 0000000..691ab60
Binary files /dev/null and b/docs/assets/images/disassembly/IMG_8957_nohand.jpg differ
diff --git a/docs/assets/images/disassembly/IMG_8961.jpg b/docs/assets/images/disassembly/IMG_8961.jpg
new file mode 100644
index 0000000..d7f84df
Binary files /dev/null and b/docs/assets/images/disassembly/IMG_8961.jpg differ
diff --git a/docs/assets/images/disassembly/IMG_8963.jpg b/docs/assets/images/disassembly/IMG_8963.jpg
new file mode 100644
index 0000000..88accc2
Binary files /dev/null and b/docs/assets/images/disassembly/IMG_8963.jpg differ
diff --git a/docs/assets/images/disassembly/IMG_8964.jpg b/docs/assets/images/disassembly/IMG_8964.jpg
new file mode 100644
index 0000000..7e69d3b
Binary files /dev/null and b/docs/assets/images/disassembly/IMG_8964.jpg differ
diff --git a/docs/assets/images/disassembly/IMG_8975.jpg b/docs/assets/images/disassembly/IMG_8975.jpg
new file mode 100644
index 0000000..26ffa6b
Binary files /dev/null and b/docs/assets/images/disassembly/IMG_8975.jpg differ
diff --git a/docs/assets/images/disassembly/IMG_8983.jpg b/docs/assets/images/disassembly/IMG_8983.jpg
new file mode 100644
index 0000000..1b8f90e
Binary files /dev/null and b/docs/assets/images/disassembly/IMG_8983.jpg differ
diff --git a/docs/assets/images/disassembly/IMG_8986_arrow.jpg b/docs/assets/images/disassembly/IMG_8986_arrow.jpg
new file mode 100644
index 0000000..6aa9533
Binary files /dev/null and b/docs/assets/images/disassembly/IMG_8986_arrow.jpg differ
diff --git a/docs/assets/images/disassembly/IMG_8989.jpg b/docs/assets/images/disassembly/IMG_8989.jpg
new file mode 100644
index 0000000..65f39ce
Binary files /dev/null and b/docs/assets/images/disassembly/IMG_8989.jpg differ
diff --git a/docs/assets/images/disassembly/IMG_8993.jpg b/docs/assets/images/disassembly/IMG_8993.jpg
new file mode 100644
index 0000000..91828d9
Binary files /dev/null and b/docs/assets/images/disassembly/IMG_8993.jpg differ
diff --git a/docs/user_manual/tutorials/hardware/teardown.md b/docs/user_manual/tutorials/hardware/teardown.md
index 3b82c11..ec59a71 100644
--- a/docs/user_manual/tutorials/hardware/teardown.md
+++ b/docs/user_manual/tutorials/hardware/teardown.md
@@ -1,18 +1,126 @@
-## Step 1 {.step-title}
-![FunKey and Screwdriver](/assets/images/IMG_8800.jpg){.step-thumb}
-![Insert Screwdriver](/assets/images/IMG_8801.jpg){.step-thumb}
-![Turn Screwdriver CCW](/assets/images/IMG_8802.jpg){.step-thumb}
+The FunKey S teardown was designed to be
+pretty straightforward. It only require a standard **Phillips
+screwdriver (PH0)** and **tweezers**.
 
- - You will need a Philips PH0 screwdriver
- - Insert the screwdriver in the hole
- - Turn the screwdriver counter-clockwise
+!!! note
+	FunKey Project is not responsible for any damage done to your console during a teardown.
 
-## Step 2 {.step-title}
-![FunKey screws and Screwdriver](/assets/images/IMG_8803.jpg){.step-thumb}
-![FunKey and screws](/assets/images/IMG_8804.jpg){.step-thumb}
+### **STEP 1 - Removing the screws** {.step-title}
+
+![Before opening](/assets/images/disassembly/IMG_8800.jpg){.step-thumb}
+![Remove the screws](/assets/images/disassembly/IMG_8801.jpg){.step-thumb}
+![Screws removed](/assets/images/disassembly/IMG_8803.jpg){.step-thumb}
+
+Using a standard **Phillips PH0 screwdriver**, remove the 2 screws on
+the back of your FunKey S.
+
+!!! warning
+	Be careful to use the correct screwdriver head size and type to
+	prevent damaging the screws (do not use JIS screwdrivers). 
+	FunKey Project is not responsible for replacing damaged screws.
+
+### **STEP 2 - Opening up the console** {.step-title}
+
+![Pull up hinge first](/assets/images/disassembly/IMG_8848.jpg){.step-thumb}
+![Console opened](/assets/images/disassembly/IMG_8989.jpg){.step-thumb}
+
+Carefully remove the plastic back of the console by pulling up the hinge side first
+
+### **STEP 3 - Removing the keychain lanyard** {.step-title}
+
+![Console opened](/assets/images/disassembly/IMG_8994.jpg){.step-thumb}
+![Console opened](/assets/images/disassembly/IMG_8993.jpg){.step-thumb}
+![Pull up the plastic buttons](/assets/images/disassembly/IMG_8896.jpg){.step-thumb}
+
+Carefully remove the keychain lanyard and its axis by pulling gently (it may fall off when opening).
+
+!!! warning
+    The axis is a small part, be careful not to loose it.
+
+### **STEP 4 - Removing the LR buttons** {.step-title}
+
+![Console opened](/assets/images/disassembly/IMG_8846.jpg){.step-thumb}
+![Pull up the plastic buttons](/assets/images/disassembly/IMG_8844.jpg){.step-thumb}
+![Pull up the plastic buttons](/assets/images/disassembly/IMG_8900.jpg){.step-thumb}
+
+Carefully remove the L/R plastic buttons by gently pulling them out of their axis
+
+!!! warning
+    Be careful not to damage the L/R switches on the circuit board!
+
+### **STEP 5 - Unplugging the battery** {.step-title}
+
+![Lift the battery](/assets/images/disassembly/IMG_8818.jpg){.step-thumb}
+![Get the battery out of the way](/assets/images/disassembly/IMG_8828.jpg){.step-thumb}
+![Get the battery out of the way](/assets/images/disassembly/IMG_8986_arrow.jpg){.step-thumb}
+
+Lift the battery and pull gently by the top of the circuit board to unplug the battery. The battery may be stuck to the processor with double-sided adhesive, it's perfectly normal if you have to lift with a bit of force to unstick it. 
+
+!!! warning
+	Be sure to pull on the connector and **NOT the wires** when removing the battery. It is recommended to use tweezers.
+
+### **STEP 6 - Unplugging the screen** {.step-title}
+
+![Pull PCB by its micro-USB port](/assets/images/disassembly/IMG_8964.jpg){.step-thumb}
+![Pull PCB by its micro-USB port](/assets/images/disassembly/IMG_8963.jpg){.step-thumb}
+![Pull PCB by its micro-USB port](/assets/images/disassembly/IMG_8938.jpg){.step-thumb}
+
+Now that you have access to the circuit board, you can unplug the screen. 
+!!! warning
+	This connector is fragile, unplug it vertically without force. It is recommended to use tweezers.
+
+### **STEP 7 - Removing the circuit board** {.step-title}
+
+![Pull PCB by its micro-USB port](/assets/images/disassembly/IMG_8942.jpg){.step-thumb}
+![Pull PCB by its micro-USB port](/assets/images/disassembly/IMG_8943.jpg){.step-thumb}
+![Pull PCB by its micro-USB port](/assets/images/disassembly/IMG_8902.jpg){.step-thumb}
+
+By grabbing it **by the hinge side**, gently pull up the circuit board from the plastic casing.
+
+### **STEP 8 - Removing the micro-SD card** {.step-title}
+
+![Remove the micro-SD](/assets/images/disassembly/IMG_8961.jpg){.step-thumb}
+![Insert the new micro-SD](/assets/images/disassembly/IMG_8957_nohand.jpg){.step-thumb}
+
+Remove the micro-SD card from its socket.
+
+!!! note
+    You may need to use some tweezers and pull with some strength in
+    order to remove the micro-SD card from its socket, as it is
+    strongly inserted to prevent loose connections.
+!!! warning
+	During this step be very careful not to damage the L/R switches. Never put the PCB on a flat surface (this would apply force on the LR switches) and do not grab the PCB by these switches.
+
+### **STEP 9 - Removing the buttons** {.step-title}
+
+![Remove the micro-SD](/assets/images/disassembly/IMG_8934.jpg){.step-thumb}
+![Insert the new micro-SD](/assets/images/disassembly/IMG_8905.jpg){.step-thumb}
+![Insert the new micro-SD](/assets/images/disassembly/IMG_8933.jpg){.step-thumb}
+
+Remove the buttons from their socket. It is recommended to use tweezers.
+
+### **STEP 10 - Teardown complete** {.step-title}
+
+![Remove the micro-SD](/assets/images/disassembly/IMG_8975.jpg){.step-thumb}
+![Insert the new micro-SD](/assets/images/disassembly/IMG_8983.jpg){.step-thumb}
+
+Good job the teardown is complete.
+
+### **STEP 11 - Reassembly** {.step-title}
+
+![Insert speaker first](/assets/images/disassembly/IMG_9013_YES.jpg){.step-thumb}
+![Do not insert hinge first](/assets/images/disassembly/IMG_9015_NO.jpg){.step-thumb}
+
+Insert first the speaker into its location in the casing before
+putting the circuit board back in the case, like in the pictures.
+
+Reassemble the console by following the previous steps in reverse order.
+
+!!! warning
+    Be careful not to damage the switches on the circuit board when
+    putting back the L/R plastic buttons.
 
-Now all the _screws_ are removed!
 
 --8<--
 includes/glossary.md
---8<--
+--8<--
\ No newline at end of file