diff --git a/ci/docker/build-image.sh b/ci/docker/build-image.sh
index e32e952..bbaad33 100755
--- a/ci/docker/build-image.sh
+++ b/ci/docker/build-image.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-DOCKER_IMAGE=${DOCKER_IMAGE:-friegger/cf-openstack-validator-ci}
+DOCKER_IMAGE=${DOCKER_IMAGE:-boshcpi/cf-openstack-validator-ci}
 
 docker login
 
diff --git a/ci/tasks/validate.yml b/ci/tasks/validate.yml
index 03ae08f..b3e996e 100644
--- a/ci/tasks/validate.yml
+++ b/ci/tasks/validate.yml
@@ -4,7 +4,7 @@ platform: linux
 image_resource:
   type: docker-image
   source:
-    repository: friegger/cf-openstack-validator-ci
+    repository: boshcpi/cf-openstack-validator-ci
     tag: 'latest'
 
 inputs: