diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf5a3f20..fcab9d7b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 All notable changes to this project since 0.82.0 will be documented in this file.
 
+## [2.1.4] - 2020-04-01
+### Changed
+- Fix configparser error from Azure Cli Core [[#426](https://github.com/Azure/iotedgedev/issues/426)]
+
 ## [2.1.3] - 2020-03-27
 ### Changed
 - Fix genconfig does not fail when schema validation failed. [[#424](https://github.com/Azure/iotedgedev/issues/424)]
diff --git a/docker/tool/linux/Dockerfile.base b/docker/tool/linux/Dockerfile.base
index 87ac3d3e..beeb246a 100644
--- a/docker/tool/linux/Dockerfile.base
+++ b/docker/tool/linux/Dockerfile.base
@@ -22,11 +22,7 @@ RUN apt-get install -y wget && \
     apt-get install -y dotnet-sdk-$DOTNETCORESDK_VERSION
 RUN curl -L https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose && \
     chmod +x /usr/local/bin/docker-compose
-RUN AZ_REPO=$(lsb_release -cs) && \
-    echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ $AZ_REPO main" | \
-    tee /etc/apt/sources.list.d/azure-cli.list && \
-    apt-key adv --keyserver packages.microsoft.com --recv-keys 52E16F86FEE04B979B07E28DB02C46DF417A0893 && \   
-    apt-get update && apt-get install azure-cli
+RUN curl -sL https://aka.ms/InstallAzureCLIDeb | bash
 RUN apt-get update && \
     npm i npm@latest -g && \
     npm i -g iothub-explorer yo generator-azure-iot-edge-module && \
diff --git a/iotedgedev/__init__.py b/iotedgedev/__init__.py
index 26d4fb86..f9a86cee 100644
--- a/iotedgedev/__init__.py
+++ b/iotedgedev/__init__.py
@@ -4,5 +4,5 @@
 
 __author__ = 'Microsoft Corporation'
 __email__ = 'vsciet@microsoft.com'
-__version__ = '2.1.3'
+__version__ = '2.1.4'
 __AIkey__ = '95b20d64-f54f-4de3-8ad5-165a75a6c6fe'
diff --git a/setup.cfg b/setup.cfg
index 2caf0f88..1ccb6719 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.1.3
+current_version = 2.1.4
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 626a3f8a..0dd8b1e7 100644
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@
     'python-dotenv',
     'requests >= 2.20.0, < 2.21',
     'fstrings',
-    'azure-cli-core',
+    'azure-cli-core < 2.3.0',
     'azure-cli-iot',
     'azure-cli-profile',
     'azure-cli-extension',
@@ -44,7 +44,7 @@
 
 setup(
     name='iotedgedev',
-    version='2.1.3',
+    version='2.1.4',
     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',