diff --git a/.github/workflows/build-push-eleel.yml b/.github/workflows/build-push-eleel.yml
index 1acb323..d587632 100644
--- a/.github/workflows/build-push-eleel.yml
+++ b/.github/workflows/build-push-eleel.yml
@@ -66,7 +66,7 @@ jobs:
           source_repository: ${{ inputs.repository }}
           source_ref: ${{ inputs.ref }}
           target_tag: ${{ inputs.docker_tag || inputs.ref }}
-          target_repository: ethpandaops/besu
+          target_repository: ethpandaops/eleel
           platforms: ${{ needs.prepare.outputs.platforms }}
 
           DOCKER_USERNAME: "${{ vars.DOCKER_USERNAME }}"
diff --git a/.github/workflows/build-push-erigon.yml b/.github/workflows/build-push-erigon.yml
index fdaaab7..e533bf8 100644
--- a/.github/workflows/build-push-erigon.yml
+++ b/.github/workflows/build-push-erigon.yml
@@ -65,7 +65,7 @@ jobs:
           source_repository: ${{ inputs.repository }}
           source_ref: ${{ inputs.ref }}
           target_tag: ${{ inputs.docker_tag || inputs.ref }}
-          target_repository: ethpandaops/besu
+          target_repository: ethpandaops/erigon
           platforms: ${{ needs.prepare.outputs.platforms }}
 
           DOCKER_USERNAME: "${{ vars.DOCKER_USERNAME }}"
diff --git a/.github/workflows/build-push-ethereumjs.yml b/.github/workflows/build-push-ethereumjs.yml
index b1c5fd8..09df385 100644
--- a/.github/workflows/build-push-ethereumjs.yml
+++ b/.github/workflows/build-push-ethereumjs.yml
@@ -66,7 +66,7 @@ jobs:
           source_repository: ${{ inputs.repository }}
           source_ref: ${{ inputs.ref }}
           target_tag: ${{ inputs.docker_tag || inputs.ref }}
-          target_repository: ethpandaops/besu
+          target_repository: ethpandaops/ethereumjs
           platforms: ${{ needs.prepare.outputs.platforms }}
 
           DOCKER_USERNAME: "${{ vars.DOCKER_USERNAME }}"
diff --git a/.github/workflows/build-push-geth.yml b/.github/workflows/build-push-geth.yml
index 3f571ea..b5fa6ad 100644
--- a/.github/workflows/build-push-geth.yml
+++ b/.github/workflows/build-push-geth.yml
@@ -65,7 +65,7 @@ jobs:
           source_repository: ${{ inputs.repository }}
           source_ref: ${{ inputs.ref }}
           target_tag: ${{ inputs.docker_tag || inputs.ref }}
-          target_repository: ethpandaops/besu
+          target_repository: ethpandaops/geth
           platforms: ${{ needs.prepare.outputs.platforms }}
 
           DOCKER_USERNAME: "${{ vars.DOCKER_USERNAME }}"
diff --git a/.github/workflows/build-push-lighthouse.yml b/.github/workflows/build-push-lighthouse.yml
index 83d474c..f2dd478 100644
--- a/.github/workflows/build-push-lighthouse.yml
+++ b/.github/workflows/build-push-lighthouse.yml
@@ -66,7 +66,7 @@ jobs:
           source_repository: ${{ inputs.repository }}
           source_ref: ${{ inputs.ref }}
           target_tag: ${{ inputs.docker_tag || inputs.ref }}
-          target_repository: ethpandaops/besu
+          target_repository: ethpandaops/lighthouse
           platforms: ${{ needs.prepare.outputs.platforms }}
 
           DOCKER_USERNAME: "${{ vars.DOCKER_USERNAME }}"
diff --git a/.github/workflows/build-push-lodestar.yml b/.github/workflows/build-push-lodestar.yml
index 04ffdc9..faf4255 100644
--- a/.github/workflows/build-push-lodestar.yml
+++ b/.github/workflows/build-push-lodestar.yml
@@ -65,7 +65,7 @@ jobs:
           source_repository: ${{ inputs.repository }}
           source_ref: ${{ inputs.ref }}
           target_tag: ${{ inputs.docker_tag || inputs.ref }}
-          target_repository: ethpandaops/besu
+          target_repository: ethpandaops/lodestar
           platforms: ${{ needs.prepare.outputs.platforms }}
 
           DOCKER_USERNAME: "${{ vars.DOCKER_USERNAME }}"
diff --git a/.github/workflows/build-push-nethermind.yml b/.github/workflows/build-push-nethermind.yml
index 932a504..b3e6729 100644
--- a/.github/workflows/build-push-nethermind.yml
+++ b/.github/workflows/build-push-nethermind.yml
@@ -65,7 +65,7 @@ jobs:
           source_repository: ${{ inputs.repository }}
           source_ref: ${{ inputs.ref }}
           target_tag: ${{ inputs.docker_tag || inputs.ref }}
-          target_repository: ethpandaops/besu
+          target_repository: ethpandaops/nethermind
           platforms: ${{ needs.prepare.outputs.platforms }}
 
           DOCKER_USERNAME: "${{ vars.DOCKER_USERNAME }}"
diff --git a/.github/workflows/build-push-nimbus.yml b/.github/workflows/build-push-nimbus.yml
index 8c22954..f6c980d 100644
--- a/.github/workflows/build-push-nimbus.yml
+++ b/.github/workflows/build-push-nimbus.yml
@@ -66,7 +66,7 @@ jobs:
           source_repository: ${{ inputs.repository }}
           source_ref: ${{ inputs.ref }}
           target_tag: ${{ inputs.docker_tag || inputs.ref }}
-          target_repository: ethpandaops/besu
+          target_repository: ethpandaops/nimbus
           platforms: ${{ needs.prepare.outputs.platforms }}
 
           DOCKER_USERNAME: "${{ vars.DOCKER_USERNAME }}"
diff --git a/.github/workflows/build-push-prysm.yml b/.github/workflows/build-push-prysm.yml
index 0921c68..95976c8 100644
--- a/.github/workflows/build-push-prysm.yml
+++ b/.github/workflows/build-push-prysm.yml
@@ -67,7 +67,7 @@ jobs:
           source_repository: ${{ inputs.repository }}
           source_ref: ${{ inputs.ref }}
           target_tag: ${{ inputs.docker_tag || inputs.ref }}
-          target_repository: ethpandaops/besu
+          target_repository: ethpandaops/prysm
           platforms: ${{ needs.prepare.outputs.platforms }}
 
           DOCKER_USERNAME: "${{ vars.DOCKER_USERNAME }}"
diff --git a/.github/workflows/build-push-reth.yml b/.github/workflows/build-push-reth.yml
index 6232386..c4ff3fa 100644
--- a/.github/workflows/build-push-reth.yml
+++ b/.github/workflows/build-push-reth.yml
@@ -65,7 +65,7 @@ jobs:
           source_repository: ${{ inputs.repository }}
           source_ref: ${{ inputs.ref }}
           target_tag: ${{ inputs.docker_tag || inputs.ref }}
-          target_repository: ethpandaops/besu
+          target_repository: ethpandaops/reth
           platforms: ${{ needs.prepare.outputs.platforms }}
 
           DOCKER_USERNAME: "${{ vars.DOCKER_USERNAME }}"
diff --git a/.github/workflows/build-push-teku.yml b/.github/workflows/build-push-teku.yml
index 8c3c47e..88ee8cf 100644
--- a/.github/workflows/build-push-teku.yml
+++ b/.github/workflows/build-push-teku.yml
@@ -66,7 +66,7 @@ jobs:
           source_repository: ${{ inputs.repository }}
           source_ref: ${{ inputs.ref }}
           target_tag: ${{ inputs.docker_tag || inputs.ref }}
-          target_repository: ethpandaops/besu
+          target_repository: ethpandaops/teku
           platforms: ${{ needs.prepare.outputs.platforms }}
 
           DOCKER_USERNAME: "${{ vars.DOCKER_USERNAME }}"