diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0b89b12..ad4eb54 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,30 +4,22 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="82def982-1f77-496a-a21a-a6ccc7bf68be" name="Changes" comment="Added security for local running applications">
-      <change afterPath="$PROJECT_DIR$/kubernetes/infra/keycloak/course-management-realm.json" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/kubernetes/infra/keycloak/keycloak.yml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/kubernetes/infra/mongodb/mongo.yml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/kubernetes/infra/postgres/postgres.yml" afterDir="false" />
+    <list default="true" id="82def982-1f77-496a-a21a-a6ccc7bf68be" name="Changes" comment="Added oAuth with keycloak">
+      <change afterPath="$PROJECT_DIR$/docker/fluent-bit/fluent-bit.conf" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/docker/grafana/provisioning/datasources/datasource.yml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/docker/loki/loki-config.yml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/docker/prometheus/prometheus.yml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/docker/tempo/tempo-config.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/kubernetes/infra/mongodb/deployment.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/kubernetes/infra/mongodb/service.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/kubernetes/infra/postgres/deployment.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/kubernetes/infra/postgres/service.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/microservices/course-composite-service/kubernetes/deployment.yml" beforeDir="false" afterPath="$PROJECT_DIR$/microservices/course-composite-service/kubernetes/deployment.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/microservices/course-composite-service/src/main/java/io/javatab/microservices/composite/course/config/ResourceController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/microservices/course-composite-service/src/main/java/io/javatab/microservices/composite/course/config/SecurityConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/microservices/course-composite-service/src/main/java/io/javatab/microservices/composite/course/config/SecurityConfig.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/microservices/course-composite-service/src/main/java/io/javatab/microservices/composite/course/web/CourseAggregateController.java" beforeDir="false" afterPath="$PROJECT_DIR$/microservices/course-composite-service/src/main/java/io/javatab/microservices/composite/course/web/CourseAggregateController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/microservices/course-composite-service/src/main/java/io/javatab/microservices/composite/course/web/CourseCompositeIntegration.java" beforeDir="false" afterPath="$PROJECT_DIR$/microservices/course-composite-service/src/main/java/io/javatab/microservices/composite/course/web/CourseCompositeIntegration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Tiltfile" beforeDir="false" afterPath="$PROJECT_DIR$/Tiltfile" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/docker/docker-compose-base.yml" beforeDir="false" afterPath="$PROJECT_DIR$/docker/docker-compose-base.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/docker/docker-compose-infra.yml" beforeDir="false" afterPath="$PROJECT_DIR$/docker/docker-compose-infra.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/kubernetes/infra/keycloak/course-management-realm.json" beforeDir="false" afterPath="$PROJECT_DIR$/kubernetes/infrastructure/keycloak/course-management-realm.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/kubernetes/infra/keycloak/keycloak.yml" beforeDir="false" afterPath="$PROJECT_DIR$/kubernetes/infrastructure/keycloak/keycloak.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/kubernetes/infra/mongodb/mongo.yml" beforeDir="false" afterPath="$PROJECT_DIR$/kubernetes/infrastructure/mongodb/mongodb.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/kubernetes/infra/postgres/postgres.yml" beforeDir="false" afterPath="$PROJECT_DIR$/kubernetes/infrastructure/postgres/postgres.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/microservices/course-composite-service/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/microservices/course-composite-service/pom.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/microservices/course-composite-service/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/microservices/course-composite-service/src/main/resources/application.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/microservices/course-service/kubernetes/deployment.yml" beforeDir="false" afterPath="$PROJECT_DIR$/microservices/course-service/kubernetes/deployment.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/microservices/course-service/src/main/java/io/javatab/microservices/core/course/config/SecurityConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/microservices/course-service/src/main/java/io/javatab/microservices/core/course/config/SecurityConfig.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/microservices/course-service/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/microservices/course-service/src/main/resources/application.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/microservices/review-service/kubernetes/deployment.yml" beforeDir="false" afterPath="$PROJECT_DIR$/microservices/review-service/kubernetes/deployment.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/microservices/review-service/src/main/java/io/javatab/microservices/core/review/config/SecurityConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/microservices/review-service/src/main/java/io/javatab/microservices/core/review/config/SecurityConfig.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/microservices/review-service/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/microservices/review-service/src/main/resources/application.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/spring-cloud/gateway-service/kubernetes/deployment.yml" beforeDir="false" afterPath="$PROJECT_DIR$/spring-cloud/gateway-service/kubernetes/deployment.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/spring-cloud/gateway-service/src/main/java/com/example/springcloud/gateway/config/SecurityConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/spring-cloud/gateway-service/src/main/java/com/example/springcloud/gateway/config/SecurityConfig.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -70,25 +62,28 @@
     <option name="showLibraryContents" value="true" />
     <option name="showVisibilityIcons" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;Application.CourseCompositeServiceApplication.executor&quot;: &quot;Run&quot;,
-    &quot;Application.CourseServiceApplication.executor&quot;: &quot;Run&quot;,
-    &quot;Application.GatewayServiceApplication.executor&quot;: &quot;Run&quot;,
-    &quot;Application.ReviewServiceApplication.executor&quot;: &quot;Run&quot;,
-    &quot;Maven.course-service [compile].executor&quot;: &quot;Run&quot;,
-    &quot;Maven.course-service [package].executor&quot;: &quot;Run&quot;,
-    &quot;Maven.util [install].executor&quot;: &quot;Run&quot;,
-    &quot;Maven.util [package].executor&quot;: &quot;Run&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
-    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;revamp&quot;,
-    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;/Users/maersk-mtc-79/Nasir/Personal/Codebase/microservices-example/spring-boot-update/spring-boot-based-microservices/microservices/review-service&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;terminal&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "Application.CourseCompositeServiceApplication.executor": "Run",
+    "Application.CourseServiceApplication.executor": "Run",
+    "Application.GatewayServiceApplication.executor": "Run",
+    "Application.ReviewServiceApplication.executor": "Run",
+    "Maven.course-service [compile].executor": "Run",
+    "Maven.course-service [package].executor": "Run",
+    "Maven.util [install].executor": "Run",
+    "Maven.util [package].executor": "Run",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.git.unshallow": "true",
+    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
+    "git-widget-placeholder": "revamp",
+    "kotlin-language-version-configured": "true",
+    "last_opened_file_path": "/Users/maersk-mtc-79/Nasir/Personal/Codebase/microservices-example/spring-boot-update/spring-boot-based-microservices/microservices/review-service",
+    "project.structure.last.edited": "Project",
+    "project.structure.proportion": "0.15",
+    "project.structure.side.proportion": "0.0",
+    "settings.editor.selected.configurable": "MavenSettings"
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="CreateClassDialog.RecentsKey">
       <recent name="io.javatab.microservices.core.course.domain" />
@@ -249,7 +244,15 @@
       <option name="project" value="LOCAL" />
       <updated>1741325074203</updated>
     </task>
-    <option name="localTasksCounter" value="5" />
+    <task id="LOCAL-00005" summary="Added oAuth with keycloak">
+      <option name="closed" value="true" />
+      <created>1741363113389</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1741363113389</updated>
+    </task>
+    <option name="localTasksCounter" value="6" />
     <servers />
   </component>
   <component name="UnknownFeatures">
@@ -271,7 +274,8 @@
     <MESSAGE value="Added ingress support" />
     <MESSAGE value="Fix for aggregate course" />
     <MESSAGE value="Added security for local running applications" />
-    <option name="LAST_COMMIT_MESSAGE" value="Added security for local running applications" />
+    <MESSAGE value="Added oAuth with keycloak" />
+    <option name="LAST_COMMIT_MESSAGE" value="Added oAuth with keycloak" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
diff --git a/Tiltfile b/Tiltfile
index 35e4bb1..18c2012 100644
--- a/Tiltfile
+++ b/Tiltfile
@@ -1,11 +1,23 @@
+# Define and build infrastructure services
+k8s_yaml([
+    "kubernetes/infrastructure/keycloak/keycloak.yml",
+    "kubernetes/infrastructure/postgres/postgres.yml",
+    "kubernetes/infrastructure/mongodb/mongodb.yml"
+])
+
+# Define infrastructure resources
+k8s_resource("keycloak", labels=["infra"], auto_init=True)
+k8s_resource("course-postgres", labels=["infra"], auto_init=True)
+k8s_resource("review-mongodb", labels=["infra"], auto_init=True)
+
 # Define and build course-service
 docker_build(
     "course-service",
     context="./microservices/course-service",
     dockerfile="./microservices/course-service/Dockerfile",
     live_update=[
-        sync("./microservices/course-service/src", "/application/src"),  # Sync only Java files
-        run("mvn package -DskipTests", trigger=["/application/src"]),    # Rebuild JAR when code changes
+        sync("./microservices/course-service/src", "/application/src"),
+        run("mvn package -DskipTests", trigger=["/application/src"]),
     ]
 )
 k8s_yaml([
@@ -14,8 +26,8 @@ k8s_yaml([
 ])
 k8s_resource(
     "course-service",
-    port_forwards="9001:9001",  # Maps host port 9001 to container port 9001
-    labels=["services"]         # Optional: Group in Tilt UI
+    port_forwards="9001:9001",
+    labels=["services"]
 )
 
 # Define and build review-service
@@ -24,8 +36,8 @@ docker_build(
     context="./microservices/review-service",
     dockerfile="./microservices/review-service/Dockerfile",
     live_update=[
-        sync("./microservices/review-service/src", "/application/src"),  # Sync only Java files
-        run("mvn package -DskipTests", trigger=["/application/src"]),    # Rebuild JAR when code changes
+        sync("./microservices/review-service/src", "/application/src"),
+        run("mvn package -DskipTests", trigger=["/application/src"]),
     ]
 )
 k8s_yaml([
@@ -38,14 +50,14 @@ k8s_resource(
     labels=["services"]
 )
 
-# Define and build course-aggregate-service
+# Define and build course-composite-service
 docker_build(
     "course-composite-service",
     context="./microservices/course-composite-service",
     dockerfile="./microservices/course-composite-service/Dockerfile",
     live_update=[
-        sync("./microservices/course-composite-service/src", "/application/src"),  # Sync only Java files
-        run("mvn package -DskipTests", trigger=["/application/src"]),    # Rebuild JAR when code changes
+        sync("./microservices/course-composite-service/src", "/application/src"),
+        run("mvn package -DskipTests", trigger=["/application/src"]),
     ]
 )
 k8s_yaml([
@@ -58,15 +70,14 @@ k8s_resource(
     labels=["services"]
 )
 
-
 # Define and build gateway-service
 docker_build(
     "gateway-service",
     context="./spring-cloud/gateway-service",
     dockerfile="./spring-cloud/gateway-service/Dockerfile",
     live_update=[
-        sync("./spring-cloud/gateway-service/src", "/application/src"),  # Sync only Java files
-        run("mvn package -DskipTests", trigger=["/application/src"]),    # Rebuild JAR when code changes
+        sync("./spring-cloud/gateway-service/src", "/application/src"),
+        run("mvn package -DskipTests", trigger=["/application/src"]),
     ]
 )
 k8s_yaml([
@@ -74,9 +85,7 @@ k8s_yaml([
     "spring-cloud/gateway-service/kubernetes/service.yml",
     "spring-cloud/gateway-service/kubernetes/ingress.yml"
 ])
-
 k8s_resource(
     "gateway-service",
-#    port_forwards="9000:9000",  # Maps host port 9000 to container port 9000
-     labels=["services"]         # Optional: Group in Tilt UI
+    labels=["services"]
 )
\ No newline at end of file
diff --git a/docker/docker-compose-infra.yml b/docker/docker-compose-infra.yml
index 8a5daba..24e4724 100644
--- a/docker/docker-compose-infra.yml
+++ b/docker/docker-compose-infra.yml
@@ -42,7 +42,6 @@ services:
     command: [ "start-dev" ]
     networks:
       - shared-network
-
 networks:
   shared-network:
     name: shared-network
\ No newline at end of file
diff --git a/kubernetes/infra/keycloak/course-management-realm.json b/kubernetes/infrastructure/keycloak/course-management-realm.json
similarity index 100%
rename from kubernetes/infra/keycloak/course-management-realm.json
rename to kubernetes/infrastructure/keycloak/course-management-realm.json
diff --git a/kubernetes/infra/keycloak/keycloak.yml b/kubernetes/infrastructure/keycloak/keycloak.yml
similarity index 100%
rename from kubernetes/infra/keycloak/keycloak.yml
rename to kubernetes/infrastructure/keycloak/keycloak.yml
diff --git a/kubernetes/infra/mongodb/mongo.yml b/kubernetes/infrastructure/mongodb/mongodb.yml
similarity index 100%
rename from kubernetes/infra/mongodb/mongo.yml
rename to kubernetes/infrastructure/mongodb/mongodb.yml
diff --git a/kubernetes/infra/postgres/postgres.yml b/kubernetes/infrastructure/postgres/postgres.yml
similarity index 100%
rename from kubernetes/infra/postgres/postgres.yml
rename to kubernetes/infrastructure/postgres/postgres.yml