diff --git a/CMakeLists.txt b/CMakeLists.txt
index fcc6cb5b3c..273196de07 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.18)
 
 message("Configuring for ${CMAKE_GENERATOR}")
 get_property(IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
@@ -89,9 +89,6 @@ endif()
 ## Toolchain Setup
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.17)
-    cmake_policy(SET CMP0099 OLD)
-endif()
 
 find_program(PYTHON_EXECUTABLE NAMES python3 python)
 if(MSVC)
diff --git a/addons/CMakeLists.txt b/addons/CMakeLists.txt
index 2e21a8e38e..9a6c80c797 100644
--- a/addons/CMakeLists.txt
+++ b/addons/CMakeLists.txt
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.18)
 
 project(addons VERSION 1.0.0 LANGUAGES CXX
         DESCRIPTION "Mozilla VPN Addons"
diff --git a/linux/debian/control b/linux/debian/control
index 4fc37d86a8..a2b74bc73c 100644
--- a/linux/debian/control
+++ b/linux/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: mozilla <vpn@mozilla.com>
 Build-Depends: debhelper (>= 11.2),
                cdbs,
-               cmake (>= 3.16~),
+               cmake (>= 3.18~),
                flex,
                gcc (>=4:8.0.0~),
                g++ (>=4:8.0.0~),
diff --git a/lottie/CMakeLists.txt b/lottie/CMakeLists.txt
index 487adf7208..a7b4031cb0 100644
--- a/lottie/CMakeLists.txt
+++ b/lottie/CMakeLists.txt
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.18)
 
 project(lottie VERSION 1.0.0 LANGUAGES CXX
         DESCRIPTION "Lightweight scalable animations: QML Wrapper library"
@@ -14,9 +14,6 @@ set(CMAKE_AUTOUIC ON)
 if(NOT CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
     set(CMAKE_FOLDER "Lottie")
 endif()
-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.17)
-    cmake_policy(SET CMP0099 OLD)
-endif()
 
 add_library(lottie STATIC)
 
diff --git a/tests/functional/addons/CMakeLists.txt b/tests/functional/addons/CMakeLists.txt
index cabe330f79..15cea15ff3 100644
--- a/tests/functional/addons/CMakeLists.txt
+++ b/tests/functional/addons/CMakeLists.txt
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.18)
 
 project(testing_addons VERSION 1.0.0 LANGUAGES CXX
         DESCRIPTION "Mozilla VPN Addons for Functional Testing"