diff --git a/hack/lib/constants.sh b/hack/lib/constants.sh
index b31ab973129c..2d895b7fd033 100755
--- a/hack/lib/constants.sh
+++ b/hack/lib/constants.sh
@@ -334,7 +334,6 @@ readonly OS_ALL_IMAGES=(
   openshift/origin-pod
   openshift/origin-deployer
   openshift/origin-docker-builder
-  openshift/origin-docker-registry
   openshift/origin-keepalived-ipfailover
   openshift/origin-sti-builder
   openshift/origin-haproxy-router
@@ -380,7 +379,6 @@ function os::build::images() {
 
   # images that depend on "${tag_prefix}-base"
   ( os::build::image "${tag_prefix}"                       images/origin ) &
-  ( os::build::image "${tag_prefix}-docker-registry"       images/dockerregistry ) &
   ( os::build::image "${tag_prefix}-egress-router"         images/egress/router ) &
   ( os::build::image "${tag_prefix}-egress-http-proxy"     images/egress/http-proxy ) &
   ( os::build::image "${tag_prefix}-federation"            images/federation ) &
diff --git a/hack/test-local-registry.sh b/hack/test-local-registry.sh
deleted file mode 100755
index f8ad404ac2ca..000000000000
--- a/hack/test-local-registry.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-source "$(dirname "${BASH_SOURCE}")/lib/init.sh"
-
-os::build::setup_env
-
-os::util::ensure::built_binary_exists 'dockerregistry'
-
-url="${DOCKER_REGISTRY_URL:-localhost:5000}"
-# find the first builder service account token
-token="$(oc get $(oc get secrets -o name | grep builder-token | head -n 1) --template '{{ .data.token }}' | os::util::base64decode)"
-echo
-echo "Login with:"
-echo "  docker login -p \"${token}\" -u user ${url}"
-echo
-
-REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY="${REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY:-/tmp/registry}" \
-  DOCKER_REGISTRY_URL="${url}" \
-	KUBECONFIG=openshift.local.config/master/openshift-registry.kubeconfig \
-	dockerregistry images/dockerregistry/config.yml
diff --git a/images/dockerregistry/.cccp.yml b/images/dockerregistry/.cccp.yml
deleted file mode 100644
index 7ba0ac11fde6..000000000000
--- a/images/dockerregistry/.cccp.yml
+++ /dev/null
@@ -1 +0,0 @@
-job-id: origin-docker-registry
diff --git a/images/dockerregistry/Dockerfile b/images/dockerregistry/Dockerfile
deleted file mode 100644
index 4058fc8e5ccb..000000000000
--- a/images/dockerregistry/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# This is the integrated OpenShift Origin Docker registry. It is configured to
-# publish metadata to OpenShift to provide automatic management of images on push.
-#
-# The standard name for this image is openshift/origin-docker-registry
-#
-FROM openshift/origin-docker-registry:latest
diff --git a/images/dockerregistry/Dockerfile.centos7 b/images/dockerregistry/Dockerfile.centos7
deleted file mode 100644
index 4058fc8e5ccb..000000000000
--- a/images/dockerregistry/Dockerfile.centos7
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# This is the integrated OpenShift Origin Docker registry. It is configured to
-# publish metadata to OpenShift to provide automatic management of images on push.
-#
-# The standard name for this image is openshift/origin-docker-registry
-#
-FROM openshift/origin-docker-registry:latest
diff --git a/images/dockerregistry/OWNERS b/images/dockerregistry/OWNERS
deleted file mode 100644
index ec1c82be5c1d..000000000000
--- a/images/dockerregistry/OWNERS
+++ /dev/null
@@ -1,19 +0,0 @@
-reviewers:
-  - miminar
-  - smarterclayton
-  - legionus
-  - tdawson
-  - kargakis
-  - aweiteka
-  - stevekuznetsov
-  - pravisankar
-  - pweil-
-approvers:
-  - smarterclayton
-  - legionus
-  - tdawson
-  - kargakis
-  - stevekuznetsov
-  - dmage
-  - legionus
-  - miminar
diff --git a/images/dockerregistry/bin/.gitignore b/images/dockerregistry/bin/.gitignore
deleted file mode 100644
index d6b7ef32c847..000000000000
--- a/images/dockerregistry/bin/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/images/dockerregistry/config.yml b/images/dockerregistry/config.yml
deleted file mode 100644
index 9b68f73ca0fd..000000000000
--- a/images/dockerregistry/config.yml
+++ /dev/null
@@ -1,60 +0,0 @@
-version: 0.1
-log:
-  level: debug
-http:
-  addr: :5000
-storage:
-  cache:
-    blobdescriptor: inmemory
-  filesystem:
-    rootdirectory: /registry
-  delete:
-    enabled: true
-auth:
-  openshift:
-    realm: openshift
-    audit:
-      enabled: false
-
-    # tokenrealm is a base URL to use for the token-granting registry endpoint.
-    # If unspecified, the scheme and host for the token redirect are determined from the incoming request.
-    # If specified, a scheme and host must be chosen that all registry clients can resolve and access:
-    #
-    # tokenrealm: https://example.com:5000
-middleware:
-  registry:
-    - name: openshift
-  repository:
-    - name: openshift
-      options:
-        acceptschema2: true
-        pullthrough: true
-        mirrorpullthrough: true
-        enforcequota: false
-        projectcachettl: 1m
-        blobrepositorycachettl: 10m
-  storage:
-    - name: openshift
-openshift:
-  version: 1.0
-  metrics:
-    enabled: false
-    # secret is used to authenticate to metrics endpoint. It cannot be empty.
-    # Attention! A weak secret can lead to the leakage of private data.
-    #
-    # secret: TopSecretLongToken
-  requests:
-    # GET and HEAD requests
-    read:
-      # maxrunning is a limit for the number of in-flight requests. A zero value means there is no limit.
-      maxrunning: 0
-      # maxinqueue sets the maximum number of requests that can be queued if the limit for the number of in-flight requests is reached.
-      maxinqueue: 0
-      # maxwaitinqueue is how long a request can wait in the queue. A zero value means it can wait forever.
-      maxwaitinqueue: 0
-    # PUT, PATCH, POST, DELETE requests and internal mirroring requests
-    write:
-      # See description of openshift.requests.read.
-      maxrunning: 0
-      maxinqueue: 0
-      maxwaitinqueue: 0