diff --git a/flyteadmin/.github/workflows/master.yml b/flyteadmin/.github/workflows/master.yml
index 2940f9645b..043e273767 100644
--- a/flyteadmin/.github/workflows/master.yml
+++ b/flyteadmin/.github/workflows/master.yml
@@ -26,11 +26,11 @@ jobs:
         run: (docker load -i /tmp/tmp/docker-images/snapshot-builder.tar || true) && (docker load -i /tmp/tmp/docker-images/snapshot.tar || true)
       - name: Build dockerfile
         run: |
-          docker build -t lyft/${{ github.event.repository.name }}:builder --target builder --cache-from=lyft/${{ github.event.repository.name }}:builder .
-          docker build -t lyft/${{ github.event.repository.name }}:latest --cache-from=lyft/${{ github.event.repository.name }}:builder .
+          docker build -t flyteorg/${{ github.event.repository.name }}:builder --target builder --cache-from=flyteorg/${{ github.event.repository.name }}:builder .
+          docker build -t flyteorg/${{ github.event.repository.name }}:latest --cache-from=flyteorg/${{ github.event.repository.name }}:builder .
 
       - name: Tag and cache docker image
-        run: mkdir -p /tmp/tmp/docker-images && docker save lyft/${{ github.event.repository.name }}:builder -o /tmp/tmp/docker-images/snapshot-builder.tar && docker save lyft/${{ github.event.repository.name }}:latest -o /tmp/tmp/docker-images/snapshot.tar
+        run: mkdir -p /tmp/tmp/docker-images && docker save flyteorg/${{ github.event.repository.name }}:builder -o /tmp/tmp/docker-images/snapshot-builder.tar && docker save flyteorg/${{ github.event.repository.name }}:latest -o /tmp/tmp/docker-images/snapshot.tar
 
   # Duplicated from pull request workflow because sharing is not yet supported
   endtoend:
@@ -57,7 +57,7 @@ jobs:
           kubectl get pods -n kube-system
           echo "current-context:" $(kubectl config current-context)
           echo "environment-kubeconfig:" ${KUBECONFIG}
-          IMAGE_NAME=${{ github.event.repository.name }} IMAGE=lyft/${{ github.event.repository.name }}:latest make end2end_execute
+          IMAGE_NAME=${{ github.event.repository.name }} IMAGE=flyteorg/${{ github.event.repository.name }}:latest make end2end_execute
 
   bump-version:
     name: Bump Version
diff --git a/flyteadmin/.github/workflows/pull_request.yml b/flyteadmin/.github/workflows/pull_request.yml
index dd43ab901d..2008f27456 100644
--- a/flyteadmin/.github/workflows/pull_request.yml
+++ b/flyteadmin/.github/workflows/pull_request.yml
@@ -23,11 +23,11 @@ jobs:
         run: (docker load -i /tmp/tmp/docker-images/snapshot-builder.tar || true) && (docker load -i /tmp/tmp/docker-images/snapshot.tar || true)
       - name: Build dockerfile
         run: |
-          docker build -t lyft/${{ github.event.repository.name }}:builder --target builder --cache-from=lyft/${{ github.event.repository.name }}:builder .
-          docker build -t lyft/${{ github.event.repository.name }}:latest --cache-from=lyft/${{ github.event.repository.name }}:builder .
+          docker build -t flyteorg/${{ github.event.repository.name }}:builder --target builder --cache-from=flyteorg/${{ github.event.repository.name }}:builder .
+          docker build -t flyteorg/${{ github.event.repository.name }}:latest --cache-from=flyteorg/${{ github.event.repository.name }}:builder .
 
       - name: Tag and cache docker image
-        run: mkdir -p /tmp/tmp/docker-images && docker save lyft/${{ github.event.repository.name }}:builder -o /tmp/tmp/docker-images/snapshot-builder.tar && docker save lyft/${{ github.event.repository.name }}:latest -o /tmp/tmp/docker-images/snapshot.tar
+        run: mkdir -p /tmp/tmp/docker-images && docker save flyteorg/${{ github.event.repository.name }}:builder -o /tmp/tmp/docker-images/snapshot-builder.tar && docker save flyteorg/${{ github.event.repository.name }}:latest -o /tmp/tmp/docker-images/snapshot.tar
 
   endtoend:
     name: End to End tests
@@ -53,7 +53,7 @@ jobs:
           kubectl get pods -n kube-system
           echo "current-context:" $(kubectl config current-context)
           echo "environment-kubeconfig:" ${KUBECONFIG}
-          IMAGE_NAME=${{ github.event.repository.name }} IMAGE=lyft/${{ github.event.repository.name }}:latest make end2end_execute
+          IMAGE_NAME=${{ github.event.repository.name }} IMAGE=flyteorg/${{ github.event.repository.name }}:latest make end2end_execute
 
   integration:
     name: Integration tests
@@ -77,7 +77,7 @@ jobs:
           kubectl get pods -n kube-system
           echo "current-context:" $(kubectl config current-context)
           echo "environment-kubeconfig:" ${KUBECONFIG}
-          IMAGE_NAME=${{ github.event.repository.name }} IMAGE=lyft/${{ github.event.repository.name }}:builder make k8s_integration_execute
+          IMAGE_NAME=${{ github.event.repository.name }} IMAGE=flyteorg/${{ github.event.repository.name }}:builder make k8s_integration_execute
 
   tests-lint:
     name: Run tests and lint
diff --git a/flyteadmin/README.md b/flyteadmin/README.md
index b7b2a55a7d..8bcf891d26 100644
--- a/flyteadmin/README.md
+++ b/flyteadmin/README.md
@@ -2,10 +2,10 @@ Flyteadmin
 =============
 [![Current Release](https://img.shields.io/github/release/flyteorg/flyteadmin.svg)](https://github.com/flyteorg/flyteadmin/releases/latest)
 ![Master](https://github.com/flyteorg/flyteadmin/workflows/Master/badge.svg)
-[![GoDoc](https://godoc.org/github.com/lyft/flyteadmin?status.svg)](https://pkg.go.dev/mod/github.com/lyft/flyteadmin)
+[![GoDoc](https://godoc.org/github.com/flyteorg/flyteadmin?status.svg)](https://pkg.go.dev/mod/github.com/flyteorg/flyteadmin)
 [![License](https://img.shields.io/badge/LICENSE-Apache2.0-ff69b4.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)
 [![CodeCoverage](https://img.shields.io/codecov/c/github/flyteorg/flyteadmin.svg)](https://codecov.io/gh/flyteorg/flyteadmin)
-[![Go Report Card](https://goreportcard.com/badge/github.com/lyft/flyteadmin)](https://goreportcard.com/report/github.com/lyft/flyteadmin)
+[![Go Report Card](https://goreportcard.com/badge/github.com/flyteorg/flyteadmin)](https://goreportcard.com/report/github.com/flyteorg/flyteadmin)
 ![Commit activity](https://img.shields.io/github/commit-activity/w/flyteorg/flyteadmin.svg?style=plastic)
 ![Commit since last release](https://img.shields.io/github/commits-since/flyteorg/flyteadmin/latest.svg?style=plastic)
 
diff --git a/flyteadmin/boilerplate/lyft/end2end/end2end.sh b/flyteadmin/boilerplate/lyft/end2end/end2end.sh
index 49c328cee4..e995492eec 100755
--- a/flyteadmin/boilerplate/lyft/end2end/end2end.sh
+++ b/flyteadmin/boilerplate/lyft/end2end/end2end.sh
@@ -11,7 +11,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 
 OUT="${DIR}/tmp"
 rm -rf ${OUT}
-git clone https://github.com/lyft/flyte.git "${OUT}"
+git clone https://github.com/flyteorg/flyte.git "${OUT}"
 
 pushd ${OUT}