diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 4759246a..d792f56d 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -38,7 +38,7 @@ jobs:
           context: .
           push: false
           file: build/package/Dockerfile.${{ matrix.image }}
-          tags: localhost:5000/ods/ods-${{ matrix.image }}:latest
+          tags: localhost:5001/ods/ods-${{ matrix.image }}:latest
           outputs: type=docker,dest=/tmp/image-ods-${{ matrix.image }}.tar
       -
         name: Upload artifacts
@@ -77,10 +77,10 @@ jobs:
           do
             echo "::group::Push ods-$image to local registry"
             docker load --input /tmp/buildx-image-ods-$image/image-ods-$image.tar
-            docker push localhost:5000/ods/ods-$image:latest
+            docker push localhost:5001/ods/ods-$image:latest
             if [[ "${{ github.event_name }}" == 'pull_request' ]]
             then
-              docker rmi localhost:5000/ods/ods-$image:latest
+              docker rmi localhost:5001/ods/ods-$image:latest
             fi
             echo "::endgroup::"
           done
@@ -143,7 +143,7 @@ jobs:
           for image in ${images[*]}
           do
             echo "::group::Push ods-$image to ghcr.io"
-            docker tag localhost:5000/ods/ods-$image:latest ghcr.io/${{ env.IMAGE_BASE }}/ods-$image:latest
+            docker tag localhost:5001/ods/ods-$image:latest ghcr.io/${{ env.IMAGE_BASE }}/ods-$image:latest
             docker push ghcr.io/${{ env.IMAGE_BASE }}/ods-$image:latest
             echo "::endgroup::"
           done
diff --git a/deploy/ods-pipeline/values.kind.yaml b/deploy/ods-pipeline/values.kind.yaml
index 61ab556b..f577756f 100644
--- a/deploy/ods-pipeline/values.kind.yaml
+++ b/deploy/ods-pipeline/values.kind.yaml
@@ -20,7 +20,7 @@ setup:
     storageSize: '2Gi'
     replicaCount: 1
     image:
-      registry: localhost:5000
+      registry: localhost:5001
       namespace: ods
       repository: ods-pipeline-manager
       pullPolicy: Always
@@ -65,9 +65,9 @@ tasks:
   # registry: ghcr.io
   # namespace: opendevstack/ods-pipeline
 
-  registry: localhost:5000
+  registry: localhost:5001
   namespace: ods
-  pushRegistry: kind-registry.kind:5000
+  pushRegistry: kind-registry.kind:5001
 
 ##
 # images chart
diff --git a/docs/adr/20210517-testing-tekton-tasks.md b/docs/adr/20210517-testing-tekton-tasks.md
index b16314f6..dfd0a60c 100644
--- a/docs/adr/20210517-testing-tekton-tasks.md
+++ b/docs/adr/20210517-testing-tekton-tasks.md
@@ -32,7 +32,7 @@ Run a task that prints a hello world message and define a test in Go using Use [
 As part of the preconditions to run the tests, we shall:
 
 - Create a KinD cluster with a registry. (needed to push images for buildah)
-- Pull the images from DockerHub into the KinD registry (Tasks by default will use localhost:5000, make it easy later to override).
+- Pull the images from DockerHub into the KinD registry (Tasks by default will use localhost:5001, make it easy later to override).
 - Install Tekton Core components
 - Apply the custom Tekton tasks under /deploy.
 - Verify we can run Tekton tests.
diff --git a/scripts/build-and-push-images.sh b/scripts/build-and-push-images.sh
index d155164a..9eccbb45 100755
--- a/scripts/build-and-push-images.sh
+++ b/scripts/build-and-push-images.sh
@@ -3,7 +3,7 @@ set -eu
 
 # To carry out normal operations like running ODS Tekton Tasks,
 # we need the ODS tasks images available in the KinD cluster.
-REGISTRY="localhost:5000"
+REGISTRY="localhost:5001"
 NAMESPACE="ods"
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
diff --git a/scripts/kind-with-registry.sh b/scripts/kind-with-registry.sh
index 1842866b..832dd3dd 100755
--- a/scripts/kind-with-registry.sh
+++ b/scripts/kind-with-registry.sh
@@ -25,7 +25,7 @@ ODS_PIPELINE_DIR=${SCRIPT_DIR%/*}
 # desired cluster name; default is "kind"
 KIND_CLUSTER_NAME="kind"
 RECREATE_KIND_CLUSTER="false"
-REGISTRY_PORT="5000"
+REGISTRY_PORT="5001"
 
 # K8S version is aligned with OpenShift GA 4.8.
 # See https://docs.openshift.com/container-platform/4.8/release_notes/ocp-4-8-release-notes.html
diff --git a/test/tasks/ods-deploy-helm_external_test.go b/test/tasks/ods-deploy-helm_external_test.go
index 151b9d50..6eec2578 100644
--- a/test/tasks/ods-deploy-helm_external_test.go
+++ b/test/tasks/ods-deploy-helm_external_test.go
@@ -100,11 +100,11 @@ func TestTaskODSDeployHelmExternal(t *testing.T) {
 
 					imageStream = random.PseudoString()
 					tag := "latest"
-					fullTag := fmt.Sprintf("localhost:5000/%s/%s:%s", ctxt.Namespace, imageStream, tag)
+					fullTag := fmt.Sprintf("localhost:5001/%s/%s:%s", ctxt.Namespace, imageStream, tag)
 					buildAndPushImageWithLabel(t, ctxt, fullTag, wsDir)
 					ia := artifact.Image{
-						Image:      fmt.Sprintf("kind-registry.kind:5000/%s/%s:%s", ctxt.Namespace, imageStream, tag),
-						Registry:   "kind-registry.kind:5000",
+						Image:      fmt.Sprintf("kind-registry.kind:5001/%s/%s:%s", ctxt.Namespace, imageStream, tag),
+						Registry:   "kind-registry.kind:5001",
 						Repository: ctxt.Namespace,
 						Name:       imageStream,
 						Tag:        tag,
diff --git a/test/tasks/ods-package-image_test.go b/test/tasks/ods-package-image_test.go
index 896ecf80..cdc0be13 100644
--- a/test/tasks/ods-package-image_test.go
+++ b/test/tasks/ods-package-image_test.go
@@ -207,5 +207,5 @@ func getDockerImageTag(t *testing.T, ctxt *tasktesting.TaskRunContext, wsDir str
 	if err != nil {
 		t.Fatalf("could not read git-commit-sha: %s", err)
 	}
-	return fmt.Sprintf("localhost:5000/%s/%s:%s", ctxt.Namespace, ctxt.ODS.Component, sha)
+	return fmt.Sprintf("localhost:5001/%s/%s:%s", ctxt.Namespace, ctxt.ODS.Component, sha)
 }