diff --git a/docker-compose.yml b/docker-compose.yml
index bae31117d..2613de401 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -861,7 +861,7 @@ services:
       - 8088:8088
       - 8089:8089
     environment:
-      UB_CLASSPATH: '/usr/share/java/confluent-security/ksql/*:/usr/share/java/ksqldb-server/*:/usr/share/java/cp-base-new/*'
+      UB_CLASSPATH: '/usr/share/java/confluent-security/ksql/*:/usr/share/java/ksqldb/*:/usr/share/java/cp-base-new/*'
 
       KSQL_LOG4J_ROOT_LOGLEVEL: INFO
 
@@ -872,7 +872,7 @@ services:
       # For Demo purposes: improve resource utilization and avoid timeouts
       KSQL_KSQL_STREAMS_NUM_STREAM_THREADS: 1
 
-      KSQL_LOG4J_OPTS: "-Dlog4j.configuration=file:/tmp/helper/log4j-secure.properties"
+      KSQL_LOG4J_OPTS: "-Dlog4j.configurationFile=file:/tmp/helper/log4j2-secure.yaml"
       KSQL_KSQL_LOGGING_PROCESSING_TOPIC_REPLICATION_FACTOR: 2
       KSQL_KSQL_LOGGING_PROCESSING_TOPIC_AUTO_CREATE: 'true'
       KSQL_KSQL_LOGGING_PROCESSING_STREAM_AUTO_CREATE: 'true'
diff --git a/scripts/helper/log4j-secure.properties b/scripts/helper/log4j-secure.properties
deleted file mode 100644
index 3921b9164..000000000
--- a/scripts/helper/log4j-secure.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-log4j.rootLogger=INFO, stdout
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%d] %p %m (%c)%n
-log4j.appender.kafka_appender=org.apache.kafka.log4jappender.KafkaLog4jAppender
-log4j.appender.kafka_appender.layout=io.confluent.common.logging.log4j.StructuredJsonLayout
-log4j.appender.kafka_appender.BrokerList=kafka1:11091,kafka2:11092
-log4j.appender.kafka_appender.Topic=ksql-clusterksql_processing_log
-log4j.appender.kafka_appender.SyncSend=false
-log4j.appender.kafka_appender.SecurityProtocol=SSL
-log4j.appender.kafka_appender.SslKeystoreType=JKS
-log4j.appender.kafka_appender.SslTruststoreLocation=/etc/kafka/secrets/kafka.controlCenterAndKsqlDBServer.truststore.jks
-log4j.appender.kafka_appender.SslTruststorePassword=confluent
-log4j.appender.kafka_appender.SslKeystoreLocation=/etc/kafka/secrets/kafka.controlCenterAndKsqlDBServer.keystore.jks
-log4j.appender.kafka_appender.SslKeystorePassword=confluent
-log4j.logger.processing=ERROR, kafka_appender
diff --git a/scripts/helper/log4j.properties b/scripts/helper/log4j.properties
deleted file mode 100644
index 456c87ff0..000000000
--- a/scripts/helper/log4j.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-log4j.rootLogger=DEBUG, stderr
-log4j.appender.stderr=org.apache.log4j.ConsoleAppender
-log4j.appender.stderr.layout=org.apache.log4j.PatternLayout
-log4j.appender.stderr.layout.ConversionPattern=[%d] %p %m (%c)%n
-log4j.appender.stderr.Target=System.err
diff --git a/scripts/helper/log4j2-secure.yaml b/scripts/helper/log4j2-secure.yaml
new file mode 100644
index 000000000..754cfb8d2
--- /dev/null
+++ b/scripts/helper/log4j2-secure.yaml
@@ -0,0 +1,45 @@
+Configuration:
+  status: WARN
+
+  Appenders:
+    Console:
+      name: stdout
+      target: SYSTEM_OUT
+      PatternLayout:
+        pattern: "[%d] %p %m (%c)%n"
+
+    Kafka:
+      name: kafka_appender
+      topic: ksql-clusterksql_processing_log
+      syncSend: false
+      Property:
+        - name: bootstrap.servers
+          value: "kafka1:11091,kafka2:11092"
+        - name: security.protocol
+          value: "SSL"
+        - name: ssl.keystore.type
+          value: "JKS"
+        - name: ssl.truststore.location
+          value: "/etc/kafka/secrets/kafka.controlCenterAndKsqlDBServer.truststore.jks"
+        - name: ssl.truststore.password
+          value: "confluent"
+        - name: ssl.keystore.location
+          value: "/etc/kafka/secrets/kafka.controlCenterAndKsqlDBServer.keystore.jks"
+        - name: ssl.keystore.password
+          value: "confluent"
+      JsonLayout:
+        compact: true
+        eventEol: true
+
+  Loggers:
+    Logger:
+      name: processing
+      level: error
+      additivity: false
+      AppenderRef:
+        - ref: kafka_appender
+
+    Root:
+      level: info
+      AppenderRef:
+        - ref: stdout