diff --git a/confluent_osdeploy/common/initramfs/opt/confluent/bin/apiclient b/confluent_osdeploy/common/initramfs/opt/confluent/bin/apiclient
index fc1aad87..0287a4f1 100644
--- a/confluent_osdeploy/common/initramfs/opt/confluent/bin/apiclient
+++ b/confluent_osdeploy/common/initramfs/opt/confluent/bin/apiclient
@@ -315,7 +315,8 @@ class HTTPSClient(client.HTTPConnection, object):
                     psock = socket.socket(addrinf[0])
                     psock.settimeout(timeo)
                     psock.connect(addrinf[4])
-                    ctx.wrap_socket(psock, server_hostname=host)
+                    chost = host.split('%', 1)[0]
+                    ctx.wrap_socket(psock, server_hostname=chost)
                     foundsrv = host
                     psock.close()
                     break
@@ -323,6 +324,8 @@ class HTTPSClient(client.HTTPConnection, object):
                     continue
                 except ssl.SSLError:
                     continue
+                except ssl.CertificateError:
+                    continue
             else:
                 continue
             break