diff --git a/.travis.yml b/.travis.yml
index 2e0ebce8aa..b5bdfbe0d8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -125,20 +125,20 @@ script:
   # Clean up egg-info directories which get created when installing runners
   # NOTE: We enable code coverage and per test timing information on master so build can take twice
   # as long as PR builds
-  - if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${IS_NIGHTLY_BUILD}" = "no" ]; then COMMAND_THRESHOLD=$(expr ${COMMAND_THRESHOLD} \* 2); fi; ./scripts/travis/time-command.sh "make ${TASK}" ${COMMAND_THRESHOLD}
+  - if [[ "${TRAVIS_PULL_REQUEST}" = "false" ]] && [[ "${IS_NIGHTLY_BUILD}" = "no" ]]; then COMMAND_THRESHOLD=$(expr ${COMMAND_THRESHOLD} \* 2); fi; ./scripts/travis/time-command.sh "make ${TASK}" ${COMMAND_THRESHOLD}
   # Run any additional nightly checks only as part of a nightly (cron) build
-  - if [ "${IS_NIGHTLY_BUILD}" = "yes" ]; then ./scripts/travis/run-nightly-make-task-if-exists.sh "${TASK}"; fi
+  - if [[ "${IS_NIGHTLY_BUILD}" = "yes" ]]; then ./scripts/travis/run-nightly-make-task-if-exists.sh "${TASK}"; fi
   # NOTE: We only generate and submit coverage report for master and version branches
   # NOTE: We put this here and not after_success so build is marked as failed if this step fails
   # See https://docs.travis-ci.com/user/customizing-the-build/#breaking-the-build
   # https://github.com/travis-ci/travis-ci/issues/758#issuecomment-266756853
-  - if [ ${TASK} = 'ci-unit' ] || [ ${TASK} = 'ci-integration' ] && [ "${ENABLE_COVERAGE}" = 'yes' ]; then ./scripts/travis/submit-codecov-coverage.sh; fi
+  - if [[ ${TASK} = 'ci-unit' ]] || [[ ${TASK} = 'ci-integration' ]] && [[ "${ENABLE_COVERAGE}" = 'yes' ]]; then ./scripts/travis/submit-codecov-coverage.sh; fi
 
 # Don't store cache for target PR branch (typically `master`), because it will be re-used for opened PRs
 # See: https://docs.travis-ci.com/user/caching/#Pull-request-builds-and-caches
 # Alternative: use strict pip pinning, including git-based pip packages
 before_cache:
-  - if [ ${TRAVIS_PULL_REQUEST} = 'false' ] && [ "${IS_NIGHTLY_BUILD}" = "no" ]; then rm -rf virtualenv/; fi
+  - if [[ "${TRAVIS_PULL_REQUEST}" = 'false' ]] && [[ "${IS_NIGHTLY_BUILD}" = "no" ]]; then rm -rf virtualenv/; fi
 
 # We want to be notified when a master or nightly build fails
 notifications:
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index e8cf66e473..a435c8a50c 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -52,6 +52,7 @@ Changed
   connection related errors, our code would first wait for this timeout to be reached (30 seconds)
   before returning error to the end user. #4834
 * Upgrade ``pymongo`` to the latest stable version (``3.10.0.``). #4835 (improvement)
+* Updated Paramiko to v2.7.1 to support new PEM ECDSA key formats #4901 (improvement)
 * Remove ``.scrutinizer.yml`` config file. No longer used.
 * Convert escaped dict and dynamic fields in workflow db models to normal dict and dynamic fields.
   (performnce improvement)
@@ -61,6 +62,7 @@ Changed
 * Refactor how inbound criteria for join task in orquesta workflow is evaluated to count by
   task completion instead of task transition. (improvement)
 
+
 Fixed
 ~~~~~
 * Fix the passing of arrays to shell scripts where the arrays where not detected as such by the 
diff --git a/fixed-requirements.txt b/fixed-requirements.txt
index 661910fc75..84eee50218 100644
--- a/fixed-requirements.txt
+++ b/fixed-requirements.txt
@@ -21,7 +21,7 @@ networkx==1.11
 # See https://github.com/StackStorm/st2/issues/4160#issuecomment-394386433 for details
 oslo.config>=1.12.1,<1.13
 oslo.utils>=3.36.2,<=3.37.0
-paramiko==2.6.0
+paramiko==2.7.1
 passlib==1.7.1
 prance==0.9.0
 prompt-toolkit==1.0.15
diff --git a/requirements.txt b/requirements.txt
index 65080afc6a..31ccd889f2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -35,7 +35,7 @@ nose-parallel==0.3.1
 nose-timer==0.7.5
 oslo.config<1.13,>=1.12.1
 oslo.utils<=3.37.0,>=3.36.2
-paramiko==2.6.0
+paramiko==2.7.1
 passlib==1.7.1
 prettytable
 prompt-toolkit==1.0.15
diff --git a/st2common/requirements.txt b/st2common/requirements.txt
index 848133a82b..e5cf70494f 100644
--- a/st2common/requirements.txt
+++ b/st2common/requirements.txt
@@ -22,7 +22,7 @@ lockfile==0.12.2
 mongoengine==0.18.2
 networkx==1.11
 oslo.config<1.13,>=1.12.1
-paramiko==2.6.0
+paramiko==2.7.1
 pymongo==3.10.0
 python-dateutil==2.8.0
 python-statsd==2.1.0