diff --git a/Core/Src/canlog.c b/Core/Src/canlog.c
index 71d1ab4..5549e31 100644
--- a/Core/Src/canlog.c
+++ b/Core/Src/canlog.c
@@ -27,25 +27,6 @@
 extern CAN_HandleTypeDef hcan1;
 extern CAN_HandleTypeDef hcan2;
 
-/* USER CODE BEGIN RTOS_TASKS */
-/* Definitions for CAN1rx incoming */
-osThreadId_t vCAN1_rx;
-const osThreadAttr_t vCAN1_rx_attributes = {
-  .name = "vCAN1_rx",
-  .stack_size = 128 * 4,
-  .priority = (osPriority_t) osPriorityRealtime1,
-};
-
-/* Definitions for CAN2rx incoming*/
-osThreadId_t vCAN2_rx;
-const osThreadAttr_t vCAN2_rx_attributes = {
-  .name = "vCAN2_rx",
-  .stack_size = 128 * 4,
-  .priority = (osPriority_t) osPriorityRealtime,
-};
-/* USER END RTOS_TASKS */
-
-
 /* Private function prototypes -----------------------------------------------*/
 /* USER CODE BEGIN FunctionPrototypes */
 /* BEGIN CAN_Logger_Init */
diff --git a/Core/Src/main.c b/Core/Src/main.c
index 28d7de2..db36324 100644
--- a/Core/Src/main.c
+++ b/Core/Src/main.c
@@ -121,6 +121,21 @@ int main(void)
   /* Init scheduler */
   osKernelInitialize();
 
+  /* USER CODE BEGIN RTOS_TASKS */
+  osThreadId_t vCAN1_rx;
+  const osThreadAttr_t vCAN1_rx_attributes = {
+    .name = "vCAN1_rx",
+    .stack_size = 128 * 4,
+    .priority = (osPriority_t) osPriorityRealtime1,
+  };
+  osThreadId_t vCAN2_rx;
+  const osThreadAttr_t vCAN2_rx_attributes = {
+    .name = "vCAN2_rx",
+    .stack_size = 128 * 4,
+    .priority = (osPriority_t) osPriorityRealtime,
+  };
+  /* USER END RTOS_TASKS */
+
   /* USER CODE BEGIN RTOS_MUTEX */
   /* add mutexes, ... */
   /* USER CODE END RTOS_MUTEX */