diff --git a/CHANGELOG b/CHANGELOG
index e8fcc6a..c2a6a61 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+22-05-2023 (AKo): V0.6.24.0
+	- Update Obsconfig schema to add components & agents to channels config
+
+05-05-2023 (AKo): v0.6.23.0
+	- Update dockerfile (Upgrading to Ubuntu 22.04 & python 3.10) & requirements files
+	- Upgrade vuejs version (3.2.47)
+
+	
 25-04-2023 (AKo): v0.6.22.0
 	- Add ephem to pickle seq & add pickle creation when submitting seq via api
 	- Add Filenames to ConfigPyros & add fn_contexts in config_pyros.yml
diff --git a/config/schemas/schema_observatory-2.0.yml b/config/schemas/schema_observatory-2.0.yml
index d9f00d4..d847cb8 100644
--- a/config/schemas/schema_observatory-2.0.yml
+++ b/config/schemas/schema_observatory-2.0.yml
@@ -139,11 +139,62 @@ schema;schema_CHANNEL:
     name:
       type: str
       required: True
-    COMPONENT_AGENTS:
+    COMPONENTS:
       type: seq
-      required: True
+      required: False
       sequence:
         - type: any
+    AGENTS:
+      type: seq
+      required: False
+      sequence:
+        - type: any
+    fn_contexts:
+      type: map
+      required: True
+      mapping: 
+        img_L0:
+          type: map 
+          required: False
+          mapping:
+            root_dir:
+              type: str
+            description:
+              type: str
+            extension:
+              type: str 
+            naming: 
+              type: str
+            pathnaming:
+              type: str 
+        img_L1:
+          type: map 
+          required: False
+          mapping:
+            root_dir:
+              type: str
+            description:
+              type: str
+            extension:
+              type: str 
+            naming: 
+              type: str
+            pathnaming:
+              type: str
+        pyros_seq:
+          type: map 
+          required: False
+          mapping:
+            root_dir:
+              type: str
+            description:
+              type: str
+            extension:
+              type: str   
+            naming: 
+              type: str
+            pathnaming:
+              type: str
 
 schema;schema_IMAGE_CALIBRATIONS:
   type: map
diff --git a/privatedev/config/tnc/observatory_tnc.yml b/privatedev/config/tnc/observatory_tnc.yml
index 0d43786..7f2edce 100644
--- a/privatedev/config/tnc/observatory_tnc.yml
+++ b/privatedev/config/tnc/observatory_tnc.yml
@@ -187,15 +187,22 @@ OBSERVATORY:
                     links:
                         - link:
                             type: git
-                            name: guitastro_mount_astromecca
-                            url: https://gitlab.irap.omp.eu/guitastrolib/guitastro_mount_astromecca
+                            name: guitastro_device_astromecca
+                            url: https://gitlab.irap.omp.eu/guitastrolib/guitastro_device_astromecca
                             install: 
                                 shell: /bin/sh
                                 script: "guitastro/install/install.sh"
                         - link:
                             type: git
-                            name: guitastro_camera_indi
-                            url: https://gitlab.irap.omp.eu/guitastrolib/guitastro_camera_indi
+                            name: guitastro_device_optec
+                            url: https://gitlab.irap.omp.eu/guitastrolib/guitastro_device_optec
+                            install: 
+                                shell: /bin/sh
+                                script: "guitastro/install/install.sh"
+                        - link:
+                            type: git
+                            name: guitastro_device_indi
+                            url: https://gitlab.irap.omp.eu/guitastrolib/guitastro_device_indi
                             install: 
                                 shell: /bin/sh
                                 script: "guitastro/install/install.sh"
@@ -500,11 +507,11 @@ OBSERVATORY:
                         name: OpticalChannel_up1
                         symbol: CH1
                         AGENTS:
-                            AD_camera_up1
-                            AD_focuser_up1
-                            A_AgentImagesProcessor_up1_akz
+                           - AD_camera_up1
+                           - AD_focuser_up1
+                           - A_AgentImagesProcessor_up1_akz
                         COMPONENTS:
-                            Takahashi_Epsilon_180ED_001
+                            - Takahashi_Epsilon_180ED_001
                         fn_contexts:
                             img_L0:
                               root_dir: "data/images/"
@@ -522,32 +529,65 @@ OBSERVATORY:
                     - CHANNEL:
                         name: OpticalChannel_up2
                         symbol: CH2
-                        COMPONENT_AGENTS:
-                            - OpticImager: optic_up2
-                            - DetectorFocuser: focuser_up2
-                            - DetectorSensor: camera_up2
-                            - DetectorShutter: camera_up2
-                            - DetectorTimer: camera_up2
-
+                        AGENTS: 
+                            - focuser_up2
+                            - camera_up2
+                            #- A_AgentImagesProcessor_up2_akz
+                        COMPONENTS:
+                            - Takahashi_Epsilon_180ED_002
+                        fn_contexts:
+                            img_L0:
+                              root_dir: "data/images/"
+                              description: "pyros_img_L0"
+                              extension: ".fit"
+                              naming: "PyROS.img.1"
+                            img_L1:
+                              root_dir: "data/images/"
+                              description: "pyros_img_L1"
+                              extension: ".fits"
+                              pathnaming: "PyROS.img.1"
+                              
                     - CHANNEL:
                         name: OpticalChannel_down1
                         symbol: CH3
-                        COMPONENT_AGENTS:
-                            - OpticImager: optic_down1
-                            - DetectorFocuser: focuser_down1
-                            - DetectorSensor: camera_down1
-                            - DetectorShutter: camera_down1
-                            - DetectorTimer: camera_down1
+                        AGENTS: 
+                            - focuser_down
+                            - camera_down1
+                            #- A_AgentImagesProcessor_down1_akz
+                        COMPONENTS:
+                            - Takahashi_Epsilon_180ED_003
+                        fn_contexts:
+                            img_L0:
+                              root_dir: "data/images/"
+                              description: "pyros_img_L0"
+                              extension: ".fit"
+                              naming: "PyROS.img.1"
+                            img_L1:
+                              root_dir: "data/images/"
+                              description: "pyros_img_L1"
+                              extension: ".fits"
+                              pathnaming: "PyROS.img.1"
 
                     - CHANNEL:
                         name: OpticalChannel_down2
                         symbol: CH4
-                        COMPONENT_AGENTS:
-                            - OpticImager: optic_down2
-                            - DetectorFocuser: focuser_down2
-                            - DetectorSensor: camera_down2
-                            - DetectorShutter: camera_down2
-                            - DetectorTimer: camera_down2
+                        AGENTS: 
+                            - focuser_down2
+                            - camera_down2
+                            #- A_AgentImagesProcessor_down2_akz
+                        COMPONENTS:
+                            - Takahashi_Epsilon_180ED_004
+                        fn_contexts:
+                            img_L0:
+                              root_dir: "data/images/"
+                              description: "pyros_img_L0"
+                              extension: ".fit"
+                              naming: "PyROS.img.1"
+                            img_L1:
+                              root_dir: "data/images/"
+                              description: "pyros_img_L1"
+                              extension: ".fits"
+                              pathnaming: "PyROS.img.1"
 
                 ALBUMS:
                 
--
libgit2 0.21.2