diff --git a/murano/cfapi/cfapi.py b/murano/cfapi/cfapi.py
index abb51572..6fe37fce 100644
--- a/murano/cfapi/cfapi.py
+++ b/murano/cfapi/cfapi.py
@@ -17,8 +17,8 @@ import uuid
 
 from oslo_config import cfg
 from oslo_log import log as logging
-import retrying
 import six
+import tenacity
 from webob import response
 
 from murano.common.i18n import _LI, _LW
@@ -224,11 +224,11 @@ class Controller(object):
             for action_id in list(actions):
                 if 'getCredentials' in action_id:
 
-                    @retrying.retry(retry_on_exception=lambda e: isinstance(e,
-                                    TypeError),
-                                    wait_random_min=1000,
-                                    wait_random_max=10000,
-                                    stop_max_delay=30000)
+                    @tenacity.retry(
+                        retry=tenacity.retry_if_exception_type(TypeError),
+                        wait=tenacity.wait_random(min=1, max=10),
+                        stop=tenacity.stop_after_delay(30),
+                        reraise=True)
                     def _get_creds(client, task_id, environment_id):
                         result = m_cli.actions.get_result(environment_id,
                                                           task_id)['result']
diff --git a/murano/engine/system/net_explorer.py b/murano/engine/system/net_explorer.py
index d75543f3..ff11f0d2 100644
--- a/murano/engine/system/net_explorer.py
+++ b/murano/engine/system/net_explorer.py
@@ -20,7 +20,7 @@ import neutronclient.v2_0.client as nclient
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_utils import uuidutils
-import retrying
+import tenacity
 
 from murano.common import auth_utils
 from murano.common import exceptions as exc
@@ -60,10 +60,11 @@ class NetworkExplorer(object):
     # NOTE(starodubcevna): to avoid simultaneous router requests we use retry
     # decorator with random delay 1-10 seconds between attempts and maximum
     # delay time 30 seconds.
-    @retrying.retry(retry_on_exception=lambda e: isinstance(e,
-                    exc.RouterInfoException),
-                    wait_random_min=1000, wait_random_max=10000,
-                    stop_max_delay=30000)
+    @tenacity.retry(
+        retry=tenacity.retry_if_exception_type(exc.RouterInfoException),
+        stop=tenacity.stop_after_delay(30),
+        wait=tenacity.wait_random(min=1, max=10),
+        reraise=True)
     def get_default_router(self):
         router_name = self._settings.router_name
 
diff --git a/requirements.txt b/requirements.txt
index c1490a70..5e6c025b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ eventlet!=0.18.3,>=0.18.2 # MIT
 PasteDeploy>=1.5.0 # MIT
 Routes!=2.0,!=2.1,!=2.3.0,>=1.12.3;python_version=='2.7' # MIT
 Routes!=2.0,!=2.3.0,>=1.12.3;python_version!='2.7' # MIT
-retrying!=1.3.0,>=1.2.3 # Apache-2.0
+tenacity>=3.1.0  # Apache-2.0
 WebOb>=1.2.3 # MIT
 kombu>=3.0.25 # BSD
 psutil<2.0.0,>=1.1.1 # BSD