diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
index 9ec916bc..2a1b4b14 100644
--- a/.github/workflows/publish-docker.yml
+++ b/.github/workflows/publish-docker.yml
@@ -12,7 +12,6 @@ on:
         default: "master"
 
 jobs:
-
   docker-moonbeam-tracing:
     runs-on: ubuntu-latest
     outputs:
@@ -46,7 +45,7 @@ jobs:
       - name: Prepare
         id: prep
         run: |
-          DOCKER_IMAGE=purestake/moonbeam-tracing
+          DOCKER_IMAGE=moonbeamfoundation/moonbeam-tracing
           DOCKER_TAG="${DOCKER_IMAGE}:${{ github.event.inputs.client_tag }}-${{ steps.get-last-spec-version.outputs.last_spec_version }}-${{ steps.get-sha.outputs.sha4 }}"
           DOCKER_LATEST_TAG="${DOCKER_IMAGE}:${{ github.event.inputs.client_tag }}-${{ steps.get-last-spec-version.outputs.last_spec_version }}-latest"
           echo ::set-output name=docker_tag::${DOCKER_TAG}
@@ -69,7 +68,7 @@ jobs:
         run: |
           mkdir build
           CLIENT_TAG=${{ github.event.inputs.client_tag }}
-          CLIENT_IMAGE="purestake/moonbeam:$CLIENT_TAG"
+          CLIENT_IMAGE="moonbeamfoundation/moonbeam:$CLIENT_TAG"
           docker create -ti --name dummy $CLIENT_IMAGE bash
           docker cp dummy:/moonbeam/moonbeam build/moonbeam
           docker rm -f dummy
@@ -119,4 +118,3 @@ jobs:
             org.opencontainers.image.created=${{ steps.prep.outputs.created }}
             org.opencontainers.image.revision=${{ github.sha }}
             org.opencontainers.image.licenses=${{ github.event.repository.license.spdx_id }}
-      
diff --git a/scripts/import-tracing-runtime.sh b/scripts/import-tracing-runtime.sh
index e6633e15..47d11694 100755
--- a/scripts/import-tracing-runtime.sh
+++ b/scripts/import-tracing-runtime.sh
@@ -18,7 +18,7 @@ else
   echo "Get moonbeam snapshot..."
   rm -rf tmp
   mkdir tmp
-  git clone https://github.com/PureStake/moonbeam --depth 1 -b $GIT_REF $MOONBEAM_PATH
+  git clone https://github.com/moonbeam-foundation/moonbeam --depth 1 -b $GIT_REF $MOONBEAM_PATH
 fi
 
 # Copy relevant files
@@ -35,7 +35,7 @@ rm -rf tracing/$SPEC_VERSION/runtime/relay-encoder
 
 echo "Run migration script"
 cd scripts
-cargo run -q --bin migrate-imported -- --dir ../tracing/$SPEC_VERSION --repo "https://github.com/PureStake/moonbeam" $GIT_DEP_REF
+cargo run -q --bin migrate-imported -- --dir ../tracing/$SPEC_VERSION --repo "https://github.com/moonbeam-foundation/moonbeam" $GIT_DEP_REF
 cd ..
 
 echo "Running ./scripts/update-tracing-runtime-lock.sh $SPEC_VERSION ..."