diff --git a/.github/workflows/retag-commit.yml b/.github/workflows/retag-commit.yml
index 7c3887ea..2a172507 100644
--- a/.github/workflows/retag-commit.yml
+++ b/.github/workflows/retag-commit.yml
@@ -8,6 +8,8 @@ on:
 jobs:
   retag:
     runs-on: ubuntu-latest
+    env:
+      TAG_NAME: wasp-v0.12-template
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4
@@ -19,10 +21,10 @@ jobs:
 
       - name: Delete Old Tag
         run: |
-          git tag -d wasp-v0.12-template || true 
-          git push origin :refs/tags/wasp-v0.12-template || true
+          git tag -d ${{ env.TAG_NAME }} || true 
+          git push origin :refs/tags/${{ env.TAG_NAME }} || true
 
       - name: Add New Tag
         run: |
-          git tag wasp-v0.12-template
-          git push origin wasp-v0.12-template
+          git tag ${{ env.TAG_NAME }}
+          git push origin ${{ env.TAG_NAME }}
diff --git a/e2e-tests/ci-start-app.js b/e2e-tests/ci-start-app.js
index f2bf2081..67a726ff 100644
--- a/e2e-tests/ci-start-app.js
+++ b/e2e-tests/ci-start-app.js
@@ -27,5 +27,5 @@ const cb = (code) => {
     process.exit(code);
   }
 };
-spawn('app', 'npm', ['run', 'example-app:start-app'], cb);
-spawn('db', 'npm', ['run', 'example-app:start-db'], cb);
+spawn('app', 'npm', ['run', 'e2e:start-app'], cb);
+spawn('db', 'npm', ['run', 'e2e:start-db'], cb);
diff --git a/e2e-tests/package.json b/e2e-tests/package.json
index 803fc27e..1066f60f 100644
--- a/e2e-tests/package.json
+++ b/e2e-tests/package.json
@@ -7,13 +7,13 @@
     "test": "tests"
   },
   "scripts": {
-    "example-app:start": "node ci-start-app.js",
-    "example-app:start-db": "npm run example-app:cleanup-db && cd ../app && wasp start db",
-    "example-app:start-app": "npm run example-app:wait-for-db && cd ../app && wasp db migrate-dev && wasp start",
-    "example-app:wait-for-db": "npx wait-port 5432",
-    "example-app:cleanup-db": "(docker container rm $(docker container ls -f name=^wasp-dev-db-OpenSaaS- -q) -f || true) && docker volume rm $(docker volume ls -f name=^wasp-dev-db-OpenSaaS- -q) -f || true",
-    "example-app:playwright": "playwright test",
-    "example-app:playwright:ui": "playwright test --ui"
+    "e2e:start": "node ci-start-app.js",
+    "e2e:start-db": "npm run e2e:cleanup-db && cd ../app && wasp start db",
+    "e2e:start-app": "npm run e2e:wait-for-db && cd ../app && wasp db migrate-dev && wasp start",
+    "e2e:wait-for-db": "npx wait-port 5432",
+    "e2e:cleanup-db": "(docker container rm $(docker container ls -f name=^wasp-dev-db-OpenSaaS- -q) -f || true) && docker volume rm $(docker volume ls -f name=^wasp-dev-db-OpenSaaS- -q) -f || true",
+    "e2e:playwright": "playwright test",
+    "e2e:playwright:ui": "playwright test --ui"
   },
   "author": "",
   "license": "ISC",