diff --git a/roles/taskotron/buildmaster-configure/templates/ci.master.cfg.j2 b/roles/taskotron/buildmaster-configure/templates/ci.master.cfg.j2
index f1bc5efd22..f566824454 100644
--- a/roles/taskotron/buildmaster-configure/templates/ci.master.cfg.j2
+++ b/roles/taskotron/buildmaster-configure/templates/ci.master.cfg.j2
@@ -160,6 +160,7 @@ from buildbot.process.factory import BuildFactory
 from buildbot.steps.source.git import Git
 from buildbot.steps.shell import ShellCommand
 from buildbot.process.properties import Property, Interpolate
+from buildbot.steps.transfer import DirectoryUpload
 
 
 
@@ -172,7 +173,6 @@ def create_test_factory(repo_name, func=True):
     factory.addStep(ShellCommand(command=['virtualenv', '--system-site-packages', 'env']))
     factory.addStep(ShellCommand(command=['bash', '-c', 'source env/bin/activate; pip install -r requirements.txt']))
     factory.addStep(ShellCommand(command=['bash', '-c', 'source env/bin/activate; TEST="true" py.test %s testing/' % '-F' if func else ''], name=repo_name))
-
     return factory
 
 
@@ -184,22 +184,22 @@ def create_test_factory(repo_name, func=True):
 #    factory.addStep(Git(repourl=Interpolate('{{ repo_base }}/%s.git' % repo_name),
 #                    mode='full', env={'GIT_SSL_NO_VERIFY': 'yes'},
 #                    method='clobber'))
-    factory.addStep(Git(repourl=Interpolate('https://bitbucket.org/fedoraqa/%s.git' % repo_name),
+    factory.addStep(Git(repourl=Interpolate('https://bitbucket.org/tflink/%s.git' % repo_name),
                     mode='full',method='clobber'))
     factory.addStep(ShellCommand(command=['doit', 'envtype=ci', 'test'], descriptionDone = ['run tests']))
-    factory.addStep(ShellCommand(command=['doit', Interpolate('basedir=/srv/static/%(prop:Project)s'), 'envtype=ci', 'chainbuild'], descriptionDone=['Chainbuild RPMs']))
-    factory.addStep(ShellCommand(command=['doit', Interpolate('basedir=/srv/static/%(prop:Project)s'), 'envtype=ci', 'buildtype=release', 'releasedocs'], descriptionDone=['Build Documentation']))
-    factory.addStep(ShellCommand(command=['doit', Interpolate('basedir=/srv/static/%(prop:Project)s'), 'envtype=ci', 'buildtype=release', 'updatelatest'], descriptionDone=['Update Release Symlinks']))
+    factory.addStep(ShellCommand(command=['doit', Interpolate('basedir=/srv/builds/%(prop:Project)s'), 'envtype=ci', 'chainbuild'], descriptionDone=['Chainbuild RPMs']))
+    factory.addStep(ShellCommand(command=['doit', Interpolate('basedir=/srv/docs/%(prop:Project)s'), 'envtype=ci', 'buildtype=release', 'releasedocs'], descriptionDone=['Build Documentation']))
+    factory.addStep(ShellCommand(command=['doit', Interpolate('basedir=/srv/docs/%(prop:Project)s'), 'envtype=ci', 'buildtype=release', 'updatelatest'], descriptionDone=['Update Symlinks']))
 
     return factory
 
 {% endif %}
 
-trigger_factory = create_test_factory('taskotron-trigger')
-libtaskotron_factory = create_test_factory('libtaskotron')
-resultsdb_factory = create_test_factory('resultsdb')
-resultsdb_api_factory = create_test_factory('resultsdb_api')
-fake_fedorainfra_factory = create_test_factory('fake_fedorainfra')
+#trigger_factory = create_test_factory('taskotron-trigger')
+libtaskotron_factory = create_test_factory('libtaskotron-docs')
+#resultsdb_factory = create_test_factory('resultsdb')
+#resultsdb_api_factory = create_test_factory('resultsdb_api')
+#fake_fedorainfra_factory = create_test_factory('fake_fedorainfra')
 
 from buildbot.config import BuilderConfig