diff --git a/.vscode/launch.json b/.vscode/launch.json
index 0b29e08a..89b0844c 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -102,6 +102,16 @@
             "projectName": "aws-lambda-project",
             "args": "--spring.profiles.active=local",
             "envFile": "${workspaceFolder}/.env"
+        },
+        {
+            "type": "java",
+            "name": "Spring Boot-Application<aws-cloudwatch-project>",
+            "request": "launch",
+            "cwd": "${workspaceFolder}",
+            "mainClass": "com.example.awsspring.Application",
+            "projectName": "aws-cloudwatch-project",
+            "args": "--spring.profiles.active=local",
+            "envFile": "${workspaceFolder}/.env"
         }
     ]
 }
\ No newline at end of file
diff --git a/aws-cloudwatch-project/.gitignore b/aws-cloudwatch-project/.gitignore
index c456913c..32a9df65 100644
--- a/aws-cloudwatch-project/.gitignore
+++ b/aws-cloudwatch-project/.gitignore
@@ -34,4 +34,5 @@ build/
 
 ### Misc ###
 *.log
-.DS_Store
\ No newline at end of file
+.DS_Store
+/docker/volume
\ No newline at end of file
diff --git a/aws-cloudwatch-project/docker/docker-compose-elk.yml b/aws-cloudwatch-project/docker/docker-compose-elk.yml
index 09b7d5a7..20bc9d5c 100644
--- a/aws-cloudwatch-project/docker/docker-compose-elk.yml
+++ b/aws-cloudwatch-project/docker/docker-compose-elk.yml
@@ -2,7 +2,7 @@ version: '3.8'
 services:
 
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:7.17.17
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.12.0
     container_name: elasticsearch
     environment:
       - cluster.name=docker-cluster
@@ -15,13 +15,9 @@ services:
     ports:
       - "9200:9200"
       - "9300:9300"
-    ulimits:
-      memlock:
-        soft: -1
-        hard: -1
 
   logstash:
-    image: docker.elastic.co/logstash/logstash:7.17.17
+    image: docker.elastic.co/logstash/logstash:8.12.0
     container_name: logstash
     command: logstash -f /etc/logstash/conf.d/logstash.conf
     volumes:
@@ -32,7 +28,7 @@ services:
       - elasticsearch
 
   kibana:
-    image: docker.elastic.co/kibana/kibana:7.17.17
+    image: docker.elastic.co/kibana/kibana:8.12.0
     container_name: kibana
     environment:
       - ELASTICSEARCH_URL=http://elasticsearch:9200
diff --git a/aws-cloudwatch-project/pom.xml b/aws-cloudwatch-project/pom.xml
index df8e16e6..059eaf6a 100644
--- a/aws-cloudwatch-project/pom.xml
+++ b/aws-cloudwatch-project/pom.xml
@@ -21,9 +21,6 @@
         <java.version>21</java.version>
         <spring-cloud-aws.version>3.1.0</spring-cloud-aws.version>
         <springdoc-openapi.version>2.3.0</springdoc-openapi.version>
-        <commons-io.version>2.15.1</commons-io.version>
-
-        <testcontainers.version>1.18.0</testcontainers.version>
 
         <project.testresult.directory>${project.build.directory}/test-results</project.testresult.directory>
         <spotless.version>2.43.0</spotless.version>
@@ -102,13 +99,9 @@
             <version>${springdoc-openapi.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>${commons-io.version}</version>
+            <groupId>net.logstash.logback</groupId>
+            <artifactId>logstash-logback-encoder</artifactId>
+            <version>7.4</version>
         </dependency>
 
         <dependency>
@@ -116,11 +109,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.awaitility</groupId>
-            <artifactId>awaitility</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>junit-jupiter</artifactId>
diff --git a/aws-cloudwatch-project/src/main/resources/application-local.properties b/aws-cloudwatch-project/src/main/resources/application-local.properties
index 412ec2a6..8e49239a 100644
--- a/aws-cloudwatch-project/src/main/resources/application-local.properties
+++ b/aws-cloudwatch-project/src/main/resources/application-local.properties
@@ -8,4 +8,7 @@ spring.cloud.aws.cloudwatch.region=us-east-1
 
 spring.cloud.aws.credentials.access-key=noop
 spring.cloud.aws.credentials.secret-key=noop
-spring.cloud.aws.region.static=us-east-1
\ No newline at end of file
+spring.cloud.aws.region.static=us-east-1
+
+logstash.host=localhost
+logstash.port=5000
\ No newline at end of file
diff --git a/aws-cloudwatch-project/src/main/resources/logback-spring.xml b/aws-cloudwatch-project/src/main/resources/logback-spring.xml
index f94ab788..b3d07807 100644
--- a/aws-cloudwatch-project/src/main/resources/logback-spring.xml
+++ b/aws-cloudwatch-project/src/main/resources/logback-spring.xml
@@ -3,6 +3,17 @@
     <include resource="org/springframework/boot/logging/logback/defaults.xml" />
     <include resource="org/springframework/boot/logging/logback/console-appender.xml" />
 
+    <springProperty scope="context" name="app_name" source="spring.application.name"/>
+    <springProperty scope="context" name="app_port" source="server.port"/>
+    <springProperty scope="local" name="logstash_host" source="logstash.host"/>
+    <springProperty scope="local" name="logstash_port" source="logstash.port"/>
+
+    <appender name="logstash" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+        <param name="Encoding" value="UTF-8"/>
+        <destination>${logstash_host:- }:${logstash_port:- }</destination>
+        <encoder class="net.logstash.logback.encoder.LogstashEncoder"/>
+    </appender>
+
     <springProfile name="default">
         <root level="INFO">
             <appender-ref ref="CONSOLE" />
@@ -13,6 +24,7 @@
         <root level="INFO">
             <appender-ref ref="FILE" />
             <appender-ref ref="CONSOLE" />
+            <appender-ref ref="logstash" />
         </root>
     </springProfile>
 
diff --git a/aws-kinesis-project/consumer/config/elk/logstash.conf b/aws-kinesis-project/consumer/config/elk/logstash.conf
deleted file mode 100644
index 97bc2fb6..00000000
--- a/aws-kinesis-project/consumer/config/elk/logstash.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-input {
-	tcp {
-		port => 5000
-		codec => json_lines
-	}
-}
-
-## Add your filters / logstash plugins configuration here
-
-output {
-	elasticsearch {
-		hosts => "elasticsearch:9200"
-	}
-}
diff --git a/aws-kinesis-project/consumer/docker/docker-compose-elk.yml b/aws-kinesis-project/consumer/docker/docker-compose-elk.yml
deleted file mode 100644
index 14c62076..00000000
--- a/aws-kinesis-project/consumer/docker/docker-compose-elk.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-version: '3.7'
-
-services:
-
-  # Elasticsearch Docker Images: https://www.docker.elastic.co/
-  elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:7.17.17
-    container_name: elasticsearch
-    environment:
-      - xpack.security.enabled=false
-      - discovery.type=single-node
-    ulimits:
-      memlock:
-        soft: -1
-        hard: -1
-      nofile:
-        soft: 65536
-        hard: 65536
-    cap_add:
-      - IPC_LOCK
-    volumes:
-      - elasticsearch-data:/usr/share/elasticsearch/data
-    ports:
-      - 9200:9200
-      - 9300:9300
-
-  kibana:
-    container_name: kibana
-    image: docker.elastic.co/kibana/kibana:7.17.17
-    environment:
-      - ELASTICSEARCH_HOSTS=http://elasticsearch:9200
-    ports:
-      - 5601:5601
-    depends_on:
-      - elasticsearch
-  
-  logstash:
-    image: docker.elastic.co/logstash/logstash:7.17.17
-    container_name: logstash
-    command: logstash -f /etc/logstash/conf.d/logstash.conf
-    volumes:
-      - ../config/elk:/etc/logstash/conf.d
-    ports:
-      - "5000:5000"
-    links:
-      - elasticsearch
-
-volumes:
-  elasticsearch-data:
-    driver: local
diff --git a/aws-kinesis-project/producer/config/elk/logstash.conf b/aws-kinesis-project/producer/config/elk/logstash.conf
deleted file mode 100644
index 97bc2fb6..00000000
--- a/aws-kinesis-project/producer/config/elk/logstash.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-input {
-	tcp {
-		port => 5000
-		codec => json_lines
-	}
-}
-
-## Add your filters / logstash plugins configuration here
-
-output {
-	elasticsearch {
-		hosts => "elasticsearch:9200"
-	}
-}
diff --git a/aws-kinesis-project/producer/docker/docker-compose-elk.yml b/aws-kinesis-project/producer/docker/docker-compose-elk.yml
deleted file mode 100644
index 81e0d8cb..00000000
--- a/aws-kinesis-project/producer/docker/docker-compose-elk.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-version: '3.8'
-services:
-  elasticsearch:
-    container_name: elasticsearch
-    image: docker.elastic.co/elasticsearch/elasticsearch:7.17.17
-    environment:
-      - cluster.name=es-docker-cluster
-      - discovery.type=single-node
-      - bootstrap.memory_lock=true
-      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
-    ulimits:
-      memlock:
-        soft: -1
-        hard: -1
-    volumes:
-      - es-data:/usr/share/elasticsearch/data
-    ports:
-      - "9200:9200"
-      - "9300:9300"
-    networks:
-      - elastic
-
-  kibana:
-    image: docker.elastic.co/kibana/kibana:7.17.17
-    container_name: kibana
-    environment:
-      ELASTICSEARCH_URL: http://elasticsearch:9200
-      ELASTICSEARCH_HOSTS: http://elasticsearch:9200
-    ports:
-      - "5601:5601"
-    networks:
-      - elastic
-
-  logstash:
-    image: docker.elastic.co/logstash/logstash:7.17.17
-    container_name: logstash
-    ports:
-      - "5000:5000"
-    volumes:
-      - ../config/elk:/etc/logstash/conf.d/logstash.conf:ro
-    networks:
-      - elastic
-
-volumes:
-  es-data:
-    driver: local
-
-networks:
-  elastic:
-    driver: bridge