diff --git a/lib/manageiq/messaging/kafka/client.rb b/lib/manageiq/messaging/kafka/client.rb
index 2882ac5..2f02bf6 100644
--- a/lib/manageiq/messaging/kafka/client.rb
+++ b/lib/manageiq/messaging/kafka/client.rb
@@ -91,10 +91,12 @@ def rdkafka_connection_opts(options)
           result[:"sasl.mechanism"]    = "PLAIN"
           result[:"sasl.username"]     = options[:username] if options[:username]
           result[:"sasl.password"]     = options[:password] if options[:password]
-          result[:"ssl.ca.location"]   = options[:ca_file] if options[:ca_file]
           result[:"security.protocol"] = !!options[:ssl] ? "SASL_SSL" : "PLAINTEXT"
+          result[:"ssl.ca.location"]   = options[:ca_file] if options[:ca_file]
+          result[:"ssl.keystore.location"] = options[:keystore_location] if options[:keystore_location]
+          result[:"ssl.keystore.password"] = options[:keystore_password] if options[:keystore_password]
 
-          result.merge(options.except(:port, :host, :hosts, :encoding, :protocol, :client_ref, :username, :password, :ssl, :ca_file))
+          result.merge(options.except(:port, :host, :hosts, :encoding, :protocol, :client_ref, :username, :password, :ssl, :ca_file, :keystore_location, :keystore_password))
         end
       end
     end