diff --git a/ci/scripts/docker-build-and-push.sh b/ci/scripts/docker-build-and-push.sh
index 423ea9e2ea..844811628f 100755
--- a/ci/scripts/docker-build-and-push.sh
+++ b/ci/scripts/docker-build-and-push.sh
@@ -1,6 +1,6 @@
 cd $1
 echo "Building $1"
-sudo docker build -t oneuptimeproject/$1:$2 .
+sudo docker build -t oneuptime/$1:$2 .
 echo "Pushing $1"
-sudo docker push oneuptimeproject/$1:$2
+sudo docker push oneuptime/$1:$2
 cd ..
\ No newline at end of file
diff --git a/ci/spec/accounts/deploy.yaml b/ci/spec/accounts/deploy.yaml
index 0f65cf66e6..afe582a52b 100644
--- a/ci/spec/accounts/deploy.yaml
+++ b/ci/spec/accounts/deploy.yaml
@@ -12,9 +12,9 @@ production_accounts:
         - sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
         - sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD
         - sudo docker buildx create --use
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/accounts:3.0.$CI_PIPELINE_IID --push ./accounts
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/accounts:latest --push ./accounts
-        - sudo kubectl set image deployment/fi-accounts fi-accounts=oneuptimeproject/accounts:3.0.$CI_PIPELINE_IID
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/accounts:3.0.$CI_PIPELINE_IID --push ./accounts
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/accounts:latest --push ./accounts
+        - sudo kubectl set image deployment/fi-accounts fi-accounts=oneuptime/accounts:3.0.$CI_PIPELINE_IID
         # Cleanup
         - chmod +x ./ci/scripts/deployment-cleanup.sh
         - ./ci/scripts/deployment-cleanup.sh
@@ -43,9 +43,9 @@ staging_accounts:
         # Build and deploy accounts.
         - sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD
         - sudo docker buildx create --use
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/accounts:3.0.$CI_PIPELINE_IID --push ./accounts
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/accounts:master --push ./accounts
-        - sudo kubectl set image deployment/fi-accounts fi-accounts=oneuptimeproject/accounts:3.0.$CI_PIPELINE_IID
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/accounts:3.0.$CI_PIPELINE_IID --push ./accounts
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/accounts:master --push ./accounts
+        - sudo kubectl set image deployment/fi-accounts fi-accounts=oneuptime/accounts:3.0.$CI_PIPELINE_IID
         # Cleanup
         - chmod +x ./ci/scripts/deployment-cleanup.sh
         - ./ci/scripts/deployment-cleanup.sh
diff --git a/ci/spec/accounts/lighthouse.yaml b/ci/spec/accounts/lighthouse.yaml
index 359b84750e..0b8d5d36c7 100644
--- a/ci/spec/accounts/lighthouse.yaml
+++ b/ci/spec/accounts/lighthouse.yaml
@@ -13,12 +13,12 @@ mobile_lighthouse_accounts:
         - sudo docker rm $(sudo docker ps -aq) || echo 'No docker containers'
         - sudo docker run --name mongo -p 27017:27017 -d mongo:4.2.3
         - sudo docker run --name redis -p 6379:6379 -d redis:5.0.7 redis-server
-        - sudo docker build -t oneuptimeproject/backend:3.0.$CI_PIPELINE_IID ./backend
-        - sudo docker run --env-file ./backend/.env -e IS_SAAS_SERVICE=true --net=host -d oneuptimeproject/backend:3.0.$CI_PIPELINE_IID
-        - sudo docker build -t oneuptimeproject/accounts:3.0.$CI_PIPELINE_IID ./accounts
-        - sudo docker run --env-file ./accounts/.env -e IS_SAAS_SERVICE=true -p 3003:3003 -d oneuptimeproject/accounts:3.0.$CI_PIPELINE_IID
-        - sudo docker build -t oneuptimeproject/dashboard:3.0.$CI_PIPELINE_IID ./dashboard
-        - sudo docker run --env-file ./dashboard/.env -e IS_SAAS_SERVICE=true -p 3000:3000 -d oneuptimeproject/dashboard:3.0.$CI_PIPELINE_IID
+        - sudo docker build -t oneuptime/backend:3.0.$CI_PIPELINE_IID ./backend
+        - sudo docker run --env-file ./backend/.env -e IS_SAAS_SERVICE=true --net=host -d oneuptime/backend:3.0.$CI_PIPELINE_IID
+        - sudo docker build -t oneuptime/accounts:3.0.$CI_PIPELINE_IID ./accounts
+        - sudo docker run --env-file ./accounts/.env -e IS_SAAS_SERVICE=true -p 3003:3003 -d oneuptime/accounts:3.0.$CI_PIPELINE_IID
+        - sudo docker build -t oneuptime/dashboard:3.0.$CI_PIPELINE_IID ./dashboard
+        - sudo docker run --env-file ./dashboard/.env -e IS_SAAS_SERVICE=true -p 3000:3000 -d oneuptime/dashboard:3.0.$CI_PIPELINE_IID
         - sudo docker ps
         - npm ci
         - cd accounts
@@ -51,12 +51,12 @@ desktop_lighthouse_accounts:
         - sudo docker rm $(sudo docker ps -aq) || echo 'No docker containers'
         - sudo docker run --name mongo -p 27017:27017 -d mongo:4.2.3
         - sudo docker run --name redis -p 6379:6379 -d redis:5.0.7 redis-server
-        - sudo docker build -t oneuptimeproject/backend:3.0.$CI_PIPELINE_IID ./backend
-        - sudo docker run --env-file ./backend/.env -e IS_SAAS_SERVICE=true --net=host -d oneuptimeproject/backend:3.0.$CI_PIPELINE_IID
-        - sudo docker build -t oneuptimeproject/accounts:3.0.$CI_PIPELINE_IID ./accounts
-        - sudo docker run --env-file ./accounts/.env -e IS_SAAS_SERVICE=true -p 3003:3003 -d oneuptimeproject/accounts:3.0.$CI_PIPELINE_IID
-        - sudo docker build -t oneuptimeproject/dashboard:3.0.$CI_PIPELINE_IID ./dashboard
-        - sudo docker run --env-file ./dashboard/.env -e IS_SAAS_SERVICE=true -p 3000:3000 -d oneuptimeproject/dashboard:3.0.$CI_PIPELINE_IID
+        - sudo docker build -t oneuptime/backend:3.0.$CI_PIPELINE_IID ./backend
+        - sudo docker run --env-file ./backend/.env -e IS_SAAS_SERVICE=true --net=host -d oneuptime/backend:3.0.$CI_PIPELINE_IID
+        - sudo docker build -t oneuptime/accounts:3.0.$CI_PIPELINE_IID ./accounts
+        - sudo docker run --env-file ./accounts/.env -e IS_SAAS_SERVICE=true -p 3003:3003 -d oneuptime/accounts:3.0.$CI_PIPELINE_IID
+        - sudo docker build -t oneuptime/dashboard:3.0.$CI_PIPELINE_IID ./dashboard
+        - sudo docker run --env-file ./dashboard/.env -e IS_SAAS_SERVICE=true -p 3000:3000 -d oneuptime/dashboard:3.0.$CI_PIPELINE_IID
         - sudo docker ps
         - npm ci
         - cd accounts
diff --git a/ci/spec/admin-dashboard/deploy.yaml b/ci/spec/admin-dashboard/deploy.yaml
index 3f85a440ac..ab49815ab3 100644
--- a/ci/spec/admin-dashboard/deploy.yaml
+++ b/ci/spec/admin-dashboard/deploy.yaml
@@ -11,9 +11,9 @@ production_admin-dashboard:
         - sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
         - sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD
         - sudo docker buildx create --use
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/admin-dashboard:3.0.$CI_PIPELINE_IID --push ./admin-dashboard
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/admin-dashboard:latest --push ./admin-dashboard
-        - sudo kubectl set image deployment/fi-admin fi-admin=oneuptimeproject/admin-dashboard:3.0.$CI_PIPELINE_IID
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/admin-dashboard:3.0.$CI_PIPELINE_IID --push ./admin-dashboard
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/admin-dashboard:latest --push ./admin-dashboard
+        - sudo kubectl set image deployment/fi-admin fi-admin=oneuptime/admin-dashboard:3.0.$CI_PIPELINE_IID
         # Cleanup
         - chmod +x ./ci/scripts/deployment-cleanup.sh
         - ./ci/scripts/deployment-cleanup.sh
@@ -41,9 +41,9 @@ staging_admin-dashboard:
         # Build and deploy admin-dashboard.
         - sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD
         - sudo docker buildx create --use
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/admin-dashboard:3.0.$CI_PIPELINE_IID --push ./admin-dashboard
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/admin-dashboard:master --push ./admin-dashboard
-        - sudo kubectl set image deployment/fi-admin fi-admin=oneuptimeproject/admin-dashboard:3.0.$CI_PIPELINE_IID
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/admin-dashboard:3.0.$CI_PIPELINE_IID --push ./admin-dashboard
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/admin-dashboard:master --push ./admin-dashboard
+        - sudo kubectl set image deployment/fi-admin fi-admin=oneuptime/admin-dashboard:3.0.$CI_PIPELINE_IID
         # Cleanup
         - chmod +x ./ci/scripts/deployment-cleanup.sh
         - ./ci/scripts/deployment-cleanup.sh
diff --git a/ci/spec/api-docs/deploy.yaml b/ci/spec/api-docs/deploy.yaml
index dc371631e4..b2c5ee0138 100644
--- a/ci/spec/api-docs/deploy.yaml
+++ b/ci/spec/api-docs/deploy.yaml
@@ -12,9 +12,9 @@ production_api-docs:
         - sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
         - sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD
         - sudo docker buildx create --use
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/api-docs:3.0.$CI_PIPELINE_IID --push ./api-docs
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/api-docs:latest --push ./api-docs
-        - sudo kubectl set image deployment/fi-api-docs fi-api-docs=oneuptimeproject/api-docs:3.0.$CI_PIPELINE_IID
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/api-docs:3.0.$CI_PIPELINE_IID --push ./api-docs
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/api-docs:latest --push ./api-docs
+        - sudo kubectl set image deployment/fi-api-docs fi-api-docs=oneuptime/api-docs:3.0.$CI_PIPELINE_IID
         # Cleanup
         - chmod +x ./ci/scripts/deployment-cleanup.sh
         - ./ci/scripts/deployment-cleanup.sh
@@ -43,9 +43,9 @@ staging_api-docs:
         # Build and deploy api-docs.
         - sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD
         - sudo docker buildx create --use
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/api-docs:3.0.$CI_PIPELINE_IID --push ./api-docs
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/api-docs:master --push ./api-docs
-        - sudo kubectl set image deployment/fi-api-docs fi-api-docs=oneuptimeproject/api-docs:3.0.$CI_PIPELINE_IID
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/api-docs:3.0.$CI_PIPELINE_IID --push ./api-docs
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/api-docs:master --push ./api-docs
+        - sudo kubectl set image deployment/fi-api-docs fi-api-docs=oneuptime/api-docs:3.0.$CI_PIPELINE_IID
         # Cleanup
         - chmod +x ./ci/scripts/deployment-cleanup.sh
         - ./ci/scripts/deployment-cleanup.sh
diff --git a/ci/spec/application-scanner/deploy.yaml b/ci/spec/application-scanner/deploy.yaml
index 715e967a3a..317721a5ce 100644
--- a/ci/spec/application-scanner/deploy.yaml
+++ b/ci/spec/application-scanner/deploy.yaml
@@ -14,9 +14,9 @@ staging_application-scanner:
         # Build and deploy application-scanner
         - sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD
         - sudo docker buildx create --use
-        - sudo docker buildx build --build-arg PORT="3005" --platform linux/amd64,linux/arm64 --tag oneuptimeproject/application-scanner:3.0.$CI_PIPELINE_IID --push ./application-scanner
-        - sudo docker buildx build --build-arg PORT="3005" --platform linux/amd64,linux/arm64 --tag oneuptimeproject/application-scanner:master --push ./application-scanner
-        - sudo kubectl set image deployment/fi-app-scan fi-app-scan=oneuptimeproject/application-scanner:3.0.$CI_PIPELINE_IID
+        - sudo docker buildx build --build-arg PORT="3005" --platform linux/amd64,linux/arm64 --tag oneuptime/application-scanner:3.0.$CI_PIPELINE_IID --push ./application-scanner
+        - sudo docker buildx build --build-arg PORT="3005" --platform linux/amd64,linux/arm64 --tag oneuptime/application-scanner:master --push ./application-scanner
+        - sudo kubectl set image deployment/fi-app-scan fi-app-scan=oneuptime/application-scanner:3.0.$CI_PIPELINE_IID
         # Cleanup
         - chmod +x ./ci/scripts/deployment-cleanup.sh
         - ./ci/scripts/deployment-cleanup.sh
@@ -43,9 +43,9 @@ production_application-scanner:
         - sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
         - sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD
         - sudo docker buildx create --use
-        - sudo docker buildx build --build-arg PORT="3005" --platform linux/amd64,linux/arm64 --tag oneuptimeproject/application-scanner:3.0.$CI_PIPELINE_IID --push ./application-scanner
-        - sudo docker buildx build --build-arg PORT="3005" --platform linux/amd64,linux/arm64 --tag oneuptimeproject/application-scanner:latest --push ./application-scanner
-        - sudo kubectl set image deployment/fi-app-scan fi-app-scan=oneuptimeproject/application-scanner:3.0.$CI_PIPELINE_IID
+        - sudo docker buildx build --build-arg PORT="3005" --platform linux/amd64,linux/arm64 --tag oneuptime/application-scanner:3.0.$CI_PIPELINE_IID --push ./application-scanner
+        - sudo docker buildx build --build-arg PORT="3005" --platform linux/amd64,linux/arm64 --tag oneuptime/application-scanner:latest --push ./application-scanner
+        - sudo kubectl set image deployment/fi-app-scan fi-app-scan=oneuptime/application-scanner:3.0.$CI_PIPELINE_IID
         # Cleanup
         - chmod +x ./ci/scripts/deployment-cleanup.sh
         - ./ci/scripts/deployment-cleanup.sh
diff --git a/ci/spec/backend/build-n-test.yaml b/ci/spec/backend/build-n-test.yaml
index 1b6091e37c..35cbb84852 100644
--- a/ci/spec/backend/build-n-test.yaml
+++ b/ci/spec/backend/build-n-test.yaml
@@ -16,15 +16,15 @@ test_backend:
         - sudo docker rm $(sudo docker ps -aq) || echo 'No docker containers'
         - sudo docker run --name mongo -p 27017:27017 -d mongo:4.2.3
         - sudo docker run --name redis -p 6379:6379 -d redis:5.0.7 redis-server
-        - sudo docker run --name realtime --env-file ./realtime/.env -e PORT=3300 --net=host -d oneuptimeproject/realtime:latest
+        - sudo docker run --name realtime --env-file ./realtime/.env -e PORT=3300 --net=host -d oneuptime/realtime:latest
         - sudo docker run --name=samlIdp -p 9876:8080 -p 8443:8443 -e SIMPLESAMLPHP_SP_ENTITY_ID=hackerbay.io -e SIMPLESAMLPHP_SP_ASSERTION_CONSUMER_SERVICE=http://localhost:3002/api/user/sso/callback -e SIMPLESAMLPHP_SP_SINGLE_LOGOUT_SERVICE=http://localhost/simplesaml/module.php/saml/sp/saml2-logout.php/test-sp -v $PWD/saml/users.php:/var/www/simplesamlphp/config/authsources.php -d kristophjunge/test-saml-idp
-        - sudo docker build -t oneuptimeproject/init-script:3.0.$CI_PIPELINE_IID ./init-script
-        - sudo docker run -e NODE_ENV=development -e IS_SAAS_SERVICE=true -e IS_TESTING=true --net=host -d oneuptimeproject/init-script:3.0.$CI_PIPELINE_IID
-        - sudo docker build -t oneuptimeproject/probe:3.0.$CI_PIPELINE_IID ./probe
-        - sudo docker run --name probe-1 --env-file ./probe/.env -e PORT=3024 -e SERVER_URL=http://localhost:3020 -e PROBE_NAME='Probe 1' -e PROBE_KEY=test-key --net=host -d oneuptimeproject/probe:3.0.$CI_PIPELINE_IID
-        - sudo docker run --name probe-2 --env-file ./probe/.env -e PORT=3025 -e SERVER_URL=http://localhost:3020 -e PROBE_NAME='Probe 2' -e PROBE_KEY=test-key --net=host -d oneuptimeproject/probe:3.0.$CI_PIPELINE_IID
-        - sudo docker build -t oneuptimeproject/http-test-server:3.0.$CI_PIPELINE_IID ./http-test-server
-        - sudo docker run -p 3010:3010 -d oneuptimeproject/http-test-server:3.0.$CI_PIPELINE_IID
+        - sudo docker build -t oneuptime/init-script:3.0.$CI_PIPELINE_IID ./init-script
+        - sudo docker run -e NODE_ENV=development -e IS_SAAS_SERVICE=true -e IS_TESTING=true --net=host -d oneuptime/init-script:3.0.$CI_PIPELINE_IID
+        - sudo docker build -t oneuptime/probe:3.0.$CI_PIPELINE_IID ./probe
+        - sudo docker run --name probe-1 --env-file ./probe/.env -e PORT=3024 -e SERVER_URL=http://localhost:3020 -e PROBE_NAME='Probe 1' -e PROBE_KEY=test-key --net=host -d oneuptime/probe:3.0.$CI_PIPELINE_IID
+        - sudo docker run --name probe-2 --env-file ./probe/.env -e PORT=3025 -e SERVER_URL=http://localhost:3020 -e PROBE_NAME='Probe 2' -e PROBE_KEY=test-key --net=host -d oneuptime/probe:3.0.$CI_PIPELINE_IID
+        - sudo docker build -t oneuptime/http-test-server:3.0.$CI_PIPELINE_IID ./http-test-server
+        - sudo docker run -p 3010:3010 -d oneuptime/http-test-server:3.0.$CI_PIPELINE_IID
         - sudo docker ps
         - curl -sL https://deb.nodesource.com/setup_15.x | sudo -E bash -
         - sudo apt-get install -y nodejs
@@ -60,7 +60,7 @@ test_enterprise_backend:
         - sudo docker rm $(sudo docker ps -aq) || echo 'No docker containers'
         - sudo docker run --name mongo -p 27017:27017 -d mongo:4.2.3
         - sudo docker run --name bredis -p 6379:6379 -d redis:5.0.7 redis-server
-        - sudo docker run --name realtime --env-file ./realtime/.env -e PORT=3300 --net=host -d oneuptimeproject/realtime:latest
+        - sudo docker run --name realtime --env-file ./realtime/.env -e PORT=3300 --net=host -d oneuptime/realtime:latest
         - sudo docker ps
         - curl -sL https://deb.nodesource.com/setup_15.x | sudo -E bash -
         - sudo apt-get install -y nodejs
diff --git a/ci/spec/backend/deploy.yaml b/ci/spec/backend/deploy.yaml
index 6a3aca3f7d..b03b984f6f 100644
--- a/ci/spec/backend/deploy.yaml
+++ b/ci/spec/backend/deploy.yaml
@@ -14,9 +14,9 @@ staging_backend:
         # Build and deploy backend.
         - sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD
         - sudo docker buildx create --use
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/backend:3.0.$CI_PIPELINE_IID --push ./backend
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/backend:master --push ./backend
-        - sudo kubectl set image deployment/fi-backend fi-backend=oneuptimeproject/backend:3.0.$CI_PIPELINE_IID
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/backend:3.0.$CI_PIPELINE_IID --push ./backend
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/backend:master --push ./backend
+        - sudo kubectl set image deployment/fi-backend fi-backend=oneuptime/backend:3.0.$CI_PIPELINE_IID
         # Cleanup
         - chmod +x ./ci/scripts/deployment-cleanup.sh
         - ./ci/scripts/deployment-cleanup.sh
@@ -43,9 +43,9 @@ production_backend:
         - sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
         - sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD
         - sudo docker buildx create --use
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/backend:3.0.$CI_PIPELINE_IID --push ./backend
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/backend:latest --push ./backend
-        - sudo kubectl set image deployment/fi-backend fi-backend=oneuptimeproject/backend:3.0.$CI_PIPELINE_IID
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/backend:3.0.$CI_PIPELINE_IID --push ./backend
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/backend:latest --push ./backend
+        - sudo kubectl set image deployment/fi-backend fi-backend=oneuptime/backend:3.0.$CI_PIPELINE_IID
         # Cleanup
         - chmod +x ./ci/scripts/deployment-cleanup.sh
         - ./ci/scripts/deployment-cleanup.sh
diff --git a/ci/spec/container-scanner/deploy.yaml b/ci/spec/container-scanner/deploy.yaml
index 64603a505e..f57d981401 100644
--- a/ci/spec/container-scanner/deploy.yaml
+++ b/ci/spec/container-scanner/deploy.yaml
@@ -14,9 +14,9 @@ staging_container-scanner:
         # Build and deploy container-scanner
         - sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD
         - sudo docker buildx create --use
-        - sudo docker buildx build --build-arg PORT="3055" --platform linux/amd64,linux/arm64 --tag oneuptimeproject/container-scanner:3.0.$CI_PIPELINE_IID --push ./container-scanner
-        - sudo docker buildx build --build-arg PORT="3055" --platform linux/amd64,linux/arm64 --tag oneuptimeproject/container-scanner:master --push ./container-scanner
-        - sudo kubectl set image deployment/fi-cont-scan fi-cont-scan=oneuptimeproject/container-scanner:3.0.$CI_PIPELINE_IID
+        - sudo docker buildx build --build-arg PORT="3055" --platform linux/amd64,linux/arm64 --tag oneuptime/container-scanner:3.0.$CI_PIPELINE_IID --push ./container-scanner
+        - sudo docker buildx build --build-arg PORT="3055" --platform linux/amd64,linux/arm64 --tag oneuptime/container-scanner:master --push ./container-scanner
+        - sudo kubectl set image deployment/fi-cont-scan fi-cont-scan=oneuptime/container-scanner:3.0.$CI_PIPELINE_IID
         # Cleanup
         - chmod +x ./ci/scripts/deployment-cleanup.sh
         - ./ci/scripts/deployment-cleanup.sh
@@ -43,9 +43,9 @@ production_container-scanner:
         - sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
         - sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD
         - sudo docker buildx create --use
-        - sudo docker buildx build --build-arg PORT="3055" --platform linux/amd64,linux/arm64 --tag oneuptimeproject/container-scanner:3.0.$CI_PIPELINE_IID --push ./container-scanner
-        - sudo docker buildx build --build-arg PORT="3055" --platform linux/amd64,linux/arm64 --tag oneuptimeproject/container-scanner:latest --push ./container-scanner
-        - sudo kubectl set image deployment/fi-cont-scan fi-cont-scan=oneuptimeproject/container-scanner:3.0.$CI_PIPELINE_IID
+        - sudo docker buildx build --build-arg PORT="3055" --platform linux/amd64,linux/arm64 --tag oneuptime/container-scanner:3.0.$CI_PIPELINE_IID --push ./container-scanner
+        - sudo docker buildx build --build-arg PORT="3055" --platform linux/amd64,linux/arm64 --tag oneuptime/container-scanner:latest --push ./container-scanner
+        - sudo kubectl set image deployment/fi-cont-scan fi-cont-scan=oneuptime/container-scanner:3.0.$CI_PIPELINE_IID
         # Cleanup
         - chmod +x ./ci/scripts/deployment-cleanup.sh
         - ./ci/scripts/deployment-cleanup.sh
diff --git a/ci/spec/dashboard/deploy.yaml b/ci/spec/dashboard/deploy.yaml
index d65e3d3bc4..ba01acafe6 100644
--- a/ci/spec/dashboard/deploy.yaml
+++ b/ci/spec/dashboard/deploy.yaml
@@ -12,11 +12,11 @@ staging_dashboard:
         - bash ./ci/scripts/deployment-staging-setup.sh
         # Build and deploy dashboard.
         - sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD
-        - sudo docker build -t oneuptimeproject/dashboard:master ./dashboard
-        - sudo docker tag oneuptimeproject/dashboard:master oneuptimeproject/dashboard:3.0.$CI_PIPELINE_IID
-        - sudo docker push oneuptimeproject/dashboard:3.0.$CI_PIPELINE_IID
-        - sudo docker push oneuptimeproject/dashboard:master
-        - sudo kubectl set image deployment/fi-dashboard fi-dashboard=oneuptimeproject/dashboard:3.0.$CI_PIPELINE_IID
+        - sudo docker build -t oneuptime/dashboard:master ./dashboard
+        - sudo docker tag oneuptime/dashboard:master oneuptime/dashboard:3.0.$CI_PIPELINE_IID
+        - sudo docker push oneuptime/dashboard:3.0.$CI_PIPELINE_IID
+        - sudo docker push oneuptime/dashboard:master
+        - sudo kubectl set image deployment/fi-dashboard fi-dashboard=oneuptime/dashboard:3.0.$CI_PIPELINE_IID
         # Cleanup
         - chmod +x ./ci/scripts/deployment-cleanup.sh
         - ./ci/scripts/deployment-cleanup.sh
@@ -41,11 +41,11 @@ production_dashboard:
         - chmod +x ./ci/scripts/deployment-production-setup.sh
         - bash ./ci/scripts/deployment-production-setup.sh
         - sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD
-        - sudo docker build -t oneuptimeproject/dashboard:latest ./dashboard
-        - sudo docker tag oneuptimeproject/dashboard:latest oneuptimeproject/dashboard:3.0.$CI_PIPELINE_IID
-        - sudo docker push oneuptimeproject/dashboard:3.0.$CI_PIPELINE_IID
-        - sudo docker push oneuptimeproject/dashboard:latest
-        - sudo kubectl set image deployment/fi-dashboard fi-dashboard=oneuptimeproject/dashboard:3.0.$CI_PIPELINE_IID
+        - sudo docker build -t oneuptime/dashboard:latest ./dashboard
+        - sudo docker tag oneuptime/dashboard:latest oneuptime/dashboard:3.0.$CI_PIPELINE_IID
+        - sudo docker push oneuptime/dashboard:3.0.$CI_PIPELINE_IID
+        - sudo docker push oneuptime/dashboard:latest
+        - sudo kubectl set image deployment/fi-dashboard fi-dashboard=oneuptime/dashboard:3.0.$CI_PIPELINE_IID
         # Cleanup
         - chmod +x ./ci/scripts/deployment-cleanup.sh
         - ./ci/scripts/deployment-cleanup.sh
diff --git a/ci/spec/data-ingestor/deploy.yaml b/ci/spec/data-ingestor/deploy.yaml
index 7bba033ee0..f4687a1fb1 100644
--- a/ci/spec/data-ingestor/deploy.yaml
+++ b/ci/spec/data-ingestor/deploy.yaml
@@ -12,9 +12,9 @@ production_data-ingestor:
         - sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
         - sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD
         - sudo docker buildx create --use
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/data-ingestor:3.0.$CI_PIPELINE_IID --push ./data-ingestor
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/data-ingestor:latest --push ./data-ingestor
-        - sudo kubectl set image deployment/fi-ingestor fi-ingestor=oneuptimeproject/data-ingestor:3.0.$CI_PIPELINE_IID
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/data-ingestor:3.0.$CI_PIPELINE_IID --push ./data-ingestor
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/data-ingestor:latest --push ./data-ingestor
+        - sudo kubectl set image deployment/fi-ingestor fi-ingestor=oneuptime/data-ingestor:3.0.$CI_PIPELINE_IID
         # Cleanup
         - chmod +x ./ci/scripts/deployment-cleanup.sh
         - ./ci/scripts/deployment-cleanup.sh
@@ -43,9 +43,9 @@ staging_data-ingestor:
         # Build and deploy data-ingestor.
         - sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD
         - sudo docker buildx create --use
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/data-ingestor:3.0.$CI_PIPELINE_IID --push ./data-ingestor
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/data-ingestor:master --push ./data-ingestor
-        - sudo kubectl set image deployment/fi-ingestor fi-ingestor=oneuptimeproject/data-ingestor:3.0.$CI_PIPELINE_IID
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/data-ingestor:3.0.$CI_PIPELINE_IID --push ./data-ingestor
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/data-ingestor:master --push ./data-ingestor
+        - sudo kubectl set image deployment/fi-ingestor fi-ingestor=oneuptime/data-ingestor:3.0.$CI_PIPELINE_IID
         # Cleanup
         - chmod +x ./ci/scripts/deployment-cleanup.sh
         - ./ci/scripts/deployment-cleanup.sh
diff --git a/ci/spec/go-sdk/build-n-test.yaml b/ci/spec/go-sdk/build-n-test.yaml
index ad9e4ec36d..40fb95af2d 100644
--- a/ci/spec/go-sdk/build-n-test.yaml
+++ b/ci/spec/go-sdk/build-n-test.yaml
@@ -14,8 +14,8 @@ test_go-sdk:
         - sudo docker rm $(sudo docker ps -aq) || echo 'No docker containers'
         - sudo docker run --name mongo -p 27017:27017 -d mongo:4.2.3
         - sudo docker run --name redis -p 6379:6379 -d redis:5.0.7 redis-server
-        - sudo docker build -t oneuptimeproject/backend:3.0.$CI_PIPELINE_IID ./backend
-        - sudo docker run --env-file ./backend/.env  -e ENCRYPTION_KEY=$ENCRYPTION_KEY --net=host -d oneuptimeproject/backend:3.0.$CI_PIPELINE_IID
+        - sudo docker build -t oneuptime/backend:3.0.$CI_PIPELINE_IID ./backend
+        - sudo docker run --env-file ./backend/.env  -e ENCRYPTION_KEY=$ENCRYPTION_KEY --net=host -d oneuptime/backend:3.0.$CI_PIPELINE_IID
         - sudo docker ps
         - wget https://dl.google.com/go/go1.16.4.linux-amd64.tar.gz
         - sudo tar -xvf go1.16.4.linux-amd64.tar.gz
diff --git a/ci/spec/haraka/deploy.yaml b/ci/spec/haraka/deploy.yaml
index 4ec56f0b36..045f4e54ef 100644
--- a/ci/spec/haraka/deploy.yaml
+++ b/ci/spec/haraka/deploy.yaml
@@ -12,11 +12,11 @@ staging_haraka:
         - bash ./ci/scripts/deployment-staging-setup.sh
         # Build and deploy haraka.
         - sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD
-        - sudo docker build --build-arg PORT="2525" ./haraka -t oneuptimeproject/haraka:master
-        - sudo docker tag oneuptimeproject/haraka:master oneuptimeproject/haraka:3.0.$CI_PIPELINE_IID
-        - sudo docker push oneuptimeproject/haraka:3.0.$CI_PIPELINE_IID
-        - sudo docker push oneuptimeproject/haraka:master
-        - sudo kubectl set image deployment/fi-haraka fi-haraka=oneuptimeproject/haraka:3.0.$CI_PIPELINE_IID
+        - sudo docker build --build-arg PORT="2525" ./haraka -t oneuptime/haraka:master
+        - sudo docker tag oneuptime/haraka:master oneuptime/haraka:3.0.$CI_PIPELINE_IID
+        - sudo docker push oneuptime/haraka:3.0.$CI_PIPELINE_IID
+        - sudo docker push oneuptime/haraka:master
+        - sudo kubectl set image deployment/fi-haraka fi-haraka=oneuptime/haraka:3.0.$CI_PIPELINE_IID
         # Cleanup
         - chmod +x ./ci/scripts/deployment-cleanup.sh
         - ./ci/scripts/deployment-cleanup.sh
@@ -41,11 +41,11 @@ production_haraka:
         - chmod +x ./ci/scripts/deployment-production-setup.sh
         - bash ./ci/scripts/deployment-production-setup.sh
         - sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD
-        - sudo docker build --build-arg PORT="2525" ./haraka -t oneuptimeproject/haraka:latest
-        - sudo docker tag oneuptimeproject/haraka:latest oneuptimeproject/haraka:3.0.$CI_PIPELINE_IID
-        - sudo docker push oneuptimeproject/haraka:3.0.$CI_PIPELINE_IID
-        - sudo docker push oneuptimeproject/haraka:latest
-        - sudo kubectl set image deployment/fi-haraka fi-haraka=oneuptimeproject/haraka:3.0.$CI_PIPELINE_IID
+        - sudo docker build --build-arg PORT="2525" ./haraka -t oneuptime/haraka:latest
+        - sudo docker tag oneuptime/haraka:latest oneuptime/haraka:3.0.$CI_PIPELINE_IID
+        - sudo docker push oneuptime/haraka:3.0.$CI_PIPELINE_IID
+        - sudo docker push oneuptime/haraka:latest
+        - sudo kubectl set image deployment/fi-haraka fi-haraka=oneuptime/haraka:3.0.$CI_PIPELINE_IID
         # Cleanup
         - chmod +x ./ci/scripts/deployment-cleanup.sh
         - ./ci/scripts/deployment-cleanup.sh
diff --git a/ci/spec/helm-chart/deploy.yaml b/ci/spec/helm-chart/deploy.yaml
index c767486e03..5810ca297b 100644
--- a/ci/spec/helm-chart/deploy.yaml
+++ b/ci/spec/helm-chart/deploy.yaml
@@ -19,11 +19,11 @@ staging_helm-chart:
         - cd ..
         # Build and deploy helm-chart.
         - sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD
-        - sudo docker build -t oneuptimeproject/helm-chart:master ./helm-chart
-        - sudo docker tag oneuptimeproject/helm-chart:master oneuptimeproject/helm-chart:3.0.$CI_PIPELINE_IID
-        - sudo docker push oneuptimeproject/helm-chart:3.0.$CI_PIPELINE_IID
-        - sudo docker push oneuptimeproject/helm-chart:master
-        - sudo kubectl set image deployment/fi-helm-chart fi-helm-chart=oneuptimeproject/helm-chart:3.0.$CI_PIPELINE_IID
+        - sudo docker build -t oneuptime/helm-chart:master ./helm-chart
+        - sudo docker tag oneuptime/helm-chart:master oneuptime/helm-chart:3.0.$CI_PIPELINE_IID
+        - sudo docker push oneuptime/helm-chart:3.0.$CI_PIPELINE_IID
+        - sudo docker push oneuptime/helm-chart:master
+        - sudo kubectl set image deployment/fi-helm-chart fi-helm-chart=oneuptime/helm-chart:3.0.$CI_PIPELINE_IID
         # Cleanup
         - chmod +x ./ci/scripts/deployment-cleanup.sh
         - ./ci/scripts/deployment-cleanup.sh
@@ -56,11 +56,11 @@ production_helm-chart:
         - cd ..
         # Deploy to production
         - sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD
-        - sudo docker build -t oneuptimeproject/helm-chart:latest ./helm-chart
-        - sudo docker tag oneuptimeproject/helm-chart:latest oneuptimeproject/helm-chart:3.0.$CI_PIPELINE_IID
-        - sudo docker push oneuptimeproject/helm-chart:3.0.$CI_PIPELINE_IID
-        - sudo docker push oneuptimeproject/helm-chart:latest
-        - sudo kubectl set image deployment/fi-helm-chart fi-helm-chart=oneuptimeproject/helm-chart:3.0.$CI_PIPELINE_IID
+        - sudo docker build -t oneuptime/helm-chart:latest ./helm-chart
+        - sudo docker tag oneuptime/helm-chart:latest oneuptime/helm-chart:3.0.$CI_PIPELINE_IID
+        - sudo docker push oneuptime/helm-chart:3.0.$CI_PIPELINE_IID
+        - sudo docker push oneuptime/helm-chart:latest
+        - sudo kubectl set image deployment/fi-helm-chart fi-helm-chart=oneuptime/helm-chart:3.0.$CI_PIPELINE_IID
         # Cleanup
         - chmod +x ./ci/scripts/deployment-cleanup.sh
         - ./ci/scripts/deployment-cleanup.sh
diff --git a/ci/spec/home/deploy.yaml b/ci/spec/home/deploy.yaml
index 5243380548..9ec88fe2af 100644
--- a/ci/spec/home/deploy.yaml
+++ b/ci/spec/home/deploy.yaml
@@ -11,9 +11,9 @@ production_home:
         - bash ./ci/scripts/deployment-production-setup.sh
         - sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
         - sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/home:3.0.$CI_PIPELINE_IID --push ./home
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/home:master --push ./home
-        - sudo kubectl set image deployment/fi-home fi-home=oneuptimeproject/home:3.0.$CI_PIPELINE_IID
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/home:3.0.$CI_PIPELINE_IID --push ./home
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/home:master --push ./home
+        - sudo kubectl set image deployment/fi-home fi-home=oneuptime/home:3.0.$CI_PIPELINE_IID
         # Cleanup
         - chmod +x ./ci/scripts/deployment-cleanup.sh
         - ./ci/scripts/deployment-cleanup.sh
@@ -42,9 +42,9 @@ staging_home:
         # Build and deploy home.
         - sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD
         - sudo docker buildx create --use
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/home:3.0.$CI_PIPELINE_IID --push ./home
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/home:master --push ./home
-        - sudo kubectl set image deployment/fi-home fi-home=oneuptimeproject/home:3.0.$CI_PIPELINE_IID
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/home:3.0.$CI_PIPELINE_IID --push ./home
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/home:master --push ./home
+        - sudo kubectl set image deployment/fi-home fi-home=oneuptime/home:3.0.$CI_PIPELINE_IID
         # Cleanup
         - chmod +x ./ci/scripts/deployment-cleanup.sh
         - ./ci/scripts/deployment-cleanup.sh
diff --git a/ci/spec/home/lighthouse.yaml b/ci/spec/home/lighthouse.yaml
index 28a9043559..5f01b68997 100644
--- a/ci/spec/home/lighthouse.yaml
+++ b/ci/spec/home/lighthouse.yaml
@@ -11,8 +11,8 @@ mobile_lighthouse_home:
         - echo "Setup machine for running lighthouse on home page"
         - sudo docker stop $(sudo docker ps -aq) || echo 'No docker containers'
         - sudo docker rm $(sudo docker ps -aq) || echo 'No docker containers'
-        - sudo docker build -t oneuptimeproject/home:3.0.$CI_PIPELINE_IID ./home
-        - sudo docker run -p 1444:1444 -d oneuptimeproject/home:3.0.$CI_PIPELINE_IID
+        - sudo docker build -t oneuptime/home:3.0.$CI_PIPELINE_IID ./home
+        - sudo docker run -p 1444:1444 -d oneuptime/home:3.0.$CI_PIPELINE_IID
         - sudo docker ps
         - cd home
         - npm ci
@@ -40,8 +40,8 @@ desktop_lighthouse_home:
         - echo "Setup machine for running lighthouse on home page"
         - sudo docker stop $(sudo docker ps -aq) || echo 'No docker containers'
         - sudo docker rm $(sudo docker ps -aq) || echo 'No docker containers'
-        - sudo docker build -t oneuptimeproject/home:3.0.$CI_PIPELINE_IID ./home
-        - sudo docker run -p 1444:1444 -d oneuptimeproject/home:3.0.$CI_PIPELINE_IID
+        - sudo docker build -t oneuptime/home:3.0.$CI_PIPELINE_IID ./home
+        - sudo docker run -p 1444:1444 -d oneuptime/home:3.0.$CI_PIPELINE_IID
         - sudo docker ps
         - cd home
         - npm ci
diff --git a/ci/spec/http-test-server/deploy.yaml b/ci/spec/http-test-server/deploy.yaml
index 2a675d96db..28f528890d 100644
--- a/ci/spec/http-test-server/deploy.yaml
+++ b/ci/spec/http-test-server/deploy.yaml
@@ -12,9 +12,9 @@ staging_http_test_server:
         - sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
         - sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD
         - sudo docker buildx create --use
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/http-test-server:3.0.$CI_PIPELINE_IID --push ./http-test-server
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/http-test-server:master --push ./http-test-server
-        - sudo kubectl set image deployment/fi-test fi-test=oneuptimeproject/http-test-server:3.0.$CI_PIPELINE_IID
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/http-test-server:3.0.$CI_PIPELINE_IID --push ./http-test-server
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/http-test-server:master --push ./http-test-server
+        - sudo kubectl set image deployment/fi-test fi-test=oneuptime/http-test-server:3.0.$CI_PIPELINE_IID
         # Cleanup
         - chmod +x ./ci/scripts/deployment-cleanup.sh
         - ./ci/scripts/deployment-cleanup.sh
@@ -41,9 +41,9 @@ production_http_test_server:
         - sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
         - sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD
         - sudo docker buildx create --use
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/http-test-server:3.0.$CI_PIPELINE_IID --push ./http-test-server
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/http-test-server:latest --push ./http-test-server
-        - sudo kubectl set image deployment/fi-test fi-test=oneuptimeproject/http-test-server:3.0.$CI_PIPELINE_IID
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/http-test-server:3.0.$CI_PIPELINE_IID --push ./http-test-server
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/http-test-server:latest --push ./http-test-server
+        - sudo kubectl set image deployment/fi-test fi-test=oneuptime/http-test-server:3.0.$CI_PIPELINE_IID
         # Cleanup
         - chmod +x ./ci/scripts/deployment-cleanup.sh
         - ./ci/scripts/deployment-cleanup.sh
diff --git a/ci/spec/init-script/deploy.yaml b/ci/spec/init-script/deploy.yaml
index d48e7792b4..0d5628392d 100644
--- a/ci/spec/init-script/deploy.yaml
+++ b/ci/spec/init-script/deploy.yaml
@@ -13,10 +13,10 @@ staging_init-script:
         - chmod +x ./ci/scripts/deployment-staging-setup.sh
         - bash ./ci/scripts/deployment-staging-setup.sh
         - sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD
-        - sudo docker build -t oneuptimeproject/init-script:master ./init-script
-        - sudo docker tag oneuptimeproject/init-script:master oneuptimeproject/init-script:3.0.$CI_PIPELINE_IID
-        - sudo docker push oneuptimeproject/init-script:3.0.$CI_PIPELINE_IID
-        - sudo docker push oneuptimeproject/init-script:master
+        - sudo docker build -t oneuptime/init-script:master ./init-script
+        - sudo docker tag oneuptime/init-script:master oneuptime/init-script:3.0.$CI_PIPELINE_IID
+        - sudo docker push oneuptime/init-script:3.0.$CI_PIPELINE_IID
+        - sudo docker push oneuptime/init-script:master
         ## You cannot update a Kubernetes job. They are immutable. Delete it and run helm again which will create a a new job. .
         - sudo kubectl delete job fi-init-script || echo "Job not found"
         - sudo helm upgrade --reuse-values fi ./helm-chart/public/oneuptime
@@ -46,10 +46,10 @@ production_init-script:
         - chmod +x ./ci/scripts/deployment-production-setup.sh
         - bash ./ci/scripts/deployment-production-setup.sh
         - sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD
-        - sudo docker build -t oneuptimeproject/init-script:latest ./init-script
-        - sudo docker tag oneuptimeproject/init-script:latest oneuptimeproject/init-script:3.0.$CI_PIPELINE_IID
-        - sudo docker push oneuptimeproject/init-script:3.0.$CI_PIPELINE_IID
-        - sudo docker push oneuptimeproject/init-script:latest
+        - sudo docker build -t oneuptime/init-script:latest ./init-script
+        - sudo docker tag oneuptime/init-script:latest oneuptime/init-script:3.0.$CI_PIPELINE_IID
+        - sudo docker push oneuptime/init-script:3.0.$CI_PIPELINE_IID
+        - sudo docker push oneuptime/init-script:latest
         ## You cannot update a Kubernetes job. They are immutable. Delete it and run helm again which will create a a new job. .
         - sudo kubectl delete job fi-init-script || echo "Job not found"
         - sudo helm upgrade --reuse-values fi ./helm-chart/public/oneuptime
diff --git a/ci/spec/java-sdk/build-n-test.yaml b/ci/spec/java-sdk/build-n-test.yaml
index 014052276d..1aaeace39c 100644
--- a/ci/spec/java-sdk/build-n-test.yaml
+++ b/ci/spec/java-sdk/build-n-test.yaml
@@ -12,8 +12,8 @@ test_java-sdk:
         - sudo docker rm $(sudo docker ps -aq) || echo 'No docker containers'
         - sudo docker run --name mongo -p 27017:27017 -d mongo:4.2.3
         - sudo docker run --name redis -p 6379:6379 -d redis:5.0.7 redis-server
-        - sudo docker build -t oneuptimeproject/backend:3.0.$CI_PIPELINE_IID ./backend
-        - sudo docker run --env-file ./backend/.env  -e ENCRYPTION_KEY=$ENCRYPTION_KEY --net=host -d oneuptimeproject/backend:3.0.$CI_PIPELINE_IID
+        - sudo docker build -t oneuptime/backend:3.0.$CI_PIPELINE_IID ./backend
+        - sudo docker run --env-file ./backend/.env  -e ENCRYPTION_KEY=$ENCRYPTION_KEY --net=host -d oneuptime/backend:3.0.$CI_PIPELINE_IID
         - sudo docker ps
         - sudo apt-get install -y maven
         - sudo apt-get remove -y --purge openjdk* java-common default-jdk
diff --git a/ci/spec/java-sdk/deploy.yaml b/ci/spec/java-sdk/deploy.yaml
index 5d5965f786..ca06606e78 100644
--- a/ci/spec/java-sdk/deploy.yaml
+++ b/ci/spec/java-sdk/deploy.yaml
@@ -14,8 +14,8 @@ staging_java-sdk:
         - sudo docker rm $(sudo docker ps -aq) || echo 'No docker containers'
         - sudo docker run --name mongo -p 27017:27017 -d mongo:4.2.3
         - sudo docker run --name redis -p 6379:6379 -d redis:5.0.7 redis-server
-        - sudo docker build -t oneuptimeproject/backend:3.0.$CI_PIPELINE_IID ./backend
-        - sudo docker run --env-file ./backend/.env --net=host -d oneuptimeproject/backend:3.0.$CI_PIPELINE_IID
+        - sudo docker build -t oneuptime/backend:3.0.$CI_PIPELINE_IID ./backend
+        - sudo docker run --env-file ./backend/.env --net=host -d oneuptime/backend:3.0.$CI_PIPELINE_IID
         - sudo docker ps
         - cd java-sdk
         # - gpg --batch --passphrase $GPG_PASSPHRASE --quick-generate-key FYIPE default default 2024-07-16
@@ -56,8 +56,8 @@ production_java-sdk:
         - sudo docker rm $(sudo docker ps -aq) || echo 'No docker containers'
         - sudo docker run --name mongo -p 27017:27017 -d mongo:4.2.3
         - sudo docker run --name redis -p 6379:6379 -d redis:5.0.7 redis-server
-        - sudo docker build -t oneuptimeproject/backend:3.0.$CI_PIPELINE_IID ./backend
-        - sudo docker run --env-file ./backend/.env --net=host -d oneuptimeproject/backend:3.0.$CI_PIPELINE_IID
+        - sudo docker build -t oneuptime/backend:3.0.$CI_PIPELINE_IID ./backend
+        - sudo docker run --env-file ./backend/.env --net=host -d oneuptime/backend:3.0.$CI_PIPELINE_IID
         - sudo docker ps
         - cd java-sdk
         # - gpg --batch --passphrase $GPG_PASSPHRASE --quick-generate-key FYIPE default default 2024-07-16
diff --git a/ci/spec/js-sdk/build-n-test.yaml b/ci/spec/js-sdk/build-n-test.yaml
index 53aceeffdb..407e74de6d 100644
--- a/ci/spec/js-sdk/build-n-test.yaml
+++ b/ci/spec/js-sdk/build-n-test.yaml
@@ -12,8 +12,8 @@ test_js-sdk:
         - sudo docker rm $(sudo docker ps -aq) || echo 'No docker containers'
         - sudo docker run --name mongo -p 27017:27017 -d mongo:4.2.3
         - sudo docker run --name redis -p 6379:6379 -d redis:5.0.7 redis-server
-        - sudo docker build -t oneuptimeproject/backend:3.0.$CI_PIPELINE_IID ./backend
-        - sudo docker run --env-file ./backend/.env  -e ENCRYPTION_KEY=$ENCRYPTION_KEY --net=host -d oneuptimeproject/backend:3.0.$CI_PIPELINE_IID
+        - sudo docker build -t oneuptime/backend:3.0.$CI_PIPELINE_IID ./backend
+        - sudo docker run --env-file ./backend/.env  -e ENCRYPTION_KEY=$ENCRYPTION_KEY --net=host -d oneuptime/backend:3.0.$CI_PIPELINE_IID
         - sudo docker ps
         - cd js-sdk
         - npm ci
diff --git a/ci/spec/licensing/build-n-test.yaml b/ci/spec/licensing/build-n-test.yaml
index 14a5b4dddf..32940c1d57 100644
--- a/ci/spec/licensing/build-n-test.yaml
+++ b/ci/spec/licensing/build-n-test.yaml
@@ -7,9 +7,9 @@ test_licensing:
         - curl -sSL https://get.docker.com/ | sh #Install docker.
         - sudo docker stop $(sudo docker ps -aq) || echo 'No docker containers'
         - sudo docker rm $(sudo docker ps -aq) || echo 'No docker containers'
-        - sudo docker build -t oneuptimeproject/licensing:3.0.$CI_PIPELINE_IID ./licensing
+        - sudo docker build -t oneuptime/licensing:3.0.$CI_PIPELINE_IID ./licensing
         - sudo docker ps
-        - sudo docker run --env-file ./licensing/.env --net=host oneuptimeproject/licensing:3.0.$CI_PIPELINE_IID npm test
+        - sudo docker run --env-file ./licensing/.env --net=host oneuptime/licensing:3.0.$CI_PIPELINE_IID npm test
         - chmod +x ./ci/scripts/storehash.sh
         - ./ci/scripts/storehash.sh test_licensing licensing
         - chmod +x ./ci/scripts/cleanup.sh
diff --git a/ci/spec/licensing/deploy.yaml b/ci/spec/licensing/deploy.yaml
index 2603384092..e6dc77e178 100644
--- a/ci/spec/licensing/deploy.yaml
+++ b/ci/spec/licensing/deploy.yaml
@@ -14,9 +14,9 @@ staging_licensing:
         # Build and deploy licensing.
         - sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD
         - sudo docker buildx create --use
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/licensing:3.0.$CI_PIPELINE_IID --push ./licensing
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/licensing:master --push ./licensing
-        - sudo kubectl set image deployment/fi-licensing fi-licensing=oneuptimeproject/licensing:3.0.$CI_PIPELINE_IID
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/licensing:3.0.$CI_PIPELINE_IID --push ./licensing
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/licensing:master --push ./licensing
+        - sudo kubectl set image deployment/fi-licensing fi-licensing=oneuptime/licensing:3.0.$CI_PIPELINE_IID
         # Cleanup
         - chmod +x ./ci/scripts/deployment-cleanup.sh
         - ./ci/scripts/deployment-cleanup.sh
@@ -43,9 +43,9 @@ production_licensing:
         - sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
         - sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD
         - sudo docker buildx create --use
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/licensing:3.0.$CI_PIPELINE_IID --push ./licensing
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/licensing:latest --push ./licensing
-        - sudo kubectl set image deployment/fi-licensing fi-licensing=oneuptimeproject/licensing:3.0.$CI_PIPELINE_IID
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/licensing:3.0.$CI_PIPELINE_IID --push ./licensing
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/licensing:latest --push ./licensing
+        - sudo kubectl set image deployment/fi-licensing fi-licensing=oneuptime/licensing:3.0.$CI_PIPELINE_IID
         # Cleanup
         - chmod +x ./ci/scripts/deployment-cleanup.sh
         - ./ci/scripts/deployment-cleanup.sh
diff --git a/ci/spec/lighthouse-runner/deploy.yaml b/ci/spec/lighthouse-runner/deploy.yaml
index f593a04816..1aa41792bb 100644
--- a/ci/spec/lighthouse-runner/deploy.yaml
+++ b/ci/spec/lighthouse-runner/deploy.yaml
@@ -14,9 +14,9 @@ staging_lighthouse-runner:
         # Build and deploy lighthouse-runner
         - sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD
         - sudo docker buildx create --use
-        - sudo docker buildx build --build-arg PORT="3015" --platform linux/amd64,linux/arm64 --tag oneuptimeproject/lighthouse-runner:3.0.$CI_PIPELINE_IID --push ./lighthouse-runner
-        - sudo docker buildx build --build-arg PORT="3015" --platform linux/amd64,linux/arm64 --tag oneuptimeproject/lighthouse-runner:master --push ./lighthouse-runner
-        - sudo kubectl set image deployment/fi-lighthouse fi-lighthouse=oneuptimeproject/lighthouse-runner:3.0.$CI_PIPELINE_IID
+        - sudo docker buildx build --build-arg PORT="3015" --platform linux/amd64,linux/arm64 --tag oneuptime/lighthouse-runner:3.0.$CI_PIPELINE_IID --push ./lighthouse-runner
+        - sudo docker buildx build --build-arg PORT="3015" --platform linux/amd64,linux/arm64 --tag oneuptime/lighthouse-runner:master --push ./lighthouse-runner
+        - sudo kubectl set image deployment/fi-lighthouse fi-lighthouse=oneuptime/lighthouse-runner:3.0.$CI_PIPELINE_IID
         # Cleanup
         - chmod +x ./ci/scripts/deployment-cleanup.sh
         - ./ci/scripts/deployment-cleanup.sh
@@ -43,9 +43,9 @@ production_lighthouse-runner:
         - sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
         - sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD
         - sudo docker buildx create --use
-        - sudo docker buildx build --build-arg PORT="3015" --platform linux/amd64,linux/arm64 --tag oneuptimeproject/lighthouse-runner:3.0.$CI_PIPELINE_IID --push ./lighthouse-runner
-        - sudo docker buildx build --build-arg PORT="3015" --platform linux/amd64,linux/arm64 --tag oneuptimeproject/lighthouse-runner:latest --push ./lighthouse-runner
-        - sudo kubectl set image deployment/fi-lighthouse fi-lighthouse=oneuptimeproject/lighthouse-runner:3.0.$CI_PIPELINE_IID
+        - sudo docker buildx build --build-arg PORT="3015" --platform linux/amd64,linux/arm64 --tag oneuptime/lighthouse-runner:3.0.$CI_PIPELINE_IID --push ./lighthouse-runner
+        - sudo docker buildx build --build-arg PORT="3015" --platform linux/amd64,linux/arm64 --tag oneuptime/lighthouse-runner:latest --push ./lighthouse-runner
+        - sudo kubectl set image deployment/fi-lighthouse fi-lighthouse=oneuptime/lighthouse-runner:3.0.$CI_PIPELINE_IID
         # Cleanup
         - chmod +x ./ci/scripts/deployment-cleanup.sh
         - ./ci/scripts/deployment-cleanup.sh
diff --git a/ci/spec/php-sdk/build-n-test.yaml b/ci/spec/php-sdk/build-n-test.yaml
index 1ef2b17b4f..ed7840c9b3 100644
--- a/ci/spec/php-sdk/build-n-test.yaml
+++ b/ci/spec/php-sdk/build-n-test.yaml
@@ -15,8 +15,8 @@ test_php-sdk:
         - sudo docker rm $(sudo docker ps -aq) || echo 'No docker containers'
         - sudo docker run --name mongo -p 27017:27017 -d mongo:4.2.3
         - sudo docker run --name redis -p 6379:6379 -d redis:5.0.7 redis-server
-        - sudo docker build -t oneuptimeproject/backend:3.0.$CI_PIPELINE_IID ./backend
-        - sudo docker run --env-file ./backend/.env  -e ENCRYPTION_KEY=$ENCRYPTION_KEY --net=host -d oneuptimeproject/backend:3.0.$CI_PIPELINE_IID
+        - sudo docker build -t oneuptime/backend:3.0.$CI_PIPELINE_IID ./backend
+        - sudo docker run --env-file ./backend/.env  -e ENCRYPTION_KEY=$ENCRYPTION_KEY --net=host -d oneuptime/backend:3.0.$CI_PIPELINE_IID
         - sudo docker ps
         - cd php-sdk
         - composer install
diff --git a/ci/spec/probe/deploy.yaml b/ci/spec/probe/deploy.yaml
index 4f31e479cd..62aaa15b25 100644
--- a/ci/spec/probe/deploy.yaml
+++ b/ci/spec/probe/deploy.yaml
@@ -12,10 +12,10 @@ production_probe:
         - sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
         - sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD
         - sudo docker buildx create --use
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/probe:3.0.$CI_PIPELINE_IID --push ./probe
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/probe:latest --push ./probe
-        - sudo kubectl set image deployment/fi-probe1 fi-probe1=oneuptimeproject/probe:3.0.$CI_PIPELINE_IID
-        - sudo kubectl set image deployment/fi-probe2 fi-probe2=oneuptimeproject/probe:3.0.$CI_PIPELINE_IID
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/probe:3.0.$CI_PIPELINE_IID --push ./probe
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/probe:latest --push ./probe
+        - sudo kubectl set image deployment/fi-probe1 fi-probe1=oneuptime/probe:3.0.$CI_PIPELINE_IID
+        - sudo kubectl set image deployment/fi-probe2 fi-probe2=oneuptime/probe:3.0.$CI_PIPELINE_IID
         # Cleanup
         - chmod +x ./ci/scripts/deployment-cleanup.sh
         - ./ci/scripts/deployment-cleanup.sh
@@ -44,11 +44,11 @@ staging_probe:
         # Build and deploy probe.
         - sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD
         - sudo docker buildx create --use
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/probe:3.0.$CI_PIPELINE_IID --push ./probe
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/probe:master --push ./probe
-        - sudo kubectl set image deployment/fi-probe1 fi-probe1=oneuptimeproject/probe:3.0.$CI_PIPELINE_IID
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/probe:3.0.$CI_PIPELINE_IID --push ./probe
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/probe:master --push ./probe
+        - sudo kubectl set image deployment/fi-probe1 fi-probe1=oneuptime/probe:3.0.$CI_PIPELINE_IID
         # Additionally update probe1 deployment as well.
-        - sudo kubectl set image deployment/fi-probe2 fi-probe2=oneuptimeproject/probe:3.0.$CI_PIPELINE_IID
+        - sudo kubectl set image deployment/fi-probe2 fi-probe2=oneuptime/probe:3.0.$CI_PIPELINE_IID
         # Cleanup
         - chmod +x ./ci/scripts/deployment-cleanup.sh
         - ./ci/scripts/deployment-cleanup.sh
diff --git a/ci/spec/python-sdk/build-n-test.yaml b/ci/spec/python-sdk/build-n-test.yaml
index 88dda11196..87fae471a6 100644
--- a/ci/spec/python-sdk/build-n-test.yaml
+++ b/ci/spec/python-sdk/build-n-test.yaml
@@ -12,8 +12,8 @@ test_python-sdk:
         - sudo docker rm $(sudo docker ps -aq) || echo 'No docker containers'
         - sudo docker run --name mongo -p 27017:27017 -d mongo:4.2.3
         - sudo docker run --name redis -p 6379:6379 -d redis:5.0.7 redis-server
-        - sudo docker build -t oneuptimeproject/backend:3.0.$CI_PIPELINE_IID ./backend
-        - sudo docker run --env-file ./backend/.env  -e ENCRYPTION_KEY=$ENCRYPTION_KEY --net=host -d oneuptimeproject/backend:3.0.$CI_PIPELINE_IID
+        - sudo docker build -t oneuptime/backend:3.0.$CI_PIPELINE_IID ./backend
+        - sudo docker run --env-file ./backend/.env  -e ENCRYPTION_KEY=$ENCRYPTION_KEY --net=host -d oneuptime/backend:3.0.$CI_PIPELINE_IID
         - sudo docker ps
         - sudo apt-get install -y python3-pip
         - cd python-sdk
diff --git a/ci/spec/realtime/deploy.yaml b/ci/spec/realtime/deploy.yaml
index 9ddff3a681..f93a2227bd 100644
--- a/ci/spec/realtime/deploy.yaml
+++ b/ci/spec/realtime/deploy.yaml
@@ -12,9 +12,9 @@ production_realtime:
         - sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
         - sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD
         - sudo docker buildx create --use
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/realtime:3.0.$CI_PIPELINE_IID --push ./realtime
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/realtime:latest --push ./realtime
-        - sudo kubectl set image deployment/fi-realtime fi-realtime=oneuptimeproject/realtime:3.0.$CI_PIPELINE_IID
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/realtime:3.0.$CI_PIPELINE_IID --push ./realtime
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/realtime:latest --push ./realtime
+        - sudo kubectl set image deployment/fi-realtime fi-realtime=oneuptime/realtime:3.0.$CI_PIPELINE_IID
         # Cleanup
         - chmod +x ./ci/scripts/deployment-cleanup.sh
         - ./ci/scripts/deployment-cleanup.sh
@@ -43,9 +43,9 @@ staging_realtime:
         # Build and deploy realtime.
         - sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD
         - sudo docker buildx create --use
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/realtime:3.0.$CI_PIPELINE_IID --push ./realtime
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/realtime:master --push ./realtime
-        - sudo kubectl set image deployment/fi-realtime fi-realtime=oneuptimeproject/realtime:3.0.$CI_PIPELINE_IID
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/realtime:3.0.$CI_PIPELINE_IID --push ./realtime
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/realtime:master --push ./realtime
+        - sudo kubectl set image deployment/fi-realtime fi-realtime=oneuptime/realtime:3.0.$CI_PIPELINE_IID
         # Cleanup
         - chmod +x ./ci/scripts/deployment-cleanup.sh
         - ./ci/scripts/deployment-cleanup.sh
diff --git a/ci/spec/ruby-sdk/build-n-test.yaml b/ci/spec/ruby-sdk/build-n-test.yaml
index de120388c3..92f6e3c027 100644
--- a/ci/spec/ruby-sdk/build-n-test.yaml
+++ b/ci/spec/ruby-sdk/build-n-test.yaml
@@ -12,8 +12,8 @@ test_ruby-sdk:
         - sudo docker rm $(sudo docker ps -aq) || echo 'No docker containers'
         - sudo docker run --name mongo -p 27017:27017 -d mongo:4.2.3
         - sudo docker run --name redis -p 6379:6379 -d redis:5.0.7 redis-server
-        - sudo docker build -t oneuptimeproject/backend:3.0.$CI_PIPELINE_IID ./backend
-        - sudo docker run --env-file ./backend/.env  -e ENCRYPTION_KEY=$ENCRYPTION_KEY --net=host -d oneuptimeproject/backend:3.0.$CI_PIPELINE_IID
+        - sudo docker build -t oneuptime/backend:3.0.$CI_PIPELINE_IID ./backend
+        - sudo docker run --env-file ./backend/.env  -e ENCRYPTION_KEY=$ENCRYPTION_KEY --net=host -d oneuptime/backend:3.0.$CI_PIPELINE_IID
         - sudo docker ps
         - sudo apt install -y rbenv
         - cd ruby-sdk/fyipe
diff --git a/ci/spec/script-runner/deploy.yaml b/ci/spec/script-runner/deploy.yaml
index 6412c1621c..9344fdb1d0 100644
--- a/ci/spec/script-runner/deploy.yaml
+++ b/ci/spec/script-runner/deploy.yaml
@@ -14,9 +14,9 @@ staging_script-runner:
         # Build and deploy script-runner.
         - sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD
         - sudo docker buildx create --use
-        - sudo docker buildx build --build-arg PORT="3009" --platform linux/amd64,linux/arm64 --tag oneuptimeproject/script-runner:3.0.$CI_PIPELINE_IID --push ./script-runner
-        - sudo docker buildx build --build-arg PORT="3009" --platform linux/amd64,linux/arm64 --tag oneuptimeproject/script-runner:master --push ./script-runner
-        - sudo kubectl set image deployment/fi-script fi-script=oneuptimeproject/script-runner:3.0.$CI_PIPELINE_IID
+        - sudo docker buildx build --build-arg PORT="3009" --platform linux/amd64,linux/arm64 --tag oneuptime/script-runner:3.0.$CI_PIPELINE_IID --push ./script-runner
+        - sudo docker buildx build --build-arg PORT="3009" --platform linux/amd64,linux/arm64 --tag oneuptime/script-runner:master --push ./script-runner
+        - sudo kubectl set image deployment/fi-script fi-script=oneuptime/script-runner:3.0.$CI_PIPELINE_IID
         # Cleanup
         - chmod +x ./ci/scripts/deployment-cleanup.sh
         - ./ci/scripts/deployment-cleanup.sh
@@ -43,9 +43,9 @@ production_script-runner:
         - sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
         - sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD
         - sudo docker buildx create --use
-        - sudo docker buildx build --build-arg PORT="3009" --platform linux/amd64,linux/arm64 --tag oneuptimeproject/script-runner:3.0.$CI_PIPELINE_IID --push ./script-runner
-        - sudo docker buildx build --build-arg PORT="3009" --platform linux/amd64,linux/arm64 --tag oneuptimeproject/script-runner:latest --push ./script-runner
-        - sudo kubectl set image deployment/fi-script fi-script=oneuptimeproject/script-runner:3.0.$CI_PIPELINE_IID
+        - sudo docker buildx build --build-arg PORT="3009" --platform linux/amd64,linux/arm64 --tag oneuptime/script-runner:3.0.$CI_PIPELINE_IID --push ./script-runner
+        - sudo docker buildx build --build-arg PORT="3009" --platform linux/amd64,linux/arm64 --tag oneuptime/script-runner:latest --push ./script-runner
+        - sudo kubectl set image deployment/fi-script fi-script=oneuptime/script-runner:3.0.$CI_PIPELINE_IID
         # Cleanup
         - chmod +x ./ci/scripts/deployment-cleanup.sh
         - ./ci/scripts/deployment-cleanup.sh
diff --git a/ci/spec/status-page/deploy.yaml b/ci/spec/status-page/deploy.yaml
index 13f6900fcf..09675b8bb6 100644
--- a/ci/spec/status-page/deploy.yaml
+++ b/ci/spec/status-page/deploy.yaml
@@ -13,9 +13,9 @@ staging_status-page:
         # Build and deploy status-page.
         - sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD
         - sudo docker buildx create --use
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/status-page:3.0.$CI_PIPELINE_IID --push ./status-page
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/status-page:master --push ./status-page
-        - sudo kubectl set image deployment/fi-status fi-status=oneuptimeproject/status-page:3.0.$CI_PIPELINE_IID
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/status-page:3.0.$CI_PIPELINE_IID --push ./status-page
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/status-page:master --push ./status-page
+        - sudo kubectl set image deployment/fi-status fi-status=oneuptime/status-page:3.0.$CI_PIPELINE_IID
         # Cleanup
         - chmod +x ./ci/scripts/deployment-cleanup.sh
         - ./ci/scripts/deployment-cleanup.sh
@@ -41,9 +41,9 @@ production_status-page:
         - sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
         - sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD
         - sudo docker buildx create --use
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/status-page:3.0.$CI_PIPELINE_IID --push ./status-page
-        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptimeproject/status-page:latest --push ./status-page
-        - sudo kubectl set image deployment/fi-status fi-status=oneuptimeproject/status-page:3.0.$CI_PIPELINE_IID
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/status-page:3.0.$CI_PIPELINE_IID --push ./status-page
+        - sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/status-page:latest --push ./status-page
+        - sudo kubectl set image deployment/fi-status fi-status=oneuptime/status-page:3.0.$CI_PIPELINE_IID
         # Cleanup
         - chmod +x ./ci/scripts/deployment-cleanup.sh
         - ./ci/scripts/deployment-cleanup.sh
diff --git a/dashboard/src/components/modals/EditContainerSecurity.js b/dashboard/src/components/modals/EditContainerSecurity.js
index 90b16e2b85..9039dabec2 100644
--- a/dashboard/src/components/modals/EditContainerSecurity.js
+++ b/dashboard/src/components/modals/EditContainerSecurity.js
@@ -247,7 +247,7 @@ class EditContainerSecurity extends Component {
                                                                         type="text"
                                                                         name="imagePath"
                                                                         id="imagePath"
-                                                                        placeholder="oneuptimeproject/home"
+                                                                        placeholder="oneuptime/home"
                                                                         disabled={
                                                                             isRequesting
                                                                         }
diff --git a/dashboard/src/components/security/ContainerSecurityForm.js b/dashboard/src/components/security/ContainerSecurityForm.js
index 2a21743e8c..16ee77b164 100644
--- a/dashboard/src/components/security/ContainerSecurityForm.js
+++ b/dashboard/src/components/security/ContainerSecurityForm.js
@@ -234,7 +234,7 @@ class ContainerSecurityForm extends Component {
                                                             type="text"
                                                             name="imagePath"
                                                             id="imagePath"
-                                                            placeholder="oneuptimeproject/home"
+                                                            placeholder="oneuptime/home"
                                                             disabled={
                                                                 addingContainer
                                                             }
diff --git a/devops/docs/helm-ops.md b/devops/docs/helm-ops.md
index c3ad46289b..3f5341eaf1 100644
--- a/devops/docs/helm-ops.md
+++ b/devops/docs/helm-ops.md
@@ -110,7 +110,7 @@ cd..
 
 ### Docker Images
 
-Docker Images are hosted at: https://hub.docker.com/orgs/oneuptimeproject/repositories and are public.
+Docker Images are hosted at: https://hub.docker.com/orgs/oneuptime/repositories and are public.
 
 ### More info
 
diff --git a/devops/update.sh b/devops/update.sh
index 0be8074cf4..1279f1fbcc 100644
--- a/devops/update.sh
+++ b/devops/update.sh
@@ -15,22 +15,22 @@ function update {
 }
 
 # $1 - image tag
-update deployment/fi-accounts fi-accounts=oneuptimeproject/accounts:$1
-update deployment/fi-dashboard fi-dashboard=oneuptimeproject/dashboard:$1
-update deployment/fi-admin fi-admin=oneuptimeproject/admin-dashboard:$1
-update deployment/fi-api-docs fi-api-docs=oneuptimeproject/api-docs:$1
-update deployment/fi-app-scan fi-app-scan=oneuptimeproject/application-scanner:$1
-update deployment/fi-backend fi-backend=oneuptimeproject/backend:$1
-update deployment/fi-cont-scan fi-cont-scan=oneuptimeproject/container-scanner:$1
-update deployment/fi-ingestor fi-ingestor=oneuptimeproject/data-ingestor:$1
-update deployment/fi-haraka fi-haraka=oneuptimeproject/haraka:$1
-update deployment/fi-helm-chart fi-helm-chart=oneuptimeproject/helm-chart:$1
-update deployment/fi-home fi-home=oneuptimeproject/home:$1
-update deployment/fi-test fi-test=oneuptimeproject/http-test-server:$1
-update deployment/fi-licensing fi-licensing=oneuptimeproject/licensing:$1
-update deployment/fi-lighthouse fi-lighthouse=oneuptimeproject/lighthouse-runner:$1
-update deployment/fi-probe1 fi-probe1=oneuptimeproject/probe:$1
-update deployment/fi-probe2 fi-probe2=oneuptimeproject/probe:$1
-update deployment/fi-realtime fi-realtime=oneuptimeproject/realtime:$1
-update deployment/fi-script fi-script=oneuptimeproject/script-runner:$1
-update deployment/fi-status fi-status=oneuptimeproject/status-page:$1
\ No newline at end of file
+update deployment/fi-accounts fi-accounts=oneuptime/accounts:$1
+update deployment/fi-dashboard fi-dashboard=oneuptime/dashboard:$1
+update deployment/fi-admin fi-admin=oneuptime/admin-dashboard:$1
+update deployment/fi-api-docs fi-api-docs=oneuptime/api-docs:$1
+update deployment/fi-app-scan fi-app-scan=oneuptime/application-scanner:$1
+update deployment/fi-backend fi-backend=oneuptime/backend:$1
+update deployment/fi-cont-scan fi-cont-scan=oneuptime/container-scanner:$1
+update deployment/fi-ingestor fi-ingestor=oneuptime/data-ingestor:$1
+update deployment/fi-haraka fi-haraka=oneuptime/haraka:$1
+update deployment/fi-helm-chart fi-helm-chart=oneuptime/helm-chart:$1
+update deployment/fi-home fi-home=oneuptime/home:$1
+update deployment/fi-test fi-test=oneuptime/http-test-server:$1
+update deployment/fi-licensing fi-licensing=oneuptime/licensing:$1
+update deployment/fi-lighthouse fi-lighthouse=oneuptime/lighthouse-runner:$1
+update deployment/fi-probe1 fi-probe1=oneuptime/probe:$1
+update deployment/fi-probe2 fi-probe2=oneuptime/probe:$1
+update deployment/fi-realtime fi-realtime=oneuptime/realtime:$1
+update deployment/fi-script fi-script=oneuptime/script-runner:$1
+update deployment/fi-status fi-status=oneuptime/status-page:$1
\ No newline at end of file
diff --git a/helm-chart/public/oneuptime/README.md b/helm-chart/public/oneuptime/README.md
index e70bec21b8..0ed0e4707d 100644
--- a/helm-chart/public/oneuptime/README.md
+++ b/helm-chart/public/oneuptime/README.md
@@ -215,7 +215,7 @@ OneUptime Images are loaded from DockerHub by default. Images are public and by
 ```
 image:
   registry: docker.io # Docker Registry where to pull images from.
-  repository: oneuptimeproject # OneUptime docker repository.
+  repository: oneuptime # OneUptime docker repository.
   tag: latest # We recommend `latest` tag.
   pullPolicy: Always # We recommend Always
   restartPolicy: Always # We recommend Always
diff --git a/helm-chart/public/oneuptime/values.yaml b/helm-chart/public/oneuptime/values.yaml
index 4d8c4cd217..6f8e9d3858 100644
--- a/helm-chart/public/oneuptime/values.yaml
+++ b/helm-chart/public/oneuptime/values.yaml
@@ -88,12 +88,12 @@ rateLimitter:
 
 
 ## OneUptime official image version on Docker Hub
-## ref: https://hub.docker.com/u/oneuptimeproject
+## ref: https://hub.docker.com/u/oneuptime
 ##
 
 image:
   registry: docker.io
-  repository: oneuptimeproject
+  repository: oneuptime
   tag: latest
   pullPolicy: Always
   restartPolicy: Always
diff --git a/kubernetes/values-saas-ci.yaml b/kubernetes/values-saas-ci.yaml
index e6a81a6805..3af4eae5d0 100644
--- a/kubernetes/values-saas-ci.yaml
+++ b/kubernetes/values-saas-ci.yaml
@@ -35,7 +35,7 @@ oneuptime:
 
 image:
     registry: docker.io
-    repository: oneuptimeproject
+    repository: oneuptime
     tag: test
     pullPolicy: Always
     restartPolicy: Always
diff --git a/kubernetes/values-saas-staging.yaml b/kubernetes/values-saas-staging.yaml
index db4c9632dc..75ede4c6bc 100644
--- a/kubernetes/values-saas-staging.yaml
+++ b/kubernetes/values-saas-staging.yaml
@@ -46,7 +46,7 @@ oneuptime:
 
 image:
     registry: docker.io
-    repository: oneuptimeproject
+    repository: oneuptime
     tag: master
     pullPolicy: Always
     restartPolicy: Always