diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3aada19f..0b6d6174 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Changelog
 All notable changes to this project since 0.82.0 will be documented in this file.
 
+## [2.2.0] - 2021-01-06
+### Changed
+- Remove explicit cryptography package install to resolve dependency conflicts so tests can run
+- Add local registry support for Windows
+
 ## [2.1.6] - 2020-09-23
 ### Changed
 - Fix warning about ConfigParser readfp deprecation
diff --git a/iotedgedev/__init__.py b/iotedgedev/__init__.py
index 8eab2f32..eb76cc5a 100644
--- a/iotedgedev/__init__.py
+++ b/iotedgedev/__init__.py
@@ -4,5 +4,5 @@
 
 __author__ = 'Microsoft Corporation'
 __email__ = 'vsciet@microsoft.com'
-__version__ = '2.1.6'
+__version__ = '2.2.0'
 __AIkey__ = '95b20d64-f54f-4de3-8ad5-165a75a6c6fe'
diff --git a/setup.cfg b/setup.cfg
index 258c9b1f..04846b13 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.1.6
+current_version = 2.2.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 0980de80..ad028906 100644
--- a/setup.py
+++ b/setup.py
@@ -45,7 +45,7 @@
 
 setup(
     name='iotedgedev',
-    version='2.1.6',
+    version='2.2.0',
     description='The Azure IoT Edge Dev Tool greatly simplifies the IoT Edge development process by automating many routine manual tasks, such as building, deploying, pushing modules and configuring the IoT Edge Runtime.',
     long_description='See https://github.com/azure/iotedgedev for usage instructions.',
     author='Microsoft Corporation',