diff --git a/roles/taskotron/buildmaster-configure/templates/ci.master.cfg.j2 b/roles/taskotron/buildmaster-configure/templates/ci.master.cfg.j2
index ccecef6c42..517ccc1a83 100644
--- a/roles/taskotron/buildmaster-configure/templates/ci.master.cfg.j2
+++ b/roles/taskotron/buildmaster-configure/templates/ci.master.cfg.j2
@@ -146,7 +146,7 @@ c['schedulers'].append(SingleBranchScheduler(
 
 c['schedulers'].append(ForceScheduler(
                             name="force",
-                            builderNames=["libtaskotron-builder"]))
+                            builderNames=["libtaskotron-builder"])xf
 
 {% endif %}
 #}
@@ -184,12 +184,12 @@ 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/tflink/%s.git' % repo_name),
+    factory.addStep(Git(repourl=Interpolate('https://bitbucket.org/fedoraqa/%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/content/%(prop:Project)s'), 'envtype=ci', 'chainbuild'], descriptionDone=['Chainbuild RPMs']))
-    factory.addStep(ShellCommand(command=['doit', Interpolate('basedir=/srv/content/%(prop:Project)s'), 'envtype=ci', 'buildtype=release', 'releasedocs'], descriptionDone=['Build Documentation']))
-    factory.addStep(ShellCommand(command=['doit', Interpolate('basedir=/srv/content/%(prop:Project)s'), 'envtype=ci', 'buildtype=release', 'updatelatest'], descriptionDone=['Update Symlinks']))
+    factory.addStep(ShellCommand(command=['doit', Interpolate('basedir=/srv/content/releases/%(prop:project)s'), 'envtype=ci', 'chainbuild'], descriptionDone=['Chainbuild RPMs']))
+    factory.addStep(ShellCommand(command=['doit', Interpolate('basedir=/srv/content/docs/%(prop:project)s'), 'envtype=ci', 'buildtype=release', 'releasedocs'], descriptionDone=['Build Documentation']))
+    factory.addStep(ShellCommand(command=['doit', Interpolate('basedir=/srv/content/docs/%(prop:project)s'), 'envtype=ci', 'buildtype=release', 'updatelatest'], descriptionDone=['Update Symlinks']))
 
     return factory