diff --git a/.github/workflows/build_image.yml b/.github/workflows/build_image.yml
index 23bc635d7d..4123ebf4c6 100644
--- a/.github/workflows/build_image.yml
+++ b/.github/workflows/build_image.yml
@@ -47,44 +47,6 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
-  build-and-push-flyteagent-images-manual:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: "0"
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: "${{ secrets.FLYTE_BOT_USERNAME }}"
-          password: "${{ secrets.FLYTE_BOT_PAT }}"
-      - name: Prepare Flyte Agent Image Names
-        id: flyteagent-names
-        uses: docker/metadata-action@v3
-        with:
-          images: |
-            ghcr.io/${{ github.repository_owner }}/flyteagent
-          tags: |
-            ${{ github.sha }}
-      - name: Push External Plugin Service Image to GitHub Registry
-        uses: docker/build-push-action@v2
-        with:
-          context: "."
-          platforms: linux/arm64, linux/amd64
-          push: true
-          tags: ${{ steps.flyteagent-names.outputs.tags }}
-          build-args: |
-            VERSION=${{ github.sha }}
-          file: ./Dockerfile.connector
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
   build-and-push-flyteconnector-images-manual:
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/pythonpublish.yml b/.github/workflows/pythonpublish.yml
index 3581f1642d..c11cbf4cde 100644
--- a/.github/workflows/pythonpublish.yml
+++ b/.github/workflows/pythonpublish.yml
@@ -170,74 +170,6 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
-  build-and-push-flyteagent-images:
-    runs-on: ubuntu-latest
-    needs: deploy
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: "0"
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to GitHub Container Registry
-        if: ${{ github.event_name == 'release' }}
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: "${{ secrets.FLYTE_BOT_USERNAME }}"
-          password: "${{ secrets.FLYTE_BOT_PAT }}"
-      - name: Prepare Flyte Agent Slim Image Names
-        id: flyteagent-slim-names
-        uses: docker/metadata-action@v3
-        with:
-          images: |
-            ghcr.io/${{ github.repository_owner }}/flyteagent-slim
-          tags: |
-            latest
-            ${{ github.sha }}
-            ${{ needs.deploy.outputs.version }}
-      - name: Prepare Flyte Agent Image Names
-        id: flyteagent-names
-        uses: docker/metadata-action@v3
-        with:
-          images: |
-            ghcr.io/${{ github.repository_owner }}/flyteagent
-          tags: |
-            latest
-            ${{ github.sha }}
-            ${{ needs.deploy.outputs.version }}
-      - name: Push flyteagent-slim Image to GitHub Registry
-        uses: docker/build-push-action@v2
-        with:
-          context: "."
-          platforms: linux/arm64, linux/amd64
-          target: connector-slim
-          push: ${{ github.event_name == 'release' }}
-          tags: ${{ steps.flyteagent-slim-names.outputs.tags }}
-          build-args: |
-            VERSION=${{ needs.deploy.outputs.version }}
-          file: ./Dockerfile.connector
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-      - name: Confirm Agent can start
-        run: |
-          docker run --rm ghcr.io/${{ github.repository_owner }}/flyteagent-slim:${{ github.sha }} pyflyte serve agent --port 8000 --timeout 1
-      - name: Push flyteagent-all Image to GitHub Registry
-        uses: docker/build-push-action@v2
-        with:
-          context: "."
-          platforms: linux/arm64, linux/amd64
-          target: agent-all
-          push: ${{ github.event_name == 'release' }}
-          tags: ${{ steps.flyteagent-names.outputs.tags }}
-          build-args: |
-            VERSION=${{ needs.deploy.outputs.version }}
-          file: ./Dockerfile.connector
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
 
   build-and-push-flyteconnector-images:
     runs-on: ubuntu-latest