diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml
index 2c2c786..c1e502e 100644
--- a/.github/workflows/external_trigger.yml
+++ b/.github/workflows/external_trigger.yml
@@ -18,7 +18,7 @@ jobs:
           fi
           echo "**** External trigger running off of v4-preview branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_OMBI_V4_PREVIEW\". ****"
           echo "**** Retrieving external version ****"
-          EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/Ombi-io/Ombi.Releases/releases" | jq -r '.[0] | .tag_name')
+          EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/Ombi-app/Ombi.Releases/releases" | jq -r '.[0] | .tag_name')
           if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
             echo "**** Can't retrieve external version, exiting ****"
             FAILURE_REASON="Can't retrieve external version for ombi branch v4-preview"
diff --git a/Dockerfile b/Dockerfile
index 28642a6..94cbde5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,10 +20,10 @@ RUN \
  mkdir -p \
 	/opt/ombi && \
  if [ -z ${OMBI_RELEASE+x} ]; then \
-	OMBI_RELEASE=$(curl -sX GET "https://api.github.com/repos/Ombi-io/Ombi.Releases/releases" \
+	OMBI_RELEASE=$(curl -sX GET "https://api.github.com/repos/Ombi-app/Ombi.Releases/releases" \
 	| jq -r '.[0] | .tag_name'); \
  fi && \
- OMBI_DURL=$(curl -s https://api.github.com/repos/Ombi-io/Ombi.Releases/releases/tags/"${OMBI_RELEASE}" \
+ OMBI_DURL=$(curl -s https://api.github.com/repos/Ombi-app/Ombi.Releases/releases/tags/"${OMBI_RELEASE}" \
 	|jq -r '.assets[].browser_download_url' |grep 'linux-x64') && \
  curl -o \
 	/tmp/ombi.tar.gz -L \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 273532b..2794603 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -20,10 +20,10 @@ RUN \
  mkdir -p \
 	/opt/ombi && \
  if [ -z ${OMBI_RELEASE+x} ]; then \
-	OMBI_RELEASE=$(curl -sX GET "https://api.github.com/repos/Ombi-io/Ombi.Releases/releases" \
+	OMBI_RELEASE=$(curl -sX GET "https://api.github.com/repos/Ombi-app/Ombi.Releases/releases" \
 	| jq -r '.[0] | .tag_name'); \
  fi && \
- OMBI_DURL=$(curl -s https://api.github.com/repos/Ombi-io/Ombi.Releases/releases/tags/"${OMBI_RELEASE}" \
+ OMBI_DURL=$(curl -s https://api.github.com/repos/Ombi-app/Ombi.Releases/releases/tags/"${OMBI_RELEASE}" \
 	|jq -r '.assets[].browser_download_url' |grep 'linux-arm64') && \
  curl -o \
 	/tmp/ombi.tar.gz -L \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 44ab4b2..f897458 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -20,10 +20,10 @@ RUN \
  mkdir -p \
 	/opt/ombi && \
  if [ -z ${OMBI_RELEASE+x} ]; then \
-	OMBI_RELEASE=$(curl -sX GET "https://api.github.com/repos/Ombi-io/Ombi.Releases/releases" \
+	OMBI_RELEASE=$(curl -sX GET "https://api.github.com/repos/Ombi-app/Ombi.Releases/releases" \
 	| jq -r '.[0] | .tag_name'); \
  fi && \
- OMBI_DURL=$(curl -s https://api.github.com/repos/Ombi-io/Ombi.Releases/releases/tags/"${OMBI_RELEASE}" \
+ OMBI_DURL=$(curl -s https://api.github.com/repos/Ombi-app/Ombi.Releases/releases/tags/"${OMBI_RELEASE}" \
 	|jq -r '.assets[].browser_download_url' |grep 'linux-arm.tar.gz') && \
  curl -o \
 	/tmp/ombi.tar.gz -L \
diff --git a/Jenkinsfile b/Jenkinsfile
index bc9d74b..73529e1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
     GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0')
     GITLAB_NAMESPACE=credentials('gitlab-namespace-id')
     EXT_GIT_BRANCH = 'master'
-    EXT_USER = 'Ombi-io'
+    EXT_USER = 'Ombi-app'
     EXT_REPO = 'Ombi.Releases'
     CONTAINER_NAME = 'ombi'
     BUILD_VERSION_ARG = 'OMBI_RELEASE'
@@ -241,7 +241,7 @@ pipeline {
               set -e
               TEMPDIR=$(mktemp -d)
               docker pull ghcr.io/linuxserver/jenkins-builder:latest
-              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=v4-preview -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest 
+              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=v4-preview -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest
               CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
               cd ${TEMPDIR}/docker-${CONTAINER_NAME}
               NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
@@ -315,7 +315,7 @@ pipeline {
              "merge_requests_access_level":"disabled",\
              "repository_access_level":"enabled",\
              "visibility":"public"}' '''
-      } 
+      }
     }
     /* ###############
        Build Container
@@ -640,8 +640,8 @@ pipeline {
                     docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm
                     docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
                     docker manifest push --purge ${MANIFESTIMAGE}:v4-preview
-                    docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} 
-                    docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} 
+                    docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
+                    docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG}
                   done
                '''
           }
@@ -714,7 +714,7 @@ pipeline {
                 set -e
                 TEMPDIR=$(mktemp -d)
                 docker pull ghcr.io/linuxserver/jenkins-builder:latest
-                docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest 
+                docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest
                 docker pull ghcr.io/linuxserver/lsiodev-readme-sync
                 docker run --rm=true \
                   -e DOCKERHUB_USERNAME=$DOCKERUSER \
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index 909b178..14af760 100644
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -1,5 +1,4 @@
 ---
-
 # jenkins variables
 project_name: docker-ombi
 external_type: github_devel
@@ -8,7 +7,7 @@ release_tag: v4-preview
 ls_branch: v4-preview
 repo_vars:
   - EXT_GIT_BRANCH = 'master'
-  - EXT_USER = 'Ombi-io'
+  - EXT_USER = 'Ombi-app'
   - EXT_REPO = 'Ombi.Releases'
   - CONTAINER_NAME = 'ombi'
   - BUILD_VERSION_ARG = 'OMBI_RELEASE'