diff --git a/openair2/COMMON/messages_def.h b/openair2/COMMON/messages_def.h
index 5db487b599..4b14c7e9b0 100644
--- a/openair2/COMMON/messages_def.h
+++ b/openair2/COMMON/messages_def.h
@@ -13,4 +13,5 @@
 #include "s1ap_messages_def.h"
 #include "x2ap_messages_def.h"
 #include "sctp_messages_def.h"
+#include "udp_messages_def.h"
 
diff --git a/openair2/COMMON/messages_types.h b/openair2/COMMON/messages_types.h
index dcceaa0098..8bebeb997e 100644
--- a/openair2/COMMON/messages_types.h
+++ b/openair2/COMMON/messages_types.h
@@ -21,5 +21,6 @@
 #include "s1ap_messages_types.h"
 #include "x2ap_messages_types.h"
 #include "sctp_messages_types.h"
+#include "udp_messages_types.h"
 
 #endif /* MESSAGES_TYPES_H_ */
diff --git a/openair2/COMMON/tasks_def.h b/openair2/COMMON/tasks_def.h
index b30f91cedf..db4b4621ce 100644
--- a/openair2/COMMON/tasks_def.h
+++ b/openair2/COMMON/tasks_def.h
@@ -23,6 +23,10 @@ SUB_TASK_DEF(TASK_L2L1,     TASK_PDCP_ENB,              200)
 /// RAL task for ENB
 TASK_DEF(TASK_RAL_ENB, TASK_PRIORITY_MED, 200)
 
+    // UDP TASK
+    TASK_DEF(TASK_UDP,      TASK_PRIORITY_MED,          200)
+    // GTP_V1U task
+    TASK_DEF(TASK_GTPU,     TASK_PRIORITY_MED,          200)
     TASK_DEF(TASK_S1AP,     TASK_PRIORITY_MED,          200)
     ///   X2ap task, acts as both source and target
     TASK_DEF(TASK_X2AP,     TASK_PRIORITY_MED,          200)
diff --git a/openair2/COMMON/udp_messages_def.h b/openair2/COMMON/udp_messages_def.h
new file mode 100755
index 0000000000..08e98b801e
--- /dev/null
+++ b/openair2/COMMON/udp_messages_def.h
@@ -0,0 +1,3 @@
+MESSAGE_DEF(UDP_INIT,     MESSAGE_PRIORITY_MED, udp_init_t,     udp_init)
+MESSAGE_DEF(UDP_DATA_REQ, MESSAGE_PRIORITY_MED, udp_data_req_t, udp_data_req)
+MESSAGE_DEF(UDP_DATA_IND, MESSAGE_PRIORITY_MED, udp_data_ind_t, udp_data_ind)
diff --git a/openair2/COMMON/udp_messages_types.h b/openair2/COMMON/udp_messages_types.h
new file mode 100755
index 0000000000..f548b2b0bc
--- /dev/null
+++ b/openair2/COMMON/udp_messages_types.h
@@ -0,0 +1,18 @@
+#ifndef UDP_MESSAGES_TYPES_H_
+#define UDP_MESSAGES_TYPES_H_
+
+#define UDP_INIT(mSGpTR)    (mSGpTR)->ittiMsg.udp_init
+
+typedef struct {
+    uint32_t  port;
+    char     *address;
+} udp_init_t;
+
+typedef struct {
+    uint8_t  *buffer;
+    uint32_t  buffer_length;
+    uint32_t  peer_address;
+    uint32_t  peer_port;
+} udp_data_req_t, udp_data_ind_t;
+
+#endif /* UDP_MESSAGES_TYPES_H_ */