diff --git a/tuskar/api/__init__.py b/tuskar/api/__init__.py
index 55b76dce..ede13b70 100644
--- a/tuskar/api/__init__.py
+++ b/tuskar/api/__init__.py
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 API_SERVICE_OPTS = [
     cfg.StrOpt(
diff --git a/tuskar/api/acl.py b/tuskar/api/acl.py
index 234595e7..b2e20289 100644
--- a/tuskar/api/acl.py
+++ b/tuskar/api/acl.py
@@ -16,7 +16,7 @@
 """Access Control Lists (ACL's) control access the API server."""
 
 from keystoneclient.middleware import auth_token
-from oslo.config import cfg
+from oslo_config import cfg
 
 
 OPT_GROUP_NAME = 'keystone_authtoken'
diff --git a/tuskar/api/app.py b/tuskar/api/app.py
index d9b6c9ec..f8722f9f 100644
--- a/tuskar/api/app.py
+++ b/tuskar/api/app.py
@@ -14,7 +14,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 import pecan
 
 from tuskar.api import acl
diff --git a/tuskar/api/hooks.py b/tuskar/api/hooks.py
index 33b4d98c..80d2a9a0 100644
--- a/tuskar/api/hooks.py
+++ b/tuskar/api/hooks.py
@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from pecan import hooks
 
 from tuskar.db import api as dbapi
diff --git a/tuskar/cmd/api.py b/tuskar/cmd/api.py
index a058a8d8..36239e2c 100644
--- a/tuskar/cmd/api.py
+++ b/tuskar/cmd/api.py
@@ -21,7 +21,7 @@ import logging
 import sys
 from wsgiref import simple_server
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from tuskar.api import app
 from tuskar.common import service as tuskar_service
diff --git a/tuskar/cmd/delete_roles.py b/tuskar/cmd/delete_roles.py
index 46c49397..96a4c59e 100644
--- a/tuskar/cmd/delete_roles.py
+++ b/tuskar/cmd/delete_roles.py
@@ -18,7 +18,7 @@ from __future__ import print_function
 
 import sys
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from tuskar.common import service
 from tuskar.storage.delete_roles import delete_roles
diff --git a/tuskar/cmd/load_role.py b/tuskar/cmd/load_role.py
index c8f31925..aca47827 100644
--- a/tuskar/cmd/load_role.py
+++ b/tuskar/cmd/load_role.py
@@ -19,7 +19,7 @@ from __future__ import print_function
 
 import sys
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from tuskar.common import service
 from tuskar.storage.load_roles import load_role
diff --git a/tuskar/cmd/load_roles.py b/tuskar/cmd/load_roles.py
index f6f1840b..80217d35 100644
--- a/tuskar/cmd/load_roles.py
+++ b/tuskar/cmd/load_roles.py
@@ -19,7 +19,7 @@ from __future__ import print_function
 
 import sys
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from tuskar.common import service
 from tuskar.storage.load_roles import load_roles
diff --git a/tuskar/cmd/load_seed.py b/tuskar/cmd/load_seed.py
index df0d87c7..272545fb 100644
--- a/tuskar/cmd/load_seed.py
+++ b/tuskar/cmd/load_seed.py
@@ -16,7 +16,7 @@ from __future__ import print_function
 
 import sys
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from tuskar.common import service
 from tuskar.storage.load_roles import load_seed
diff --git a/tuskar/common/config.py b/tuskar/common/config.py
index fcf53606..045135c2 100644
--- a/tuskar/common/config.py
+++ b/tuskar/common/config.py
@@ -15,8 +15,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.config import cfg
-from oslo.db import options as db_options
+from oslo_config import cfg
+from oslo_db import options as db_options
 
 from tuskar import version
 
diff --git a/tuskar/common/exception.py b/tuskar/common/exception.py
index e3018417..0bd94a9f 100644
--- a/tuskar/common/exception.py
+++ b/tuskar/common/exception.py
@@ -18,7 +18,7 @@ Includes decorator for re-raising Tuskar-type exceptions.
 SHOULD include dedicated exception logging.
 """
 
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 from tuskar.openstack.common.gettextutils import _  # noqa
diff --git a/tuskar/common/paths.py b/tuskar/common/paths.py
index 58dfe8d3..66fea171 100644
--- a/tuskar/common/paths.py
+++ b/tuskar/common/paths.py
@@ -17,7 +17,7 @@
 
 import os
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 path_opts = [
     cfg.StrOpt('pybasedir',
diff --git a/tuskar/common/service.py b/tuskar/common/service.py
index 9e1336c7..d6c29a14 100644
--- a/tuskar/common/service.py
+++ b/tuskar/common/service.py
@@ -16,7 +16,7 @@
 
 import socket
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from tuskar.openstack.common import log
 
diff --git a/tuskar/common/utils.py b/tuskar/common/utils.py
index b60fea9d..c814c5b1 100644
--- a/tuskar/common/utils.py
+++ b/tuskar/common/utils.py
@@ -21,7 +21,7 @@
 import os
 import re
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from tuskar.common import exception
 from tuskar.openstack.common import log as logging
diff --git a/tuskar/db/api.py b/tuskar/db/api.py
index 4660e56a..e54431ab 100644
--- a/tuskar/db/api.py
+++ b/tuskar/db/api.py
@@ -18,8 +18,8 @@ Base classes for storage engines
 
 import abc
 
-from oslo.config import cfg
-from oslo.db import api as db_api
+from oslo_config import cfg
+from oslo_db import api as db_api
 import six
 
 _BACKEND_MAPPING = {'sqlalchemy': 'tuskar.db.sqlalchemy.api'}
diff --git a/tuskar/db/sqlalchemy/api.py b/tuskar/db/sqlalchemy/api.py
index 4a44f4d4..a5be1d0b 100644
--- a/tuskar/db/sqlalchemy/api.py
+++ b/tuskar/db/sqlalchemy/api.py
@@ -17,9 +17,9 @@
 
 import threading
 
-from oslo.config import cfg
-from oslo.db import exception as db_exception
-from oslo.db.sqlalchemy import session as db_session
+from oslo_config import cfg
+from oslo_db import exception as db_exception
+from oslo_db.sqlalchemy import session as db_session
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm.exc import NoResultFound
 from sqlalchemy.orm import subqueryload
diff --git a/tuskar/db/sqlalchemy/migrate_repo/versions/003_add_relative_path.py b/tuskar/db/sqlalchemy/migrate_repo/versions/003_add_relative_path.py
index 3464cc42..84ee4db6 100644
--- a/tuskar/db/sqlalchemy/migrate_repo/versions/003_add_relative_path.py
+++ b/tuskar/db/sqlalchemy/migrate_repo/versions/003_add_relative_path.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.db.sqlalchemy import utils
+from oslo_db.sqlalchemy import utils
 from sqlalchemy import Column, String
 
 
diff --git a/tuskar/db/sqlalchemy/migrate_repo/versions/004_add_registry_path.py b/tuskar/db/sqlalchemy/migrate_repo/versions/004_add_registry_path.py
index 78445570..5e1b6a8a 100644
--- a/tuskar/db/sqlalchemy/migrate_repo/versions/004_add_registry_path.py
+++ b/tuskar/db/sqlalchemy/migrate_repo/versions/004_add_registry_path.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.db.sqlalchemy import utils
+from oslo_db.sqlalchemy import utils
 from sqlalchemy import Column, String
 
 
diff --git a/tuskar/db/sqlalchemy/models.py b/tuskar/db/sqlalchemy/models.py
index d0575203..8775a6a3 100644
--- a/tuskar/db/sqlalchemy/models.py
+++ b/tuskar/db/sqlalchemy/models.py
@@ -15,8 +15,8 @@
 Tuskar domain models for use with SQLAlchemy.
 """
 
-from oslo.config import cfg
-from oslo.db.sqlalchemy import models
+from oslo_config import cfg
+from oslo_db.sqlalchemy import models
 
 from sqlalchemy import (Column, ForeignKey, Integer, String, Text)
 from sqlalchemy.ext.declarative import declarative_base
diff --git a/tuskar/heat/client.py b/tuskar/heat/client.py
index a631187e..4fbf41a6 100644
--- a/tuskar/heat/client.py
+++ b/tuskar/heat/client.py
@@ -23,7 +23,7 @@
 
 from os import environ as env
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from tuskar.openstack.common import log as logging
 
diff --git a/tuskar/heat/template_tools.py b/tuskar/heat/template_tools.py
index 878506d2..0eeca0e6 100644
--- a/tuskar/heat/template_tools.py
+++ b/tuskar/heat/template_tools.py
@@ -18,7 +18,7 @@ from upstream tripleo-heat-templates.
 
 import os
 
-from oslo.config import cfg
+from oslo_config import cfg
 from tripleo_heat_merge import merge
 
 
diff --git a/tuskar/netconf.py b/tuskar/netconf.py
index bccda06c..6c3f2be4 100644
--- a/tuskar/netconf.py
+++ b/tuskar/netconf.py
@@ -17,7 +17,7 @@
 
 import socket
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 CONF = cfg.CONF
 
diff --git a/tuskar/openstack/common/config/generator.py b/tuskar/openstack/common/config/generator.py
index 4e7d2f0f..06db9e61 100644
--- a/tuskar/openstack/common/config/generator.py
+++ b/tuskar/openstack/common/config/generator.py
@@ -27,7 +27,7 @@ import socket
 import sys
 import textwrap
 
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 import stevedore.named
 
diff --git a/tuskar/openstack/common/log.py b/tuskar/openstack/common/log.py
index 17fe04a6..7492d99e 100644
--- a/tuskar/openstack/common/log.py
+++ b/tuskar/openstack/common/log.py
@@ -37,7 +37,7 @@ import re
 import sys
 import traceback
 
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 from six import moves
 
diff --git a/tuskar/storage/__init__.py b/tuskar/storage/__init__.py
index 8c0815f7..aa485d35 100644
--- a/tuskar/storage/__init__.py
+++ b/tuskar/storage/__init__.py
@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from tuskar.openstack.common import log as logging
 
diff --git a/tuskar/storage/drivers/sqlalchemy.py b/tuskar/storage/drivers/sqlalchemy.py
index 36972ca2..d8684359 100644
--- a/tuskar/storage/drivers/sqlalchemy.py
+++ b/tuskar/storage/drivers/sqlalchemy.py
@@ -16,7 +16,7 @@ from __future__ import absolute_import
 
 from uuid import uuid4
 
-from oslo.config import cfg
+from oslo_config import cfg
 from sqlalchemy import and_
 from sqlalchemy import func
 from sqlalchemy.orm.exc import NoResultFound
diff --git a/tuskar/tests/api/api.py b/tuskar/tests/api/api.py
index 0adb33d1..5486bcc6 100644
--- a/tuskar/tests/api/api.py
+++ b/tuskar/tests/api/api.py
@@ -14,7 +14,7 @@
 # under the License.
 
 
-from oslo.config import cfg
+from oslo_config import cfg
 import pecan
 import pecan.testing
 
diff --git a/tuskar/tests/base.py b/tuskar/tests/base.py
index 5a174b5f..e388a801 100644
--- a/tuskar/tests/base.py
+++ b/tuskar/tests/base.py
@@ -28,7 +28,7 @@ import os
 import shutil
 
 import fixtures
-from oslo.config import cfg
+from oslo_config import cfg
 import testtools
 import unittest2
 
diff --git a/tuskar/tests/conf_fixture.py b/tuskar/tests/conf_fixture.py
index 0ca89e8a..9ca710c2 100644
--- a/tuskar/tests/conf_fixture.py
+++ b/tuskar/tests/conf_fixture.py
@@ -15,7 +15,7 @@
 #    under the License.
 
 import fixtures
-from oslo.config import cfg
+from oslo_config import cfg
 
 from tuskar.common import config
 
diff --git a/tuskar/tests/storage/drivers/test_sqlalchemy.py b/tuskar/tests/storage/drivers/test_sqlalchemy.py
index 9d0da0b6..93b8d75b 100644
--- a/tuskar/tests/storage/drivers/test_sqlalchemy.py
+++ b/tuskar/tests/storage/drivers/test_sqlalchemy.py
@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.db.sqlalchemy import test_base
+from oslo_db.sqlalchemy import test_base
 
 from tuskar.storage.drivers import sqlalchemy
 from tuskar.tests.storage.drivers import base