diff --git a/.github/workflows/check-python.yaml b/.github/workflows/check-python.yaml
index cc493db..6ddda88 100644
--- a/.github/workflows/check-python.yaml
+++ b/.github/workflows/check-python.yaml
@@ -14,7 +14,7 @@ jobs:
         run: pipx install poetry
 
       - name: Install algokit
-        run: pipx install algokit
+        run: pipx install git+https://github.com/algorandfoundation/algokit-cli.git@chore/patching-tests
 
       - name: Run algokit localnet
         run: algokit localnet start
diff --git a/examples/generators/production_python_smart_contract_python/.algokit/generators/create_env_file/copier.yaml b/examples/generators/production_python_smart_contract_python/.algokit/generators/create_env_file/copier.yaml
index e1adf73..4837f8a 100644
--- a/examples/generators/production_python_smart_contract_python/.algokit/generators/create_env_file/copier.yaml
+++ b/examples/generators/production_python_smart_contract_python/.algokit/generators/create_env_file/copier.yaml
@@ -24,4 +24,32 @@ custom_network_name:
   placeholder: "custom"
   when: "{{ not use_generic_env and target_network == 'custom' }}"
 
+is_localnet:
+  type: bool
+  help: Whether to deploy on localnet.
+  placeholder: "true"
+  default: "{{ target_network == 'localnet' and not use_generic_env }}"
+  when: 'false'
+
+is_testnet:
+  type: bool
+  help: Whether to deploy on testnet.
+  placeholder: "true"
+  default: "{{ target_network == 'testnet' and not use_generic_env }}"
+  when: 'false'
+
+is_mainnet:
+  type: bool
+  help: Whether to deploy on mainnet.
+  placeholder: "true"
+  default: "{{ target_network == 'mainnet' and not use_generic_env }}"
+  when: 'false'
+
+is_customnet:
+  type: bool
+  help: Whether to deploy on custom network.
+  placeholder: "true"
+  default: "{{ target_network == 'custom' and not use_generic_env }}"
+  when: 'false'
+
 _templates_suffix: ".j2"
diff --git a/examples/generators/production_python_smart_contract_python/.algokit/generators/create_env_file/{% if not use_generic_env and target_network == 'custom' %}.env.{{custom_network_name}}.j2{% endif %} b/examples/generators/production_python_smart_contract_python/.algokit/generators/create_env_file/{% if is_customnet %}.env.{{custom_network_name}}{% endif %}
similarity index 100%
rename from examples/generators/production_python_smart_contract_python/.algokit/generators/create_env_file/{% if not use_generic_env and target_network == 'custom' %}.env.{{custom_network_name}}.j2{% endif %}
rename to examples/generators/production_python_smart_contract_python/.algokit/generators/create_env_file/{% if is_customnet %}.env.{{custom_network_name}}{% endif %}
diff --git a/examples/generators/production_python_smart_contract_python/.algokit/generators/create_env_file/{% if not use_generic_env and target_network == 'localnet' %}.env.localnet.j2{% endif %} b/examples/generators/production_python_smart_contract_python/.algokit/generators/create_env_file/{% if is_localnet %}.env.localnet{% endif %}
similarity index 100%
rename from examples/generators/production_python_smart_contract_python/.algokit/generators/create_env_file/{% if not use_generic_env and target_network == 'localnet' %}.env.localnet.j2{% endif %}
rename to examples/generators/production_python_smart_contract_python/.algokit/generators/create_env_file/{% if is_localnet %}.env.localnet{% endif %}
diff --git a/examples/generators/production_python_smart_contract_python/.algokit/generators/create_env_file/{% if not use_generic_env and target_network == 'mainnet' %}.env.mainnet.j2{% endif %} b/examples/generators/production_python_smart_contract_python/.algokit/generators/create_env_file/{% if is_mainnet %}.env.mainnet{% endif %}
similarity index 100%
rename from examples/generators/production_python_smart_contract_python/.algokit/generators/create_env_file/{% if not use_generic_env and target_network == 'mainnet' %}.env.mainnet.j2{% endif %}
rename to examples/generators/production_python_smart_contract_python/.algokit/generators/create_env_file/{% if is_mainnet %}.env.mainnet{% endif %}
diff --git a/examples/generators/production_python_smart_contract_python/.algokit/generators/create_env_file/{% if not use_generic_env and target_network == 'testnet' %}.env.testnet.j2{% endif %} b/examples/generators/production_python_smart_contract_python/.algokit/generators/create_env_file/{% if is_testnet %}.env.testnet{% endif %}
similarity index 100%
rename from examples/generators/production_python_smart_contract_python/.algokit/generators/create_env_file/{% if not use_generic_env and target_network == 'testnet' %}.env.testnet.j2{% endif %}
rename to examples/generators/production_python_smart_contract_python/.algokit/generators/create_env_file/{% if is_testnet %}.env.testnet{% endif %}
diff --git a/examples/generators/production_python_smart_contract_python/.algokit/generators/create_env_file/{% if use_generic_env %}.env.j2{% endif %} b/examples/generators/production_python_smart_contract_python/.algokit/generators/create_env_file/{% if use_generic_env %}.env{% endif %}
similarity index 100%
rename from examples/generators/production_python_smart_contract_python/.algokit/generators/create_env_file/{% if use_generic_env %}.env.j2{% endif %}
rename to examples/generators/production_python_smart_contract_python/.algokit/generators/create_env_file/{% if use_generic_env %}.env{% endif %}
diff --git a/examples/generators/production_python_smart_contract_typescript/.algokit/generators/create_env_file/copier.yaml b/examples/generators/production_python_smart_contract_typescript/.algokit/generators/create_env_file/copier.yaml
index e1adf73..4837f8a 100644
--- a/examples/generators/production_python_smart_contract_typescript/.algokit/generators/create_env_file/copier.yaml
+++ b/examples/generators/production_python_smart_contract_typescript/.algokit/generators/create_env_file/copier.yaml
@@ -24,4 +24,32 @@ custom_network_name:
   placeholder: "custom"
   when: "{{ not use_generic_env and target_network == 'custom' }}"
 
+is_localnet:
+  type: bool
+  help: Whether to deploy on localnet.
+  placeholder: "true"
+  default: "{{ target_network == 'localnet' and not use_generic_env }}"
+  when: 'false'
+
+is_testnet:
+  type: bool
+  help: Whether to deploy on testnet.
+  placeholder: "true"
+  default: "{{ target_network == 'testnet' and not use_generic_env }}"
+  when: 'false'
+
+is_mainnet:
+  type: bool
+  help: Whether to deploy on mainnet.
+  placeholder: "true"
+  default: "{{ target_network == 'mainnet' and not use_generic_env }}"
+  when: 'false'
+
+is_customnet:
+  type: bool
+  help: Whether to deploy on custom network.
+  placeholder: "true"
+  default: "{{ target_network == 'custom' and not use_generic_env }}"
+  when: 'false'
+
 _templates_suffix: ".j2"
diff --git a/examples/generators/production_python_smart_contract_typescript/.algokit/generators/create_env_file/{% if not use_generic_env and target_network == 'custom' %}.env.{{custom_network_name}}.j2{% endif %} b/examples/generators/production_python_smart_contract_typescript/.algokit/generators/create_env_file/{% if is_customnet %}.env.{{custom_network_name}}{% endif %}
similarity index 100%
rename from examples/generators/production_python_smart_contract_typescript/.algokit/generators/create_env_file/{% if not use_generic_env and target_network == 'custom' %}.env.{{custom_network_name}}.j2{% endif %}
rename to examples/generators/production_python_smart_contract_typescript/.algokit/generators/create_env_file/{% if is_customnet %}.env.{{custom_network_name}}{% endif %}
diff --git a/examples/generators/production_python_smart_contract_typescript/.algokit/generators/create_env_file/{% if not use_generic_env and target_network == 'localnet' %}.env.localnet.j2{% endif %} b/examples/generators/production_python_smart_contract_typescript/.algokit/generators/create_env_file/{% if is_localnet %}.env.localnet{% endif %}
similarity index 100%
rename from examples/generators/production_python_smart_contract_typescript/.algokit/generators/create_env_file/{% if not use_generic_env and target_network == 'localnet' %}.env.localnet.j2{% endif %}
rename to examples/generators/production_python_smart_contract_typescript/.algokit/generators/create_env_file/{% if is_localnet %}.env.localnet{% endif %}
diff --git a/examples/generators/production_python_smart_contract_typescript/.algokit/generators/create_env_file/{% if not use_generic_env and target_network == 'mainnet' %}.env.mainnet.j2{% endif %} b/examples/generators/production_python_smart_contract_typescript/.algokit/generators/create_env_file/{% if is_mainnet %}.env.mainnet{% endif %}
similarity index 100%
rename from examples/generators/production_python_smart_contract_typescript/.algokit/generators/create_env_file/{% if not use_generic_env and target_network == 'mainnet' %}.env.mainnet.j2{% endif %}
rename to examples/generators/production_python_smart_contract_typescript/.algokit/generators/create_env_file/{% if is_mainnet %}.env.mainnet{% endif %}
diff --git a/examples/generators/production_python_smart_contract_typescript/.algokit/generators/create_env_file/{% if not use_generic_env and target_network == 'testnet' %}.env.testnet.j2{% endif %} b/examples/generators/production_python_smart_contract_typescript/.algokit/generators/create_env_file/{% if is_testnet %}.env.testnet{% endif %}
similarity index 100%
rename from examples/generators/production_python_smart_contract_typescript/.algokit/generators/create_env_file/{% if not use_generic_env and target_network == 'testnet' %}.env.testnet.j2{% endif %}
rename to examples/generators/production_python_smart_contract_typescript/.algokit/generators/create_env_file/{% if is_testnet %}.env.testnet{% endif %}
diff --git a/examples/generators/production_python_smart_contract_typescript/.algokit/generators/create_env_file/{% if use_generic_env %}.env.j2{% endif %} b/examples/generators/production_python_smart_contract_typescript/.algokit/generators/create_env_file/{% if use_generic_env %}.env{% endif %}
similarity index 100%
rename from examples/generators/production_python_smart_contract_typescript/.algokit/generators/create_env_file/{% if use_generic_env %}.env.j2{% endif %}
rename to examples/generators/production_python_smart_contract_typescript/.algokit/generators/create_env_file/{% if use_generic_env %}.env{% endif %}
diff --git a/examples/generators/starter_python_smart_contract_python/.algokit/generators/create_env_file/copier.yaml b/examples/generators/starter_python_smart_contract_python/.algokit/generators/create_env_file/copier.yaml
index e1adf73..4837f8a 100644
--- a/examples/generators/starter_python_smart_contract_python/.algokit/generators/create_env_file/copier.yaml
+++ b/examples/generators/starter_python_smart_contract_python/.algokit/generators/create_env_file/copier.yaml
@@ -24,4 +24,32 @@ custom_network_name:
   placeholder: "custom"
   when: "{{ not use_generic_env and target_network == 'custom' }}"
 
+is_localnet:
+  type: bool
+  help: Whether to deploy on localnet.
+  placeholder: "true"
+  default: "{{ target_network == 'localnet' and not use_generic_env }}"
+  when: 'false'
+
+is_testnet:
+  type: bool
+  help: Whether to deploy on testnet.
+  placeholder: "true"
+  default: "{{ target_network == 'testnet' and not use_generic_env }}"
+  when: 'false'
+
+is_mainnet:
+  type: bool
+  help: Whether to deploy on mainnet.
+  placeholder: "true"
+  default: "{{ target_network == 'mainnet' and not use_generic_env }}"
+  when: 'false'
+
+is_customnet:
+  type: bool
+  help: Whether to deploy on custom network.
+  placeholder: "true"
+  default: "{{ target_network == 'custom' and not use_generic_env }}"
+  when: 'false'
+
 _templates_suffix: ".j2"
diff --git a/examples/generators/starter_python_smart_contract_python/.algokit/generators/create_env_file/{% if not use_generic_env and target_network == 'custom' %}.env.{{custom_network_name}}.j2{% endif %} b/examples/generators/starter_python_smart_contract_python/.algokit/generators/create_env_file/{% if is_customnet %}.env.{{custom_network_name}}{% endif %}
similarity index 100%
rename from examples/generators/starter_python_smart_contract_python/.algokit/generators/create_env_file/{% if not use_generic_env and target_network == 'custom' %}.env.{{custom_network_name}}.j2{% endif %}
rename to examples/generators/starter_python_smart_contract_python/.algokit/generators/create_env_file/{% if is_customnet %}.env.{{custom_network_name}}{% endif %}
diff --git a/examples/generators/starter_python_smart_contract_python/.algokit/generators/create_env_file/{% if not use_generic_env and target_network == 'localnet' %}.env.localnet.j2{% endif %} b/examples/generators/starter_python_smart_contract_python/.algokit/generators/create_env_file/{% if is_localnet %}.env.localnet{% endif %}
similarity index 100%
rename from examples/generators/starter_python_smart_contract_python/.algokit/generators/create_env_file/{% if not use_generic_env and target_network == 'localnet' %}.env.localnet.j2{% endif %}
rename to examples/generators/starter_python_smart_contract_python/.algokit/generators/create_env_file/{% if is_localnet %}.env.localnet{% endif %}
diff --git a/examples/generators/starter_python_smart_contract_python/.algokit/generators/create_env_file/{% if not use_generic_env and target_network == 'mainnet' %}.env.mainnet.j2{% endif %} b/examples/generators/starter_python_smart_contract_python/.algokit/generators/create_env_file/{% if is_mainnet %}.env.mainnet{% endif %}
similarity index 100%
rename from examples/generators/starter_python_smart_contract_python/.algokit/generators/create_env_file/{% if not use_generic_env and target_network == 'mainnet' %}.env.mainnet.j2{% endif %}
rename to examples/generators/starter_python_smart_contract_python/.algokit/generators/create_env_file/{% if is_mainnet %}.env.mainnet{% endif %}
diff --git a/examples/generators/starter_python_smart_contract_python/.algokit/generators/create_env_file/{% if not use_generic_env and target_network == 'testnet' %}.env.testnet.j2{% endif %} b/examples/generators/starter_python_smart_contract_python/.algokit/generators/create_env_file/{% if is_testnet %}.env.testnet{% endif %}
similarity index 100%
rename from examples/generators/starter_python_smart_contract_python/.algokit/generators/create_env_file/{% if not use_generic_env and target_network == 'testnet' %}.env.testnet.j2{% endif %}
rename to examples/generators/starter_python_smart_contract_python/.algokit/generators/create_env_file/{% if is_testnet %}.env.testnet{% endif %}
diff --git a/examples/generators/starter_python_smart_contract_python/.algokit/generators/create_env_file/{% if use_generic_env %}.env.j2{% endif %} b/examples/generators/starter_python_smart_contract_python/.algokit/generators/create_env_file/{% if use_generic_env %}.env{% endif %}
similarity index 100%
rename from examples/generators/starter_python_smart_contract_python/.algokit/generators/create_env_file/{% if use_generic_env %}.env.j2{% endif %}
rename to examples/generators/starter_python_smart_contract_python/.algokit/generators/create_env_file/{% if use_generic_env %}.env{% endif %}
diff --git a/examples/generators/starter_python_smart_contract_typescript/.algokit/generators/create_env_file/copier.yaml b/examples/generators/starter_python_smart_contract_typescript/.algokit/generators/create_env_file/copier.yaml
index e1adf73..4837f8a 100644
--- a/examples/generators/starter_python_smart_contract_typescript/.algokit/generators/create_env_file/copier.yaml
+++ b/examples/generators/starter_python_smart_contract_typescript/.algokit/generators/create_env_file/copier.yaml
@@ -24,4 +24,32 @@ custom_network_name:
   placeholder: "custom"
   when: "{{ not use_generic_env and target_network == 'custom' }}"
 
+is_localnet:
+  type: bool
+  help: Whether to deploy on localnet.
+  placeholder: "true"
+  default: "{{ target_network == 'localnet' and not use_generic_env }}"
+  when: 'false'
+
+is_testnet:
+  type: bool
+  help: Whether to deploy on testnet.
+  placeholder: "true"
+  default: "{{ target_network == 'testnet' and not use_generic_env }}"
+  when: 'false'
+
+is_mainnet:
+  type: bool
+  help: Whether to deploy on mainnet.
+  placeholder: "true"
+  default: "{{ target_network == 'mainnet' and not use_generic_env }}"
+  when: 'false'
+
+is_customnet:
+  type: bool
+  help: Whether to deploy on custom network.
+  placeholder: "true"
+  default: "{{ target_network == 'custom' and not use_generic_env }}"
+  when: 'false'
+
 _templates_suffix: ".j2"
diff --git a/examples/generators/starter_python_smart_contract_typescript/.algokit/generators/create_env_file/{% if not use_generic_env and target_network == 'custom' %}.env.{{custom_network_name}}.j2{% endif %} b/examples/generators/starter_python_smart_contract_typescript/.algokit/generators/create_env_file/{% if is_customnet %}.env.{{custom_network_name}}{% endif %}
similarity index 100%
rename from examples/generators/starter_python_smart_contract_typescript/.algokit/generators/create_env_file/{% if not use_generic_env and target_network == 'custom' %}.env.{{custom_network_name}}.j2{% endif %}
rename to examples/generators/starter_python_smart_contract_typescript/.algokit/generators/create_env_file/{% if is_customnet %}.env.{{custom_network_name}}{% endif %}
diff --git a/examples/generators/starter_python_smart_contract_typescript/.algokit/generators/create_env_file/{% if not use_generic_env and target_network == 'localnet' %}.env.localnet.j2{% endif %} b/examples/generators/starter_python_smart_contract_typescript/.algokit/generators/create_env_file/{% if is_localnet %}.env.localnet{% endif %}
similarity index 100%
rename from examples/generators/starter_python_smart_contract_typescript/.algokit/generators/create_env_file/{% if not use_generic_env and target_network == 'localnet' %}.env.localnet.j2{% endif %}
rename to examples/generators/starter_python_smart_contract_typescript/.algokit/generators/create_env_file/{% if is_localnet %}.env.localnet{% endif %}
diff --git a/examples/generators/starter_python_smart_contract_typescript/.algokit/generators/create_env_file/{% if not use_generic_env and target_network == 'mainnet' %}.env.mainnet.j2{% endif %} b/examples/generators/starter_python_smart_contract_typescript/.algokit/generators/create_env_file/{% if is_mainnet %}.env.mainnet{% endif %}
similarity index 100%
rename from examples/generators/starter_python_smart_contract_typescript/.algokit/generators/create_env_file/{% if not use_generic_env and target_network == 'mainnet' %}.env.mainnet.j2{% endif %}
rename to examples/generators/starter_python_smart_contract_typescript/.algokit/generators/create_env_file/{% if is_mainnet %}.env.mainnet{% endif %}
diff --git a/examples/generators/starter_python_smart_contract_typescript/.algokit/generators/create_env_file/{% if not use_generic_env and target_network == 'testnet' %}.env.testnet.j2{% endif %} b/examples/generators/starter_python_smart_contract_typescript/.algokit/generators/create_env_file/{% if is_testnet %}.env.testnet{% endif %}
similarity index 100%
rename from examples/generators/starter_python_smart_contract_typescript/.algokit/generators/create_env_file/{% if not use_generic_env and target_network == 'testnet' %}.env.testnet.j2{% endif %}
rename to examples/generators/starter_python_smart_contract_typescript/.algokit/generators/create_env_file/{% if is_testnet %}.env.testnet{% endif %}
diff --git a/examples/generators/starter_python_smart_contract_typescript/.algokit/generators/create_env_file/{% if use_generic_env %}.env.j2{% endif %} b/examples/generators/starter_python_smart_contract_typescript/.algokit/generators/create_env_file/{% if use_generic_env %}.env{% endif %}
similarity index 100%
rename from examples/generators/starter_python_smart_contract_typescript/.algokit/generators/create_env_file/{% if use_generic_env %}.env.j2{% endif %}
rename to examples/generators/starter_python_smart_contract_typescript/.algokit/generators/create_env_file/{% if use_generic_env %}.env{% endif %}
diff --git a/template_content/.algokit/generators/create_env_file/copier.yaml b/template_content/.algokit/generators/create_env_file/copier.yaml
index e1adf73..4837f8a 100644
--- a/template_content/.algokit/generators/create_env_file/copier.yaml
+++ b/template_content/.algokit/generators/create_env_file/copier.yaml
@@ -24,4 +24,32 @@ custom_network_name:
   placeholder: "custom"
   when: "{{ not use_generic_env and target_network == 'custom' }}"
 
+is_localnet:
+  type: bool
+  help: Whether to deploy on localnet.
+  placeholder: "true"
+  default: "{{ target_network == 'localnet' and not use_generic_env }}"
+  when: 'false'
+
+is_testnet:
+  type: bool
+  help: Whether to deploy on testnet.
+  placeholder: "true"
+  default: "{{ target_network == 'testnet' and not use_generic_env }}"
+  when: 'false'
+
+is_mainnet:
+  type: bool
+  help: Whether to deploy on mainnet.
+  placeholder: "true"
+  default: "{{ target_network == 'mainnet' and not use_generic_env }}"
+  when: 'false'
+
+is_customnet:
+  type: bool
+  help: Whether to deploy on custom network.
+  placeholder: "true"
+  default: "{{ target_network == 'custom' and not use_generic_env }}"
+  when: 'false'
+
 _templates_suffix: ".j2"
diff --git a/template_content/.algokit/generators/create_env_file/{% raw %}{% if not use_generic_env and target_network == 'custom' %}.env.{{custom_network_name}}.j2{% endif %}{% endraw %} b/template_content/.algokit/generators/create_env_file/{% raw %}{% if is_customnet %}.env.{{custom_network_name}}{% endif %}{% endraw %}
similarity index 100%
rename from template_content/.algokit/generators/create_env_file/{% raw %}{% if not use_generic_env and target_network == 'custom' %}.env.{{custom_network_name}}.j2{% endif %}{% endraw %}
rename to template_content/.algokit/generators/create_env_file/{% raw %}{% if is_customnet %}.env.{{custom_network_name}}{% endif %}{% endraw %}
diff --git a/template_content/.algokit/generators/create_env_file/{% raw %}{% if not use_generic_env and target_network == 'localnet' %}.env.localnet.j2{% endif %}{% endraw %} b/template_content/.algokit/generators/create_env_file/{% raw %}{% if is_localnet %}.env.localnet{% endif %}{% endraw %}
similarity index 100%
rename from template_content/.algokit/generators/create_env_file/{% raw %}{% if not use_generic_env and target_network == 'localnet' %}.env.localnet.j2{% endif %}{% endraw %}
rename to template_content/.algokit/generators/create_env_file/{% raw %}{% if is_localnet %}.env.localnet{% endif %}{% endraw %}
diff --git a/template_content/.algokit/generators/create_env_file/{% raw %}{% if not use_generic_env and target_network == 'mainnet' %}.env.mainnet.j2{% endif %}{% endraw %} b/template_content/.algokit/generators/create_env_file/{% raw %}{% if is_mainnet %}.env.mainnet{% endif %}{% endraw %}
similarity index 100%
rename from template_content/.algokit/generators/create_env_file/{% raw %}{% if not use_generic_env and target_network == 'mainnet' %}.env.mainnet.j2{% endif %}{% endraw %}
rename to template_content/.algokit/generators/create_env_file/{% raw %}{% if is_mainnet %}.env.mainnet{% endif %}{% endraw %}
diff --git a/template_content/.algokit/generators/create_env_file/{% raw %}{% if not use_generic_env and target_network == 'testnet' %}.env.testnet.j2{% endif %}{% endraw %} b/template_content/.algokit/generators/create_env_file/{% raw %}{% if is_testnet %}.env.testnet{% endif %}{% endraw %}
similarity index 100%
rename from template_content/.algokit/generators/create_env_file/{% raw %}{% if not use_generic_env and target_network == 'testnet' %}.env.testnet.j2{% endif %}{% endraw %}
rename to template_content/.algokit/generators/create_env_file/{% raw %}{% if is_testnet %}.env.testnet{% endif %}{% endraw %}
diff --git a/template_content/.algokit/generators/create_env_file/{% raw %}{% if use_generic_env %}.env.j2{% endif %}{% endraw %} b/template_content/.algokit/generators/create_env_file/{% raw %}{% if use_generic_env %}.env{% endif %}{% endraw %}
similarity index 100%
rename from template_content/.algokit/generators/create_env_file/{% raw %}{% if use_generic_env %}.env.j2{% endif %}{% endraw %}
rename to template_content/.algokit/generators/create_env_file/{% raw %}{% if use_generic_env %}.env{% endif %}{% endraw %}