diff --git a/.github/workflows/docker_build_base.yml b/.github/workflows/docker_build_base.yml
index 1d7590bdc7b..00848e2518e 100644
--- a/.github/workflows/docker_build_base.yml
+++ b/.github/workflows/docker_build_base.yml
@@ -15,9 +15,8 @@ permissions: read-all
 jobs:
   build_and_push_base:
     name: Build and push vitess/base Docker images
-    runs-on: ubuntu-latest
-#    runs-on: gh-hosted-runners-16cores-1
-#    if: github.repository == 'vitessio/vitess'
+    runs-on: gh-hosted-runners-16cores-1
+    if: github.repository == 'vitessio/vitess'
 
     strategy:
       fail-fast: true
@@ -49,7 +48,7 @@ jobs:
           context: .
           file: ${{ env.DOCKERFILE }}
           push: true
-          tags: frouioui/base:${{ matrix.branch }}
+          tags: vitess/base:${{ matrix.branch }}
 
       ######
       # All code below only applies to new tags
@@ -63,7 +62,7 @@ jobs:
         if: startsWith(github.ref, 'refs/tags/') && matrix.branch == 'latest'
         run: |
           if [[ "${{ matrix.branch }}" == "latest" ]]; then
-            echo "DOCKER_TAG=frouioui/base:${TAG_NAME}" >> $GITHUB_ENV
+            echo "DOCKER_TAG=vitess/base:${TAG_NAME}" >> $GITHUB_ENV
           fi
 
       - name: Build and push on tags
@@ -78,9 +77,8 @@ jobs:
   build_and_push_k8s:
     needs: build_and_push_base
     name: Build and push vitess/k8s image
-    runs-on: ubuntu-latest
-#    runs-on: gh-hosted-runners-16cores-1
-#    if: github.repository == 'vitessio/vitess'
+    runs-on: gh-hosted-runners-16cores-1
+    if: github.repository == 'vitessio/vitess'
 
     strategy:
       fail-fast: true
@@ -107,7 +105,7 @@ jobs:
         with:
           context: ${{ env.DOCKER_CTX }}
           push: true
-          tags: frouioui/k8s:latest
+          tags: vitess/k8s:latest
           build-args: |
             VT_BASE_VER=latest
             DEBIAN_VER=${{ matrix.debian }}-slim
@@ -118,7 +116,7 @@ jobs:
         with:
           context: ${{ env.DOCKER_CTX }}
           push: true
-          tags: frouioui/k8s:latest-${{ matrix.debian }}
+          tags: vitess/k8s:latest-${{ matrix.debian }}
           build-args: |
             VT_BASE_VER=latest
             DEBIAN_VER=${{ matrix.debian }}-slim
@@ -140,8 +138,8 @@ jobs:
       - name: Set Docker tag name
         if: startsWith(github.ref, 'refs/tags/')
         run: |
-          echo "DOCKER_TAG_DEFAULT_DEBIAN=frouioui/k8s:${TAG_NAME}" >> $GITHUB_ENV
-          echo "DOCKER_TAG=frouioui/k8s:${TAG_NAME}-${{ matrix.debian }}" >> $GITHUB_ENV
+          echo "DOCKER_TAG_DEFAULT_DEBIAN=vitess/k8s:${TAG_NAME}" >> $GITHUB_ENV
+          echo "DOCKER_TAG=vitess/k8s:${TAG_NAME}-${{ matrix.debian }}" >> $GITHUB_ENV
 
       # Build and Push component image to DOCKER_TAG, applies to both debian version
       - name: Build and push on tags using Debian extension
@@ -172,16 +170,14 @@ jobs:
   build_and_push_components:
     needs: build_and_push_k8s
     name: Build and push vitess components Docker images
-    runs-on: ubuntu-latest
-#    runs-on: gh-hosted-runners-16cores-1
-#    if: github.repository == 'vitessio/vitess'
+    runs-on: gh-hosted-runners-16cores-1
+    if: github.repository == 'vitessio/vitess'
 
     strategy:
       fail-fast: true
       matrix:
         debian: [ bullseye, bookworm ]
-        component: [ vtbackup, vtexplain ]
-#        component: [ vtadmin, vtorc, vtgate, vttablet, mysqlctld, mysqlctl, vtctl, vtctlclient, vtctld, logrotate, logtail, vtbackup, vtexplain ]
+        component: [ vtadmin, vtorc, vtgate, vttablet, mysqlctld, mysqlctl, vtctl, vtctlclient, vtctld, logrotate, logtail, vtbackup, vtexplain ]
 
     steps:
       - name: Check out code
@@ -203,7 +199,7 @@ jobs:
         with:
           context: ${{ env.DOCKER_CTX }}
           push: true
-          tags: frouioui/${{ matrix.component }}:latest
+          tags: vitess/${{ matrix.component }}:latest
           build-args: |
             VT_BASE_VER=latest
             DEBIAN_VER=${{ matrix.debian }}-slim
@@ -214,7 +210,7 @@ jobs:
         with:
           context: ${{ env.DOCKER_CTX }}
           push: true
-          tags: frouioui/${{ matrix.component }}:latest-${{ matrix.debian }}
+          tags: vitess/${{ matrix.component }}:latest-${{ matrix.debian }}
           build-args: |
             VT_BASE_VER=latest
             DEBIAN_VER=${{ matrix.debian }}-slim
@@ -236,8 +232,8 @@ jobs:
       - name: Set Docker tag name
         if: startsWith(github.ref, 'refs/tags/')
         run: |
-          echo "DOCKER_TAG_DEFAULT_DEBIAN=frouioui/${{ matrix.component }}:${TAG_NAME}" >> $GITHUB_ENV
-          echo "DOCKER_TAG=frouioui/${{ matrix.component }}:${TAG_NAME}-${{ matrix.debian }}" >> $GITHUB_ENV
+          echo "DOCKER_TAG_DEFAULT_DEBIAN=vitess/${{ matrix.component }}:${TAG_NAME}" >> $GITHUB_ENV
+          echo "DOCKER_TAG=vitess/${{ matrix.component }}:${TAG_NAME}-${{ matrix.debian }}" >> $GITHUB_ENV
 
       # Build and Push component image to DOCKER_TAG, applies to both debian version
       - name: Build and push on tags using Debian extension