diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 954aeae..a046a8a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -48,6 +48,6 @@ jobs:
         name: "Build ddev ${{ matrix.version }} multi-arch image"
         shell: 'script -q -e -c "bash {0}"'
         run: |
-          echo ${{ secrets.GHCR_TOKEN }} | docker login ghcr.io -u ${{ secrets.GHCR_USERNAME }} --password-stdin
+          echo "${{ secrets.GHCR_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
           docker buildx create --use --platform=linux/arm64,linux/amd64
           ./build.sh -v ${{ matrix.version }} -x -p
diff --git a/Dockerfile b/Dockerfile
index db5f6ab..eb204c4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM docker:latest
 
-LABEL org.opencontainers.image.source=https://github.com/ochorocho/ddev-gitlab-ci
+LABEL org.opencontainers.image.source=https://github.com/ddev/ddev-gitlab-ci
 
 ARG ddev_version
 ENV DDEV_VERSION=${ddev_version}
diff --git a/README.md b/README.md
index 7cc35e2..1ae548c 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ Available options:
 | ./build.sh -v v1.23   | v1.23, v1.23.x (latest bugfix) |
 | ...                   | ...                            |
 
-The image is stored on the [GitHub Package Registry](https://github.com/ochorocho/ddev-gitlab-ci/pkgs/container/ddev-gitlab-ci) 
+The image is stored on the [GitHub Package Registry](https://github.com/ddev/ddev-gitlab-ci/pkgs/container/ddev-gitlab-ci) 
 
 ### Run tests locally
 
diff --git a/build.sh b/build.sh
index 5fba3b1..40231e3 100755
--- a/build.sh
+++ b/build.sh
@@ -3,7 +3,7 @@
 GITHUB_OWNER=ddev
 PUSH=""
 LOAD=""
-IMAGE_NAME="ghcr.io/ochorocho/ddev-gitlab-ci"
+IMAGE_NAME="ghcr.io/ddev/ddev-gitlab-ci"
 DDEV_VERSION=""
 
 # @todo:
diff --git a/docs/docker.md b/docs/docker.md
index 762dc9c..a24993b 100644
--- a/docs/docker.md
+++ b/docs/docker.md
@@ -33,7 +33,7 @@ stages:
 
 ddev-initialize-docker:
   stage: testing
-  image: ghcr.io/ochorocho/ddev-gitlab-ci:v1.23
+  image: ghcr.io/ddev/ddev-gitlab-ci:v1.23
   variables:
     # Remove "umask 0000" usage, so DDEV has permissions on the cloned repository
     # see https://docs.gitlab.com/runner/configuration/feature-flags.html#available-feature-flags
diff --git a/docs/gitlab-com.md b/docs/gitlab-com.md
index eae0490..c000f91 100644
--- a/docs/gitlab-com.md
+++ b/docs/gitlab-com.md
@@ -11,7 +11,7 @@ stages:
 
 ddev-initialize:
   stage: testing
-  image: ghcr.io/ochorocho/ddev-gitlab-ci:v1.23
+  image: ghcr.io/ddev/ddev-gitlab-ci:v1.23
   variables:
     # Remove "umask 0000" usage, so DDEV has permissions on the cloned repository
     # see https://docs.gitlab.com/runner/configuration/feature-flags.html#available-feature-flags
diff --git a/docs/podman.md b/docs/podman.md
index 5bb4ee9..bf2914a 100644
--- a/docs/podman.md
+++ b/docs/podman.md
@@ -33,7 +33,7 @@ stages:
 
 ddev-initialize-podman:
   stage: testing
-  image: ghcr.io/ochorocho/ddev-gitlab-ci:v1.23
+  image: ghcr.io/ddev/ddev-gitlab-ci:v1.23
   variables:
     # Remove "umask 0000" usage, so DDEV has permissions on the cloned repository
     # see https://docs.gitlab.com/runner/configuration/feature-flags.html#available-feature-flags
diff --git a/tests/test.bats b/tests/test.bats
index bcb98e2..3839e30 100644
--- a/tests/test.bats
+++ b/tests/test.bats
@@ -72,5 +72,5 @@
 docker-run() {
   local COMMAND=${1}
 
-  docker run --rm -it --network ddev-docker ghcr.io/ochorocho/ddev-gitlab-ci:"${DDEV_VERSION}" /bin/sh -c "${COMMAND}"
+  docker run --rm -it --network ddev-docker ghcr.io/ddev/ddev-gitlab-ci:"${DDEV_VERSION}" /bin/sh -c "${COMMAND}"
 }