diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index c6c14fd..7676a64 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,33 +1,16 @@
 # Default owners for everything in the repo
 
-- @w3w-internal/tech-frontend
+- @what3words/front-end-team
 
 # Hybrid product-team ownership
 
-/*.md @w3w-internal/w3w-product @w3w-internal/tech-frontend
-/packages/components/javascript/src/translations/ @w3w-internal/w3w-product @w3w-internal/tech-frontend
-/apps/demos/ @w3w-internal/w3w-product @w3w-internal/tech-frontend
-/apps/examples/components/ @w3w-internal/w3w-product @w3w-internal/tech-frontend
+/*.md @what3words/product @what3words/front-end-team
+/packages/components/javascript/src/translations/ @what3words/product @what3words/front-end-team
+/apps/demos/ @what3words/product @what3words/front-end-team
+/apps/examples/components/ @what3words/product @what3words/front-end-team
 
 # Tech-team ownership
 
-/apps/examples/e2e/ @w3w-internal/tech-frontend
-/.github/workflows/ @w3w-internal/tech-frontend
-/packages/ @w3w-internal/tech-frontend
-
-## Default owners for everything in the repo
-
-#- @what3words/front-end-team
-
-## Hybrid product-team ownership
-
-#/*.md @what3words/product @what3words/front-end-team
-#/packages/components/javascript/src/translations/ @what3words/product @what3words/front-end-team
-#/apps/demos/ @what3words/product @what3words/front-end-team
-#/apps/examples/components/ @what3words/product @what3words/front-end-team
-
-## Tech-team ownership
-
-#/apps/examples/e2e/ @what3words/front-end-team
-#/.github/workflows/ @what3words/front-end-team
-#/packages/ @what3words/front-end-team
+/apps/examples/e2e/ @what3words/front-end-team
+/.github/workflows/ @what3words/front-end-team
+/packages/ @what3words/front-end-team
diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md b/.github/pull_request_template.md
similarity index 100%
rename from .github/PULL_REQUEST_TEMPLATE/pull_request_template.md
rename to .github/pull_request_template.md
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 4dda79a..b8a0381 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -97,14 +97,17 @@ jobs:
           # we create newline separated raw strings to map iterate with xargs that runs the npm publish command: https://stackoverflow.com/a/50845457
           packageNames=$(jq -rc 'keys | join("\n")' <<< '${{needs.prepare-packages.outputs.checked-package-versions}}')
           echo $packageNames | xargs -n 1 npm publish -w
+        env:
+          NODE_OPTIONS: "--max_old_space_size=4096"
+          NODE_AUTH_TOKEN: ${{ env.NPM_TOKEN }}
+
+      - name: Publish packages status
+        run: |
           echo "### Package(s) published! :gift:" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
           echo "#### Published package(s)" >> $GITHUB_STEP_SUMMARY
           packageUrls=$(jq -rc '. as $o | with_entries(.key |= "[" + . + "](https://www.npmjs.com/package/" + . + "/v/" + $o[.].committedVersion + ")") | keys | join("\n")' <<< '${{needs.prepare-packages.outputs.checked-package-versions}}')
           echo $packageUrls | xargs -n 1 echo >> $GITHUB_STEP_SUMMARY
-        env:
-          NODE_OPTIONS: "--max_old_space_size=4096"
-          NODE_AUTH_TOKEN: ${{ env.NPM_TOKEN }}
 
   upload-distribution:
     runs-on: ubuntu-latest
@@ -172,6 +175,9 @@ jobs:
           npm run --workspace=${{env.DISTRIBUTION_PACKAGE}} build
           echo "::notice title=Uploading distributions::sources_path=${{needs.prepare-packages.outputs.dist-directory}}, target_path=${{ env.AWS_S3_DIRECTORY }}"
           aws s3 cp . s3://${{ env.AWS_S3_BUCKET }}/${{ env.AWS_S3_DIRECTORY }}@${{needs.prepare-packages.outputs.dist-committed-version}}/ --recursive --exclude "*" --include "dist/*" --include "loader/*"
+
+      - name: Upload distribution status
+        run: |
           echo "### Distribution uploaded! :rocket:" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
           echo "Package: ${{env.DISTRIBUTION_PACKAGE}}@${{needs.prepare-packages.outputs.dist-committed-version}}" >> $GITHUB_STEP_SUMMARY