diff --git a/roles/distgit/files/clime-dist-git-epel-7.repo b/roles/distgit/files/clime-dist-git-epel-7.repo
deleted file mode 100644
index 9f9545bb44..0000000000
--- a/roles/distgit/files/clime-dist-git-epel-7.repo
+++ /dev/null
@@ -1,10 +0,0 @@
-[clime-dist-git]
-name=Copr repo for dist-git owned by clime
-baseurl=https://copr-be.cloud.fedoraproject.org/results/clime/dist-git/epel-7-$basearch/
-type=rpm-md
-skip_if_unavailable=True
-gpgcheck=1
-gpgkey=https://copr-be.cloud.fedoraproject.org/results/clime/dist-git/pubkey.gpg
-repo_gpgcheck=0
-enabled=1
-enabled_metadata=1
\ No newline at end of file
diff --git a/roles/distgit/files/dist-git.conf b/roles/distgit/files/dist-git.conf
new file mode 100644
index 0000000000..8d45800b26
--- /dev/null
+++ b/roles/distgit/files/dist-git.conf
@@ -0,0 +1,7 @@
+[dist-git]
+git_author_name  = Fedora Release Engineering
+git_author_email = rel-eng@lists.fedoraproject.org
+
+cache_dir   = /srv/cache
+gitroot_dir = /srv/git/repositories
+gitolite    = True
diff --git a/roles/distgit/tasks/main.yml b/roles/distgit/tasks/main.yml
index e70e0409a0..ecc5eebde3 100644
--- a/roles/distgit/tasks/main.yml
+++ b/roles/distgit/tasks/main.yml
@@ -66,21 +66,21 @@
 
 # -- Dist Git --------------------------------------------
 # This is the Git setup itself: group, root directory, scripts,...
-- name: install the Dist Git-related httpd config
-  copy: src=clime-dist-git-epel-7.repo dest=/etc/yum.repos.d/clime-dist-git-epel-7.repo
+- name: install dist-git
+  yum: pkg=dist-git state=latest
   when: env == "staging" and inventory_hostname.startswith('pkgs02')
   tags:
   - distgit
 
-- name: install dist-git
-  yum: pkg=dist-git state=present
+- name: install the dist-git config
+  copy: src=dist-git.conf dest=/etc/dist-git/dist-git.conf
   when: env == "staging" and inventory_hostname.startswith('pkgs02')
   tags:
+  - config
   - distgit
 
 - name: create the distgit root directory (/srv/git)
   file: dest=/srv/git state=directory mode=0755
-  when: env != "staging" or inventory_hostname.startswith('pkgs01')
   tags:
   - distgit
 
@@ -104,7 +104,6 @@
 
 - name: create the distgit root directory (/srv/git/repositories)
   file: dest=/srv/git/repositories state=directory mode=2775 group=packager
-  when: env != "staging" or inventory_hostname.startswith('pkgs01')
   tags:
   - distgit
 
@@ -123,21 +122,13 @@
   tags:
   - distgit
 
-- name: install the distgit scripts
-  copy: src={{item}} dest=/usr/local/bin/{{item}} owner=root group=root mode=0755
-  with_items:
-    - pkgdb2-clone
-  tags:
-  - config
-  - distgit
-
 - name: install the distgit scripts
   copy: src={{item}} dest=/usr/local/bin/{{item}} owner=root group=root mode=0755
   with_items:
     - setup_git_package
     - mkbranch
     - mkbranch_branching
-  when: env != "staging" or inventory_hostname.startswith('pkgs01')
+    - pkgdb2-clone
   tags:
   - config
   - distgit