diff --git a/conf/config.py b/conf/config.py
index 0dc82f3..6cc5328 100644
--- a/conf/config.py
+++ b/conf/config.py
@@ -33,7 +33,7 @@ class BaseConfiguration(object):
     KOJI_REPOSITORY_URL = 'https://kojipkgs.stg.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/"]
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