diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..de73ac4e
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "tts-protobufs"]
+	path = tts-protobufs
+	url = https://github.com/NIAEFEUP/tts-protobufs.git
diff --git a/django/Dockerfile b/django/Dockerfile
index 09fdfe68..5f8d1d37 100644
--- a/django/Dockerfile
+++ b/django/Dockerfile
@@ -1,39 +1,45 @@
 # deps
 FROM python:3.11-slim AS deps
 
-WORKDIR /usr/src/django/ 
+WORKDIR /usr/src/django/
 
-# Get's the output from the django in realtime. 
+# Get's the output from the django in realtime.
 ENV PYTHONUNBUFFERED=1
 
-# Copy requirements 
-COPY ./requirements.txt ./requirements.txt 
+# Copy requirements
+COPY ./django/requirements.txt ./requirements.txt
+
+COPY ./tts-protobufs protos  
 
 # Dependencies for building the requirements
 RUN apt-get update
-RUN apt-get -y install build-essential
+RUN apt-get -y install build-essential protobuf-compiler git
+
+RUN git init
+RUN git submodule init
+RUN git submodule update
 
 # Install postgres dependencies (pgsql client and development files)
-COPY ./etc/pgdg.sh /tmp/pgdg.sh
+COPY ./django/etc/pgdg.sh /tmp/pgdg.sh
 RUN /tmp/pgdg.sh
 
 RUN apt -y install libpq-dev postgresql-client-16
 RUN apt -y clean && rm -rf /var/lib/apt/lists/*
 
-# Install the requirements
 RUN pip install -r requirements.txt
 
 EXPOSE 8000
 
-COPY ./entrypoint.sh ./entrypoint.sh  
+# Install the requirements
+COPY ./django/entrypoint.sh ./entrypoint.sh
 ENTRYPOINT ["/usr/src/django/entrypoint.sh"]
 
 # prod
 FROM deps AS prod
 
-COPY tts_be/ ./tts_be
-COPY university/ ./university
-COPY manage.py tasks.py ./
+COPY django/tts_be/ ./tts_be
+COPY django/university/ ./university
+COPY django/manage.py django/tasks.py ./
 
-COPY ./entrypoint_prod.sh ./entrypoint_prod.sh
-ENTRYPOINT ["/usr/src/django/entrypoint_prod.sh"]
+COPY ./django/entrypoint_prod.sh ./entrypoint_prod.sh
+ENTRYPOINT ["/usr/src/django/entrypoint_prod.sh"]
\ No newline at end of file
diff --git a/django/entrypoint.sh b/django/entrypoint.sh
index c7a44d66..4eb7e346 100755
--- a/django/entrypoint.sh
+++ b/django/entrypoint.sh
@@ -16,9 +16,13 @@ until PGPASSWORD="${POSTGRES_PASSWORD}" psql -h "${POSTGRES_HOST}" -U "${POSTGRE
 	>&2 echo "PostgreSQL is unavailable - sleeping"
 	sleep 4
 done
->&2 echo "PostgreSQL is up - executing command"
 
-echo "ENTRYPOINT RAN"
+>&2 echo "PostgreSQL is up - executing commands" 
+
+# Compile protobuf files
+echo "Compiling protobuf files..."
+protoc --python_out=generated -I=./protos/ ./protos/**/*.proto
+echo "Protobuf files compiled successfully."
 
 # Migrate the Django.
 python manage.py makemigrations
diff --git a/django/entrypoint_prod.sh b/django/entrypoint_prod.sh
index 0fe765f4..8c21f419 100755
--- a/django/entrypoint_prod.sh
+++ b/django/entrypoint_prod.sh
@@ -7,6 +7,11 @@ until PGPASSWORD="${POSTGRES_PASSWORD}" psql -h "${POSTGRES_HOST}" -U "${POSTGRE
 done
 >&2 echo "PostgreSQL is up - executing command"
 
+# Compile protobuf files
+echo "Compiling protobuf files..."
+protoc --python_out=generated -I=./protos/ ./protos/**/*.proto
+echo "Protobuf files compiled successfully."
+
 # Migrate the Django.
 python manage.py inspectdb >university/models.py
 python manage.py makemigrations
diff --git a/docker-compose.yaml b/docker-compose.yaml
index b9dd5be9..0d56aad2 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -36,13 +36,17 @@ services:
       - ./nginx/certs/:/etc/nginx/certs/
 
   django:
-    build: ./django
+    build:
+      context: ./
+      dockerfile: django/Dockerfile
     container_name: tts_django
     env_file:
       - django/.env.dev
     command: ["python", "manage.py", "runserver", "0.0.0.0:8000"]
     volumes:
       - ./django/:/usr/src/django/
+      - ./tts-protobufs/protos/:/usr/src/django/protos/
+      - ./protos/:/usr/src/django/generated/
     ports:
       - 8100:8000
       
diff --git a/protos/class_pb2.py b/protos/class_pb2.py
new file mode 100644
index 00000000..0b8d21d6
--- /dev/null
+++ b/protos/class_pb2.py
@@ -0,0 +1,93 @@
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: class.proto
+
+import sys
+_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from google.protobuf import reflection as _reflection
+from google.protobuf import symbol_database as _symbol_database
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2
+
+
+DESCRIPTOR = _descriptor.FileDescriptor(
+  name='class.proto',
+  package='example',
+  syntax='proto3',
+  serialized_options=None,
+  serialized_pb=_b('\n\x0b\x63lass.proto\x12\x07\x65xample\x1a\x1fgoogle/protobuf/timestamp.proto\"k\n\x05\x43lass\x12\n\n\x02id\x18\x01 \x01(\x03\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x16\n\x0e\x63ourse_unit_id\x18\x03 \x01(\x05\x12\x30\n\x0clast_updated\x18\x04 \x01(\x0b\x32\x1a.google.protobuf.Timestampb\x06proto3')
+  ,
+  dependencies=[google_dot_protobuf_dot_timestamp__pb2.DESCRIPTOR,])
+
+
+
+
+_CLASS = _descriptor.Descriptor(
+  name='Class',
+  full_name='example.Class',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='id', full_name='example.Class.id', index=0,
+      number=1, type=3, cpp_type=2, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='name', full_name='example.Class.name', index=1,
+      number=2, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='course_unit_id', full_name='example.Class.course_unit_id', index=2,
+      number=3, type=5, cpp_type=1, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='last_updated', full_name='example.Class.last_updated', index=3,
+      number=4, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=57,
+  serialized_end=164,
+)
+
+_CLASS.fields_by_name['last_updated'].message_type = google_dot_protobuf_dot_timestamp__pb2._TIMESTAMP
+DESCRIPTOR.message_types_by_name['Class'] = _CLASS
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+Class = _reflection.GeneratedProtocolMessageType('Class', (_message.Message,), dict(
+  DESCRIPTOR = _CLASS,
+  __module__ = 'class_pb2'
+  # @@protoc_insertion_point(class_scope:example.Class)
+  ))
+_sym_db.RegisterMessage(Class)
+
+
+# @@protoc_insertion_point(module_scope)
diff --git a/tts-protobufs b/tts-protobufs
new file mode 160000
index 00000000..12aefb5c
--- /dev/null
+++ b/tts-protobufs
@@ -0,0 +1 @@
+Subproject commit 12aefb5c815feaecfa311a286934a8c72c362a99