diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
index 88bd4543..619bee06 100644
--- a/.github/workflows/build-and-deploy.yml
+++ b/.github/workflows/build-and-deploy.yml
@@ -78,6 +78,7 @@ jobs:
 
       - name: Add a comment in PR
         uses: unsplash/comment-on-pr@v1.2.0
+        if: ${{ github.event_name == 'pull_request' }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
diff --git a/deeployer.libsonnet b/deeployer.libsonnet
index a39bd32a..3ba149ae 100644
--- a/deeployer.libsonnet
+++ b/deeployer.libsonnet
@@ -2,12 +2,13 @@
   local env = std.extVar("env"),
   local namespace = env.GITHUB_REF_SLUG,
   local tag = namespace,
+  local url = if namespace == "master" then "wordadventu.re" else namespace+".workadventure.test.thecodingmachine.com",
   "$schema": "https://raw.githubusercontent.com/thecodingmachine/deeployer/master/deeployer.schema.json",
   "containers": {
      "back": {
        "image": "thecodingmachine/workadventure-back:"+tag,
        "host": {
-         "url": "api."+namespace+".workadventure.test.thecodingmachine.com",
+         "url": "api."+url,
          "https": "enable"
        },
        "ports": [8080],
@@ -18,12 +19,12 @@
     "front": {
       "image": "thecodingmachine/workadventure-front:"+tag,
       "host": {
-        "url": namespace+".workadventure.test.thecodingmachine.com",
+        "url": url,
         "https": "enable"
       },
       "ports": [80],
       "env": {
-        "API_URL": "https://api."+namespace+".workadventure.test.thecodingmachine.com"
+        "API_URL": "https://api."+url
       }
     }
   },