diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..e3f81b9
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,7 @@
+version: 2
+updates:
+  - package-ecosystem: maven
+    directory: "/"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..ca99fe5
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,33 @@
+name: CI
+on:
+  push:
+    branches:
+      - '*'
+  pull_request:
+    branches:
+      - '*'
+permissions:
+  contents: read
+jobs:
+  ci:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
+        java: [ 11, 17 ]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Set up JDK ${{ matrix.java }}
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{ matrix.java }}
+      - name: Cache local Maven repository
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+      - name: Build with Maven
+        run: mvn -B verify
diff --git a/.gitignore b/.gitignore
index fea1305..0b255f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ dist/eap/docker/jboss-eap-openshift.zip
 dist/wildfly/docker/wildfly-openshift.zip
 hs_err_pid*
 target/
+release.properties
diff --git a/Jenkinsfile b/Jenkinsfile
index f7c6325..c3168c2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -12,7 +12,7 @@ pipeline {
         stage('Build') {
             steps {
                 script {
-                    env.JAVA_HOME = tool('JDK 8')
+                    env.JAVA_HOME = tool('JDK 11')
                     def mvnHome = tool 'Maven'
                     sh "${mvnHome}/bin/mvn clean install -Dmaven.test.failure.ignore=true"
                     junit '**/target/*-reports/*.xml'
@@ -23,12 +23,12 @@ pipeline {
         
         stage('Deploy SNAPSHOT') {
             when {
-                branch 'master'
+                branch 'main'
             }
             steps {
                 configFileProvider([configFile(fileId: 'maven-settings-with-deploy-snapshot', variable: 'MAVEN_SETTINGS')]) {
                     script {
-                        env.JAVA_HOME = tool('JDK 8')
+                        env.JAVA_HOME = tool('JDK 11')
                         def mvnHome = tool 'Maven'
                         sh "${mvnHome}/bin/mvn deploy -s $MAVEN_SETTINGS -DskipTests"
                     }
diff --git a/README.adoc b/README.adoc
index e90fd74..1070605 100644
--- a/README.adoc
+++ b/README.adoc
@@ -23,7 +23,7 @@ A sample configuration looks like this:
   <org.jgroups.protocols.kubernetes.KUBE_PING
      port_range="1"
      namespace="${KUBERNETES_NAMESPACE:production}"
-     labels="${KUBERNETES_LABEL:cluster=nyc}"
+     labels="${KUBERNETES_LABELS:cluster=nyc}"
   />
   ...
 ----
@@ -115,7 +115,7 @@ Labels are similar to namespaces; different labels can separate clusters running
 Similarly to namespaces, labels also have to be defined when launching a pod, either via `--labels=<label>` passed
 to `kubectl run`, or in the YAML or JSON configuration file passed to `kubectl create -f <config>`.
 
-In the sample configuration above, labels were defined as `labels="${KUBERNETES_LABEL:cluster=nyc}"`. This means that
+In the sample configuration above, labels were defined as `labels="${KUBERNETES_LABELS:cluster=nyc}"`. This means that
 Kubernetes will only return IP addresses of pods started with label `cluster=nyc`.
 
 Namespaces and labels can be both set; in this case, Kubernetes will return the IP addresses of all pods started in
@@ -127,51 +127,51 @@ namespace `"default"` will be returned.
 
 === KUBE_PING configuration
 
-[align="left",width="90%",cols="3,3,10",options="header"]
+[align="left",width="90%",cols="3,3,3,10",options="header"]
 |===============
-|Attribute name | System property | Description
+| Attribute name | System property | Default | Description
 
-| port_range || Number of additional ports to be probed for membership. A port_range of 0 does not
-                  probe additional ports. Example: `initial_hosts=A[7800] port_range=0` probes `A:7800`, `port_range=1`
-                  probes `A:7800` and `A:7801`
+| port_range || 1 | Number of additional ports to be probed for membership. A port_range of 0 does not
+                    probe additional ports. Example: `initial_hosts=A[7800] port_range=0` probes `A:7800`, `port_range=1`
+                    probes `A:7800` and `A:7801`
 
-| connectTimeout | KUBERNETES_CONNECT_TIMEOUT | Max time (in millis) to wait for a connection to the Kubernetes server. If exceeded, an exception will be thrown
+| connectTimeout | KUBERNETES_CONNECT_TIMEOUT | 5000 | Maximum time (in milliseconds) to wait for a connection to the Kubernetes server. If exceeded, an exception will be thrown.
 
-| readTimeout | KUBERNETES_READ_TIMEOUT | Max time (in millis) to wait for a response from the Kubernetes server
+| readTimeout | KUBERNETES_READ_TIMEOUT | 30000 | Maximum time in milliseconds to wait for a response from the Kubernetes server.
 
-| operationAttempts | KUBERNETES_OPERATION_ATTEMPTS | Max number of attempts to send discovery requests
+| operationAttempts | KUBERNETES_OPERATION_ATTEMPTS | 3 | Maximum number of attempts to send discovery requests.
 
-| operationSleep | KUBERNETES_OPERATION_SLEEP | Time (in millis) between operation attempts
+| operationSleep | KUBERNETES_OPERATION_SLEEP | 1000 | Time in milliseconds between operation attempts.
 
-| masterProtocol | KUBERNETES_MASTER_PROTOCOL | http or https (default). Used to send the initial discovery request to the Kubernetes server
+| masterProtocol | KUBERNETES_MASTER_PROTOCOL | "https" | Schema http or https to be used to send the initial discovery request to the Kubernetes server.
 
-| masterHost | KUBERNETES_SERVICE_HOST | The URL of the Kubernetes server
+| masterHost | KUBERNETES_SERVICE_HOST || The URL of the Kubernetes server.
 
-| masterPort | KUBERNETES_SERVICE_PORT | The port on which the Kubernetes server is listening
+| masterPort | KUBERNETES_SERVICE_PORT || The port on which the Kubernetes server is listening.
 
-| apiVersion | KUBERNETES_API_VERSION | The version of the protocol to the Kubernetes server
+| apiVersion | KUBERNETES_API_VERSION | "v1" | The version of the protocol to the Kubernetes server.
 
-| namespace | KUBERNETES_NAMESPACE | The namespace to be used (leaving this undefined uses `"default"`)
+| namespace | KUBERNETES_NAMESPACE | "default" | The namespace to be used.
 
-| labels | KUBERNETES_LABELS | The labels to use in the discovery request to the Kubernetes server
+| labels | KUBERNETES_LABELS || The labels to use in the discovery request to the Kubernetes server.
 
-| clientCertFile | KUBERNETES_CLIENT_CERTIFICATE_FILE | Certificate to access the Kubernetes server
+| clientCertFile | KUBERNETES_CLIENT_CERTIFICATE_FILE || Certificate to access the Kubernetes server.
 
-| clientKeyFile | KUBERNETES_CLIENT_KEY_FILE | Client key file (store)
+| clientKeyFile | KUBERNETES_CLIENT_KEY_FILE || Client key file (store).
 
-| clientKeyPassword | KUBERNETES_CLIENT_KEY_PASSWORD | The password to access the client key store
+| clientKeyPassword | KUBERNETES_CLIENT_KEY_PASSWORD || The password to access the client key store.
 
-| clientKeyAlgo | KUBERNETES_CLIENT_KEY_ALGO | The algorithm used by the client
+| clientKeyAlgo | KUBERNETES_CLIENT_KEY_ALGO | "RSA" | The algorithm used by the client.
 
-| caCertFile | KUBERNETES_CA_CERTIFICATE_FILE | Client CA certificate
+| caCertFile | KUBERNETES_CA_CERTIFICATE_FILE | "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt" | Client CA certificate.
 
-| saTokenFile | SA_TOKEN_FILE | Token file
+| saTokenFile | SA_TOKEN_FILE | "/var/run/secrets/kubernetes.io/serviceaccount/token" | Token file.
 
-| dump_requests || Dumps all discovery requests and responses to the Kubernetes server to stdout when true
+| dump_requests || false | Dumps all discovery requests and responses to the Kubernetes server to stdout when true.
 
-| split_clusters_during_rolling_update | KUBERNETES_SPLIT_CLUSTERS_DURING_ROLLING_UPDATE | During the Rolling Update, prevents from putting all Pods into a single cluster
+| split_clusters_during_rolling_update | KUBERNETES_SPLIT_CLUSTERS_DURING_ROLLING_UPDATE | false | During the Rolling Update, prevents from putting all Pods into a single cluster.
 
-| useNotReadyAddresses | KUBERNETES_USE_NOT_READY_ADDRESSES | True if initial discovery should take unready Pods into consideration. Default is `true`.
+| useNotReadyAddresses | KUBERNETES_USE_NOT_READY_ADDRESSES | true | True if initial discovery should take unready Pods into consideration.
 
 |===============
 
@@ -228,7 +228,7 @@ subjects:
 
 apiVersion: v1
 items:
-- apiVersion: extensions/v1beta1
+- apiVersion: apps/v1
   kind: Deployment
   metadata:
     annotations:
@@ -237,6 +237,8 @@ items:
   spec:
     replicas: 3
     selector:
+      matchLabels:
+        run: ispn-perf-test
     template:
       metadata:
         labels:
@@ -245,7 +247,7 @@ items:
         serviceAccountName: jgroups-kubeping-service-account
         containers:
         - args:
-          - /opt/jgroups/IspnPerfTest/bin/kube.sh
+          - /opt/ispn/IspnPerfTest/bin/kube.sh
           - -nohup
           env:
           - name: KUBERNETES_NAMESPACE
diff --git a/pom.xml b/pom.xml
index d63c01e..e8d15ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>org.jgroups.kubernetes</groupId>
     <artifactId>jgroups-kubernetes</artifactId>
-    <version>1.0.13.Final</version>
+    <version>2.0.1.Final</version>
     <packaging>jar</packaging>
     <name>KUBE_PING</name>
     <url>https://github.com/jgroups-extras/jgroups-kubernetes</url>
@@ -49,24 +49,24 @@
         <connection>scm:git:git@github.com:jgroups-extras/jgroups-kubernetes.git</connection>
         <developerConnection>scm:git:git@github.com:jgroups-extras/jgroups-kubernetes.git</developerConnection>
         <url>https://github.com/jgroups-extras/jgroups-kubernetes</url>
-        <tag>1.0.13.Final</tag>
+        <tag>2.0.1.Final</tag>
     </scm>
 
     <properties>
-        <version.jgroups>4.1.0.Final</version.jgroups>
-        <version.junit>4.12</version.junit>
-        <version.assertj>3.8.0</version.assertj>
+        <version.jgroups>5.2.2.Final</version.jgroups>
+        <version.junit>4.13.2</version.junit>
+        <version.assertj>3.22.0</version.assertj>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <insecure.repositories>ERROR</insecure.repositories>
 
         <!-- nexus-staging-maven-plugin -->
         <autoReleaseAfterClose>true</autoReleaseAfterClose>
         <nexus.server.id>jboss-releases-repository</nexus.server.id>
         <nexus.server.url>https://repository.jboss.org/nexus</nexus.server.url>
         <nexus.snapshot.server.id>jboss-snapshots-repository</nexus.snapshot.server.id>
-        <nexus.snapshot.server.url>https://repository.jboss.org/nexus/content/repositories/snapshots/
-        </nexus.snapshot.server.url>
+        <nexus.snapshot.server.url>https://repository.jboss.org/nexus/content/repositories/snapshots/</nexus.snapshot.server.url>
     </properties>
 
 
@@ -134,7 +134,6 @@
             <artifactId>jgroups</artifactId>
             <version>${version.jgroups}</version>
         </dependency>
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -151,6 +150,36 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>enforce-java-version</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <bannedRepositories>
+                                    <message>To build this project, don't use maven repositories over HTTP. Please use HTTPS in your settings.xml or run the build with property insecure.repositories=WARN</message>
+                                    <level>${insecure.repositories}</level>
+                                    <bannedRepositories>
+                                        <bannedRepository>http://*</bannedRepository>
+                                    </bannedRepositories>
+                                    <bannedPluginRepositories>
+                                        <bannedPluginRepository>http://*</bannedPluginRepository>
+                                    </bannedPluginRepositories>
+                                </bannedRepositories>
+                                <requireJavaVersion>
+                                    <message>To build this project JDK 11 (or greater) is required. Please install it.</message>
+                                    <version>11</version>
+                                </requireJavaVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
@@ -162,7 +191,6 @@
                     <autoReleaseAfterClose>true</autoReleaseAfterClose>
                 </configuration>
             </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
@@ -181,32 +209,41 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
-                    <additionalparam>-Xdoclint:none</additionalparam>
+                    <!-- JDK8 has become extremely strict with JavaDoc problems -->
+                    <failOnError>false</failOnError>
                 </configuration>
             </plugin>
         </plugins>
 
         <pluginManagement>
             <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-enforcer-plugin</artifactId>
+                    <version>3.0.0</version>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>2.10.4</version>
+                    <version>3.4.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-release-plugin</artifactId>
-                    <version>2.5.2</version>
+                    <version>2.5.3</version>
+                    <configuration>
+                        <tagNameFormat>@{project.version}</tagNameFormat>
+                    </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.sonatype.plugins</groupId>
                     <artifactId>nexus-staging-maven-plugin</artifactId>
-                    <version>1.6.5</version>
+                    <version>1.6.13</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-source-plugin</artifactId>
-                    <version>2.2.1</version>
+                    <version>3.2.1</version>
                 </plugin>
             </plugins>
         </pluginManagement>
diff --git a/src/main/java/org/jgroups/protocols/kubernetes/KUBE_PING.java b/src/main/java/org/jgroups/protocols/kubernetes/KUBE_PING.java
index a0daf79..3b565ca 100644
--- a/src/main/java/org/jgroups/protocols/kubernetes/KUBE_PING.java
+++ b/src/main/java/org/jgroups/protocols/kubernetes/KUBE_PING.java
@@ -1,10 +1,7 @@
 
 package org.jgroups.protocols.kubernetes;
 
-import org.jgroups.Address;
-import org.jgroups.Event;
-import org.jgroups.Message;
-import org.jgroups.PhysicalAddress;
+import org.jgroups.*;
 import org.jgroups.annotations.MBean;
 import org.jgroups.annotations.ManagedOperation;
 import org.jgroups.annotations.Property;
@@ -12,7 +9,6 @@
 import org.jgroups.protocols.Discovery;
 import org.jgroups.protocols.PingData;
 import org.jgroups.protocols.PingHeader;
-import org.jgroups.protocols.TP;
 import org.jgroups.protocols.kubernetes.stream.CertificateStreamProvider;
 import org.jgroups.protocols.kubernetes.stream.StreamProvider;
 import org.jgroups.protocols.kubernetes.stream.TokenStreamProvider;
@@ -116,6 +112,8 @@ public class KUBE_PING extends Discovery {
 
     protected int     tp_bind_port;
 
+    private boolean   failedJsonErrorReported = false;
+
     public boolean isDynamic() {
         return false; // bind_port in the transport needs to be fixed (cannot be 0)
     }
@@ -139,8 +137,6 @@ protected boolean isClusteringEnabled() {
 
     public void init() throws Exception {
         super.init();
-
-        TP transport=getTransport();
         tp_bind_port=transport.getBindPort();
         if(tp_bind_port <= 0)
             throw new IllegalArgumentException(String.format("%s only works with  %s.bind_port > 0",
@@ -188,16 +184,11 @@ else if (deprecatedDefined)
             log.warn("%s is deprecated, please remove it and use %s instead", deprecated_name, property_name);
     }
 
-    private boolean isPropertyDefined(String property_name) {
+    private static boolean isPropertyDefined(String property_name) {
         return System.getProperty(property_name) != null
                 || System.getenv(property_name) != null;
     }
 
-    @Override public void destroy() {
-        client=null;
-        super.destroy();
-    }
-
     private PhysicalAddress getCurrentPhysicalAddress(Address addr) {
         return (PhysicalAddress)down(new Event(Event.GET_PHYSICAL_ADDRESS, addr));
     }
@@ -208,13 +199,11 @@ public void findMembers(List<Address> members, boolean initial_discovery, Respon
         PhysicalAddress       physical_addr=null;
         PingData              data=null;
 
-        if(!use_ip_addrs || !initial_discovery) {
-            physical_addr = getCurrentPhysicalAddress(local_addr);
-            // https://issues.jboss.org/browse/JGRP-1670
-            data=new PingData(local_addr, false, NameCache.get(local_addr), physical_addr);
-            if(members != null && members.size() <= max_members_in_discovery_request)
-                data.mbrs(members);
-        }
+        physical_addr = getCurrentPhysicalAddress(local_addr);
+        // https://issues.jboss.org/browse/JGRP-1670
+        data=new PingData(local_addr, false, NameCache.get(local_addr), physical_addr);
+        if(members != null && members.size() <= max_members_in_discovery_request)
+            data.mbrs(members);
 
         if(hosts != null) {
             if(log.isTraceEnabled())
@@ -279,14 +268,14 @@ public void findMembers(List<Address> members, boolean initial_discovery, Respon
             log.trace("%s: sending discovery requests to %s", local_addr, cluster_members);
         PingHeader hdr=new PingHeader(PingHeader.GET_MBRS_REQ).clusterName(cluster_name).initialDiscovery(initial_discovery);
         for(final PhysicalAddress addr: cluster_members) {
-            if(physical_addr != null && addr.equals(physical_addr)) // no need to send the request to myself
+            if(addr.equals(physical_addr)) // no need to send the request to myself
                 continue;
 
             // the message needs to be DONT_BUNDLE, see explanation above
-            final Message msg=new Message(addr).setFlag(Message.Flag.INTERNAL, Message.Flag.DONT_BUNDLE, Message.Flag.OOB)
+            final Message msg=new BytesMessage(addr).setFlag(Message.Flag.DONT_BUNDLE, Message.Flag.OOB)
               .putHeader(this.id,hdr);
             if(data != null)
-                msg.setBuffer(marshal(data));
+                msg.setArray(marshal(data));
 
             if(async_discovery_use_separate_thread_per_request)
                 timer.execute(() -> sendDiscoveryRequest(msg), sends_can_block);
@@ -306,11 +295,16 @@ public String fetchFromKube() {
     protected List<Pod> readAll() {
         if(isClusteringEnabled() && client != null) {
             try {
-                return client.getPods(namespace, labels, dump_requests);
+                List<Pod> pods = client.getPods(namespace, labels, dump_requests);
+                failedJsonErrorReported = false;
+                return pods;
             }
             catch(Exception e) {
-                log.warn("failed getting JSON response from Kubernetes %s for cluster [%s], namespace [%s], labels [%s]; encountered [%s: %s]",
-                         client.info(), cluster_name, namespace, labels, e.getClass().getName(), e.getMessage());
+                if (!failedJsonErrorReported) {
+                    failedJsonErrorReported = true;
+                    log.warn("failed getting JSON response from Kubernetes %s for cluster [%s], namespace [%s], labels [%s]; encountered [%s: %s]",
+                            client.info(), cluster_name, namespace, labels, e.getClass().getName(), e.getMessage());
+                }
             }
         }
         return Collections.emptyList();
diff --git a/src/test/java/org/jgroups/ping/kube/test/CertsTest.java b/src/test/java/org/jgroups/ping/kube/test/CertsTest.java
index 466c771..998d128 100644
--- a/src/test/java/org/jgroups/ping/kube/test/CertsTest.java
+++ b/src/test/java/org/jgroups/ping/kube/test/CertsTest.java
@@ -1,19 +1,3 @@
-/**
- * Copyright 2014 Red Hat, Inc.
- * <p/>
- * Red Hat licenses this file to you under the Apache License, version
- * 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.  See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
 package org.jgroups.ping.kube.test;
 
 import org.jgroups.protocols.kubernetes.stream.CertificateStreamProvider;