diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml
index 1187534a5..76f7f6512 100644
--- a/.github/workflows/build_push.yml
+++ b/.github/workflows/build_push.yml
@@ -30,68 +30,3 @@ jobs:
           build_extra_args: "--compress=true"
           context: ./cookbook
           dockerfile: Dockerfile
-      - name: Push Pod Plugin Docker Image to Github Registry
-        uses: whoan/docker-build-with-cache-action@v5
-        with:
-          # https://docs.github.com/en/packages/learn-github-packages/publishing-a-package
-          username: "${{ secrets.FLYTE_BOT_USERNAME }}"
-          password: "${{ secrets.FLYTE_BOT_PAT }}"
-          image_name: ${{ github.repository_owner }}/flytecookbook-pod
-          image_tag: latest,${{ github.sha }},${{ github.event.ref }}
-          push_git_tag: true
-          registry: ghcr.io
-          build_extra_args: "--compress=true"
-          context: ./cookbook/recipes/plugins/pod
-          dockerfile: Dockerfile
-      - name: Push Spark Plugin Docker Image to Github Registry
-        uses: whoan/docker-build-with-cache-action@v5
-        with:
-          # https://docs.github.com/en/packages/learn-github-packages/publishing-a-package
-          username: "${{ secrets.FLYTE_BOT_USERNAME }}"
-          password: "${{ secrets.FLYTE_BOT_PAT }}"
-          image_name: ${{ github.repository_owner }}/flytecookbook-spark
-          image_tag: latest,${{ github.sha }},${{ github.event.ref }}
-          push_git_tag: true
-          registry: ghcr.io
-          build_extra_args: "--compress=true"
-          context: ./cookbook/recipes/plugins/k8s_spark
-          dockerfile: Dockerfile
-      - name: Push Kubeflow Pytorch Plugin Docker Image to Github Registry
-        uses: whoan/docker-build-with-cache-action@v5
-        with:
-          # https://docs.github.com/en/packages/learn-github-packages/publishing-a-package
-          username: "${{ secrets.FLYTE_BOT_USERNAME }}"
-          password: "${{ secrets.FLYTE_BOT_PAT }}"
-          image_name: ${{ github.repository_owner }}/flytecookbook-kfpytorch
-          image_tag: latest,${{ github.sha }},${{ github.event.ref }}
-          push_git_tag: true
-          registry: ghcr.io
-          build_extra_args: "--compress=true"
-          context: ./cookbook/recipes/plugins/kfpytorch
-          dockerfile: Dockerfile
-      - name: Push SageMaker Pytorch Plugin Docker Image to Github Registry
-        uses: whoan/docker-build-with-cache-action@v5
-        with:
-          # https://docs.github.com/en/packages/learn-github-packages/publishing-a-package
-          username: "${{ secrets.FLYTE_BOT_USERNAME }}"
-          password: "${{ secrets.FLYTE_BOT_PAT }}"
-          image_name: ${{ github.repository_owner }}/flytecookbook-sagemaker-pytorch
-          image_tag: latest,${{ github.sha }},${{ github.event.ref }}
-          push_git_tag: true
-          registry: ghcr.io
-          build_extra_args: "--compress=true"
-          context: ./cookbook/recipes/plugins/sagemaker_pytorch
-          dockerfile: Dockerfile
-      - name: Push SageMaker Training Plugin Docker Image to Github Registry
-        uses: whoan/docker-build-with-cache-action@v5
-        with:
-          # https://docs.github.com/en/packages/learn-github-packages/publishing-a-package
-          username: "${{ secrets.FLYTE_BOT_USERNAME }}"
-          password: "${{ secrets.FLYTE_BOT_PAT }}"
-          image_name: ${{ github.repository_owner }}/flytecookbook-sagemaker-training
-          image_tag: latest,${{ github.sha }},${{ github.event.ref }}
-          push_git_tag: true
-          registry: ghcr.io
-          build_extra_args: "--compress=true"
-          context: ./cookbook/recipes/plugins/sagemaker_training
-          dockerfile: Dockerfile
diff --git a/.github/workflows/ghcr_kfpytorch.yml b/.github/workflows/ghcr_kfpytorch.yml
new file mode 100644
index 000000000..e61fb6c3a
--- /dev/null
+++ b/.github/workflows/ghcr_kfpytorch.yml
@@ -0,0 +1,32 @@
+name: Build & Push Kubeflow Pytorch Plugin Docker Image
+
+on:
+  pull_request:
+  create:
+    tags:
+      - v*
+
+jobs:
+  push-github:
+    name: Push to GHCR
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: cookbook
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: "0"
+      - name: Push Kubeflow Pytorch Plugin Docker Image to Github Registry
+        uses: whoan/docker-build-with-cache-action@v5
+        with:
+          # https://docs.github.com/en/packages/learn-github-packages/publishing-a-package
+          username: "${{ secrets.FLYTE_BOT_USERNAME }}"
+          password: "${{ secrets.FLYTE_BOT_PAT }}"
+          image_name: ${{ github.repository_owner }}/flytecookbook-kfpytorch
+          image_tag: latest,${{ github.sha }},${{ github.event.ref }}
+          push_git_tag: true
+          registry: ghcr.io
+          build_extra_args: "--compress=true"
+          context: ./cookbook/recipes/plugins/kfpytorch
+          dockerfile: Dockerfile
diff --git a/.github/workflows/ghcr_pod.yml b/.github/workflows/ghcr_pod.yml
new file mode 100644
index 000000000..f037f31bc
--- /dev/null
+++ b/.github/workflows/ghcr_pod.yml
@@ -0,0 +1,32 @@
+name: Build & Push Pod Plugin Docker Image
+
+on:
+  pull_request:
+  create:
+    tags:
+      - v*
+
+jobs:
+  push-github:
+    name: Push to GHCR
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: cookbook
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: "0"
+      - name: Push Pod Plugin Docker Image to Github Registry
+        uses: whoan/docker-build-with-cache-action@v5
+        with:
+          # https://docs.github.com/en/packages/learn-github-packages/publishing-a-package
+          username: "${{ secrets.FLYTE_BOT_USERNAME }}"
+          password: "${{ secrets.FLYTE_BOT_PAT }}"
+          image_name: ${{ github.repository_owner }}/flytecookbook-pod
+          image_tag: latest,${{ github.sha }},${{ github.event.ref }}
+          push_git_tag: true
+          registry: ghcr.io
+          build_extra_args: "--compress=true"
+          context: ./cookbook/recipes/plugins/pod
+          dockerfile: Dockerfile
diff --git a/.github/workflows/ghcr_sagemaker_pytorch.yml b/.github/workflows/ghcr_sagemaker_pytorch.yml
new file mode 100644
index 000000000..ee1e2a2aa
--- /dev/null
+++ b/.github/workflows/ghcr_sagemaker_pytorch.yml
@@ -0,0 +1,32 @@
+name: Build & Push SageMaker Pytorch Plugin Docker Image
+
+on:
+  pull_request:
+  create:
+    tags:
+      - v*
+
+jobs:
+  push-github:
+    name: Push to GHCR
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: cookbook
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: "0"
+      - name: Push SageMaker Pytorch Plugin Docker Image to Github Registry
+        uses: whoan/docker-build-with-cache-action@v5
+        with:
+          # https://docs.github.com/en/packages/learn-github-packages/publishing-a-package
+          username: "${{ secrets.FLYTE_BOT_USERNAME }}"
+          password: "${{ secrets.FLYTE_BOT_PAT }}"
+          image_name: ${{ github.repository_owner }}/flytecookbook-sagemaker-pytorch
+          image_tag: latest,${{ github.sha }},${{ github.event.ref }}
+          push_git_tag: true
+          registry: ghcr.io
+          build_extra_args: "--compress=true"
+          context: ./cookbook/recipes/plugins/sagemaker_pytorch
+          dockerfile: Dockerfile
diff --git a/.github/workflows/ghcr_sagemaker_training.yml b/.github/workflows/ghcr_sagemaker_training.yml
new file mode 100644
index 000000000..781f0ce33
--- /dev/null
+++ b/.github/workflows/ghcr_sagemaker_training.yml
@@ -0,0 +1,32 @@
+name: Build & Push SageMaker Training Plugin Docker Image
+
+on:
+  pull_request:
+  create:
+    tags:
+      - v*
+
+jobs:
+  push-github:
+    name: Push to GHCR
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: cookbook
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: "0"
+      - name: Push SageMaker Training Plugin Docker Image to Github Registry
+        uses: whoan/docker-build-with-cache-action@v5
+        with:
+          # https://docs.github.com/en/packages/learn-github-packages/publishing-a-package
+          username: "${{ secrets.FLYTE_BOT_USERNAME }}"
+          password: "${{ secrets.FLYTE_BOT_PAT }}"
+          image_name: ${{ github.repository_owner }}/flytecookbook-sagemaker-training
+          image_tag: latest,${{ github.sha }},${{ github.event.ref }}
+          push_git_tag: true
+          registry: ghcr.io
+          build_extra_args: "--compress=true"
+          context: ./cookbook/recipes/plugins/sagemaker_training
+          dockerfile: Dockerfile
diff --git a/.github/workflows/ghcr_spark.yml b/.github/workflows/ghcr_spark.yml
new file mode 100644
index 000000000..13a8f6fec
--- /dev/null
+++ b/.github/workflows/ghcr_spark.yml
@@ -0,0 +1,32 @@
+name: Build & Push Spark Plugin Docker Image
+
+on:
+  pull_request:
+  create:
+    tags:
+      - v*
+
+jobs:
+  push-github:
+    name: Push to GHCR
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: cookbook
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: "0"
+      - name: Push Spark Plugin Docker Image to Github Registry
+        uses: whoan/docker-build-with-cache-action@v5
+        with:
+          # https://docs.github.com/en/packages/learn-github-packages/publishing-a-package
+          username: "${{ secrets.FLYTE_BOT_USERNAME }}"
+          password: "${{ secrets.FLYTE_BOT_PAT }}"
+          image_name: ${{ github.repository_owner }}/flytecookbook-spark
+          image_tag: latest,${{ github.sha }},${{ github.event.ref }}
+          push_git_tag: true
+          registry: ghcr.io
+          build_extra_args: "--compress=true"
+          context: ./cookbook/recipes/plugins/k8s_spark
+          dockerfile: Dockerfile