diff --git a/roles/repository/README.md b/roles/repository/README.md
index c46d2f1..2a633de 100644
--- a/roles/repository/README.md
+++ b/roles/repository/README.md
@@ -1,6 +1,6 @@
 # performancecopilot.metrics.repository
 
-Installs and configures the upstream package repositories - currently hosted at [jFrog Artifactory](https://performancecopilot.jfrog.io/ui/builds) - to get the very latest [Performance Co-Pilot](https://pcp.io/) toolkit releases.
+Installs and configures the upstream package repositories - currently hosted at [Packagecloud](https://packagecloud.io/performancecopilot/pcp) - to get the very latest [Performance Co-Pilot](https://pcp.io/) toolkit releases.
 
 ## Requirements
 
diff --git a/roles/repository/templates/artifactory.debs.j2 b/roles/repository/templates/artifactory.debs.j2
deleted file mode 100644
index 0510982..0000000
--- a/roles/repository/templates/artifactory.debs.j2
+++ /dev/null
@@ -1 +0,0 @@
-deb https://performancecopilot.jfrog.io/artifactory/pcp-deb-release {{ __repository_distro_name }} main
diff --git a/roles/repository/templates/artifactory.rpms.j2 b/roles/repository/templates/artifactory.rpms.j2
deleted file mode 100644
index aa3e04e..0000000
--- a/roles/repository/templates/artifactory.rpms.j2
+++ /dev/null
@@ -1,9 +0,0 @@
-{{ ansible_managed | comment }}
-{{ "performancecopilot:ansible-pcp" | comment(prefix="", postfix="") }}
-[performancecpilot]
-name=Performance Co-Pilot
-baseurl=https://performancecopilot.jfrog.io/artifactory/pcp-rpm-release/{{ __repository_distro_name }}/$releasever/$basearch
-enabled=1
-gpgcheck=0
-gpgkey=https://performancecopilot.jfrog.io/artifactory/pcp-rpm-release/{{ __repository_distro_name }}/$releasever/$basearch/repodata/repomd.xml.key
-repo_gpgcheck=1
diff --git a/roles/repository/templates/packagecloud.debs.j2 b/roles/repository/templates/packagecloud.debs.j2
new file mode 100644
index 0000000..39434e8
--- /dev/null
+++ b/roles/repository/templates/packagecloud.debs.j2
@@ -0,0 +1,2 @@
+deb https://packagecloud.io/performancecopilot/pcp/{{ __repository_distro_name }} {{ ansible_distribution_release }} main
+deb-src https://packagecloud.io/performancecopilot/pcp/{{ __repository_distro_name }} {{ ansible_distribution_release }} main
diff --git a/roles/repository/templates/packagecloud.rpms.j2 b/roles/repository/templates/packagecloud.rpms.j2
new file mode 100644
index 0000000..35b7a3d
--- /dev/null
+++ b/roles/repository/templates/packagecloud.rpms.j2
@@ -0,0 +1,23 @@
+{{ ansible_managed | comment }}
+{{ "performancecopilot:ansible-pcp" | comment(prefix="", postfix="") }}
+[performancecopilot]
+name=Performance Co-Pilot
+baseurl=https://packagecloud.io/performancecopilot/pcp/{{ __repository_distro_name }}/$releasever/$basearch
+repo_gpgcheck=1
+enabled=1
+gpgcheck=0
+gpgkey=https://packagecloud.io/performancecopilot/pcp/gpgkey
+sslverify=1
+sslcacert=/etc/pki/tls/certs/ca-bundle.crt
+metadata_expire=300
+
+[performancecopilot-source]
+name=Performance Co-Pilot source
+baseurl=https://packagecloud.io/performancecopilot/pcp/{{ __repository_distro_name }}/$releasever/SRPMS
+repo_gpgcheck=1
+gpgcheck=0
+enabled=1
+gpgkey=https://packagecloud.io/performancecopilot/pcp/gpgkey
+sslverify=1
+sslcacert=/etc/pki/tls/certs/ca-bundle.crt
+metadata_expire=300
diff --git a/roles/repository/vars/Debian.yml b/roles/repository/vars/Debian.yml
index 32a1b45..a2eb198 100644
--- a/roles/repository/vars/Debian.yml
+++ b/roles/repository/vars/Debian.yml
@@ -2,4 +2,4 @@
 ---
 # Put internal variables here with Debian specific values.
 
-__repository_distro_name: "{{ ansible_facts['distribution_release'] }}"
+__repository_distro_name: "{{ ansible_distribution | lower }}"
diff --git a/roles/repository/vars/RedHat.yml b/roles/repository/vars/RedHat.yml
index 5f68b09..dd5f1e9 100644
--- a/roles/repository/vars/RedHat.yml
+++ b/roles/repository/vars/RedHat.yml
@@ -2,4 +2,4 @@
 ---
 # Put internal variables here with Red Hat specific values.
 
-__repository_distro_name: "centos"
+__repository_distro_name: "el"