diff --git a/inventory/host_vars/oci-registry01.phx2.fedoraproject.org b/inventory/host_vars/oci-registry01.phx2.fedoraproject.org
index b6cb4c4593..c72afc5082 100644
--- a/inventory/host_vars/oci-registry01.phx2.fedoraproject.org
+++ b/inventory/host_vars/oci-registry01.phx2.fedoraproject.org
@@ -5,7 +5,7 @@ dns: 10.5.126.21
 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-28-docker-reg
 ks_repo: http://10.5.126.23/pub/fedora/linux/releases/28/Server/x86_64/os/
 volgroup: /dev/vg_guests
-eth0_ip: 10.5.125.78
+eth0_ip: 10.5.125.77
 vmhost: bvirthost04.phx2.fedoraproject.org
 datacenter: phx2
 
diff --git a/inventory/host_vars/oci-registry02.phx2.fedoraproject.org b/inventory/host_vars/oci-registry02.phx2.fedoraproject.org
index f125b36f21..1d6c44c915 100644
--- a/inventory/host_vars/oci-registry02.phx2.fedoraproject.org
+++ b/inventory/host_vars/oci-registry02.phx2.fedoraproject.org
@@ -5,7 +5,7 @@ dns: 10.5.126.21
 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-28-docker-reg
 ks_repo: http://10.5.126.23/pub/fedora/linux/releases/28/Server/x86_64/os/
 volgroup: /dev/vg_guests
-eth0_ip: 10.5.125.77
+eth0_ip: 10.5.125.78
 vmhost: bvirthost01.phx2.fedoraproject.org
 datacenter: phx2
 
diff --git a/master.yml b/master.yml
index 369a7c5f53..c4857d619e 100644
--- a/master.yml
+++ b/master.yml
@@ -38,7 +38,7 @@
 - import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-frontend.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-keygen.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/groups/datagrepper.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/docker-registry.yml
+- import_playbook: /srv/web/infra/ansible/playbooks/groups/oci-registry.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/groups/dns.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/groups/download.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/groups/elections.yml
diff --git a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
index 437d3bbc8c..e54fc7a776 100644
--- a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
+++ b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
@@ -1142,15 +1142,15 @@
           remote_ip_prefix: "0.0.0.0/0"
     with_items: "{{all_tenants}}"
 
-  - name: "Create 'docker-registry-5000-anywhere' security group"
+  - name: "Create 'oci-registry-5000-anywhere' security group"
     neutron_sec_group:
       login_username: "admin"
       login_password: "{{ ADMIN_PASS }}"
       login_tenant_name: "admin"
       auth_url: "https://{{controller_publicname}}:35357/v2.0"
       state: "present"
-      name: 'docker-registry-5000-anywhere-{{item}}'
-      description: "allow docker-registry-5000 from anywhere"
+      name: 'oci-registry-5000-anywhere-{{item}}'
+      description: "allow oci-registry-5000 from anywhere"
       tenant_name: "{{item}}"
       rules:
         - direction: "ingress"
diff --git a/roles/haproxy/templates/haproxy.cfg b/roles/haproxy/templates/haproxy.cfg
index 839862f201..5891fd5f66 100644
--- a/roles/haproxy/templates/haproxy.cfg
+++ b/roles/haproxy/templates/haproxy.cfg
@@ -366,7 +366,6 @@ backend osbs-backend
     balance hdr(appserver)
     server osbs-master01 osbs-master01:8443 check inter 10s rise 1 fall 2 check ssl verify none
 
-# This is silly, but basically, stg has registry01/02, prod has registry02/03
 frontend docker-registry-frontend
     bind 0.0.0.0:10048
     default_backend docker-registry-backend
@@ -375,10 +374,11 @@ backend docker-registry-backend
     balance hdr(appserver)
 {% if env == "staging" %}
     server docker-registry01 docker-registry01:5000 check inter 10s rise 1 fall 2
-{% endif %}
     server docker-registry02 docker-registry02:5000 check inter 10s rise 1 fall 2
+{% endif %}
 {% if env == "production" %}
-    server docker-registry03 docker-registry03:5000 check inter 10s rise 1 fall 2
+    server oci-registry01 oci-registry01:5000 check inter 10s rise 1 fall 2
+    server oci-registry02 oci-registry02:5000 check inter 10s rise 1 fall 2
 {% endif %}
 {% if env == "staging" %}
 
diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.registry-generic.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.registry-generic.conf
index b291c0ad73..0e4ef7524e 100644
--- a/roles/httpd/reverseproxy/templates/reversepassproxy.registry-generic.conf
+++ b/roles/httpd/reverseproxy/templates/reversepassproxy.registry-generic.conf
@@ -12,7 +12,7 @@ RewriteRule ^/v2/(.*)/blobs/([a-zA-Z0-9:]*) https://cdn.registry.fedoraproject.o
 
 # This is terible, but Docker.
 RewriteCond %{REQUEST_METHOD} ^(PATCH|POST|PUT|DELETE)$
-RewriteRule ^/v2/(.*)$ http://docker-registry02:5000/v2/$1 [P,L]
+RewriteRule ^/v2/(.*)$ http://oci-registry02:5000/v2/$1 [P,L]
 RewriteRule ^/v2/(.*)$ http://localhost:6081/v2/$1 [P,L]
 
 DocumentRoot /srv/web/registry-index/