Abstract: Wi-Fi networks have become an integral part of our daily lives, with billions of devices connected to them. However, the security of Wi-Fi networks has always been a major concern due to vulnerabilities in security protocols. The current WPA3 security protocol is vulnerable to various types of attacks, including Dragonblood vulnerabilities and Evil Twin attacks, which can compromise sensitive user data. Furthermore, the public key cryptography utilized in WPA3 is susceptible to quantum attacks, which could potentially become viable in the upcoming years. To address these security issues, an effective method is needed to enhance Wi-Fi security. This thesis proposes a novel solution to address Wi-Fi protocol security by integrating two approaches: the Kyber-based Authenticated Key Exchange (KAKE) handshake and the Trust On First Use (TOFU) approach. The KAKE handshake provides security against vulnerabilities in both WPA2 and WPA3 protocols and offers post-quantum protection. Meanwhile, the TOFU approach addresses vulnerabilities in WPA3 by providing additional security against Evil Twin attacks and Downgrade attacks. The proposed solution has been evaluated for its performance, feasibility, and security through proof of concepts and compared with other literature results. The findings show that the proposed approach is effective in preventing different Wi-Fi attacks. Overall, this thesis can be valuable for researchers, network administrators, and other stakeholders interested in improving the security of Wi-Fi networks.