diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index 6ba46de8a2f4..981aceb49e6b 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -26,24 +26,24 @@ jobs:
           GOOS: ${{ matrix.GOOS }}
         run: echo Go GOOS=$GOOS
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       # Uses Go version from the repository.
       - name: Read .go-version file
         id: goversion
         run: echo "::set-output name=version::$(cat .go-version)"
 
-      - uses: actions/setup-go@v2
+      - uses: actions/setup-go@v3
         with:
           go-version: "${{ steps.goversion.outputs.version }}"
 
       - name: golangci-lint
         env:
           GOOS: ${{ matrix.GOOS }}
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v3
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-          version: v1.44.2
+          version: v1.47.2
 
           # Give the job more time to execute.
           # Regarding `--whole-files`, the linter is supposed to support linting of changed a patch only but,
diff --git a/.golangci.yml b/.golangci.yml
index a3c466994f22..072d23670810 100755
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,6 +1,3 @@
-# DO NOT EDIT!
-# This file is a rendered template, the source can be found in "./dev-tools/templates/.golangci.yml"
-#
 # options for analysis running
 run:
   # timeout for analysis, e.g. 30s, 5m, default is 1m
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
index 4449acfe2e10..407721978a37 100644
--- a/CHANGELOG.next.asciidoc
+++ b/CHANGELOG.next.asciidoc
@@ -10,7 +10,7 @@ https://github.com/elastic/beats/compare/v8.2.0\...main[Check the HEAD diff]
 
 *Affecting all Beats*
 
-- Fix namespacing on self-monitoring {pull}32336[32336]
+* Upgrade to Go 1.18. Certificates signed with SHA-1 are now rejected. See the Go 1.18 https://tip.golang.org/doc/go1.18#sha1[release notes] for details. {pull}32493[32493]
 
 
 *Auditbeat*
@@ -23,7 +23,6 @@ https://github.com/elastic/beats/compare/v8.2.0\...main[Check the HEAD diff]
 - Browser monitors (beta) no write to the `synthetics-*` index prefix. {pull}32064[32064]
 - Setting a custom index for a given monitor is now deprecated. Streams are preferred. {pull}32064[32064]
 
-
 *Metricbeat*
 
 
@@ -40,6 +39,7 @@ https://github.com/elastic/beats/compare/v8.2.0\...main[Check the HEAD diff]
 
 *Affecting all Beats*
 
+- Fix namespacing on self-monitoring {pull}32336[32336]
 - Expand fields in `decode_json_fields` if target is set. {issue}31712[31712] {pull}32010[32010]
 - Fix OS name reported by add_host_metadata on Windows 11. {issue}30833[30833] {pull}32259[32259]
 - Fix race condition when reloading runners {pull}32309[32309]
diff --git a/dev-tools/templates/.golangci.yml b/dev-tools/templates/.golangci.yml
deleted file mode 100644
index e2efca97bd6e..000000000000
--- a/dev-tools/templates/.golangci.yml
+++ /dev/null
@@ -1,145 +0,0 @@
-# options for analysis running
-run:
-  # timeout for analysis, e.g. 30s, 5m, default is 1m
-  timeout: 15m
-
-issues:
-  # Maximum count of issues with the same text.
-  # Set to 0 to disable.
-  # Default: 3
-  max-same-issues: 3
-  # Maximum issues count per one linter.
-  # Set to 0 to disable.
-  # Default: 50
-  max-issues-per-linter: 50
-  exclude-rules:
-    # Exclude package name contains '-' issue because we have at least one package with
-    # it on its name.
-    - text: "ST1003:"
-      linters:
-        - stylecheck
-    # From mage we are priting to the console to ourselves
-    - path: (.*magefile.go|.*dev-tools/mage/.*)
-      linters: forbidigo
-
-output:
-  sort-results: true
-
-# Find the whole list here https://golangci-lint.run/usage/linters/
-linters:
-  disable-all: true
-  enable:
-    - errcheck # checking for unchecked errors in go programs
-    - errorlint # errorlint is a linter for that can be used to find code that will cause problems with the error wrapping scheme introduced in Go 1.13.
-    - forbidigo # forbids identifiers	matched by reg exps
-    - gosimple # linter for Go source code that specializes in simplifying a code
-    - misspell # finds commonly misspelled English words in comments
-    - nakedret # finds naked returns in functions greater than a specified function length
-    - nolintlint # reports ill-formed or insufficient nolint directives
-    - staticcheck # Staticcheck is a go vet on steroids, applying a ton of static analysis checks
-    - stylecheck # a replacement for golint
-    - unused # checks Go code for unused constants, variables, functions and types
-    - govet # Vet examines Go source code and reports suspicious constructs, such as Printf calls whose arguments do not align with the format string
-    - ineffassign # detects when assignments to existing variables are not used
-    - structcheck # finds unused struct fields
-    - typecheck # Like the front-end of a Go compiler, parses and type-checks Go code
-    - varcheck # Finds unused global variables and constants
-    - asciicheck # simple linter to check that your code does not contain non-ASCII identifiers
-    - bodyclose # checks whether HTTP response body is closed successfully
-    - durationcheck # check for two durations multiplied together
-    - exportloopref # checks for pointers to enclosing loop variables
-    - goimports # Goimports does everything that gofmt does. Additionally it checks unused imports
-    - gosec # inspects source code for security problems
-    - importas # enforces consistent import aliases
-    - nilerr # finds the code that returns nil even if it checks that the error is not nil.
-    - noctx # noctx finds sending http request without context.Context
-    - unconvert # Remove unnecessary type conversions
-    - wastedassign # wastedassign finds wasted assignment statements.
-    - gomodguard # check for blocked dependencies
-
-# all available settings of specific linters
-linters-settings:
-  errcheck:
-    # report about not checking of errors in type assertions: `a := b.(MyStruct)`;
-    check-type-assertions: false
-    # report about assignment of errors to blank identifier: `num, _ := strconv.Atoi(numStr)`.
-    check-blank: false
-    # List of functions to exclude from checking, where each entry is a single function to exclude.
-    # See https://github.com/kisielk/errcheck#excluding-functions for details.
-    exclude-functions:
-      - (mapstr.M).Delete # Only returns ErrKeyNotFound, can safely be ignored.
-      - (mapstr.M).Put # Can only fail on type conversions, usually safe to ignore.
-
-  errorlint:
-    # Check whether fmt.Errorf uses the %w verb for formatting errors. See the readme for caveats
-    errorf: true
-    # Check for plain type assertions and type switches
-    asserts: true
-    # Check for plain error comparisons
-    comparison: true
-
-  forbidigo:
-    # Forbid the following identifiers
-    forbid:
-      - fmt.Print.* # too much log noise
-    # Exclude godoc examples from forbidigo checks.  Default is true.
-    exclude_godoc_examples: true
-
-  goimports:
-    local-prefixes: github.com/elastic
-
-  gomodguard:
-    blocked:
-      # List of blocked modules.
-      modules:
-        # Blocked module.
-        - github.com/pkg/errors:
-            # Recommended modules that should be used instead. (Optional)
-            recommendations:
-              - errors
-              - fmt
-            reason: "This package is deprecated, use fmt.Errorf with %%w instead"
-
-  gosimple:
-    # Select the Go version to target. The default is '1.13'.
-    go: "{{.GoVersion}}"
-
-  nakedret:
-    # make an issue if func has more lines of code than this setting and it has naked returns; default is 30
-    max-func-lines: 0
-
-  nolintlint:
-    # Enable to ensure that nolint directives are all used. Default is true.
-    allow-unused: false
-    # Disable to ensure that nolint directives don't have a leading space. Default is true.
-    allow-leading-space: false
-    # Exclude following linters from requiring an explanation.  Default is [].
-    allow-no-explanation: []
-    # Enable to require an explanation of nonzero length after each nolint directive. Default is false.
-    require-explanation: true
-    # Enable to require nolint directives to mention the specific linter being suppressed. Default is false.
-    require-specific: false
-
-  staticcheck:
-    # Select the Go version to target. The default is '1.13'.
-    go: "{{.GoVersion}}"
-    checks: ["all"]
-
-  stylecheck:
-    # Select the Go version to target. The default is '1.13'.
-    go: "{{.GoVersion}}"
-    # Disabled:
-    # ST1005: error strings should not be capitalized
-    checks: ["all", "-ST1005"]
-
-  unused:
-    # Select the Go version to target. The default is '1.13'.
-    go: "{{.GoVersion}}"
-
-  gosec:
-    excludes:
-    - G306 # Expect WriteFile permissions to be 0600 or less
-    - G404 # Use of weak random number generator
-    - G401 # Detect the usage of DES, RC4, MD5 or SHA1: Used in non-crypto contexts.
-    - G501 # Import blocklist: crypto/md5: Used in non-crypto contexts.
-    - G505 # Import blocklist: crypto/sha1: Used in non-crypto contexts.
diff --git a/libbeat/outputs/kafka/kafka_integration_test.go b/libbeat/outputs/kafka/kafka_integration_test.go
index 6f3e99ad810a..ce14d22070db 100644
--- a/libbeat/outputs/kafka/kafka_integration_test.go
+++ b/libbeat/outputs/kafka/kafka_integration_test.go
@@ -69,7 +69,7 @@ func TestKafkaPublish(t *testing.T) {
 		events []eventInfo
 	}{
 		{
-			"publish single event to test topic",
+			"publish single event to test topic with nil config",
 			nil,
 			testTopic,
 			single(mapstr.M{
@@ -186,7 +186,7 @@ func TestKafkaPublish(t *testing.T) {
 			}),
 		},
 		{
-			"publish single event to test topic",
+			"publish single event to test topic with empty config",
 			map[string]interface{}{},
 			testTopic,
 			single(mapstr.M{
@@ -199,7 +199,7 @@ func TestKafkaPublish(t *testing.T) {
 			// that added a full 30sec to the test. Instead most tests run
 			// in plaintext, and individual tests can switch to SCRAM
 			// by inserting the config in this example:
-			"publish single event to test topic over SASL/SCRAM",
+			"SASL/SCRAM publish single event to test topic",
 			map[string]interface{}{
 				"hosts":          []string{getTestSASLKafkaHost()},
 				"protocol":       "https",
diff --git a/testing/environments/docker/kafka/Dockerfile b/testing/environments/docker/kafka/Dockerfile
index ac51d7394c4a..f3fbe9f391d1 100644
--- a/testing/environments/docker/kafka/Dockerfile
+++ b/testing/environments/docker/kafka/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:stretch
+FROM debian:buster
 
 ENV KAFKA_HOME /kafka
 # Controls the hostname advertised within the Docker network, should generally match the container
@@ -10,7 +10,7 @@ ENV KAFKA_VERSION 2.2.2
 ENV _JAVA_OPTIONS "-Djava.net.preferIPv4Stack=true"
 ENV TERM=linux
 
-RUN apt-get update && apt-get install -y curl openjdk-8-jre-headless netcat
+RUN apt-get update && apt-get install -y curl openjdk-11-jre-headless netcat
 
 RUN mkdir -p ${KAFKA_LOGS_DIR} && mkdir -p ${KAFKA_HOME} && \
     curl -J -L -s -f -o - https://github.com/kadwanev/retry/releases/download/1.0.1/retry-1.0.1.tar.gz | tar xfz - -C /usr/local/bin && \
diff --git a/testing/environments/docker/kafka/README.md b/testing/environments/docker/kafka/README.md
index 6a7306e2423e..16b6223f9881 100644
--- a/testing/environments/docker/kafka/README.md
+++ b/testing/environments/docker/kafka/README.md
@@ -10,23 +10,23 @@ The files in the `certs` directory were generated with these commands:
 
 ```sh
 # create the broker's key
-keytool -keystore broker.keystore.jks -storepass KafkaTest -alias broker -validity 5000 -keyalg RSA -genkey
+keytool -keystore broker.keystore.jks -storepass KafkaTest -alias broker -validity 5000 -keyalg RSA -sigalg SHA256withRSA -genkey
 
 What is your first and last name?
   [Unknown]:  kafka
   ...
 
-# create a new certificate authority
+# create a new certificate authority, use passphrase KafkaTest
 openssl req -new -x509 -keyout ca-key -out ca-cert -days 5000
 
 # add the CA to the kafka client's trust store
-keytool -keystore client.truststore.jks -storepass KafkaTest -alias CARoot -keyalg RSA -import -file ca-cert
+keytool -keystore client.truststore.jks -storepass KafkaTest -alias CARoot -keyalg RSA -sigalg SHA256withRSA -import -file ca-cert
 
 # export the server certificate
 keytool -keystore broker.keystore.jks -storepass KafkaTest -alias broker -certreq -file broker-cert
 
 # sign it with the CA
-openssl x509 -req -CA ca-cert -CAkey ca-key -in broker-cert -out broker-cert-signed -days 5000 -CAcreateserial -passin pass:KafkaTest
+openssl x509 -req -CA ca-cert -CAkey ca-key -in broker-cert -out broker-cert-signed -days 5000 -CAcreateserial -passin pass:KafkaTest -sha256
 
 # import CA and signed cert back into server keystore
 keytool -keystore broker.keystore.jks -storepass KafkaTest -alias CARoot -import -file ca-cert
diff --git a/testing/environments/docker/kafka/certs/broker-cert b/testing/environments/docker/kafka/certs/broker-cert
index 3a7d9e2498ae..d40676da0a68 100644
--- a/testing/environments/docker/kafka/certs/broker-cert
+++ b/testing/environments/docker/kafka/certs/broker-cert
@@ -1,18 +1,18 @@
 -----BEGIN NEW CERTIFICATE REQUEST-----
-MIIC3zCCAccCAQAwajEQMA4GA1UEBhMHVW5rbm93bjEQMA4GA1UECBMHVW5rbm93
-bjEQMA4GA1UEBxMHVW5rbm93bjEQMA4GA1UEChMHVW5rbm93bjEQMA4GA1UECxMH
-VW5rbm93bjEOMAwGA1UEAxMFa2Fma2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCH8VYN9FMHXjnLUwT0AJDKM0u/jXE0ng1UfWPVQaVI+Eny+vmf1zDm
-d/AoqXaYKzVNvyRXCy1BZGaLVA3go1U7+tVjtniuLTmveE07PuX4w9/ukZPKlUxf
-KCjYCmh38BeYiJA2inaxScDO2hxHfB2pulsM+l9+q0NMXFe6RSUAKS0pAeY8KLz9
-yWg9hfq6JPuPT14HZmyxLn+1SwRbZZ+TQjlAHfZFpu/igg6cif/ez30z5Gqci+2i
-VPlwl9peEsaXn5wbuP6J2Uo6dMoGiFyxFdGCWVWP9WDncvfYKJwQs09QdbFLxAst
-BYSmOTszUP+h0SohaxpdC4AOcJxs+MwhAgMBAAGgMDAuBgkqhkiG9w0BCQ4xITAf
-MB0GA1UdDgQWBBRFzbnwQXp+h4xE233eH3D+KfozxTANBgkqhkiG9w0BAQsFAAOC
-AQEAQti4SPU8KfSoeLbLUic7UciVmwO0TZtiG+Y6fCTdRm7SYovg2zXH576ERClf
-JQCzUuMH1Fi6k5adhMUxopJrVirZWOANoffe3yY/PUuFPMv5rvjmG7JqRNloNFYC
-4Jah/XeITkw3BcwYxvY3lOZeXgBoRI+PwaD4JNHYf9ruc8cxY59lbWGCQOdbWYuk
-ex/Y/rdmiv1cZpVAYY3VkdUnISXf4eePz4+hUdyuNGYt8Rh/dCj0D/1Xdo9jguUw
-IWihuXNfH5hBzBp2hX49tCa7j8stOQW6+AS+ysUBRseFNnsu9j95PD+ue9GU5ZLR
-mQzlkeZcfimH796e6XF81oCDkA==
+MIIC0jCCAboCAQAwXTELMAkGA1UEBhMCVVMxDjAMBgNVBAgTBWthZmthMQ4wDAYD
+VQQHEwVrYWZrYTEOMAwGA1UEChMFa2Fma2ExDjAMBgNVBAsTBWthZmthMQ4wDAYD
+VQQDEwVrYWZrYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL8W8cV8
+IPoqY7kyNdGeUCSS6DXy/UoNcTVaVcxHytDDske6QP5VwVQmhJDxcvpCVIr5me2o
+UqSHlk60ikCkVbgspDLPg8scchXY8jxN4uVzcAIQqKOtJ02unLaSirO9uLuxq3mw
+Tg/TLZ8Ny9ytPOoE0feZKOL8kE5B3ar+IzJWiVxvTpdbM1FxMd0JIE1AGIGrwQPv
+OLv3mhYX/SsnbCty5PESp1dpfrvtBDDYv2AWkfJQuSlzspRHeXbRdAmkhxa1+RF0
+qovgfNXzF9LkMySm9YGSqD8WHtw7hl0PwG0vteJLH4dR3pccYQWoRiLYmPlCeg/t
+ZLvZxWkiIIJjuXECAwEAAaAwMC4GCSqGSIb3DQEJDjEhMB8wHQYDVR0OBBYEFDny
+LLWik9HtleB+eQgUuFRdP4J5MA0GCSqGSIb3DQEBCwUAA4IBAQBtG9QxU1i72aMh
+S+dBbWiSI1AsBiiCzisV9J5Yj0BdMbzLtUG0rAT4knC0jiGEykU+1SV20M7cG22v
+TRbXjvk9thVjuKlCMeeVYTmGACSuMFNhP1yje9bf8ohlP22WCfhAUqO4uCdQj8yT
+QvZeO7PrdJxxSIG8GDgSFf/vdPoBzI1LUYqGD62JSyGVr+iMt0L1O/yHzYJCl/ho
+ItN5xRQLoZITlrUTSzkPacU8fR2vBjv7h6/pTzlzJ1fbHK3yS34HojMdc7v+Q0Qb
+yaOomDnX++/W/2vS1LIocK0M2/qX9Nt6eyIVe1o+dsZYirXCJRcWZ4U0L71qIvMf
+VqNymL1T
 -----END NEW CERTIFICATE REQUEST-----
diff --git a/testing/environments/docker/kafka/certs/broker-cert-signed b/testing/environments/docker/kafka/certs/broker-cert-signed
index b023f3c146d2..b52a642064e3 100644
--- a/testing/environments/docker/kafka/certs/broker-cert-signed
+++ b/testing/environments/docker/kafka/certs/broker-cert-signed
@@ -1,18 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIC8zCCAdsCCQC1GCJdAf28SzANBgkqhkiG9w0BAQUFADANMQswCQYDVQQGEwJV
-UzAeFw0yMTEwMjEyMDM0MTBaFw0zNTA2MzAyMDM0MTBaMGoxEDAOBgNVBAYTB1Vu
-a25vd24xEDAOBgNVBAgTB1Vua25vd24xEDAOBgNVBAcTB1Vua25vd24xEDAOBgNV
-BAoTB1Vua25vd24xEDAOBgNVBAsTB1Vua25vd24xDjAMBgNVBAMTBWthZmthMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAh/FWDfRTB145y1ME9ACQyjNL
-v41xNJ4NVH1j1UGlSPhJ8vr5n9cw5nfwKKl2mCs1Tb8kVwstQWRmi1QN4KNVO/rV
-Y7Z4ri05r3hNOz7l+MPf7pGTypVMXygo2Apod/AXmIiQNop2sUnAztocR3wdqbpb
-DPpffqtDTFxXukUlACktKQHmPCi8/cloPYX6uiT7j09eB2ZssS5/tUsEW2Wfk0I5
-QB32Rabv4oIOnIn/3s99M+RqnIvtolT5cJfaXhLGl5+cG7j+idlKOnTKBohcsRXR
-gllVj/Vg53L32CicELNPUHWxS8QLLQWEpjk7M1D/odEqIWsaXQuADnCcbPjMIQID
-AQABMA0GCSqGSIb3DQEBBQUAA4IBAQCMGbXC2YdC9+jJjUvuEJIQGwpapJ5Dejng
-cnvE//+x8A4W9vC7OJUHcML2GGQIrgvYWlmsCEWX1lJtcVIbqkTqq9Sq99htdMfM
-ay4fJB/ey005bhcbEP+19342HkmoOUkEg7qGWZhhL05y0m1vxKvKSUX3p+4TyW1Y
-AheRbb9j41Ld3E8+COGwqIWpMNfsGjLqWjUIajemFH91Eo2FFvshM/5ly12GZEil
-ivmUqSzV7o6ri0V7DZ5NPOSXEbiMQj5FfmImqXbo7JtBqM/H9S2yAPXZBfAloVNv
-XvjG0dY8cnYwGL5MSRiZEuJdimptWnMzFXbD8zyRxSIUMpbDcHNf
+MIIDTDCCAjQCCQD48GlXfeHoqzANBgkqhkiG9w0BAQsFADBzMQswCQYDVQQGEwJV
+UzEOMAwGA1UECAwFa2Fma2ExDjAMBgNVBAcMBWthZmthMQ4wDAYDVQQKDAVrYWZr
+YTEOMAwGA1UECwwFa2Fma2ExDjAMBgNVBAMMBWthZmthMRQwEgYJKoZIhvcNAQkB
+FgVrYWZrYTAeFw0yMjA4MDQxOTExMDZaFw0zNjA0MTIxOTExMDZaMF0xCzAJBgNV
+BAYTAlVTMQ4wDAYDVQQIEwVrYWZrYTEOMAwGA1UEBxMFa2Fma2ExDjAMBgNVBAoT
+BWthZmthMQ4wDAYDVQQLEwVrYWZrYTEOMAwGA1UEAxMFa2Fma2EwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/FvHFfCD6KmO5MjXRnlAkkug18v1KDXE1
+WlXMR8rQw7JHukD+VcFUJoSQ8XL6QlSK+ZntqFKkh5ZOtIpApFW4LKQyz4PLHHIV
+2PI8TeLlc3ACEKijrSdNrpy2koqzvbi7sat5sE4P0y2fDcvcrTzqBNH3mSji/JBO
+Qd2q/iMyVolcb06XWzNRcTHdCSBNQBiBq8ED7zi795oWF/0rJ2wrcuTxEqdXaX67
+7QQw2L9gFpHyULkpc7KUR3l20XQJpIcWtfkRdKqL4HzV8xfS5DMkpvWBkqg/Fh7c
+O4ZdD8BtL7XiSx+HUd6XHGEFqEYi2Jj5QnoP7WS72cVpIiCCY7lxAgMBAAEwDQYJ
+KoZIhvcNAQELBQADggEBAACMzkWO0HjgnMUCuCJwNbG9/ZBA3gHeV5erBspYF/9Z
+bPVvRzCAvi5VgGRefosk+Q2dT4v/BIpOvIdmHQu4IUwulDz6ICBDaAlttKBEKWwU
+nKfmvRqxfphnMx2QoX+ZsInStCj7ERnYLCrOHGJrDOuJ3EfubDOqOnotkDXjSxkc
+cAk2Bt5UshDFerCaRZ8kTSB1U5JMWVnAUwyDbyN43iu2EL0hDc5klvjcaIXsodug
+d22GAhwnFipE+UB9sztwS3JXXAgX4r7BCJeenUAKr2bZQLL7yNYw1TDll01I/z9m
++SHnz0p+fHJva4352Spv1HJXSaForJ5SKSr85UqGYk0=
 -----END CERTIFICATE-----
diff --git a/testing/environments/docker/kafka/certs/broker.keystore.jks b/testing/environments/docker/kafka/certs/broker.keystore.jks
index aa03364e3ac6..b243d544e07b 100644
Binary files a/testing/environments/docker/kafka/certs/broker.keystore.jks and b/testing/environments/docker/kafka/certs/broker.keystore.jks differ
diff --git a/testing/environments/docker/kafka/certs/ca-cert b/testing/environments/docker/kafka/certs/ca-cert
index 725647f9d8ba..f0bb7589be5f 100644
--- a/testing/environments/docker/kafka/certs/ca-cert
+++ b/testing/environments/docker/kafka/certs/ca-cert
@@ -1,16 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIICljCCAX4CCQD+dvzut8IfyTANBgkqhkiG9w0BAQsFADANMQswCQYDVQQGEwJV
-UzAeFw0yMTEwMjEyMDMyMDJaFw0zNTA2MzAyMDMyMDJaMA0xCzAJBgNVBAYTAlVT
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlR6sKchCTM0qdrjAdWqR
-BmSLfHHe+LB43B0T/+3Y1fporzg2eZC1dPCf7TXLzL92NOlJ+JQCsfb160gKTGfb
-7+z2jm+vumbYlKVffsD7MjNdW8SDu9hfMa2DyTY742n3R/X8pc4VK0fdlTQx22Zp
-aIA+XwD6hHxZQS9PHVNwTFUoPkP4jevcFANwjLUBgy3dPK0iWdVILnaAwEBg82z3
-zWRJ7I4Eg6KS+GtwZPovhiHqcJpz7QPrmggCglL8q0YZQrVrYNucRV1sjPAhEfTA
-Sh7Z0UVYdx5+jJq7MyslBqzEM0OrmKrldrTHOAo9+cTc1GiKGRBhVei2R2fP2XAC
-HQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQA37KiWMR6SZRmlLKV7hP9/9H1cL1FJ
-OPa5MKcwh8Q38IRALCF5SlxxOByP8O01ZInkWjR3jJbMc/k4RwxQXfzYDvB4jleU
-MyX63qekIsxFdUn+fzt+wA0xb7tOPGVUbM6QI++YH28p8yzSdY/bXrjRweQuVRC0
-B+0zMijI1uU6GRME9+e1OLsN5rDzCFEJUra/+UDc23BTOjC6Az00UKpOGv6oAqg8
-iuCOeVCRVPtd7mGJK1dGW3WXV3pbsu4EvfXve9qFFV/7d811JNBjnhF5lFN2JGVs
-Ka9JebJ8EKWff6Ns14FJ2cOG3tx7KuWcnfTdma/mH4PeGoU1Og5Ln/ea
+MIIDYjCCAkoCCQDUy30S9G2MXjANBgkqhkiG9w0BAQsFADBzMQswCQYDVQQGEwJV
+UzEOMAwGA1UECAwFa2Fma2ExDjAMBgNVBAcMBWthZmthMQ4wDAYDVQQKDAVrYWZr
+YTEOMAwGA1UECwwFa2Fma2ExDjAMBgNVBAMMBWthZmthMRQwEgYJKoZIhvcNAQkB
+FgVrYWZrYTAeFw0yMjA4MDQxOTEwNTNaFw0zNjA0MTIxOTEwNTNaMHMxCzAJBgNV
+BAYTAlVTMQ4wDAYDVQQIDAVrYWZrYTEOMAwGA1UEBwwFa2Fma2ExDjAMBgNVBAoM
+BWthZmthMQ4wDAYDVQQLDAVrYWZrYTEOMAwGA1UEAwwFa2Fma2ExFDASBgkqhkiG
+9w0BCQEWBWthZmthMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAugme
+4arqId/pSW3GjWIUL/JCf6kfbDj1TCQUZL/uvLMtPiEG2CbCAQSr4HHtWT/3B+Xr
+QKOjSIaxEegE4T9nIB0gNE2h2pVQWfOb3QcAWuNbZnS7oo46y+QKIOgcWFimUkHh
+KxqKDBYWA1ttBJTMDv6IXP4F3+/r25/A1MoWxLFxStoGAUo8rjYRdg62lhjOeTMA
+3+gTbkXfWDZDFcdRa+Vy6i6CFFeYduX83JsDsvyvX5udOJ0iw2oSdF+LEbo+w+GB
+i1+AEPIHs+qybkWp7a1SCjyO6pBTsslQ/di61F4K/N4GYozl/aM+jpESleqJ+Jjv
+9lUONzyOeX5pD5M2RwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAv+ziF9/MFwfZG
+J/CDVIQptfjNRhsC/MRHf/8QhT9CqUgIMtSBAVIEiJOJ6pYx8AHnHFUC7FgU9as8
+CGSnWeBbzkQpKoOceG//a3XUPXFgsS7as96vGsm1oCvxIQlvWlXk8VNm5h4em6rh
+kJD+SzmJ1ROOwM9LQTG669eKpPR65XPgeo85I+SfuwaNWELR4Xep3rHIOGYVRZhl
+Z1ctPAqFIKGYdtFw7fJZL0HnP+peNmc1WCC/WRpFtnUV1GKPkPuy9jzJ6haIdlX4
+1c5KEOyLEjJvR5wdSYP/fivIga8sgGedlU2YLZSuqNoZBNutpwgo3ntdXLRZ39VV
+p8T3AkOI
 -----END CERTIFICATE-----
diff --git a/testing/environments/docker/kafka/certs/ca-cert.srl b/testing/environments/docker/kafka/certs/ca-cert.srl
index 3336d99a9a30..75591a0f2db6 100644
--- a/testing/environments/docker/kafka/certs/ca-cert.srl
+++ b/testing/environments/docker/kafka/certs/ca-cert.srl
@@ -1 +1 @@
-B518225D01FDBC4B
+F8F069577DE1E8AB
diff --git a/testing/environments/docker/kafka/certs/ca-key b/testing/environments/docker/kafka/certs/ca-key
index 63ab92b23aa2..bb8d0e558189 100644
--- a/testing/environments/docker/kafka/certs/ca-key
+++ b/testing/environments/docker/kafka/certs/ca-key
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHzBJBgkqhkiG9w0BBQ0wPDAbBgkqhkiG9w0BBQwwDgQIPiUp46K/yl8CAggA
-MB0GCWCGSAFlAwQBKgQQ3vI4jI41do9rQtAyc+JwfwSCBNDDDv3uSHZ/12ACMLyu
-vhrz3en62CT4ooeZKjpep4H/s+2pfqfg5bDeQUguNUo2zsy0EKeK2rIBVUG6KWIa
-DWvnl0JaM/TrtGg1pMZMIFPowaf1mNcVcvN5IWEgLgoT+SY8lLtmVqIdU1d2F6nV
-t+7JEpktXA5ThS0FbBpW0XI+kG9W7Ln9YPjGLbjcPayJQX1yzWJYEUfmm8lJl7cT
-h5V94sB2KP9pwAP/SqElt2QK1BhStUVv3ezp6TT82PETi3No0Uh+oWaxltjPCr4z
-5MN/tTDJQGc3llDIrZT+umZcgB6DBsc+nXjrlAHWPeuhIcjNJGs3V0xazQs60M6n
-ldhcJH453Muwtp40VDkT21plVPwUrwQX/6gIWIHnyvK44sRG4NvmG+4NBA8V4TdK
-AKhkhYTYS+sAUDsAFo408OXvpdGy7G2/cZn+r2frLHLxUU2peqRFP7YqLVs2sdez
-sFyt6ZMSAh8UZDYK9kpyQMoeYj7Az14kMKIlE0JADsd3Mn8S/QJrrKWQzQhQVz6O
-0rpaGnIM3cICgTK7gTlK+lDIbqAmCYnFLQsU9rHIpzVMkx2iYEId+YNbxodHpFPa
-MCz6HU8qI9Tv9JIOfJKdE7tvlSnR89usOU/z+NSGqKm1dhYjG1BNI7wk8/mgMxOg
-9BAujodmGvFpMPba84+QT/AtTy9YMMi4Z0H7BKHGD7HwSOTx7kP9hMz/sVVnKxfO
-8C9gE91D4enrpQXu7J5JU07LCWSNLiZEegbdKvjBz5Cvfj5LPhazTLYuuU0KNIP9
-MjrgodrSp1LgESAA7z8qKUyhX2Z6uO0q1Q5OUFgGNEWXSYLplhWrvftPqdV0YAFI
-4y794sojVBBnHYo+Lm5gugm4cg6bLk/YY3ScQqPYEUwO1LZSMUoB9ixLHUYY48ND
-xbevM9V8vLgb6Q46zTCYPxwYfxNlcWxeQjwbVEaha5n2Sgu0dmrG/+LjrEwYtHY7
-zPdTbl28OyvXDqvilXcDQS8ZQBwqkZ00pg9fokElztgVIMp4cbtBTCiqipfNBGJg
-ALEu/lFNlGjvv4iwOdx/yhVjFt2Ri3ViTEoTJ3wAh3o4wh/o8wluNb3bMgfKzw61
-/WptUvLnqKIGQ0xZtunxG9WHIpc8oTRZMMUgLnoVzJvdU9cONT5GER9WuQbwXmEE
-ytIx9tVq4cb3CoJhynrL9cjGp716nBkx534gyu5N21elb8npk1XAHd6AHUViun0J
-TnVHPwSSLN7naaiMKS+8KaknAdjvKCIUytLSRpRb4rkoqD/7MlYlMTAPF5IX6/Xj
-fVfR8HKWtkvqhAM4lQ57zwGlpXifGM5Vi/Dq8JYcTOIHIzggbhfi+WVwWJ+SJVp3
-FQBSvyJ0XFV8piuP6J1PB6zXLioRiUMDbrl0Hmwo4spLswRsZ6D/6QuNUeNN2Lh1
-ZqtkAHWnIll1nviSEWPxiu0lA9ZwfPP1t+H0UkVi8JBUCrTh0gyr2e/CGZAd1GoP
-/LnvaRntmqytavI65NlPPlvF9S7enjeEkxvtqhAIuU9nTMORnmpXX+xStfm/AtQp
-2UNklwWW6bwPhMF9w+FnuJoK7mrQ5DphsZNcTly1RQ0uQkT6yrzWK5MNmLRiNOez
-OmM968GQKexUL9r0BmFi7T00rQ==
+MIIFHzBJBgkqhkiG9w0BBQ0wPDAbBgkqhkiG9w0BBQwwDgQIJtcnwRIUCboCAggA
+MB0GCWCGSAFlAwQBKgQQK9FMWVV6SWkfBMh1PRRkuQSCBNBe9AXT361DtUIHtvu4
+cD59bu/T/Jjt05nVr3h+bIMvkUUFF0+EVGEFq05c5eSoOcNFEjrToabv+HjqmhbQ
+xgArBcKlmVKktApgcHZ6yoTnrunJiJpAj1z2fIE+nyn7E2yNp6CmCTNIZwLD2diC
+Wi/hJ5xES11n90J0/+LqxxnwRpckZ/7IHo4sAAFVBn0vt9ZjLDVmYir7tbSdwfT4
+zFdVek32eVHAosZKXOQOP4LM7BGc2smfYHWhkOQ45Tl/xUKk9KdLIFOJFmxYM16B
+1FMT/1WklMbMqI5ZIqjVFH/K7D98zvyWEIBGQTYUE9yx7oqNWgr6gU3V8HHERUam
+UsSXEf/0YmoWgy1FrG1H7IdmQa1bayayhu9oFXAgpEP3H1Y40/12TwEiX13dD6ze
+u0DTPpZZ9b1aU8SVcYl4iCBLqLlUiHB8/TsAS2Zfdu/WXzlqyBhndh2QJMoOcisX
+0fN+nE3qRGpVjXu5GTK8qByjw6G8c/JAB6+/jIZBq/7Qq0GLA8+MHwkWU8Abeycf
+acu1ElJwWlzJEb6tKC6Riydvucb2t6qM+xrAJQDB0A9y6vGY9VeadiMpZZrxPC8u
+g8RDCmbIuQwfoxbWy5SjrE9vhp77SzBncXexoKAjFQNzZHk16M97iPpuEwvVwLvC
+PHCcHFszl/TDJP3GEY13jAh9IfjqoUn8/6qEZjaNO0qcsl1UfcfAoqLCC7aOwkzg
+4a+2QQEE0j/AWWqZwtYCznaqGnnLUaL4Q6Kcyd3VxleP0XzC7cEcbj8XuPcG7mVP
+ciV9bv9TnCkaf0cjNjf6muj59BwbkjUHllcuEyXKl++2DfPjlFbya8W1xk65bOjW
+pgHNawuL6eEyKbfXqQZG02hfG3IL/qJaW7gYWXXX1V0fBbgDboxYilQ3HhbcprPs
+9hlHGh5vZqv2TzPxcqyeAzSLAJnziDx+1SCrg2VsTHZEv0xGfOUTtReouygayY1o
+FyRs0N4SG7dsqhAK9zjkbUwkWsAwshgePWkW4F0v+fD7vdKf1Rkp6k5YiW8x5f5i
+N2idRxECOP4xjMZDx1Np1kr1KE2qFZkb8TINHnVtb0OCxl0kZRTvbDGCITpZOQPl
+t3iU+u3YLFeLRhdwwGCJbdccLY/1O0fLNTKRqgugoHkI7dC+d7DR4ObIu67eRPN/
++HrOrGt7kvcmMIwyiCVP24xZXz0Jz7jLEhXy4E0TxYwOrd1PFIqRXkRLsr6WsDmN
+FtumzvMDJ3JyOloWlyHY7p8n+6ywaXHFjtirmQzZ4NxXMsACi0oJrBj4Eaa8O9J5
+vulDUjiqkX//FAdlaQCQUIdxY/e70BdGuX5j18CrzqdqXxBMeMRxjeWTp4nb+bjv
+JJiXLx0VfKZCP7usmc61GukpV30pHsbi0EOX8fW35yx6sqWgoIHBCCet0V0Nml1j
+dQk1ZZfBO2t6whH82Cz726F2tR68uIIWGEZOCz3hRnXdUKDIarVZdst3N3A+HbIl
+ibrD6RF+UHf0y0iG6Oadin2V8lLu/Enq9zO3XIw4Xby6MicVsADj3+AMDRxj28VC
+tPpGw/ds4x4fSRStSLwd6IRk2oIsYN29xsvkd2EfEMYZPLY2kNSuMusFQTdvFkD9
+CE6tLMjpd3Htj49XZ3F+nFlxjw==
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/testing/environments/docker/kafka/certs/client.truststore.jks b/testing/environments/docker/kafka/certs/client.truststore.jks
index 7b18b3f645ed..1fc6cb1373c5 100644
Binary files a/testing/environments/docker/kafka/certs/client.truststore.jks and b/testing/environments/docker/kafka/certs/client.truststore.jks differ