diff --git a/.github/workflows/container-verify.yml b/.github/workflows/container-verify.yml
index c8f5726af75..44b58ba697f 100644
--- a/.github/workflows/container-verify.yml
+++ b/.github/workflows/container-verify.yml
@@ -30,9 +30,6 @@ jobs:
           - tag: latest
             platform: ''
             runner: ubuntu-latest
-          - tag: ${{ inputs.version }}-arm64
-            platform: ''
-            runner: besu-arm64
     runs-on: ${{ matrix.combination.runner }}
     env:
       CONTAINER_NAME: besu-check
@@ -44,7 +41,7 @@ jobs:
         run: |
           PLATFORM_OPT=""
           [[ x${{ matrix.combination.platform }} != 'x' ]] && PLATFORM_OPT="--platform ${{ matrix.combination.platform }}"
-          docker run -d $PLATFORM_OPT --name ${{ env.CONTAINER_NAME }} hyperledger/besu:${{ matrix.combination.tag }}
+          docker run -d $PLATFORM_OPT --name ${{ env.CONTAINER_NAME }} optimism-java/op-besu:${{ matrix.combination.tag }}
 
       - name: Verify besu container
         run: bash .github/workflows/BesuContainerVerify.sh
diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
index b9bb3d95973..69b5bd6ad67 100644
--- a/.github/workflows/develop.yml
+++ b/.github/workflows/develop.yml
@@ -36,7 +36,6 @@ jobs:
       matrix:
         platform:
           - ubuntu-22.04
-          - besu-arm64
     runs-on: ${{ matrix.platform }}
     steps:
       - name: Prepare
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 37476639891..1df71315401 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -194,11 +194,11 @@ jobs:
           architecture: ${{ steps.prep.outputs.ARCH }}
         with:
           cache-disabled: true
-          arguments: testDocker -PdockerOrgName=${{ env.registry }}/${{ github.repository }} -Pversion=${{github.event.release.name}} -Prelease.releaseVersion=${{ github.event.release.name }}
+          arguments: testDocker -PdockerArtifactName=${{ env.registry }}/${{ github.repository }} -Pversion=${{github.event.release.name}} -Prelease.releaseVersion=${{ github.event.release.name }}
       - name: publish
         env:
           architecture: ${{ steps.prep.outputs.ARCH }}
-        run: ./gradlew --no-daemon dockerUpload -PdockerOrgName=${{ env.registry }}/${{ github.repository }} -Pversion=${{github.event.release.name}} -Prelease.releaseVersion=${{ github.event.release.name }}
+        run: ./gradlew --no-daemon dockerUpload -PdockerArtifactName=${{ env.registry }}/${{ github.repository }} -Pversion=${{github.event.release.name}} -Prelease.releaseVersion=${{ github.event.release.name }}
 
   multiArch:
     needs: buildDocker
@@ -225,7 +225,7 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: multi-arch docker
-        run: ./gradlew manifestDocker -PdockerOrgName=${{ env.registry }}/${{ github.repository }} -Pversion=${{github.event.release.name}} -Prelease.releaseVersion=${{ github.event.release.name }}
+        run: ./gradlew manifestDocker -PdockerArtifactName=${{ env.registry }}/${{ github.repository }} -Pversion=${{github.event.release.name}} -Prelease.releaseVersion=${{ github.event.release.name }}
 
   amendNotes:
     needs: multiArch
@@ -261,9 +261,9 @@ jobs:
         with:
           cache-disabled: true
       - name: Docker upload
-        run: ./gradlew "-Prelease.releaseVersion=${{ github.event.release.name }}" "-PdockerOrgName=${{ env.registry }}/${{ github.repository }}" dockerUploadRelease
+        run: ./gradlew "-Prelease.releaseVersion=${{ github.event.release.name }}" "-PdockerArtifactName=${{ env.registry }}/${{ github.repository }}" dockerUploadRelease
       - name: Docker manifest
-        run: ./gradlew "-Prelease.releaseVersion=${{ github.event.release.name }}" "-PdockerOrgName=${{ env.registry }}/${{ github.repository }}" manifestDockerRelease
+        run: ./gradlew "-Prelease.releaseVersion=${{ github.event.release.name }}" "-PdockerArtifactName=${{ env.registry }}/${{ github.repository }}" manifestDockerRelease
 
   verifyContainer:
     needs: dockerPromoteX64
diff --git a/build.gradle b/build.gradle
index 5f2d381f32b..feecfa88d46 100644
--- a/build.gradle
+++ b/build.gradle
@@ -736,9 +736,8 @@ artifactoryPublish {
 }
 
 def dockerBuildVersion = project.hasProperty('release.releaseVersion') ? project.property('release.releaseVersion') : "${rootProject.version}"
-def dockerOrgName = project.hasProperty('dockerOrgName') ? project.getProperty("dockerOrgName") : "optimism-java"
-def dockerArtifactName = project.hasProperty("dockerArtifactName") ? project.getProperty("dockerArtifactName") : "op-besu"
-def dockerImageName = "${dockerOrgName}/${dockerArtifactName}"
+def dockerArtifactName = project.hasProperty("dockerArtifactName") ? project.getProperty("dockerArtifactName") : "optimism-java/op-besu"
+def dockerImageName = "${dockerArtifactName}"
 
 // rename the top level dir from besu-<version> to besu and this makes it really
 // simple for use in docker
@@ -889,7 +888,7 @@ task manifestDocker {
 }
 
 task manifestDockerRelease {
-  def archs = ["arm64", "amd64"]
+  def archs = ["amd64"]
   def baseTag = "${dockerImageName}:latest";
 
   doLast {