diff --git a/conf/config.py b/conf/config.py

index 0dc82f3..5f3e87c 100644

--- a/conf/config.py

+++ b/conf/config.py

@@ -30,13 +30,13 @@ class BaseConfiguration(object):

     KOJI_PROFILE = 'koji'

     KOJI_ARCHES = ['i686', 'armv7hl', 'x86_64']

     KOJI_PROXYUSER = True

-    KOJI_REPOSITORY_URL = 'https://kojipkgs.stg.fedoraproject.org/repos'

+    KOJI_REPOSITORY_URL = 'https://kojipkgs.fedoraproject.org/repos'

     KOJI_TAG_PREFIXES = ['module']

     COPR_CONFIG = '/etc/module-build-service/copr.conf'

-    PDC_URL = 'http://modularity.fedorainfracloud.org:8080/rest_api/v1'

+    PDC_URL = 'http://pdc.fedoraproject.org/rest_api/v1'

     PDC_INSECURE = True

     PDC_DEVELOP = True

-    SCMURLS = ["git://pkgs.stg.fedoraproject.org/modules/"]

+    SCMURLS = ["git://pkgs.fedoraproject.org/modules/"]

     YAML_SUBMIT_ALLOWED = False

     # How often should we resort to polling, in seconds

@@ -60,7 +60,7 @@ class BaseConfiguration(object):

     SSL_CERTIFICATE_KEY_FILE = '/etc/module-build-service/server.key'

     SSL_CA_CERTIFICATE_FILE = '/etc/module-build-service/cacert.pem'

-    PKGDB_API_URL = 'https://admin.stg.fedoraproject.org/pkgdb/api'

+    PKGDB_API_URL = 'https://admin.fedoraproject.org/pkgdb/api'

     ALLOWED_GROUPS = set([

         'packager',

diff --git a/module_build_service/builder/__init__.py b/module_build_service/builder/__init__.py

index 99c3c8b..d28d06f 100644

--- a/module_build_service/builder/__init__.py

+++ b/module_build_service/builder/__init__.py

@@ -9,9 +9,9 @@ __all__ = [

 GenericBuilder.register_backend_class(KojiModuleBuilder)

-if conf.system == "mock":

-    from MockModuleBuilder import MockModuleBuilder

-    GenericBuilder.register_backend_class(MockModuleBuilder)

+#if conf.system == "mock":

+from MockModuleBuilder import MockModuleBuilder

+GenericBuilder.register_backend_class(MockModuleBuilder)

 if conf.system == "copr":

     from CoprModuleBuilder import CoprModuleBuilder