diff --git a/backend/videoflix/videoflix/settings.py b/backend/videoflix/videoflix/settings.py
index 49ad79c..681f113 100644
--- a/backend/videoflix/videoflix/settings.py
+++ b/backend/videoflix/videoflix/settings.py
@@ -34,10 +34,16 @@ EMAIL_HOST_USER = 'andre.kempf.dev@gmail.com'
 EMAIL_HOST_PASSWORD = 'oyxwawshudwytgud'
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
 
-ALLOWED_HOSTS = []
+ALLOWED_HOSTS = [
+    'videoflix-django.andre-kempf.com', 
+    '34.65.103.198', 
+    'localhost', 
+    '127.0.0.1',
+]
 
 CORS_ALLOWED_ORIGINS = [
-    'http://localhost:4200'
+    'https://34.65.103.198',
+    'http://localhost:4200',
 ]
 
 # Application definition
diff --git a/frontend/src/app/components/home/browse/categories/categories.component.ts b/frontend/src/app/components/home/browse/categories/categories.component.ts
index 8a7b139..a9a06c2 100644
--- a/frontend/src/app/components/home/browse/categories/categories.component.ts
+++ b/frontend/src/app/components/home/browse/categories/categories.component.ts
@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { environment } from '../../../../environments/environment.development';
+import { environment } from '../../../../environments/environment';
 
 @Component({
   selector: 'app-categories',
diff --git a/frontend/src/app/components/home/browse/hero-banner/hero-banner.component.ts b/frontend/src/app/components/home/browse/hero-banner/hero-banner.component.ts
index b301fca..ac3543e 100644
--- a/frontend/src/app/components/home/browse/hero-banner/hero-banner.component.ts
+++ b/frontend/src/app/components/home/browse/hero-banner/hero-banner.component.ts
@@ -8,7 +8,7 @@ import {
 } from '@angular/core';
 import { BtnLargeComponent } from '../../../../shared/components/btn-large/btn-large.component';
 import { MovieService } from '../../../../services/movie.service';
-import { environment } from '../../../../environments/environment.development';
+import { environment } from '../../../../environments/environment';
 
 @Component({
   selector: 'app-hero-banner',
diff --git a/frontend/src/app/environments/environment.development.ts b/frontend/src/app/environments/environment.development.ts
deleted file mode 100644
index c71bc26..0000000
--- a/frontend/src/app/environments/environment.development.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export const environment = {
-  baseUrl: 'http://127.0.0.1:8000/',
-};
diff --git a/frontend/src/app/environments/environment.ts b/frontend/src/app/environments/environment.ts
index e67cb31..c12cd63 100644
--- a/frontend/src/app/environments/environment.ts
+++ b/frontend/src/app/environments/environment.ts
@@ -1,3 +1,7 @@
 export const environment = {
-  baseUrl: '',
+  // Development
+  baseUrl: 'http://127.0.0.1:8000/',
+
+  // Live
+  // baseUrl: 'https://videoflix-django.andre-kempf.com',
 };
diff --git a/frontend/src/app/services/auth.service.ts b/frontend/src/app/services/auth.service.ts
index c380386..7cc5222 100644
--- a/frontend/src/app/services/auth.service.ts
+++ b/frontend/src/app/services/auth.service.ts
@@ -1,7 +1,7 @@
 import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { catchError, lastValueFrom, map, Observable, of } from 'rxjs';
-import { environment } from '../environments/environment.development';
+import { environment } from '../environments/environment';
 
 @Injectable({
   providedIn: 'root',
diff --git a/frontend/src/app/services/movie.service.ts b/frontend/src/app/services/movie.service.ts
index b187036..443e357 100644
--- a/frontend/src/app/services/movie.service.ts
+++ b/frontend/src/app/services/movie.service.ts
@@ -1,7 +1,7 @@
 import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { lastValueFrom, Observable, of } from 'rxjs';
-import { environment } from '../environments/environment.development';
+import { environment } from '../environments/environment';
 
 @Injectable({
   providedIn: 'root',