diff --git a/roles/fedora-web/candidate-registry/tasks/main.yml b/roles/fedora-web/candidate-registry/tasks/main.yml
index 26616cc8a0..60621934cc 100644
--- a/roles/fedora-web/candidate-registry/tasks/main.yml
+++ b/roles/fedora-web/candidate-registry/tasks/main.yml
@@ -1,22 +1,3 @@
-- name: Copy over the Fedora Server CA cert
-  copy: src="{{ private }}/files/fedora-ca.cert" dest=/etc/pki/httpd/fedora-server-ca.cert
-        owner=root group=root mode=0644
-  notify:
-  - reload proxyhttpd
-  tags:
-  - fedora-web
-  - fedora-web/candidate-registry
-
-- name: Copy over the registry CA
-  copy: src="{{private}}/files/docker-registry/{{env}}/docker-registry-ca.pem"
-        dest="/etc/pki/httpd/registry-ca-{{env}}.cert"
-        owner=root group=root mode=0644
-  notify:
-  - reload proxyhttpd
-  tags:
-  - fedora-web
-  - fedora-web/candidate-registry
-
 - name: Copy over the registry passwd
   copy: src="{{private}}/files/docker-registry/{{env}}/candidate-htpasswd" dest=/etc/httpd/conf.d/candidate-registry.fedoraproject.org/passwd
         owner=root group=root mode=0644
diff --git a/roles/fedora-web/registry/files/passwd-production b/roles/fedora-web/registry/files/passwd-production
index acc4e47062..edba1bff2e 100644
--- a/roles/fedora-web/registry/files/passwd-production
+++ b/roles/fedora-web/registry/files/passwd-production
@@ -1 +1 @@
-/C=US/ST=North Carolina/O=Fedora Project/OU=Fedora Builders/CN=containerstable/emailAddress=buildsys@fedoraproject.org:xxj31ZMTZzkVA
+/CN=containerstable:xxj31ZMTZzkVA
diff --git a/roles/fedora-web/registry/tasks/main.yml b/roles/fedora-web/registry/tasks/main.yml
index 1476b1961a..cab50ae756 100644
--- a/roles/fedora-web/registry/tasks/main.yml
+++ b/roles/fedora-web/registry/tasks/main.yml
@@ -36,7 +36,7 @@
   - fedora-web/registry
 
 - name: Copy over the registry CA
-  copy: src="{{private}}/files/docker-registry/{{env}}/docker-registry-ca.pem"
+  copy: src="{{private}}/files/docker-registry/{{env}}/pki/ca.crt"
         dest="/etc/pki/httpd/registry-ca-{{env}}.cert"
         owner=root group=root mode=0644
   notify: