diff --git a/.controlplane/templates/app.yml b/.controlplane/templates/app.yml
index 4ef5b8d07..09249b7d0 100644
--- a/.controlplane/templates/app.yml
+++ b/.controlplane/templates/app.yml
@@ -1,6 +1,6 @@
 # Template setup of the GVC, roughly corresponding to a Heroku app
 kind: gvc
-name: { { APP_NAME } }
+name: {{APP_NAME}}
 spec:
   # For using templates for test apps, put ENV values here, stored in git repo.
   # Production apps will have values configured manually after app creation.
@@ -22,9 +22,9 @@ spec:
   # Part of standard configuration
   staticPlacement:
     locationLinks:
-      - { { APP_LOCATION_LINK } }
+      - {{APP_LOCATION_LINK}}
 
 ---
 # Identity is needed to access secrets
 kind: identity
-name: { { APP_IDENTITY } }
+name: {{APP_IDENTITY}}
diff --git a/.github/workflows/deploy-to-control-plane-review.yml b/.github/workflows/deploy-to-control-plane-review.yml
index f23b11cdc..65a56cd61 100644
--- a/.github/workflows/deploy-to-control-plane-review.yml
+++ b/.github/workflows/deploy-to-control-plane-review.yml
@@ -73,7 +73,7 @@ jobs:
             echo "PR_NUMBER is not set. Aborting."
             exit 1
           fi
-          echo "PR_NUMBER=\"$PR_NUMBER\"" >> $GITHUB_ENV
+          echo "PR_NUMBER=$PR_NUMBER" >> $GITHUB_ENV
       - name: Get App Name
         run: |
           echo "PR_NUMBER: ${{ env.PR_NUMBER }}"