diff --git a/Dockerfile b/Dockerfile
index f464c9e07..7d6afd7f5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -77,9 +77,6 @@ COPY ./bin ./bin/
 
 RUN chown -R deepchecks.deepchecks /code
 
-COPY ./deploy/local_certs/CA/rootCA.pem /usr/local/share/ca-certificates/deepchecksRootCA.crt
-RUN update-ca-certificates
-
 USER deepchecks
 
 # Expose container port and run entry point script
diff --git a/backend/client/requirements.txt b/backend/client/requirements.txt
index 20b3119cc..159531200 100644
--- a/backend/client/requirements.txt
+++ b/backend/client/requirements.txt
@@ -7,7 +7,7 @@ fastjsonschema==2.16.2
 termcolor
 PyYAML
 importlib_metadata; python_version < '3.8'
-pip-system-certs>=3.1
+pip-system-certs>=3.1,<5
 typing_extensions>=4.11.0,<5
 rfc3339-validator==0.1.4 # Used to validate date-time format in jsonschema
 packaging==23.0
\ No newline at end of file
diff --git a/deploy-oss.sh b/deploy-oss.sh
index 5b0176d9f..257af15ca 100755
--- a/deploy-oss.sh
+++ b/deploy-oss.sh
@@ -117,49 +117,6 @@ then
 export TLS_BLOCK="acme_ca https://acme-staging-v02.api.letsencrypt.org/directory"
 fi
 
-# rewrite caddyfile
-rm -f Caddyfile
-if [[ $ENABLE_HTTP == 'true' ]]; then
-  export SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
-  envsubst > Caddyfile <<EOF
-{
-  auto_https disable_redirects
-}
-$DOMAIN:8443 {
-    tls /certs/localhost.crt /certs/localhost.key
-
-    reverse_proxy http://casdoor:4545 {
-        header_up Host {upstream_hostport}
-        header_up X-Real-IP {remote_host}
-    }
-}
-$DOMAIN, :443 {
-    tls /certs/localhost.crt /certs/localhost.key
-
-    reverse_proxy http://app:8000
-}
-$DOMAIN:80 {
-    reverse_proxy http://app:8000
-}
-EOF
-else
-  envsubst > Caddyfile <<EOF
-{
-  $TLS_BLOCK
-}
-$DOMAIN:8443 {
-    reverse_proxy http://casdoor:4545 {
-        header_up Host {upstream_hostport}
-        header_up X-Real-IP {remote_host}
-    }
-}
-$DOMAIN, :80, :443 {
-    reverse_proxy http://app:8000
-}
-EOF
-
-fi;
-
 # Write .env file
 envsubst > .env <<EOF
 DEEPCHECKS_SECRET=$DEEPCHECKS_SECRET
diff --git a/deploy/caddyfile b/deploy/caddyfile
new file mode 100644
index 000000000..9b765858a
--- /dev/null
+++ b/deploy/caddyfile
@@ -0,0 +1,18 @@
+{
+    auto_https disable_redirects
+}
+
+{$DOMAIN:localhost}:8443 {
+    reverse_proxy http://casdoor:4545 {
+        header_up Host {upstream_hostport}
+        header_up X-Real-IP {remote_host}
+    }
+}
+
+{$DOMAIN:localhost}, :443 {
+    reverse_proxy http://app:8000
+}
+
+{$DOMAIN:localhost}:80 {
+    reverse_proxy http://app:8000
+}
\ No newline at end of file
diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml
index 8740d0a59..b5fa2f143 100644
--- a/deploy/docker-compose.yml
+++ b/deploy/docker-compose.yml
@@ -92,6 +92,7 @@ services:
       - db
       - redis
       - casdoor
+      - kafka
     extra_hosts:
       - "$DOMAIN:10.5.0.20"
     networks:
@@ -114,6 +115,7 @@ services:
       - db
       - redis
       - casdoor
+      - kafka
     networks:
       default:
         ipv4_address: 10.5.0.5
@@ -134,6 +136,7 @@ services:
       - db
       - redis
       - casdoor
+      - kafka
     networks:
       default:
         ipv4_address: 10.5.0.4
@@ -154,6 +157,7 @@ services:
       - db
       - redis
       - casdoor
+      - kafka
     networks:
       default:
         ipv4_address: 10.5.0.3
@@ -166,8 +170,7 @@ services:
       - '443:443'
       - '8443:8443'
     volumes:
-      - ./Caddyfile:/etc/caddy/Caddyfile
-      - ./monitoring/deploy/local_certs/certs:/certs
+      - ./monitoring/deploy/caddyfile:/etc/caddy/Caddyfile
     depends_on:
       - app
     networks:
diff --git a/deploy/local_certs/CA/rootCA.pem b/deploy/local_certs/CA/rootCA.pem
deleted file mode 100644
index e3b982a49..000000000
--- a/deploy/local_certs/CA/rootCA.pem
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICljCCAX4CCQCoCN8L65tB+zANBgkqhkiG9w0BAQsFADANMQswCQYDVQQGEwJJ
-TDAeFw0yMzAzMjIyMDM4MjFaFw0yODAzMjAyMDM4MjFaMA0xCzAJBgNVBAYTAklM
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1DUhw/bJkcGmDw2bqipI
-Np9qKOQ28mZWCHRy0rQos7q2Ge35JM+sABP/5BmP+EgHnEJsYZUcvIm0r/WtiRVw
-dWZwdMnNX39ix1d8UmJr0RZN8uVgZz0zYOSo+fTRaZkxqF6XmrnTjrp4CR3LVS5q
-f+KRPbM1JjYSTkU5XeraapHFFMplV0XvlmD4GN09P3B5KFN7ND6xULDmqMaMsNL/
-03Y4HKvJMoEpv+eFaG8B9mcHI6hXv7CNFIXVjrxk7VG6fhlUdqB3P7G2naY3zTa4
-E+nfDrGnTvPvOv5ii0gJj4LARcS5tVJRRG19pKaNxkpJ7iE0L0HJEloJE3WqFn48
-8wIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBIUNZE6YTfoCcf+N193odm1mb+Jzl0
-Xa9kST2Ieve3r7DcvpWNd6Y67N4ta2yC8/O3qc2oD+K2IkEA4ZzD+e8pIcsm5AgE
-PQ4qp027mfkzjENRMxGzSIu6ZlZ380OIzcjOdTA3QelTf8syoRI/3vjKprjhnvjO
-ZDF2xfBekX53j3rzJUlJtOcHn6YsVYckeNKjsLd2DcdEuUlGRZM/oi/wa+ZjmJ+h
-vjb+SSrhGKdZS/f/sxvhQBeCQipKykxxybBbTCGDD6ZCnXI4TD7XtOM7nXm1K/9X
-aSAYsJfmPFQtD7OYZR87IueA9NAWcUo0Qp21wvfe325p7+wOLEm7ITwX
------END CERTIFICATE-----
diff --git a/deploy/local_certs/certs/localhost.crt b/deploy/local_certs/certs/localhost.crt
deleted file mode 100644
index b068b555f..000000000
--- a/deploy/local_certs/certs/localhost.crt
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC9jCCAd6gAwIBAgIJANnh8ehPSdh5MA0GCSqGSIb3DQEBCwUAMA0xCzAJBgNV
-BAYTAklMMB4XDTIzMDMyMjIwNDI1MVoXDTI1MDYyNDIwNDI1MVowDTELMAkGA1UE
-BhMCSUwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDB2ZeBOrvo34S2
-niJ7jSsQpQuvrBrRMhHhDywLIZr0bRG1qBghy1ZmjHDb5Zp8IkpQc5BqpXqs3Qzx
-SjemqgXTmI0pV/8arn5d6p7h9qgztpW4nQu+xAvalpqEKfYMlj8/9NwmkoCy9y2O
-npXKIfIKX0rFhIcKipflrTrRpK9g9ZNzUQY6rYzhOUZTExUTmbKltj96Hx9707wh
-WCQGQMrdN9IaoUB5DlCsrpffMzHe4N/ceQWjCxwPIk+ZrABfo7DGc9jvzLyi97fs
-U+q4CbwsB4UxlU5fe8MwjnQOYKs7Uyvm3Kyq6KZKKWbtu8rcSPfdfAnnnTd2Izaf
-SY0B+f65AgMBAAGjWTBXMCcGA1UdIwQgMB6hEaQPMA0xCzAJBgNVBAYTAklMggkA
-qAjfC+ubQfswCQYDVR0TBAIwADALBgNVHQ8EBAMCBPAwFAYDVR0RBA0wC4IJbG9j
-YWxob3N0MA0GCSqGSIb3DQEBCwUAA4IBAQCyL1j+RbCl0j+9GgRFwSq2pK6Qk3UZ
-yT+mqVbXgYfTcZE28JafgTrn0RkwCiBqsc494/NXK2IwYqa4Th5ywYcqOsgVKzsR
-x3L4reMdxSadlQmTKRf+Z63MlKk0QscW3qUMp6Q4Xznf5YB4BBgBKW57kLX3QA+d
-n5eprFf2G0Q1BKUoZmG/LWs2fGsQ/5XdmlyWqvqwgdEIc8mL5uRjplblK/bZGiG7
-Fbc+k4mRIqa08jHlNuHcAsqguEfFwRIJo2ftknUh3zALt/WUeKVqyNbsbUEbfBj9
-8VyFRlFiXhCTPuYIbymig7zYXbije8PjdSFDrhI3gzuv6xK/if8D5DvF
------END CERTIFICATE-----
diff --git a/deploy/local_certs/certs/localhost.key b/deploy/local_certs/certs/localhost.key
deleted file mode 100644
index 857ddd86a..000000000
--- a/deploy/local_certs/certs/localhost.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAwdmXgTq76N+Etp4ie40rEKULr6wa0TIR4Q8sCyGa9G0RtagY
-IctWZoxw2+WafCJKUHOQaqV6rN0M8Uo3pqoF05iNKVf/Gq5+Xeqe4faoM7aVuJ0L
-vsQL2paahCn2DJY/P/TcJpKAsvctjp6VyiHyCl9KxYSHCoqX5a060aSvYPWTc1EG
-Oq2M4TlGUxMVE5mypbY/eh8fe9O8IVgkBkDK3TfSGqFAeQ5QrK6X3zMx3uDf3HkF
-owscDyJPmawAX6OwxnPY78y8ove37FPquAm8LAeFMZVOX3vDMI50DmCrO1Mr5tys
-quimSilm7bvK3Ej33XwJ5503diM2n0mNAfn+uQIDAQABAoIBAGY0C731sob3+eey
-fim35yGycvPfAJCVHnoTXrxLrn/6VWD6TCbdJyOQHhzB9G5IQfgixdyEfKZRMXay
-E59KeyHxh1Np8rUllLh9b+FhA5OoS033du7QPBO2Xaca3IAMYzKcLcokabhxu9I6
-6GyW8x7m2OxEkFJNegJ9D8riUhkC1hgOcW+cuW5PW/COaguv4zkJt0o7A0JxwWVH
-PH+3aKQFVVsfNn1efh/SIEPVzlvWCo054LiX8uW79PwuJigyI5ds7U+R7OEHTxG2
-KdTPji+qHfGcjVS3YCl+PN4QR+JMpg3+xBhIi9gm2XLrk3xm+mqhd+rY1mFkA2H3
-TLQa7dECgYEA4pcqEFfEfvtlPGKyzDMHEpbcvQkXjTSf6y7l04HKVgqymKchtF7T
-ErN+bMrDT9kwSJ4HXV/bubNuJupFHm6DCilSPeyJGmRTZGvoo7pQLHLr6IhcnyDm
-YsfEJoduVMQc8jTLUSogfG4WI09Tue2gJBz9LefaAB//ihqopmm2KU0CgYEA2wKS
-IG9w/DZjCzETUuph9O9cu9Lr1hLbvYNjxcGfuo1DGsKViEo73kFg8qlJ9IwR0or3
-p7m65dEbO9YPgb/e9SbFJtZfMvDmGgufkLtvOlVyyb8Jd88cepuziFgfCT0CykSr
-UFovI5RDUj7kA6BDK7425mYah0jJG+0NUVjEFR0CgYEAwq2jy0TNI1h040vdWIoi
-8nrBjnyoSn7DQzoY5f7mS8SHK5a045Zw/OlQnsIaypjM3idAJp58VvFtm2u+FOZY
-Gbvk2CVIqm82Itp/l2Q1C+t0+mVmRqXqq0X9JilHxvZz9Dkd0k9CeAXRaWb3hZA+
-/agWcoF4EJFtaUd8TPYYNyUCgYAIlA4zNQpA5sR0YMS3/7Q8is+gD7/rD6wJvUbA
-LThbb0MMnkiLIRU9PGRWvOjHqmDcVVMj/7NhYxJlAppy45gRFCauwcDS1vq8VG44
-lg7iQwyO+GufhL5B0y1yDrmQfBJK5+up5w5nn1wPsaTuu21GHlo6Jg+t8tzluiBG
-amqrxQKBgE9M3P6fM/iavqSl3c9EHezx412D+kKcXJxIKgMco/W/BpGmhzDyOoIz
-boMnvW0oZ6wAxPJj8byVeUA+1jtKwx1zVRmWs4K5Z7RdNN6iMru7QR2zukaigvfC
-rChyES61Zba2xQF+qSn/U/EffvhPXvWkM6E0VYN/5nKqKhbDuBw8
------END RSA PRIVATE KEY-----
diff --git a/deploy/local_certs/localhost.csr b/deploy/local_certs/localhost.csr
deleted file mode 100644
index ea8ad7e1a..000000000
--- a/deploy/local_certs/localhost.csr
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIICUjCCAToCAQAwDTELMAkGA1UEBhMCSUwwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDB2ZeBOrvo34S2niJ7jSsQpQuvrBrRMhHhDywLIZr0bRG1qBgh
-y1ZmjHDb5Zp8IkpQc5BqpXqs3QzxSjemqgXTmI0pV/8arn5d6p7h9qgztpW4nQu+
-xAvalpqEKfYMlj8/9NwmkoCy9y2OnpXKIfIKX0rFhIcKipflrTrRpK9g9ZNzUQY6
-rYzhOUZTExUTmbKltj96Hx9707whWCQGQMrdN9IaoUB5DlCsrpffMzHe4N/ceQWj
-CxwPIk+ZrABfo7DGc9jvzLyi97fsU+q4CbwsB4UxlU5fe8MwjnQOYKs7Uyvm3Kyq
-6KZKKWbtu8rcSPfdfAnnnTd2IzafSY0B+f65AgMBAAGgADANBgkqhkiG9w0BAQsF
-AAOCAQEApIT+/3OwlgK06kzmAHaFw/8Drtva3Mr8fZxYTwmHlJAhps6/TBRtfuMv
-N9TFKNwQdpQ/xNVScTRgt6qnOOBCr66Yn/gA6Hh8vocSr798rMaonUUjEngHO0Cr
-nBQLVDoFEfao/B/+mkTKLx2BLItv8J/1IIjApHtjSgGf0RkHM1y2tCY3RH37oR2K
-/2F3ijFj/8Z9pYoKNApaamFqMSQekS33Un+wZNJZYswhzhJSDS3pad+mu5ATlYSU
-lAGNgNC4beT9feWudRBK//ZJlZMIxyU1p65voWsUM5vfDejFjqqZ0KZpFeKpmucK
-dd8dB82QMiXuRy1kUKBGyx72Zucy3g==
------END CERTIFICATE REQUEST-----
diff --git a/deploy/local_certs/localhost.ext b/deploy/local_certs/localhost.ext
deleted file mode 100644
index 26d5e492f..000000000
--- a/deploy/local_certs/localhost.ext
+++ /dev/null
@@ -1,9 +0,0 @@
-
-authorityKeyIdentifier=keyid,issuer
-basicConstraints=CA:FALSE
-keyUsage = digitalSignature, nonRepudiation, keyEncipherment, dataEncipherment
-subjectAltName = @alt_names
-
-[alt_names]
-DNS.1 = localhost
-
diff --git a/liccheck.ini b/liccheck.ini
index fbc76c959..15d0294d5 100644
--- a/liccheck.ini
+++ b/liccheck.ini
@@ -18,6 +18,7 @@ authorized_licenses:
 	Apache License, Version 2.0
         Apache-2.0
         Apache-2.0 AND BSD-2-Clause
+        Apache License 2.0
 
         gnu lgpl
         GNU Library or Lesser General Public License (LGPL)
diff --git a/makefile b/makefile
index 7fa02aaf1..32395d791 100644
--- a/makefile
+++ b/makefile
@@ -130,7 +130,7 @@ $(ENV):
 	@echo "#### Creating Python Vertual Enviroment [ $(ENV) ] ####"
 	@test -d $(ENV) || $(ext_py) -m venv $(ENV)
 	@$(PIP) install -e backend/
-	@$(PIP) install -U pip setuptools ray==2.9.0
+	@$(PIP) install -U pip setuptools wheel ray==2.9.0
 
 
 requirements: $(ENV)
@@ -315,7 +315,7 @@ docker:
 
 external-services-setup:
 	@docker-compose -f $(E2E)/docker-compose.yml up -d
-	@sleep 2
+	@sleep 5
 
 env-setup: external-services-setup
 	@docker run -d --env-file $(E2E)/.development.env -e IS_ON_PREM -e OAUTH_CLIENT_ID -e OAUTH_CLIENT_SECRET --network deepchecks -p 8000:8000 deepchecks-enterprise-testing start-test.sh