diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 979ce3a5f4..8999d6b9c4 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -3,5 +3,5 @@ Please always provide the [GitHub issue(s)](../issues) your PR is for, as well a
 Fix #<gh-issue-id>
 
 Test URLs:
-- Before: https://main--<repo>--<owner>.hlx.page/
-- After: https://<branch>--<repo>--<owner>.hlx.page/
+- Before: https://main--{repo}--{owner}.hlx.page/
+- After: https://<branch>--{repo}--{owner}.hlx.page/
diff --git a/.github/workflows/cleanup-on-create.yaml b/.github/workflows/cleanup-on-create.yaml
index 3767143b5c..533c7885e0 100644
--- a/.github/workflows/cleanup-on-create.yaml
+++ b/.github/workflows/cleanup-on-create.yaml
@@ -18,11 +18,7 @@ jobs:
           node-version: 18
       - name: Uninstall dependencies
         run: |
-          npm uninstall --save-dev \
-            semantic-release \
-            @semantic-release/git \ 
-            @semantic-release/changelog \ 
-            @semantic-release/exec
+          npm uninstall --save-dev semantic-release @semantic-release/git @semantic-release/changelog @semantic-release/exec
       - name: Remove Helper Files
         run: | 
           rm -rf \
@@ -36,6 +32,10 @@ jobs:
         run: |
           sed -i 's/{repo}/$(basename ${{ github.repository }})/g' README.md
           sed -i 's/{owner}/$(dirname ${{ github.repository }})/g' README.md
+      - name: Initialize Pull Request Template
+        run: |
+          sed -i 's/{repo}/$(basename ${{ github.repository }})/g' .github/pull_request_template.md
+          sed -i 's/{owner}/$(dirname ${{ github.repository }})/g' .github/pull_request_template.md
 
 
         # commit back to the repository
diff --git a/.github/workflows/semantic-release.yaml b/.github/workflows/semantic-release.yaml
index de3ce77d98..fad40698e5 100644
--- a/.github/workflows/semantic-release.yaml
+++ b/.github/workflows/semantic-release.yaml
@@ -1,10 +1,12 @@
 # Generate a changelog with semantic-release
+# Skip if the commit message is "Initial commit"
 on:
   push:
     branches:
       - main
 jobs:
   semantic-release:
+    if: "!contains(github.event.head_commit.message, 'Initial commit')"
     runs-on: ubuntu-latest
     steps:
       - name: Checkout