diff --git a/.github/workflows/aws-dynamo-main.yml b/.github/workflows/aws-dynamo-main.yml
index f7ba659e..1311e8b5 100644
--- a/.github/workflows/aws-dynamo-main.yml
+++ b/.github/workflows/aws-dynamo-main.yml
@@ -23,7 +23,7 @@ jobs:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
       - name: Set up JDK 18
-        uses: actions/setup-java@v3.4.1
+        uses: actions/setup-java@v3.5.0
         with:
           java-version: 18
           distribution: 'zulu'
diff --git a/.github/workflows/aws-kinesis-consumer-main.yml b/.github/workflows/aws-kinesis-consumer-main.yml
index 05687197..34ca646d 100644
--- a/.github/workflows/aws-kinesis-consumer-main.yml
+++ b/.github/workflows/aws-kinesis-consumer-main.yml
@@ -23,7 +23,7 @@ jobs:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
       - name: Set up JDK 18
-        uses: actions/setup-java@v3.4.1
+        uses: actions/setup-java@v3.5.0
         with:
           java-version: 18
           distribution: 'zulu'
diff --git a/.github/workflows/aws-kinesis-producer-main.yml b/.github/workflows/aws-kinesis-producer-main.yml
index a85101e6..e242eb57 100644
--- a/.github/workflows/aws-kinesis-producer-main.yml
+++ b/.github/workflows/aws-kinesis-producer-main.yml
@@ -23,7 +23,7 @@ jobs:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
       - name: Set up JDK 18
-        uses: actions/setup-java@v3.4.1
+        uses: actions/setup-java@v3.5.0
         with:
           java-version: 18
           distribution: 'zulu'
diff --git a/.github/workflows/aws-s3-main.yml b/.github/workflows/aws-s3-main.yml
index 2173f15b..123a7290 100644
--- a/.github/workflows/aws-s3-main.yml
+++ b/.github/workflows/aws-s3-main.yml
@@ -23,7 +23,7 @@ jobs:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
       - name: Set up JDK 18
-        uses: actions/setup-java@v3.4.1
+        uses: actions/setup-java@v3.5.0
         with:
           java-version: 18
           distribution: 'zulu'
diff --git a/.github/workflows/aws-ses-main.yml b/.github/workflows/aws-ses-main.yml
index 7299bb4e..69ef9b4e 100644
--- a/.github/workflows/aws-ses-main.yml
+++ b/.github/workflows/aws-ses-main.yml
@@ -23,7 +23,7 @@ jobs:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
       - name: Set up JDK 18
-        uses: actions/setup-java@v3.3.0
+        uses: actions/setup-java@v3.5.0
         with:
           java-version: 18
           distribution: 'zulu'
diff --git a/.github/workflows/aws-sqs-main.yml b/.github/workflows/aws-sqs-main.yml
index f5aa653f..9e2f2a7a 100644
--- a/.github/workflows/aws-sqs-main.yml
+++ b/.github/workflows/aws-sqs-main.yml
@@ -23,7 +23,7 @@ jobs:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
       - name: Set up JDK 18
-        uses: actions/setup-java@v3.4.1
+        uses: actions/setup-java@v3.5.0
         with:
           java-version: 18
           distribution: 'zulu'
diff --git a/.gitpod.yml b/.gitpod.yml
index b3ad8461..49419e8c 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -6,6 +6,10 @@ ports:
     visibility: public
   - port: 8080
     visibility: public
+  - port: 9200
+    visibility: public
+  - port: 5601
+    visibility: public
 
 vscode:
   extensions:
diff --git a/aws-dynamodb-project/docker/docker-compose-elk.yml b/aws-dynamodb-project/docker/docker-compose-elk.yml
index e911a900..57efb443 100644
--- a/aws-dynamodb-project/docker/docker-compose-elk.yml
+++ b/aws-dynamodb-project/docker/docker-compose-elk.yml
@@ -1,46 +1,50 @@
 version: '3.8'
 services:
-
   elasticsearch:
     image: docker.elastic.co/elasticsearch/elasticsearch:8.4.1
     container_name: elasticsearch
     environment:
-      - cluster.name=docker-cluster
+      - cluster.name=es-docker-cluster
+      - discovery.type=single-node
       - bootstrap.memory_lock=true
-      - xpack.security.enabled=false
-      - "ES_JAVA_OPTS=-Xmx2048m -Xms2048m"
-    volumes:
-      - esdata1:/usr/share/elasticsearch/data
-    ports:
-      - "9200:9200"
-      - "9300:9300"
+      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
     ulimits:
       memlock:
         soft: -1
         hard: -1
-
-  logstash:
-    image: docker.elastic.co/logstash/logstash:6.8.23
-    container_name: logstash
-    command: logstash -f /etc/logstash/conf.d/logstash.conf
     volumes:
-      - ../config/elk:/etc/logstash/conf.d
+      - es-data:/usr/share/elasticsearch/data
     ports:
-      - "5000:5000"
-    links:
-      - elasticsearch
+      - "9200:9200"
+      - "9300:9300"
+    networks:
+      - elastic
 
   kibana:
-    image: docker.elastic.co/kibana/kibana:6.8.23
+    image: docker.elastic.co/kibana/kibana:7.17.6
     container_name: kibana
     environment:
-      - ELASTICSEARCH_URL=http://elasticsearch:9200
+      ELASTICSEARCH_URL: http://elasticsearch:9200
+      ELASTICSEARCH_HOSTS: http://elasticsearch:9200
     ports:
       - "5601:5601"
-    links:
-      - elasticsearch
+    networks:
+      - elastic
+
+  logstash:
+    image: docker.elastic.co/logstash/logstash:7.17.6
+    container_name: logstash
+    ports:
+      - "5000:5000"
+    volumes:
+      - ../config/elk:/etc/logstash/conf.d/logstash.conf:ro
+    networks:
+      - elastic
 
 volumes:
-  esdata1:
+  es-data:
     driver: local
 
+networks:
+  elastic:
+    driver: bridge
diff --git a/aws-kinesis-consumer-project/docker/docker-compose-elk.yml b/aws-kinesis-consumer-project/docker/docker-compose-elk.yml
index e911a900..57efb443 100644
--- a/aws-kinesis-consumer-project/docker/docker-compose-elk.yml
+++ b/aws-kinesis-consumer-project/docker/docker-compose-elk.yml
@@ -1,46 +1,50 @@
 version: '3.8'
 services:
-
   elasticsearch:
     image: docker.elastic.co/elasticsearch/elasticsearch:8.4.1
     container_name: elasticsearch
     environment:
-      - cluster.name=docker-cluster
+      - cluster.name=es-docker-cluster
+      - discovery.type=single-node
       - bootstrap.memory_lock=true
-      - xpack.security.enabled=false
-      - "ES_JAVA_OPTS=-Xmx2048m -Xms2048m"
-    volumes:
-      - esdata1:/usr/share/elasticsearch/data
-    ports:
-      - "9200:9200"
-      - "9300:9300"
+      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
     ulimits:
       memlock:
         soft: -1
         hard: -1
-
-  logstash:
-    image: docker.elastic.co/logstash/logstash:6.8.23
-    container_name: logstash
-    command: logstash -f /etc/logstash/conf.d/logstash.conf
     volumes:
-      - ../config/elk:/etc/logstash/conf.d
+      - es-data:/usr/share/elasticsearch/data
     ports:
-      - "5000:5000"
-    links:
-      - elasticsearch
+      - "9200:9200"
+      - "9300:9300"
+    networks:
+      - elastic
 
   kibana:
-    image: docker.elastic.co/kibana/kibana:6.8.23
+    image: docker.elastic.co/kibana/kibana:7.17.6
     container_name: kibana
     environment:
-      - ELASTICSEARCH_URL=http://elasticsearch:9200
+      ELASTICSEARCH_URL: http://elasticsearch:9200
+      ELASTICSEARCH_HOSTS: http://elasticsearch:9200
     ports:
       - "5601:5601"
-    links:
-      - elasticsearch
+    networks:
+      - elastic
+
+  logstash:
+    image: docker.elastic.co/logstash/logstash:7.17.6
+    container_name: logstash
+    ports:
+      - "5000:5000"
+    volumes:
+      - ../config/elk:/etc/logstash/conf.d/logstash.conf:ro
+    networks:
+      - elastic
 
 volumes:
-  esdata1:
+  es-data:
     driver: local
 
+networks:
+  elastic:
+    driver: bridge
diff --git a/aws-kinesis-project-producer/docker/docker-compose-elk.yml b/aws-kinesis-project-producer/docker/docker-compose-elk.yml
index e911a900..57efb443 100644
--- a/aws-kinesis-project-producer/docker/docker-compose-elk.yml
+++ b/aws-kinesis-project-producer/docker/docker-compose-elk.yml
@@ -1,46 +1,50 @@
 version: '3.8'
 services:
-
   elasticsearch:
     image: docker.elastic.co/elasticsearch/elasticsearch:8.4.1
     container_name: elasticsearch
     environment:
-      - cluster.name=docker-cluster
+      - cluster.name=es-docker-cluster
+      - discovery.type=single-node
       - bootstrap.memory_lock=true
-      - xpack.security.enabled=false
-      - "ES_JAVA_OPTS=-Xmx2048m -Xms2048m"
-    volumes:
-      - esdata1:/usr/share/elasticsearch/data
-    ports:
-      - "9200:9200"
-      - "9300:9300"
+      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
     ulimits:
       memlock:
         soft: -1
         hard: -1
-
-  logstash:
-    image: docker.elastic.co/logstash/logstash:6.8.23
-    container_name: logstash
-    command: logstash -f /etc/logstash/conf.d/logstash.conf
     volumes:
-      - ../config/elk:/etc/logstash/conf.d
+      - es-data:/usr/share/elasticsearch/data
     ports:
-      - "5000:5000"
-    links:
-      - elasticsearch
+      - "9200:9200"
+      - "9300:9300"
+    networks:
+      - elastic
 
   kibana:
-    image: docker.elastic.co/kibana/kibana:6.8.23
+    image: docker.elastic.co/kibana/kibana:7.17.6
     container_name: kibana
     environment:
-      - ELASTICSEARCH_URL=http://elasticsearch:9200
+      ELASTICSEARCH_URL: http://elasticsearch:9200
+      ELASTICSEARCH_HOSTS: http://elasticsearch:9200
     ports:
       - "5601:5601"
-    links:
-      - elasticsearch
+    networks:
+      - elastic
+
+  logstash:
+    image: docker.elastic.co/logstash/logstash:7.17.6
+    container_name: logstash
+    ports:
+      - "5000:5000"
+    volumes:
+      - ../config/elk:/etc/logstash/conf.d/logstash.conf:ro
+    networks:
+      - elastic
 
 volumes:
-  esdata1:
+  es-data:
     driver: local
 
+networks:
+  elastic:
+    driver: bridge
diff --git a/aws-ses-project/docker/docker-compose-elk.yml b/aws-ses-project/docker/docker-compose-elk.yml
index 844f07eb..57efb443 100644
--- a/aws-ses-project/docker/docker-compose-elk.yml
+++ b/aws-ses-project/docker/docker-compose-elk.yml
@@ -1,46 +1,50 @@
 version: '3.8'
 services:
-
   elasticsearch:
     image: docker.elastic.co/elasticsearch/elasticsearch:8.4.1
     container_name: elasticsearch
     environment:
-      - cluster.name=docker-cluster
+      - cluster.name=es-docker-cluster
+      - discovery.type=single-node
       - bootstrap.memory_lock=true
-      - xpack.security.enabled=false
-      - "ES_JAVA_OPTS=-Xmx2048m -Xms2048m"
-    volumes:
-      - esdata1:/usr/share/elasticsearch/data
-    ports:
-      - "9200:9200"
-      - "9300:9300"
+      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
     ulimits:
       memlock:
         soft: -1
         hard: -1
-
-  logstash:
-    image: docker.elastic.co/logstash/logstash:6.2.2
-    container_name: logstash
-    command: logstash -f /etc/logstash/conf.d/logstash.conf
     volumes:
-      - ../config/elk:/etc/logstash/conf.d
+      - es-data:/usr/share/elasticsearch/data
     ports:
-      - "5000:5000"
-    links:
-      - elasticsearch
+      - "9200:9200"
+      - "9300:9300"
+    networks:
+      - elastic
 
   kibana:
-    image: docker.elastic.co/kibana/kibana:6.2.2
+    image: docker.elastic.co/kibana/kibana:7.17.6
     container_name: kibana
     environment:
-      - ELASTICSEARCH_URL=http://elasticsearch:9200
+      ELASTICSEARCH_URL: http://elasticsearch:9200
+      ELASTICSEARCH_HOSTS: http://elasticsearch:9200
     ports:
       - "5601:5601"
-    links:
-      - elasticsearch
+    networks:
+      - elastic
+
+  logstash:
+    image: docker.elastic.co/logstash/logstash:7.17.6
+    container_name: logstash
+    ports:
+      - "5000:5000"
+    volumes:
+      - ../config/elk:/etc/logstash/conf.d/logstash.conf:ro
+    networks:
+      - elastic
 
 volumes:
-  esdata1:
+  es-data:
     driver: local
 
+networks:
+  elastic:
+    driver: bridge
diff --git a/aws-ses-project/docker/docker-compose.yml b/aws-ses-project/docker/docker-compose.yml
index e258832c..188f3061 100644
--- a/aws-ses-project/docker/docker-compose.yml
+++ b/aws-ses-project/docker/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.8'
 services:
   localstack:
-    image: localstack/localstack:1.0.0
+    image: localstack/localstack:1.1.0
     ports:
       - "4566:4566"
     environment: