This chapter provides some tactical and strategic solutions that cyber security professionals need to implement to mitigate and remediate the cyber risk from perceived data security threats from quantum computers. The tactical solutions would provide short term (1–4 year) coverage with quantum-resistant algorithms like AES, Diffie-Hillman (DH), ECDH, ECDHE, SIDH, techniques like cascade ciphering, increasing the key size or number of rounds of existing algorithms; and the strategic solutions would implement permanent (long term) quantum-safe algorithms like lattice-based, multivariate, code-based, hash-based and homomorphic cryptosystems.