diff --git a/.github/workflows/templates/build-packages.yml.jinja b/.github/workflows/templates/build-packages.yml.jinja
index 91adfb1c6e6..745bcc3c9ca 100644
--- a/.github/workflows/templates/build-packages.yml.jinja
+++ b/.github/workflows/templates/build-packages.yml.jinja
@@ -17,7 +17,7 @@
       relenv-version: "<{ relenv_version }>"
       python-version: "<{ python_version }>"
       source: "<{ backend }>"
-    <%- if gh_environment %>
+    <%- if gh_environment != "ci" %>
       environment: <{ gh_environment }>
       sign-macos-packages: true
       sign-windows-packages: <% if gh_environment == 'nightly' -%> false <%- else -%> ${{ inputs.sign-windows-packages }} <%- endif %>
diff --git a/.github/workflows/templates/ci.yml.jinja b/.github/workflows/templates/ci.yml.jinja
index ec15f70ca74..0553e799c89 100644
--- a/.github/workflows/templates/ci.yml.jinja
+++ b/.github/workflows/templates/ci.yml.jinja
@@ -1,3 +1,5 @@
+<%- set gh_environment = gh_environment|default("ci") %>
+
 <%- extends 'layout.yml.jinja' %>
 <%- set pre_commit_version = "3.0.4" %>
 
diff --git a/tools/precommit/workflows.py b/tools/precommit/workflows.py
index d08567dca9c..27219a90749 100644
--- a/tools/precommit/workflows.py
+++ b/tools/precommit/workflows.py
@@ -11,7 +11,7 @@ import shutil
 from typing import TYPE_CHECKING, cast
 
 import yaml
-from jinja2 import Environment, FileSystemLoader
+from jinja2 import Environment, FileSystemLoader, StrictUndefined
 from ptscripts import Context, command_group
 
 import tools.utils
@@ -292,6 +292,7 @@ def generate_workflows(ctx: Context):
             "jinja2.ext.do",
         ],
         loader=FileSystemLoader(str(TEMPLATES)),
+        undefined=StrictUndefined,
     )
     for workflow_name, details in workflows.items():
         if TYPE_CHECKING: