diff --git a/.github/workflows/test.yml.jinja b/.github/workflows/tests.yml.jinja
similarity index 81%
rename from .github/workflows/test.yml.jinja
rename to .github/workflows/tests.yml.jinja
index e3f2e2c..e6f6414 100644
--- a/.github/workflows/test.yml.jinja
+++ b/.github/workflows/tests.yml.jinja
@@ -29,7 +29,7 @@ set IMAGES = {
 jobs:
   test:
     runs-on: ubuntu-latest
-    container: {{ "${{" }} matrix.container {{ "}}" }}
+    container: {% raw %}${{ matrix.container }}{% endraw %}
     strategy:
       fail-fast: false
       matrix:
@@ -58,8 +58,10 @@ jobs:
         run: manifestoo -d . check-dev-status --default-dev-status=Beta
       - run: oca_run_tests
       - uses: codecov/codecov-action@v1
+      {% raw -%}
       - run: |
           oca_export_and_commit_pot
           git fetch --unshallow --all
-          git push https://x-access-token:{{ "${{" }} secrets.GIT_PUSH_TOKEN {{ "}}" }}@github.com/{{ "${{" }} github.repository {{ "}}" }}
-        if: {{ "${{" }} matrix.makepot == 'true' && github.event_name == 'push' && github.repository_owner == 'OCA' && startsWith(github.ref, 'refs/heads/{{ odoo_version }}') {{ "}}" }}
+          git push https://x-access-token:${{ secrets.GIT_PUSH_TOKEN }}@github.com/${{ github.repository }}
+        if: ${{ matrix.makepot == 'true' && github.event_name == 'push' && github.repository_owner == 'OCA' }}
+      {%- endraw %}