diff --git a/python/LbNightlyTools/CheckoutMethods.py b/python/LbNightlyTools/CheckoutMethods.py
index 02318327d467a3dc9ffe864a88fbd7d6823b8e37..7bdf7d0133c5de086182bccd72b5cf1f337b8cba 100644
--- a/python/LbNightlyTools/CheckoutMethods.py
+++ b/python/LbNightlyTools/CheckoutMethods.py
@@ -96,11 +96,11 @@ class _soft_db_singleton(object):
         The singleton instance.
         '''
         if self._instance is None:
-            try:
-                from LbSoftConfDB.SoftConfDBRO import SoftConfDBRO
-            except:
-                from LbRelease.SoftConfDB.SoftConfDBRO import SoftConfDBRO
-            self._instance = SoftConfDBRO()
+            from LbSoftConfDb2Clients.GenericClient import \
+                LbSoftConfDbBaseClient
+            generic_client = LbSoftConfDbBaseClient()
+            generic_client.parseOpts([])
+            self._instance = generic_client.getROInterface()
         return self._instance
 
     def __getattr__(self, name):
@@ -124,7 +124,6 @@ class _soft_db_singleton(object):
 _soft_db = _soft_db_singleton()
 del _soft_db_singleton
 
-
 def getpack(desc, recursive_head=None, export=False, protocol=None):
     '''
     Checkout the project described by the Project instance 'desc'.
diff --git a/setup.py b/setup.py
index 859fb68306376b65e4fa961612a606dcbf837e0b..33628bb6d55fbf4ba91a70a3279d4c82ca7c6169 100644
--- a/setup.py
+++ b/setup.py
@@ -131,14 +131,14 @@ setup(
     #
     # For an analysis of "install_requires" vs pip's requirements files see:
     # https://packaging.python.org/en/latest/requirements.html
-    install_requires=["LbEnv", "LbCommon>=0.0.7", "LbSoftConfDB", "LbDevTools",
+    install_requires=["LbEnv", "LbCommon>=0.0.7", "LbSoftConfDb2Clients", "LbDevTools",
                       "python-gitlab", "pika", "CouchDB", "tabulate"],
 
     # see https://stackoverflow.com/a/30064248, needed for Python 2.6 (SLC6)
     dependency_links=[
         'https://lhcb-pypi.web.cern.ch/lhcb-pypi/simple/lbenv',
         'https://lhcb-pypi.web.cern.ch/lhcb-pypi/simple/lbcommon',
-        'https://lhcb-pypi.web.cern.ch/lhcb-pypi/simple/lbsoftconfdb',
+        'https://lhcb-pypi.web.cern.ch/lhcb-pypi/simple/lbsoftconfdb2clients/',
         'https://lhcb-pypi.web.cern.ch/lhcb-pypi/simple/lbdevtools',
     ],