diff --git a/files/gitlab/phabricator-vhost.conf b/files/phabricator/phabricator-vhost.conf
similarity index 100%
rename from files/gitlab/phabricator-vhost.conf
rename to files/phabricator/phabricator-vhost.conf
diff --git a/files/gitlab/phabricator.conf.php b/files/phabricator/phabricator.conf.php
similarity index 100%
rename from files/gitlab/phabricator.conf.php
rename to files/phabricator/phabricator.conf.php
diff --git a/files/gitlab/trac-vhost.conf b/files/trac/trac-vhost.conf
similarity index 100%
rename from files/gitlab/trac-vhost.conf
rename to files/trac/trac-vhost.conf
diff --git a/files/gitlab/trac.wsgi b/files/trac/trac.wsgi
similarity index 100%
rename from files/gitlab/trac.wsgi
rename to files/trac/trac.wsgi
diff --git a/playbooks/hosts/gitlab-dev.cloud.fedoraproject.org.yml b/playbooks/hosts/gitlab-dev.cloud.fedoraproject.org.yml
index bd2acc7401..fe5e2ba216 100644
--- a/playbooks/hosts/gitlab-dev.cloud.fedoraproject.org.yml
+++ b/playbooks/hosts/gitlab-dev.cloud.fedoraproject.org.yml
@@ -256,7 +256,7 @@
       shell: source /etc/profile.d/phabricator.sh
 
     - name: Configure Apache
-      template: src=$files/gitlab/phabricator-vhost.conf dest=/etc/httpd/conf.d/phabricator.conf
+      template: src=$files/phabricator/phabricator-vhost.conf dest=/etc/httpd/conf.d/phabricator.conf
 
     - name: Graceful Apache
       command: service httpd graceful
@@ -274,7 +274,7 @@
       file: state=directory path=/srv/www/facebook/phabricator/conf/custom
 
     - name: Place a starting-point custom config in /srv/www/facebook/phabricator/conf/custom/myconfig.conf.php
-      template: src=$files/gitlab/phabricator.conf.php dest=/srv/www/facebook/phabricator/conf/custom/myconfig.conf.php
+      template: src=$files/phabricator/phabricator.conf.php dest=/srv/www/facebook/phabricator/conf/custom/myconfig.conf.php
 
     - name: Create the databases and bring them up to date
       action: command chdir=/srv/www/facebook/phabricator ./bin/storage upgrade --force
@@ -306,10 +306,10 @@
       file: state=directory path=/srv/www/trac
 
     - name: Trac WSGI File
-      template: src=$files/gitlab/trac.wsgi dest=/srv/www/trac/trac.wsgi
+      template: src=$files/trac/trac.wsgi dest=/srv/www/trac/trac.wsgi
 
     - name: Apache config
-      template: src=$files/trac-vhost.conf dest=/etc/httpd/conf.d/trac.conf
+      template: src=$files/trac/trac-vhost.conf dest=/etc/httpd/conf.d/trac.conf
 
     - name: Apache restart
       command: service httpd restart