diff --git a/.github/workflows/publish_backend.yaml b/.github/workflows/publish_backend.yaml
index 7ca0005..4a64f7c 100644
--- a/.github/workflows/publish_backend.yaml
+++ b/.github/workflows/publish_backend.yaml
@@ -1,4 +1,4 @@
-name: Deploy Dart Frog Backend
+name: Test & Deploy Dart Frog Backend
 
 on:
   push:
@@ -21,10 +21,20 @@ jobs:
       uses: dart-lang/setup-dart@v1
     
     - name: Install Dependencies
-      run: |
-        cd backend
-        dart pub get
-        cd ..
+      working-directory: ./backend
+      run: dart pub get
+
+    - name: Get dependencies (core)
+      working-directory: ./core
+      run: flutter pub get
+
+    - name: Run build_runner (core)
+      working-directory: ./core
+      run: flutter pub run build_runner build --delete-conflicting-outputs
+
+    - name: Run Tests
+      working-directory: ./backend
+      run: dart test
     
     - name: Install Globe CLI
       run: dart pub global activate globe_cli
diff --git a/backend/README.md b/backend/README.md
index 16bd2ea..a71c1c2 100644
--- a/backend/README.md
+++ b/backend/README.md
@@ -26,6 +26,7 @@ export MONGO_CONNECTION_STRING="mongodb://<username>:<password>@<host>:<port>/<d
 export JWT_AUDIENCE="http://0.0.0.0:8080/"
 export JWT_ISSUER="http://0.0.0.0:8080/"
 export JWT_SECRET="dev_secret"
+export CORS_URL="http://0.0.0.0:8080/"
 
 # Print confirmation
 echo "Environment variables have been set:"
@@ -33,6 +34,7 @@ echo "MONGO_CONNECTION_STRING=$MONGO_CONNECTION_STRING"
 echo "JWT_AUDIENCE=$JWT_AUDIENCE"
 echo "JWT_ISSUER=$JWT_ISSUER"
 echo "JWT_SECRET=$JWT_SECRET"
+echo "CORS_URL=$CORS_URL"
 
 # Start the Dart Frog backend server
 dart_frog dev
diff --git a/backend/pubspec.yaml b/backend/pubspec.yaml
index 6d92b7a..6f326aa 100644
--- a/backend/pubspec.yaml
+++ b/backend/pubspec.yaml
@@ -13,6 +13,7 @@ dependencies:
   dart_frog: ^1.1.0
   logger: ^2.4.0
   mongo_dart: ^0.10.3
+  shelf_cors_headers: ^0.1.5
 
 dev_dependencies:
   mocktail: ^1.0.3
diff --git a/backend/routes/_middleware.dart b/backend/routes/_middleware.dart
index c4fbd52..feb82b5 100644
--- a/backend/routes/_middleware.dart
+++ b/backend/routes/_middleware.dart
@@ -2,6 +2,7 @@ import 'dart:io';
 
 import 'package:dart_frog/dart_frog.dart';
 import 'package:mongo_dart/mongo_dart.dart';
+import 'package:shelf_cors_headers/shelf_cors_headers.dart';
 
 import '../src/models/token_config.dart';
 import '../src/repositories/credential_manager.dart';
@@ -11,6 +12,15 @@ import '../src/utils/extensions.dart';
 Handler middleware(Handler handler) {
   return handler
       .use(requestLogger())
+      .use(
+        fromShelfMiddleware(
+          corsHeaders(
+            headers: {
+              ACCESS_CONTROL_ALLOW_ORIGIN: Platform.environment['CORS_URL']!,
+            },
+          ),
+        ),
+      )
       .use(Middlewares.userRepository)
       .use(Middlewares.db)
       .use(Middlewares.credentialManager);
diff --git a/backend/src/utils/global_instances.dart b/backend/src/utils/global_instances.dart
index 55058ea..ae4eee2 100644
--- a/backend/src/utils/global_instances.dart
+++ b/backend/src/utils/global_instances.dart
@@ -1,3 +1,9 @@
+import 'dart:io';
+
 import 'package:logger/logger.dart';
 
-final logger = Logger();
+final logger = Logger(
+  filter: Platform.environment['CORS_URL']?.contains('0.0.0.0') ?? false
+      ? DevelopmentFilter()
+      : ProductionFilter(),
+);