From f13de37aa51843bb2a99a4a1ae68c6b6334483c4 Mon Sep 17 00:00:00 2001
From: Adrian Celebanski <acelebanski@paloaltonetworks.com>
Date: Tue, 8 Oct 2024 20:23:37 +0200
Subject: [PATCH 1/3] Add information about subscription_id to READMEs

---
 examples/common_vmseries/.header.md           |  5 +++-
 examples/common_vmseries/README.md            |  5 +++-
 .../common_vmseries_and_autoscale/.header.md  |  5 +++-
 .../common_vmseries_and_autoscale/README.md   |  5 +++-
 examples/dedicated_vmseries/.header.md        |  5 +++-
 examples/dedicated_vmseries/README.md         |  5 +++-
 .../.header.md                                |  5 +++-
 .../README.md                                 |  5 +++-
 examples/gwlb_with_vmseries/.header.md        | 29 ++++++++++---------
 examples/gwlb_with_vmseries/README.md         | 29 ++++++++++---------
 examples/standalone_panorama/.header.md       |  5 +++-
 examples/standalone_panorama/README.md        |  5 +++-
 examples/standalone_vmseries/.header.md       |  5 +++-
 examples/standalone_vmseries/README.md        |  5 +++-
 14 files changed, 80 insertions(+), 38 deletions(-)

diff --git a/examples/common_vmseries/.header.md b/examples/common_vmseries/.header.md
index bb6de35f..d309104e 100644
--- a/examples/common_vmseries/.header.md
+++ b/examples/common_vmseries/.header.md
@@ -90,7 +90,10 @@ A list of requirements might vary depending on the platform used to deploy the i
 - checkout the code locally (if you haven't done so yet)
 - copy the [`example.tfvars`](./example.tfvars) file, rename it to `terraform.tfvars` and adjust it to your needs
   (take a closer look at the `TODO` markers)
-- _(optional)_ authenticate to AzureRM, switch to the Subscription of your choice if necessary
+- _(optional)_ authenticate to AzureRM, switch to the Subscription of your choice
+- provide `subscription_id` property under the `azurerm` provider block in [`versions.tf`](./versions.tf) file or create an
+  environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value in your shell (required since AzureRM provider
+  version 4 as per [provider documentation](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs#subscription_id))
 - initialize the Terraform module:
 
   ```bash
diff --git a/examples/common_vmseries/README.md b/examples/common_vmseries/README.md
index ccc3a281..20cbc2c0 100644
--- a/examples/common_vmseries/README.md
+++ b/examples/common_vmseries/README.md
@@ -90,7 +90,10 @@ A list of requirements might vary depending on the platform used to deploy the i
 - checkout the code locally (if you haven't done so yet)
 - copy the [`example.tfvars`](./example.tfvars) file, rename it to `terraform.tfvars` and adjust it to your needs
   (take a closer look at the `TODO` markers)
-- _(optional)_ authenticate to AzureRM, switch to the Subscription of your choice if necessary
+- _(optional)_ authenticate to AzureRM, switch to the Subscription of your choice
+- provide `subscription_id` property under the `azurerm` provider block in [`versions.tf`](./versions.tf) file or create an
+  environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value in your shell (required since AzureRM provider
+  version 4 as per [provider documentation](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs#subscription_id))
 - initialize the Terraform module:
 
   ```bash
diff --git a/examples/common_vmseries_and_autoscale/.header.md b/examples/common_vmseries_and_autoscale/.header.md
index 5c756293..6b3c1d46 100644
--- a/examples/common_vmseries_and_autoscale/.header.md
+++ b/examples/common_vmseries_and_autoscale/.header.md
@@ -128,7 +128,10 @@ A non-platform requirement would be a running Panorama instance. For full automa
 - copy the [`example.tfvars`](./example.tfvars) file, rename it to `terraform.tfvars` and adjust it to your needs (take a closer
   look at the `TODO` markers). If you already have a configured Panorama (with at least minimum configuration described above) you
   might want to also adjust the `bootstrap_options` for the scale set [`common`](./example.tfvars#L224).
-- _(optional)_ authenticate to AzureRM, switch to the Subscription of your choice if necessary
+- _(optional)_ authenticate to AzureRM, switch to the Subscription of your choice
+- provide `subscription_id` property under the `azurerm` provider block in [`versions.tf`](./versions.tf) file or create an
+  environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value in your shell (required since AzureRM provider
+  version 4 as per [provider documentation](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs#subscription_id))
 - initialize the Terraform module:
 
   ```bash
diff --git a/examples/common_vmseries_and_autoscale/README.md b/examples/common_vmseries_and_autoscale/README.md
index 65d3192b..eb35379b 100644
--- a/examples/common_vmseries_and_autoscale/README.md
+++ b/examples/common_vmseries_and_autoscale/README.md
@@ -128,7 +128,10 @@ A non-platform requirement would be a running Panorama instance. For full automa
 - copy the [`example.tfvars`](./example.tfvars) file, rename it to `terraform.tfvars` and adjust it to your needs (take a closer
   look at the `TODO` markers). If you already have a configured Panorama (with at least minimum configuration described above) you
   might want to also adjust the `bootstrap_options` for the scale set [`common`](./example.tfvars#L224).
-- _(optional)_ authenticate to AzureRM, switch to the Subscription of your choice if necessary
+- _(optional)_ authenticate to AzureRM, switch to the Subscription of your choice
+- provide `subscription_id` property under the `azurerm` provider block in [`versions.tf`](./versions.tf) file or create an
+  environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value in your shell (required since AzureRM provider
+  version 4 as per [provider documentation](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs#subscription_id))
 - initialize the Terraform module:
 
   ```bash
diff --git a/examples/dedicated_vmseries/.header.md b/examples/dedicated_vmseries/.header.md
index f4edff80..d4a18eaa 100644
--- a/examples/dedicated_vmseries/.header.md
+++ b/examples/dedicated_vmseries/.header.md
@@ -92,7 +92,10 @@ A list of requirements might vary depending on the platform used to deploy the i
   look at the `TODO` markers)
 - copy the [`init-cfg.sample.txt`](./files/init-cfg.sample.txt) to `init-cfg.txt` and fill it out with required bootstrap 
   parameters (see this [documentation](https://docs.paloaltonetworks.com/vm-series/9-1/vm-series-deployment/bootstrap-the-vm-series-firewall/create-the-init-cfgtxt-file/init-cfgtxt-file-components#id07933d91-15be-414d-bc8d-f2a5f3d8df6b) for details)
-- _(optional)_ authenticate to AzureRM, switch to the Subscription of your choice if necessary
+- _(optional)_ authenticate to AzureRM, switch to the Subscription of your choice
+- provide `subscription_id` property under the `azurerm` provider block in [`versions.tf`](./versions.tf) file or create an
+  environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value in your shell (required since AzureRM provider
+  version 4 as per [provider documentation](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs#subscription_id))
 - initialize the Terraform module:
 
   ```bash
diff --git a/examples/dedicated_vmseries/README.md b/examples/dedicated_vmseries/README.md
index 024864b1..12a97c27 100644
--- a/examples/dedicated_vmseries/README.md
+++ b/examples/dedicated_vmseries/README.md
@@ -92,7 +92,10 @@ A list of requirements might vary depending on the platform used to deploy the i
   look at the `TODO` markers)
 - copy the [`init-cfg.sample.txt`](./files/init-cfg.sample.txt) to `init-cfg.txt` and fill it out with required bootstrap
   parameters (see this [documentation](https://docs.paloaltonetworks.com/vm-series/9-1/vm-series-deployment/bootstrap-the-vm-series-firewall/create-the-init-cfgtxt-file/init-cfgtxt-file-components#id07933d91-15be-414d-bc8d-f2a5f3d8df6b) for details)
-- _(optional)_ authenticate to AzureRM, switch to the Subscription of your choice if necessary
+- _(optional)_ authenticate to AzureRM, switch to the Subscription of your choice
+- provide `subscription_id` property under the `azurerm` provider block in [`versions.tf`](./versions.tf) file or create an
+  environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value in your shell (required since AzureRM provider
+  version 4 as per [provider documentation](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs#subscription_id))
 - initialize the Terraform module:
 
   ```bash
diff --git a/examples/dedicated_vmseries_and_autoscale/.header.md b/examples/dedicated_vmseries_and_autoscale/.header.md
index 63ba1637..a6ea5961 100644
--- a/examples/dedicated_vmseries_and_autoscale/.header.md
+++ b/examples/dedicated_vmseries_and_autoscale/.header.md
@@ -122,7 +122,10 @@ requirements:
   look at the `TODO` markers). If you already have a configured Panorama (with at least minimum configuration described above) you
   might want to also adjust the `bootstrap_options` for each scale set ([inbound](./example.tfvars#L205) and
   [obew](./example.tfvars#L249) separately).
-- _(optional)_ authenticate to AzureRM, switch to the Subscription of your choice if necessary
+- _(optional)_ authenticate to AzureRM, switch to the Subscription of your choice
+- provide `subscription_id` property under the `azurerm` provider block in [`versions.tf`](./versions.tf) file or create an
+  environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value in your shell (required since AzureRM provider
+  version 4 as per [provider documentation](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs#subscription_id))
 - initialize the Terraform module:
 
   ```bash
diff --git a/examples/dedicated_vmseries_and_autoscale/README.md b/examples/dedicated_vmseries_and_autoscale/README.md
index 3020d853..685aee02 100644
--- a/examples/dedicated_vmseries_and_autoscale/README.md
+++ b/examples/dedicated_vmseries_and_autoscale/README.md
@@ -122,7 +122,10 @@ requirements:
   look at the `TODO` markers). If you already have a configured Panorama (with at least minimum configuration described above) you
   might want to also adjust the `bootstrap_options` for each scale set ([inbound](./example.tfvars#L205) and
   [obew](./example.tfvars#L249) separately).
-- _(optional)_ authenticate to AzureRM, switch to the Subscription of your choice if necessary
+- _(optional)_ authenticate to AzureRM, switch to the Subscription of your choice
+- provide `subscription_id` property under the `azurerm` provider block in [`versions.tf`](./versions.tf) file or create an
+  environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value in your shell (required since AzureRM provider
+  version 4 as per [provider documentation](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs#subscription_id))
 - initialize the Terraform module:
 
   ```bash
diff --git a/examples/gwlb_with_vmseries/.header.md b/examples/gwlb_with_vmseries/.header.md
index ce21c24a..e6b4ad51 100644
--- a/examples/gwlb_with_vmseries/.header.md
+++ b/examples/gwlb_with_vmseries/.header.md
@@ -52,43 +52,46 @@ A list of requirements might vary depending on the platform used to deploy the i
 
 ### Deployment Steps
 
-* Checkout the code locally.
-* Copy `example.tfvars` to `terraform.tfvars` and adjust it to your needs.
-* Copy `files/init-cfg.txt.sample` to `files/init-cfg.txt` and fill it in with required bootstrap parameters (see this
+- checkout the code locally
+- copy `example.tfvars` to `terraform.tfvars` and adjust it to your needs
+- copy `files/init-cfg.txt.sample` to `files/init-cfg.txt` and fill it in with required bootstrap parameters (see this
 [documentation](https://docs.paloaltonetworks.com/vm-series/10-2/vm-series-deployment/bootstrap-the-vm-series-firewall/create-the-init-cfgtxt-file/init-cfgtxt-file-components)
-for details).
-* _(optional)_ Authenticate to AzureRM, switch to the Subscription of your choice if necessary.
-* Initialize the Terraform module:
+for details)
+- _(optional)_ Authenticate to AzureRM, switch to the Subscription of your choice
+- provide `subscription_id` property under the `azurerm` provider block in [`versions.tf`](./versions.tf) file or create an
+  environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value in your shell (required since AzureRM provider
+  version 4 as per [provider documentation](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs#subscription_id))
+- initialize the Terraform module:
 
 ```bash
 terraform init
 ```
 
-* _(optional)_ Plan you infrastructure to see what will be actually deployed:
+- _(optional)_ plan you infrastructure to see what will be actually deployed:
 
 ```bash
 terraform plan
 ```
 
-* Deploy the infrastructure:
+- deploy the infrastructure (you will have to confirm it with typing in `yes`):
 
 ```bash
 terraform apply
 ```
 
-* At this stage you have to wait a few minutes for the firewalls to bootstrap.
+- At this stage you have to wait a few minutes for the firewalls to bootstrap.
 
 ### Post deploy
 
 Firewalls in this example are configured with password authentication. To retrieve the initial credentials run:
 
-* for username:
+- for username:
 
 ```bash
 terraform output username
 ```
 
-* for password:
+- for password:
 
 ```bash
 terraform output password
@@ -102,8 +105,8 @@ terraform output vmseries_mgmt_ips
 
 You can now login to the devices using either:
 
-* CLI - ssh client is required
-* Web UI (https) - any modern web browser, note that initially the traffic is encrypted with a self-signed certificate.
+- CLI - ssh client is required
+- Web UI (https) - any modern web browser, note that initially the traffic is encrypted with a self-signed certificate.
 
 With default example configuration, the devices already contain `DAY0` configuration, so all network interfaces should be
 configured and Azure Gateway Load Balancer should already report that the devices are healthy.
diff --git a/examples/gwlb_with_vmseries/README.md b/examples/gwlb_with_vmseries/README.md
index 43c402e5..453f966b 100644
--- a/examples/gwlb_with_vmseries/README.md
+++ b/examples/gwlb_with_vmseries/README.md
@@ -52,43 +52,46 @@ A list of requirements might vary depending on the platform used to deploy the i
 
 ### Deployment Steps
 
-* Checkout the code locally.
-* Copy `example.tfvars` to `terraform.tfvars` and adjust it to your needs.
-* Copy `files/init-cfg.txt.sample` to `files/init-cfg.txt` and fill it in with required bootstrap parameters (see this
+- checkout the code locally
+- copy `example.tfvars` to `terraform.tfvars` and adjust it to your needs
+- copy `files/init-cfg.txt.sample` to `files/init-cfg.txt` and fill it in with required bootstrap parameters (see this
 [documentation](https://docs.paloaltonetworks.com/vm-series/10-2/vm-series-deployment/bootstrap-the-vm-series-firewall/create-the-init-cfgtxt-file/init-cfgtxt-file-components)
-for details).
-* _(optional)_ Authenticate to AzureRM, switch to the Subscription of your choice if necessary.
-* Initialize the Terraform module:
+for details)
+- _(optional)_ Authenticate to AzureRM, switch to the Subscription of your choice
+- provide `subscription_id` property under the `azurerm` provider block in [`versions.tf`](./versions.tf) file or create an
+  environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value in your shell (required since AzureRM provider
+  version 4 as per [provider documentation](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs#subscription_id))
+- initialize the Terraform module:
 
 ```bash
 terraform init
 ```
 
-* _(optional)_ Plan you infrastructure to see what will be actually deployed:
+- _(optional)_ plan you infrastructure to see what will be actually deployed:
 
 ```bash
 terraform plan
 ```
 
-* Deploy the infrastructure:
+- deploy the infrastructure (you will have to confirm it with typing in `yes`):
 
 ```bash
 terraform apply
 ```
 
-* At this stage you have to wait a few minutes for the firewalls to bootstrap.
+- At this stage you have to wait a few minutes for the firewalls to bootstrap.
 
 ### Post deploy
 
 Firewalls in this example are configured with password authentication. To retrieve the initial credentials run:
 
-* for username:
+- for username:
 
 ```bash
 terraform output username
 ```
 
-* for password:
+- for password:
 
 ```bash
 terraform output password
@@ -102,8 +105,8 @@ terraform output vmseries_mgmt_ips
 
 You can now login to the devices using either:
 
-* CLI - ssh client is required
-* Web UI (https) - any modern web browser, note that initially the traffic is encrypted with a self-signed certificate.
+- CLI - ssh client is required
+- Web UI (https) - any modern web browser, note that initially the traffic is encrypted with a self-signed certificate.
 
 With default example configuration, the devices already contain `DAY0` configuration, so all network interfaces should be
 configured and Azure Gateway Load Balancer should already report that the devices are healthy.
diff --git a/examples/standalone_panorama/.header.md b/examples/standalone_panorama/.header.md
index d7ecc1a5..c66e32ae 100644
--- a/examples/standalone_panorama/.header.md
+++ b/examples/standalone_panorama/.header.md
@@ -47,7 +47,10 @@ A list of requirements might vary depending on the platform used to deploy the i
 - checkout the code locally (if you haven't done so yet)
 - copy the [`example.tfvars`](./example.tfvars) file, rename it to `terraform.tfvars` and adjust it to your needs (take a closer
   look at the `TODO` markers)
-- _(optional)_ authenticate to AzureRM, switch to the Subscription of your choice if necessary
+- _(optional)_ authenticate to AzureRM, switch to the Subscription of your choice
+- provide `subscription_id` property under the `azurerm` provider block in [`versions.tf`](./versions.tf) file or create an
+  environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value in your shell (required since AzureRM provider
+  version 4 as per [provider documentation](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs#subscription_id))
 - initialize the Terraform module:
 
   ```bash
diff --git a/examples/standalone_panorama/README.md b/examples/standalone_panorama/README.md
index 2445c1b7..c23db60c 100644
--- a/examples/standalone_panorama/README.md
+++ b/examples/standalone_panorama/README.md
@@ -47,7 +47,10 @@ A list of requirements might vary depending on the platform used to deploy the i
 - checkout the code locally (if you haven't done so yet)
 - copy the [`example.tfvars`](./example.tfvars) file, rename it to `terraform.tfvars` and adjust it to your needs (take a closer
   look at the `TODO` markers)
-- _(optional)_ authenticate to AzureRM, switch to the Subscription of your choice if necessary
+- _(optional)_ authenticate to AzureRM, switch to the Subscription of your choice
+- provide `subscription_id` property under the `azurerm` provider block in [`versions.tf`](./versions.tf) file or create an
+  environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value in your shell (required since AzureRM provider
+  version 4 as per [provider documentation](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs#subscription_id))
 - initialize the Terraform module:
 
   ```bash
diff --git a/examples/standalone_vmseries/.header.md b/examples/standalone_vmseries/.header.md
index e08a3de0..5b904d31 100644
--- a/examples/standalone_vmseries/.header.md
+++ b/examples/standalone_vmseries/.header.md
@@ -40,7 +40,10 @@ Steps to deploy the infrastructure are as following:
 - checkout the code locally (if you haven't done so yet)
 - copy the [`example.tfvars`](./example.tfvars) file, rename it to `terraform.tfvars` and adjust it to your needs
   (take a closer look at the `TODO` markers)
-- _(optional)_ authenticate to AzureRM, switch to the Subscription of your choice if necessary
+- _(optional)_ authenticate to AzureRM, switch to the Subscription of your choice
+- provide `subscription_id` property under the `azurerm` provider block in [`versions.tf`](./versions.tf) file or create an
+  environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value in your shell (required since AzureRM provider
+  version 4 as per [provider documentation](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs#subscription_id))
 - initialize the Terraform module:
 
   ```bash
diff --git a/examples/standalone_vmseries/README.md b/examples/standalone_vmseries/README.md
index c8d884c7..69a5802e 100644
--- a/examples/standalone_vmseries/README.md
+++ b/examples/standalone_vmseries/README.md
@@ -40,7 +40,10 @@ Steps to deploy the infrastructure are as following:
 - checkout the code locally (if you haven't done so yet)
 - copy the [`example.tfvars`](./example.tfvars) file, rename it to `terraform.tfvars` and adjust it to your needs
   (take a closer look at the `TODO` markers)
-- _(optional)_ authenticate to AzureRM, switch to the Subscription of your choice if necessary
+- _(optional)_ authenticate to AzureRM, switch to the Subscription of your choice
+- provide `subscription_id` property under the `azurerm` provider block in [`versions.tf`](./versions.tf) file or create an
+  environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value in your shell (required since AzureRM provider
+  version 4 as per [provider documentation](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs#subscription_id))
 - initialize the Terraform module:
 
   ```bash

From 47accf8bb99c3ac1729924087873f1d6a6dd3f04 Mon Sep 17 00:00:00 2001
From: Adrian Celebanski <acelebanski@paloaltonetworks.com>
Date: Tue, 8 Oct 2024 20:34:00 +0200
Subject: [PATCH 2/3] Minor correction to GWLB example README

---
 examples/gwlb_with_vmseries/.header.md | 2 +-
 examples/gwlb_with_vmseries/README.md  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/gwlb_with_vmseries/.header.md b/examples/gwlb_with_vmseries/.header.md
index e6b4ad51..ef1f2040 100644
--- a/examples/gwlb_with_vmseries/.header.md
+++ b/examples/gwlb_with_vmseries/.header.md
@@ -79,7 +79,7 @@ terraform plan
 terraform apply
 ```
 
-- At this stage you have to wait a few minutes for the firewalls to bootstrap.
+- at this stage you have to wait couple of minutes for the firewalls to bootstrap.
 
 ### Post deploy
 
diff --git a/examples/gwlb_with_vmseries/README.md b/examples/gwlb_with_vmseries/README.md
index 453f966b..5866b184 100644
--- a/examples/gwlb_with_vmseries/README.md
+++ b/examples/gwlb_with_vmseries/README.md
@@ -79,7 +79,7 @@ terraform plan
 terraform apply
 ```
 
-- At this stage you have to wait a few minutes for the firewalls to bootstrap.
+- at this stage you have to wait couple of minutes for the firewalls to bootstrap.
 
 ### Post deploy
 

From 134a6da36194c9c1b29c24a209bbad205565c8d4 Mon Sep 17 00:00:00 2001
From: Adrian Celebanski <acelebanski@paloaltonetworks.com>
Date: Wed, 9 Oct 2024 23:04:13 +0200
Subject: [PATCH 3/3] Add subscription_id variable

---
 examples/common_vmseries/.header.md           |  6 +++---
 examples/common_vmseries/README.md            | 20 ++++++++++++++++---
 examples/common_vmseries/example.tfvars       |  2 ++
 examples/common_vmseries/variables.tf         | 11 ++++++++++
 examples/common_vmseries/versions.tf          |  1 +
 .../common_vmseries_and_autoscale/.header.md  |  6 +++---
 .../common_vmseries_and_autoscale/README.md   | 20 ++++++++++++++++---
 .../example.tfvars                            |  2 ++
 .../variables.tf                              | 11 ++++++++++
 .../common_vmseries_and_autoscale/versions.tf |  1 +
 examples/dedicated_vmseries/.header.md        |  6 +++---
 examples/dedicated_vmseries/README.md         | 20 ++++++++++++++++---
 examples/dedicated_vmseries/example.tfvars    |  2 ++
 examples/dedicated_vmseries/variables.tf      | 11 ++++++++++
 examples/dedicated_vmseries/versions.tf       |  1 +
 .../.header.md                                |  6 +++---
 .../README.md                                 | 20 ++++++++++++++++---
 .../example.tfvars                            |  2 ++
 .../variables.tf                              | 11 ++++++++++
 .../versions.tf                               |  1 +
 examples/gwlb_with_vmseries/.header.md        |  6 +++---
 examples/gwlb_with_vmseries/README.md         | 20 ++++++++++++++++---
 examples/gwlb_with_vmseries/example.tfvars    |  2 ++
 examples/gwlb_with_vmseries/variables.tf      | 11 ++++++++++
 examples/gwlb_with_vmseries/versions.tf       |  1 +
 examples/standalone_panorama/.header.md       |  6 +++---
 examples/standalone_panorama/README.md        | 20 ++++++++++++++++---
 examples/standalone_panorama/example.tfvars   |  2 ++
 examples/standalone_panorama/variables.tf     | 11 ++++++++++
 examples/standalone_panorama/versions.tf      |  1 +
 examples/standalone_vmseries/.header.md       |  6 +++---
 examples/standalone_vmseries/README.md        | 20 ++++++++++++++++---
 examples/standalone_vmseries/example.tfvars   |  2 ++
 examples/standalone_vmseries/variables.tf     | 11 ++++++++++
 examples/standalone_vmseries/versions.tf      |  1 +
 tests/appgw/README.md                         | 14 +++++++++++++
 tests/appgw/example.tfvars                    |  2 ++
 tests/appgw/variables.tf                      | 11 ++++++++++
 tests/appgw/versions.tf                       |  1 +
 tests/virtual_network_gateway/README.md       | 14 +++++++++++++
 tests/virtual_network_gateway/example.tfvars  |  2 ++
 tests/virtual_network_gateway/variables.tf    | 11 ++++++++++
 tests/virtual_network_gateway/versions.tf     |  1 +
 43 files changed, 294 insertions(+), 42 deletions(-)

diff --git a/examples/common_vmseries/.header.md b/examples/common_vmseries/.header.md
index d309104e..58104ce7 100644
--- a/examples/common_vmseries/.header.md
+++ b/examples/common_vmseries/.header.md
@@ -91,9 +91,9 @@ A list of requirements might vary depending on the platform used to deploy the i
 - copy the [`example.tfvars`](./example.tfvars) file, rename it to `terraform.tfvars` and adjust it to your needs
   (take a closer look at the `TODO` markers)
 - _(optional)_ authenticate to AzureRM, switch to the Subscription of your choice
-- provide `subscription_id` property under the `azurerm` provider block in [`versions.tf`](./versions.tf) file or create an
-  environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value in your shell (required since AzureRM provider
-  version 4 as per [provider documentation](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs#subscription_id))
+- provide `subscription_id` either by creating an environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value
+  in your shell (recommended option) or by setting the value of `subscription_id` variable within your `tfvars` file (discouraged
+  option, we don't recommend putting the Subscription ID in clear text inside the code).
 - initialize the Terraform module:
 
   ```bash
diff --git a/examples/common_vmseries/README.md b/examples/common_vmseries/README.md
index 20cbc2c0..74a33578 100644
--- a/examples/common_vmseries/README.md
+++ b/examples/common_vmseries/README.md
@@ -91,9 +91,9 @@ A list of requirements might vary depending on the platform used to deploy the i
 - copy the [`example.tfvars`](./example.tfvars) file, rename it to `terraform.tfvars` and adjust it to your needs
   (take a closer look at the `TODO` markers)
 - _(optional)_ authenticate to AzureRM, switch to the Subscription of your choice
-- provide `subscription_id` property under the `azurerm` provider block in [`versions.tf`](./versions.tf) file or create an
-  environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value in your shell (required since AzureRM provider
-  version 4 as per [provider documentation](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs#subscription_id))
+- provide `subscription_id` either by creating an environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value
+  in your shell (recommended option) or by setting the value of `subscription_id` variable within your `tfvars` file (discouraged
+  option, we don't recommend putting the Subscription ID in clear text inside the code).
 - initialize the Terraform module:
 
   ```bash
@@ -215,6 +215,7 @@ Name | Version | Source | Description
 
 Name | Type | Description
 --- | --- | ---
+[`subscription_id`](#subscription_id) | `string` | Azure Subscription ID is a required argument since AzureRM provider v4.
 [`resource_group_name`](#resource_group_name) | `string` | Name of the Resource Group.
 [`region`](#region) | `string` | The Azure region to use.
 [`vnets`](#vnets) | `map` | A map defining VNETs.
@@ -256,6 +257,19 @@ Name |  Description
 
 ### Required Inputs details
 
+#### subscription_id
+
+Azure Subscription ID is a required argument since AzureRM provider v4.
+
+**Note!** \
+Instead of putting the Subscription ID directly in the code, it's recommended to use an environment variable. Create an
+environment variable named `ARM_SUBSCRIPTION_ID` with your Subscription ID as value and leave this variable set to `null`.
+
+
+Type: string
+
+<sup>[back to list](#modules-required-inputs)</sup>
+
 #### resource_group_name
 
 Name of the Resource Group.
diff --git a/examples/common_vmseries/example.tfvars b/examples/common_vmseries/example.tfvars
index 739def6d..f639842b 100644
--- a/examples/common_vmseries/example.tfvars
+++ b/examples/common_vmseries/example.tfvars
@@ -1,5 +1,7 @@
 # GENERAL
 
+subscription_id = null # TODO: Put the Azure Subscription ID here only in case you cannot use an environment variable!
+
 region              = "North Europe"
 resource_group_name = "transit-vnet-common"
 name_prefix         = "example-"
diff --git a/examples/common_vmseries/variables.tf b/examples/common_vmseries/variables.tf
index ae5c985b..eb5d6d51 100644
--- a/examples/common_vmseries/variables.tf
+++ b/examples/common_vmseries/variables.tf
@@ -1,5 +1,16 @@
 # GENERAL
 
+variable "subscription_id" {
+  description = <<-EOF
+  Azure Subscription ID is a required argument since AzureRM provider v4.
+
+  **Note!** \
+  Instead of putting the Subscription ID directly in the code, it's recommended to use an environment variable. Create an
+  environment variable named `ARM_SUBSCRIPTION_ID` with your Subscription ID as value and leave this variable set to `null`.
+  EOF
+  type        = string
+}
+
 variable "name_prefix" {
   description = <<-EOF
   A prefix that will be added to all created resources.
diff --git a/examples/common_vmseries/versions.tf b/examples/common_vmseries/versions.tf
index 85620563..a189cd83 100644
--- a/examples/common_vmseries/versions.tf
+++ b/examples/common_vmseries/versions.tf
@@ -14,6 +14,7 @@ terraform {
 }
 
 provider "azurerm" {
+  subscription_id = var.subscription_id
   features {
     resource_group {
       prevent_deletion_if_contains_resources = false
diff --git a/examples/common_vmseries_and_autoscale/.header.md b/examples/common_vmseries_and_autoscale/.header.md
index 6b3c1d46..9ac5684a 100644
--- a/examples/common_vmseries_and_autoscale/.header.md
+++ b/examples/common_vmseries_and_autoscale/.header.md
@@ -129,9 +129,9 @@ A non-platform requirement would be a running Panorama instance. For full automa
   look at the `TODO` markers). If you already have a configured Panorama (with at least minimum configuration described above) you
   might want to also adjust the `bootstrap_options` for the scale set [`common`](./example.tfvars#L224).
 - _(optional)_ authenticate to AzureRM, switch to the Subscription of your choice
-- provide `subscription_id` property under the `azurerm` provider block in [`versions.tf`](./versions.tf) file or create an
-  environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value in your shell (required since AzureRM provider
-  version 4 as per [provider documentation](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs#subscription_id))
+- provide `subscription_id` either by creating an environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value
+  in your shell (recommended option) or by setting the value of `subscription_id` variable within your `tfvars` file (discouraged
+  option, we don't recommend putting the Subscription ID in clear text inside the code).
 - initialize the Terraform module:
 
   ```bash
diff --git a/examples/common_vmseries_and_autoscale/README.md b/examples/common_vmseries_and_autoscale/README.md
index eb35379b..f6bd557b 100644
--- a/examples/common_vmseries_and_autoscale/README.md
+++ b/examples/common_vmseries_and_autoscale/README.md
@@ -129,9 +129,9 @@ A non-platform requirement would be a running Panorama instance. For full automa
   look at the `TODO` markers). If you already have a configured Panorama (with at least minimum configuration described above) you
   might want to also adjust the `bootstrap_options` for the scale set [`common`](./example.tfvars#L224).
 - _(optional)_ authenticate to AzureRM, switch to the Subscription of your choice
-- provide `subscription_id` property under the `azurerm` provider block in [`versions.tf`](./versions.tf) file or create an
-  environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value in your shell (required since AzureRM provider
-  version 4 as per [provider documentation](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs#subscription_id))
+- provide `subscription_id` either by creating an environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value
+  in your shell (recommended option) or by setting the value of `subscription_id` variable within your `tfvars` file (discouraged
+  option, we don't recommend putting the Subscription ID in clear text inside the code).
 - initialize the Terraform module:
 
   ```bash
@@ -242,6 +242,7 @@ Name | Version | Source | Description
 
 Name | Type | Description
 --- | --- | ---
+[`subscription_id`](#subscription_id) | `string` | Azure Subscription ID is a required argument since AzureRM provider v4.
 [`resource_group_name`](#resource_group_name) | `string` | Name of the Resource Group.
 [`region`](#region) | `string` | The Azure region to use.
 [`vnets`](#vnets) | `map` | A map defining VNETs.
@@ -279,6 +280,19 @@ Name |  Description
 
 ### Required Inputs details
 
+#### subscription_id
+
+Azure Subscription ID is a required argument since AzureRM provider v4.
+
+**Note!** \
+Instead of putting the Subscription ID directly in the code, it's recommended to use an environment variable. Create an
+environment variable named `ARM_SUBSCRIPTION_ID` with your Subscription ID as value and leave this variable set to `null`.
+
+
+Type: string
+
+<sup>[back to list](#modules-required-inputs)</sup>
+
 #### resource_group_name
 
 Name of the Resource Group.
diff --git a/examples/common_vmseries_and_autoscale/example.tfvars b/examples/common_vmseries_and_autoscale/example.tfvars
index e873a21a..ff81ec68 100644
--- a/examples/common_vmseries_and_autoscale/example.tfvars
+++ b/examples/common_vmseries_and_autoscale/example.tfvars
@@ -1,5 +1,7 @@
 # GENERAL
 
+subscription_id = null # TODO: Put the Azure Subscription ID here only in case you cannot use an environment variable!
+
 region              = "North Europe"
 resource_group_name = "autoscale-common"
 name_prefix         = "example-"
diff --git a/examples/common_vmseries_and_autoscale/variables.tf b/examples/common_vmseries_and_autoscale/variables.tf
index 0126e20a..e7f6382d 100644
--- a/examples/common_vmseries_and_autoscale/variables.tf
+++ b/examples/common_vmseries_and_autoscale/variables.tf
@@ -1,5 +1,16 @@
 # GENERAL
 
+variable "subscription_id" {
+  description = <<-EOF
+  Azure Subscription ID is a required argument since AzureRM provider v4.
+
+  **Note!** \
+  Instead of putting the Subscription ID directly in the code, it's recommended to use an environment variable. Create an
+  environment variable named `ARM_SUBSCRIPTION_ID` with your Subscription ID as value and leave this variable set to `null`.
+  EOF
+  type        = string
+}
+
 variable "name_prefix" {
   description = <<-EOF
   A prefix that will be added to all created resources.
diff --git a/examples/common_vmseries_and_autoscale/versions.tf b/examples/common_vmseries_and_autoscale/versions.tf
index bd4a41d5..8422c5a7 100644
--- a/examples/common_vmseries_and_autoscale/versions.tf
+++ b/examples/common_vmseries_and_autoscale/versions.tf
@@ -11,6 +11,7 @@ terraform {
 }
 
 provider "azurerm" {
+  subscription_id = var.subscription_id
   features {
     virtual_machine_scale_set {
       # Make upgrade_policy_mode = "Manual" actually work. On a default setting:
diff --git a/examples/dedicated_vmseries/.header.md b/examples/dedicated_vmseries/.header.md
index d4a18eaa..5873b049 100644
--- a/examples/dedicated_vmseries/.header.md
+++ b/examples/dedicated_vmseries/.header.md
@@ -93,9 +93,9 @@ A list of requirements might vary depending on the platform used to deploy the i
 - copy the [`init-cfg.sample.txt`](./files/init-cfg.sample.txt) to `init-cfg.txt` and fill it out with required bootstrap 
   parameters (see this [documentation](https://docs.paloaltonetworks.com/vm-series/9-1/vm-series-deployment/bootstrap-the-vm-series-firewall/create-the-init-cfgtxt-file/init-cfgtxt-file-components#id07933d91-15be-414d-bc8d-f2a5f3d8df6b) for details)
 - _(optional)_ authenticate to AzureRM, switch to the Subscription of your choice
-- provide `subscription_id` property under the `azurerm` provider block in [`versions.tf`](./versions.tf) file or create an
-  environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value in your shell (required since AzureRM provider
-  version 4 as per [provider documentation](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs#subscription_id))
+- provide `subscription_id` either by creating an environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value
+  in your shell (recommended option) or by setting the value of `subscription_id` variable within your `tfvars` file (discouraged
+  option, we don't recommend putting the Subscription ID in clear text inside the code).
 - initialize the Terraform module:
 
   ```bash
diff --git a/examples/dedicated_vmseries/README.md b/examples/dedicated_vmseries/README.md
index 12a97c27..f8472c4d 100644
--- a/examples/dedicated_vmseries/README.md
+++ b/examples/dedicated_vmseries/README.md
@@ -93,9 +93,9 @@ A list of requirements might vary depending on the platform used to deploy the i
 - copy the [`init-cfg.sample.txt`](./files/init-cfg.sample.txt) to `init-cfg.txt` and fill it out with required bootstrap
   parameters (see this [documentation](https://docs.paloaltonetworks.com/vm-series/9-1/vm-series-deployment/bootstrap-the-vm-series-firewall/create-the-init-cfgtxt-file/init-cfgtxt-file-components#id07933d91-15be-414d-bc8d-f2a5f3d8df6b) for details)
 - _(optional)_ authenticate to AzureRM, switch to the Subscription of your choice
-- provide `subscription_id` property under the `azurerm` provider block in [`versions.tf`](./versions.tf) file or create an
-  environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value in your shell (required since AzureRM provider
-  version 4 as per [provider documentation](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs#subscription_id))
+- provide `subscription_id` either by creating an environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value
+  in your shell (recommended option) or by setting the value of `subscription_id` variable within your `tfvars` file (discouraged
+  option, we don't recommend putting the Subscription ID in clear text inside the code).
 - initialize the Terraform module:
 
   ```bash
@@ -219,6 +219,7 @@ Name | Version | Source | Description
 
 Name | Type | Description
 --- | --- | ---
+[`subscription_id`](#subscription_id) | `string` | Azure Subscription ID is a required argument since AzureRM provider v4.
 [`resource_group_name`](#resource_group_name) | `string` | Name of the Resource Group.
 [`region`](#region) | `string` | The Azure region to use.
 [`vnets`](#vnets) | `map` | A map defining VNETs.
@@ -260,6 +261,19 @@ Name |  Description
 
 ### Required Inputs details
 
+#### subscription_id
+
+Azure Subscription ID is a required argument since AzureRM provider v4.
+
+**Note!** \
+Instead of putting the Subscription ID directly in the code, it's recommended to use an environment variable. Create an
+environment variable named `ARM_SUBSCRIPTION_ID` with your Subscription ID as value and leave this variable set to `null`.
+
+
+Type: string
+
+<sup>[back to list](#modules-required-inputs)</sup>
+
 #### resource_group_name
 
 Name of the Resource Group.
diff --git a/examples/dedicated_vmseries/example.tfvars b/examples/dedicated_vmseries/example.tfvars
index 9ff1b8b3..7e2072f1 100644
--- a/examples/dedicated_vmseries/example.tfvars
+++ b/examples/dedicated_vmseries/example.tfvars
@@ -1,5 +1,7 @@
 # GENERAL
 
+subscription_id = null # TODO: Put the Azure Subscription ID here only in case you cannot use an environment variable!
+
 region              = "North Europe"
 resource_group_name = "transit-vnet-dedicated"
 name_prefix         = "example-"
diff --git a/examples/dedicated_vmseries/variables.tf b/examples/dedicated_vmseries/variables.tf
index ae5c985b..eb5d6d51 100644
--- a/examples/dedicated_vmseries/variables.tf
+++ b/examples/dedicated_vmseries/variables.tf
@@ -1,5 +1,16 @@
 # GENERAL
 
+variable "subscription_id" {
+  description = <<-EOF
+  Azure Subscription ID is a required argument since AzureRM provider v4.
+
+  **Note!** \
+  Instead of putting the Subscription ID directly in the code, it's recommended to use an environment variable. Create an
+  environment variable named `ARM_SUBSCRIPTION_ID` with your Subscription ID as value and leave this variable set to `null`.
+  EOF
+  type        = string
+}
+
 variable "name_prefix" {
   description = <<-EOF
   A prefix that will be added to all created resources.
diff --git a/examples/dedicated_vmseries/versions.tf b/examples/dedicated_vmseries/versions.tf
index 85620563..a189cd83 100644
--- a/examples/dedicated_vmseries/versions.tf
+++ b/examples/dedicated_vmseries/versions.tf
@@ -14,6 +14,7 @@ terraform {
 }
 
 provider "azurerm" {
+  subscription_id = var.subscription_id
   features {
     resource_group {
       prevent_deletion_if_contains_resources = false
diff --git a/examples/dedicated_vmseries_and_autoscale/.header.md b/examples/dedicated_vmseries_and_autoscale/.header.md
index a6ea5961..e77a8a58 100644
--- a/examples/dedicated_vmseries_and_autoscale/.header.md
+++ b/examples/dedicated_vmseries_and_autoscale/.header.md
@@ -123,9 +123,9 @@ requirements:
   might want to also adjust the `bootstrap_options` for each scale set ([inbound](./example.tfvars#L205) and
   [obew](./example.tfvars#L249) separately).
 - _(optional)_ authenticate to AzureRM, switch to the Subscription of your choice
-- provide `subscription_id` property under the `azurerm` provider block in [`versions.tf`](./versions.tf) file or create an
-  environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value in your shell (required since AzureRM provider
-  version 4 as per [provider documentation](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs#subscription_id))
+- provide `subscription_id` either by creating an environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value
+  in your shell (recommended option) or by setting the value of `subscription_id` variable within your `tfvars` file (discouraged
+  option, we don't recommend putting the Subscription ID in clear text inside the code).
 - initialize the Terraform module:
 
   ```bash
diff --git a/examples/dedicated_vmseries_and_autoscale/README.md b/examples/dedicated_vmseries_and_autoscale/README.md
index 685aee02..cc62e042 100644
--- a/examples/dedicated_vmseries_and_autoscale/README.md
+++ b/examples/dedicated_vmseries_and_autoscale/README.md
@@ -123,9 +123,9 @@ requirements:
   might want to also adjust the `bootstrap_options` for each scale set ([inbound](./example.tfvars#L205) and
   [obew](./example.tfvars#L249) separately).
 - _(optional)_ authenticate to AzureRM, switch to the Subscription of your choice
-- provide `subscription_id` property under the `azurerm` provider block in [`versions.tf`](./versions.tf) file or create an
-  environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value in your shell (required since AzureRM provider
-  version 4 as per [provider documentation](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs#subscription_id))
+- provide `subscription_id` either by creating an environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value
+  in your shell (recommended option) or by setting the value of `subscription_id` variable within your `tfvars` file (discouraged
+  option, we don't recommend putting the Subscription ID in clear text inside the code).
 - initialize the Terraform module:
 
   ```bash
@@ -236,6 +236,7 @@ Name | Version | Source | Description
 
 Name | Type | Description
 --- | --- | ---
+[`subscription_id`](#subscription_id) | `string` | Azure Subscription ID is a required argument since AzureRM provider v4.
 [`resource_group_name`](#resource_group_name) | `string` | Name of the Resource Group.
 [`region`](#region) | `string` | The Azure region to use.
 [`vnets`](#vnets) | `map` | A map defining VNETs.
@@ -273,6 +274,19 @@ Name |  Description
 
 ### Required Inputs details
 
+#### subscription_id
+
+Azure Subscription ID is a required argument since AzureRM provider v4.
+
+**Note!** \
+Instead of putting the Subscription ID directly in the code, it's recommended to use an environment variable. Create an
+environment variable named `ARM_SUBSCRIPTION_ID` with your Subscription ID as value and leave this variable set to `null`.
+
+
+Type: string
+
+<sup>[back to list](#modules-required-inputs)</sup>
+
 #### resource_group_name
 
 Name of the Resource Group.
diff --git a/examples/dedicated_vmseries_and_autoscale/example.tfvars b/examples/dedicated_vmseries_and_autoscale/example.tfvars
index 53edf5df..9af57548 100644
--- a/examples/dedicated_vmseries_and_autoscale/example.tfvars
+++ b/examples/dedicated_vmseries_and_autoscale/example.tfvars
@@ -1,5 +1,7 @@
 # GENERAL
 
+subscription_id = null # TODO: Put the Azure Subscription ID here only in case you cannot use an environment variable!
+
 region              = "North Europe"
 resource_group_name = "autoscale-dedicated"
 name_prefix         = "example-"
diff --git a/examples/dedicated_vmseries_and_autoscale/variables.tf b/examples/dedicated_vmseries_and_autoscale/variables.tf
index 0126e20a..e7f6382d 100644
--- a/examples/dedicated_vmseries_and_autoscale/variables.tf
+++ b/examples/dedicated_vmseries_and_autoscale/variables.tf
@@ -1,5 +1,16 @@
 # GENERAL
 
+variable "subscription_id" {
+  description = <<-EOF
+  Azure Subscription ID is a required argument since AzureRM provider v4.
+
+  **Note!** \
+  Instead of putting the Subscription ID directly in the code, it's recommended to use an environment variable. Create an
+  environment variable named `ARM_SUBSCRIPTION_ID` with your Subscription ID as value and leave this variable set to `null`.
+  EOF
+  type        = string
+}
+
 variable "name_prefix" {
   description = <<-EOF
   A prefix that will be added to all created resources.
diff --git a/examples/dedicated_vmseries_and_autoscale/versions.tf b/examples/dedicated_vmseries_and_autoscale/versions.tf
index bd4a41d5..8422c5a7 100644
--- a/examples/dedicated_vmseries_and_autoscale/versions.tf
+++ b/examples/dedicated_vmseries_and_autoscale/versions.tf
@@ -11,6 +11,7 @@ terraform {
 }
 
 provider "azurerm" {
+  subscription_id = var.subscription_id
   features {
     virtual_machine_scale_set {
       # Make upgrade_policy_mode = "Manual" actually work. On a default setting:
diff --git a/examples/gwlb_with_vmseries/.header.md b/examples/gwlb_with_vmseries/.header.md
index ef1f2040..db93b54e 100644
--- a/examples/gwlb_with_vmseries/.header.md
+++ b/examples/gwlb_with_vmseries/.header.md
@@ -58,9 +58,9 @@ A list of requirements might vary depending on the platform used to deploy the i
 [documentation](https://docs.paloaltonetworks.com/vm-series/10-2/vm-series-deployment/bootstrap-the-vm-series-firewall/create-the-init-cfgtxt-file/init-cfgtxt-file-components)
 for details)
 - _(optional)_ Authenticate to AzureRM, switch to the Subscription of your choice
-- provide `subscription_id` property under the `azurerm` provider block in [`versions.tf`](./versions.tf) file or create an
-  environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value in your shell (required since AzureRM provider
-  version 4 as per [provider documentation](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs#subscription_id))
+- provide `subscription_id` either by creating an environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value
+  in your shell (recommended option) or by setting the value of `subscription_id` variable within your `tfvars` file (discouraged
+  option, we don't recommend putting the Subscription ID in clear text inside the code).
 - initialize the Terraform module:
 
 ```bash
diff --git a/examples/gwlb_with_vmseries/README.md b/examples/gwlb_with_vmseries/README.md
index 5866b184..7c497ab7 100644
--- a/examples/gwlb_with_vmseries/README.md
+++ b/examples/gwlb_with_vmseries/README.md
@@ -58,9 +58,9 @@ A list of requirements might vary depending on the platform used to deploy the i
 [documentation](https://docs.paloaltonetworks.com/vm-series/10-2/vm-series-deployment/bootstrap-the-vm-series-firewall/create-the-init-cfgtxt-file/init-cfgtxt-file-components)
 for details)
 - _(optional)_ Authenticate to AzureRM, switch to the Subscription of your choice
-- provide `subscription_id` property under the `azurerm` provider block in [`versions.tf`](./versions.tf) file or create an
-  environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value in your shell (required since AzureRM provider
-  version 4 as per [provider documentation](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs#subscription_id))
+- provide `subscription_id` either by creating an environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value
+  in your shell (recommended option) or by setting the value of `subscription_id` variable within your `tfvars` file (discouraged
+  option, we don't recommend putting the Subscription ID in clear text inside the code).
 - initialize the Terraform module:
 
 ```bash
@@ -160,6 +160,7 @@ Name | Version | Source | Description
 
 Name | Type | Description
 --- | --- | ---
+[`subscription_id`](#subscription_id) | `string` | Azure Subscription ID is a required argument since AzureRM provider v4.
 [`resource_group_name`](#resource_group_name) | `string` | Name of the Resource Group.
 [`region`](#region) | `string` | The Azure region to use.
 [`vnets`](#vnets) | `map` | A map defining VNETs.
@@ -197,6 +198,19 @@ Name |  Description
 
 ### Required Inputs details
 
+#### subscription_id
+
+Azure Subscription ID is a required argument since AzureRM provider v4.
+
+**Note!** \
+Instead of putting the Subscription ID directly in the code, it's recommended to use an environment variable. Create an
+environment variable named `ARM_SUBSCRIPTION_ID` with your Subscription ID as value and leave this variable set to `null`.
+
+
+Type: string
+
+<sup>[back to list](#modules-required-inputs)</sup>
+
 #### resource_group_name
 
 Name of the Resource Group.
diff --git a/examples/gwlb_with_vmseries/example.tfvars b/examples/gwlb_with_vmseries/example.tfvars
index 36e5362d..015b092c 100644
--- a/examples/gwlb_with_vmseries/example.tfvars
+++ b/examples/gwlb_with_vmseries/example.tfvars
@@ -1,5 +1,7 @@
 # GENERAL
 
+subscription_id = null # TODO: Put the Azure Subscription ID here only in case you cannot use an environment variable!
+
 region              = "North Europe"
 resource_group_name = "gwlb"
 name_prefix         = "example-"
diff --git a/examples/gwlb_with_vmseries/variables.tf b/examples/gwlb_with_vmseries/variables.tf
index e4d256aa..6cb99c43 100644
--- a/examples/gwlb_with_vmseries/variables.tf
+++ b/examples/gwlb_with_vmseries/variables.tf
@@ -1,5 +1,16 @@
 # GENERAL
 
+variable "subscription_id" {
+  description = <<-EOF
+  Azure Subscription ID is a required argument since AzureRM provider v4.
+
+  **Note!** \
+  Instead of putting the Subscription ID directly in the code, it's recommended to use an environment variable. Create an
+  environment variable named `ARM_SUBSCRIPTION_ID` with your Subscription ID as value and leave this variable set to `null`.
+  EOF
+  type        = string
+}
+
 variable "name_prefix" {
   description = <<-EOF
   A prefix that will be added to all created resources.
diff --git a/examples/gwlb_with_vmseries/versions.tf b/examples/gwlb_with_vmseries/versions.tf
index e69126ed..970c756b 100644
--- a/examples/gwlb_with_vmseries/versions.tf
+++ b/examples/gwlb_with_vmseries/versions.tf
@@ -11,6 +11,7 @@ terraform {
 }
 
 provider "azurerm" {
+  subscription_id = var.subscription_id
   features {
     resource_group {
       prevent_deletion_if_contains_resources = false
diff --git a/examples/standalone_panorama/.header.md b/examples/standalone_panorama/.header.md
index c66e32ae..8b7d8910 100644
--- a/examples/standalone_panorama/.header.md
+++ b/examples/standalone_panorama/.header.md
@@ -48,9 +48,9 @@ A list of requirements might vary depending on the platform used to deploy the i
 - copy the [`example.tfvars`](./example.tfvars) file, rename it to `terraform.tfvars` and adjust it to your needs (take a closer
   look at the `TODO` markers)
 - _(optional)_ authenticate to AzureRM, switch to the Subscription of your choice
-- provide `subscription_id` property under the `azurerm` provider block in [`versions.tf`](./versions.tf) file or create an
-  environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value in your shell (required since AzureRM provider
-  version 4 as per [provider documentation](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs#subscription_id))
+- provide `subscription_id` either by creating an environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value
+  in your shell (recommended option) or by setting the value of `subscription_id` variable within your `tfvars` file (discouraged
+  option, we don't recommend putting the Subscription ID in clear text inside the code).
 - initialize the Terraform module:
 
   ```bash
diff --git a/examples/standalone_panorama/README.md b/examples/standalone_panorama/README.md
index c23db60c..f960a270 100644
--- a/examples/standalone_panorama/README.md
+++ b/examples/standalone_panorama/README.md
@@ -48,9 +48,9 @@ A list of requirements might vary depending on the platform used to deploy the i
 - copy the [`example.tfvars`](./example.tfvars) file, rename it to `terraform.tfvars` and adjust it to your needs (take a closer
   look at the `TODO` markers)
 - _(optional)_ authenticate to AzureRM, switch to the Subscription of your choice
-- provide `subscription_id` property under the `azurerm` provider block in [`versions.tf`](./versions.tf) file or create an
-  environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value in your shell (required since AzureRM provider
-  version 4 as per [provider documentation](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs#subscription_id))
+- provide `subscription_id` either by creating an environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value
+  in your shell (recommended option) or by setting the value of `subscription_id` variable within your `tfvars` file (discouraged
+  option, we don't recommend putting the Subscription ID in clear text inside the code).
 - initialize the Terraform module:
 
   ```bash
@@ -151,6 +151,7 @@ Name | Version | Source | Description
 
 Name | Type | Description
 --- | --- | ---
+[`subscription_id`](#subscription_id) | `string` | Azure Subscription ID is a required argument since AzureRM provider v4.
 [`resource_group_name`](#resource_group_name) | `string` | Name of the Resource Group.
 [`region`](#region) | `string` | The Azure region to use.
 [`vnets`](#vnets) | `map` | A map defining VNETs.
@@ -176,6 +177,19 @@ Name |  Description
 
 ### Required Inputs details
 
+#### subscription_id
+
+Azure Subscription ID is a required argument since AzureRM provider v4.
+
+**Note!** \
+Instead of putting the Subscription ID directly in the code, it's recommended to use an environment variable. Create an
+environment variable named `ARM_SUBSCRIPTION_ID` with your Subscription ID as value and leave this variable set to `null`.
+
+
+Type: string
+
+<sup>[back to list](#modules-required-inputs)</sup>
+
 #### resource_group_name
 
 Name of the Resource Group.
diff --git a/examples/standalone_panorama/example.tfvars b/examples/standalone_panorama/example.tfvars
index 535dc52a..9c7e4021 100644
--- a/examples/standalone_panorama/example.tfvars
+++ b/examples/standalone_panorama/example.tfvars
@@ -1,5 +1,7 @@
 # GENERAL
 
+subscription_id = null # TODO: Put the Azure Subscription ID here only in case you cannot use an environment variable!
+
 region                = "North Europe"
 resource_group_name   = "panorama"
 name_prefix           = "example-"
diff --git a/examples/standalone_panorama/variables.tf b/examples/standalone_panorama/variables.tf
index 70fa8f0d..ebc28285 100644
--- a/examples/standalone_panorama/variables.tf
+++ b/examples/standalone_panorama/variables.tf
@@ -1,5 +1,16 @@
 # GENERAL
 
+variable "subscription_id" {
+  description = <<-EOF
+  Azure Subscription ID is a required argument since AzureRM provider v4.
+
+  **Note!** \
+  Instead of putting the Subscription ID directly in the code, it's recommended to use an environment variable. Create an
+  environment variable named `ARM_SUBSCRIPTION_ID` with your Subscription ID as value and leave this variable set to `null`.
+  EOF
+  type        = string
+}
+
 variable "name_prefix" {
   description = <<-EOF
   A prefix that will be added to all created resources.
diff --git a/examples/standalone_panorama/versions.tf b/examples/standalone_panorama/versions.tf
index 79f61517..70ed7379 100644
--- a/examples/standalone_panorama/versions.tf
+++ b/examples/standalone_panorama/versions.tf
@@ -11,5 +11,6 @@ terraform {
 }
 
 provider "azurerm" {
+  subscription_id = var.subscription_id
   features {}
 }
diff --git a/examples/standalone_vmseries/.header.md b/examples/standalone_vmseries/.header.md
index 5b904d31..3665e3ca 100644
--- a/examples/standalone_vmseries/.header.md
+++ b/examples/standalone_vmseries/.header.md
@@ -41,9 +41,9 @@ Steps to deploy the infrastructure are as following:
 - copy the [`example.tfvars`](./example.tfvars) file, rename it to `terraform.tfvars` and adjust it to your needs
   (take a closer look at the `TODO` markers)
 - _(optional)_ authenticate to AzureRM, switch to the Subscription of your choice
-- provide `subscription_id` property under the `azurerm` provider block in [`versions.tf`](./versions.tf) file or create an
-  environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value in your shell (required since AzureRM provider
-  version 4 as per [provider documentation](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs#subscription_id))
+- provide `subscription_id` either by creating an environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value
+  in your shell (recommended option) or by setting the value of `subscription_id` variable within your `tfvars` file (discouraged
+  option, we don't recommend putting the Subscription ID in clear text inside the code).
 - initialize the Terraform module:
 
   ```bash
diff --git a/examples/standalone_vmseries/README.md b/examples/standalone_vmseries/README.md
index 69a5802e..839b5692 100644
--- a/examples/standalone_vmseries/README.md
+++ b/examples/standalone_vmseries/README.md
@@ -41,9 +41,9 @@ Steps to deploy the infrastructure are as following:
 - copy the [`example.tfvars`](./example.tfvars) file, rename it to `terraform.tfvars` and adjust it to your needs
   (take a closer look at the `TODO` markers)
 - _(optional)_ authenticate to AzureRM, switch to the Subscription of your choice
-- provide `subscription_id` property under the `azurerm` provider block in [`versions.tf`](./versions.tf) file or create an
-  environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value in your shell (required since AzureRM provider
-  version 4 as per [provider documentation](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs#subscription_id))
+- provide `subscription_id` either by creating an environment variable named `ARM_SUBSCRIPTION_ID` with Subscription ID as value
+  in your shell (recommended option) or by setting the value of `subscription_id` variable within your `tfvars` file (discouraged
+  option, we don't recommend putting the Subscription ID in clear text inside the code).
 - initialize the Terraform module:
 
   ```bash
@@ -153,6 +153,7 @@ Name | Version | Source | Description
 
 Name | Type | Description
 --- | --- | ---
+[`subscription_id`](#subscription_id) | `string` | Azure Subscription ID is a required argument since AzureRM provider v4.
 [`resource_group_name`](#resource_group_name) | `string` | Name of the Resource Group.
 [`region`](#region) | `string` | The Azure region to use.
 [`vnets`](#vnets) | `map` | A map defining VNETs.
@@ -194,6 +195,19 @@ Name |  Description
 
 ### Required Inputs details
 
+#### subscription_id
+
+Azure Subscription ID is a required argument since AzureRM provider v4.
+
+**Note!** \
+Instead of putting the Subscription ID directly in the code, it's recommended to use an environment variable. Create an
+environment variable named `ARM_SUBSCRIPTION_ID` with your Subscription ID as value and leave this variable set to `null`.
+
+
+Type: string
+
+<sup>[back to list](#modules-required-inputs)</sup>
+
 #### resource_group_name
 
 Name of the Resource Group.
diff --git a/examples/standalone_vmseries/example.tfvars b/examples/standalone_vmseries/example.tfvars
index 5033dc12..ba453ee4 100644
--- a/examples/standalone_vmseries/example.tfvars
+++ b/examples/standalone_vmseries/example.tfvars
@@ -1,5 +1,7 @@
 # GENERAL
 
+subscription_id = null # TODO: Put the Azure Subscription ID here only in case you cannot use an environment variable!
+
 region              = "North Europe"
 resource_group_name = "vmseries-standalone"
 name_prefix         = "example-"
diff --git a/examples/standalone_vmseries/variables.tf b/examples/standalone_vmseries/variables.tf
index ae5c985b..eb5d6d51 100644
--- a/examples/standalone_vmseries/variables.tf
+++ b/examples/standalone_vmseries/variables.tf
@@ -1,5 +1,16 @@
 # GENERAL
 
+variable "subscription_id" {
+  description = <<-EOF
+  Azure Subscription ID is a required argument since AzureRM provider v4.
+
+  **Note!** \
+  Instead of putting the Subscription ID directly in the code, it's recommended to use an environment variable. Create an
+  environment variable named `ARM_SUBSCRIPTION_ID` with your Subscription ID as value and leave this variable set to `null`.
+  EOF
+  type        = string
+}
+
 variable "name_prefix" {
   description = <<-EOF
   A prefix that will be added to all created resources.
diff --git a/examples/standalone_vmseries/versions.tf b/examples/standalone_vmseries/versions.tf
index 85620563..a189cd83 100644
--- a/examples/standalone_vmseries/versions.tf
+++ b/examples/standalone_vmseries/versions.tf
@@ -14,6 +14,7 @@ terraform {
 }
 
 provider "azurerm" {
+  subscription_id = var.subscription_id
   features {
     resource_group {
       prevent_deletion_if_contains_resources = false
diff --git a/tests/appgw/README.md b/tests/appgw/README.md
index 72a4fbf6..978331e4 100644
--- a/tests/appgw/README.md
+++ b/tests/appgw/README.md
@@ -31,6 +31,7 @@ Name | Version | Source | Description
 
 Name | Type | Description
 --- | --- | ---
+[`subscription_id`](#subscription_id) | `string` | Azure Subscription ID is a required argument since AzureRM provider v4.
 [`region`](#region) | `string` | The Azure region to use.
 [`resource_group_name`](#resource_group_name) | `string` | Name of the Resource Group.
 [`vnets`](#vnets) | `map` | A map defining VNETs.
@@ -49,6 +50,19 @@ Name | Type | Description
 
 ### Required Inputs details
 
+#### subscription_id
+
+Azure Subscription ID is a required argument since AzureRM provider v4.
+
+**Note!** \
+Instead of putting the Subscription ID directly in the code, it's recommended to use an environment variable. Create an
+environment variable named `ARM_SUBSCRIPTION_ID` with your Subscription ID as value and leave this variable set to `null`.
+
+
+Type: string
+
+<sup>[back to list](#modules-required-inputs)</sup>
+
 #### region
 
 The Azure region to use.
diff --git a/tests/appgw/example.tfvars b/tests/appgw/example.tfvars
index b4928d59..ba63f13d 100644
--- a/tests/appgw/example.tfvars
+++ b/tests/appgw/example.tfvars
@@ -1,5 +1,7 @@
 # GENERAL
 
+subscription_id = null # TODO: Put the Azure Subscription ID here only in case you cannot use an environment variable!
+
 region              = "North Europe"
 resource_group_name = "appgw-example"
 name_prefix         = "fosix-"
diff --git a/tests/appgw/variables.tf b/tests/appgw/variables.tf
index 894e99cd..28c0c95e 100644
--- a/tests/appgw/variables.tf
+++ b/tests/appgw/variables.tf
@@ -1,5 +1,16 @@
 # GENERAL
 
+variable "subscription_id" {
+  description = <<-EOF
+  Azure Subscription ID is a required argument since AzureRM provider v4.
+
+  **Note!** \
+  Instead of putting the Subscription ID directly in the code, it's recommended to use an environment variable. Create an
+  environment variable named `ARM_SUBSCRIPTION_ID` with your Subscription ID as value and leave this variable set to `null`.
+  EOF
+  type        = string
+}
+
 variable "tags" {
   description = "Map of tags to assign to the created resources."
   default     = {}
diff --git a/tests/appgw/versions.tf b/tests/appgw/versions.tf
index 85620563..a189cd83 100644
--- a/tests/appgw/versions.tf
+++ b/tests/appgw/versions.tf
@@ -14,6 +14,7 @@ terraform {
 }
 
 provider "azurerm" {
+  subscription_id = var.subscription_id
   features {
     resource_group {
       prevent_deletion_if_contains_resources = false
diff --git a/tests/virtual_network_gateway/README.md b/tests/virtual_network_gateway/README.md
index 9c4142d7..ec3103a6 100644
--- a/tests/virtual_network_gateway/README.md
+++ b/tests/virtual_network_gateway/README.md
@@ -30,6 +30,7 @@ Name | Version | Source | Description
 
 Name | Type | Description
 --- | --- | ---
+[`subscription_id`](#subscription_id) | `string` | Azure Subscription ID is a required argument since AzureRM provider v4.
 [`resource_group_name`](#resource_group_name) | `string` | Name of the Resource Group.
 [`region`](#region) | `string` | The Azure region to use.
 [`vnets`](#vnets) | `map` | A map defining VNETs.
@@ -53,6 +54,19 @@ Name |  Description
 
 ### Required Inputs details
 
+#### subscription_id
+
+Azure Subscription ID is a required argument since AzureRM provider v4.
+
+**Note!** \
+Instead of putting the Subscription ID directly in the code, it's recommended to use an environment variable. Create an
+environment variable named `ARM_SUBSCRIPTION_ID` with your Subscription ID as value and leave this variable set to `null`.
+
+
+Type: string
+
+<sup>[back to list](#modules-required-inputs)</sup>
+
 #### resource_group_name
 
 Name of the Resource Group.
diff --git a/tests/virtual_network_gateway/example.tfvars b/tests/virtual_network_gateway/example.tfvars
index 56ef27f7..adac044d 100644
--- a/tests/virtual_network_gateway/example.tfvars
+++ b/tests/virtual_network_gateway/example.tfvars
@@ -1,5 +1,7 @@
 # GENERAL
 
+subscription_id = null # TODO: Put the Azure Subscription ID here only in case you cannot use an environment variable!
+
 region              = "North Europe"
 resource_group_name = "vng"
 name_prefix         = "ac-example-"
diff --git a/tests/virtual_network_gateway/variables.tf b/tests/virtual_network_gateway/variables.tf
index 7f413b61..117f11ec 100644
--- a/tests/virtual_network_gateway/variables.tf
+++ b/tests/virtual_network_gateway/variables.tf
@@ -1,5 +1,16 @@
 # GENERAL
 
+variable "subscription_id" {
+  description = <<-EOF
+  Azure Subscription ID is a required argument since AzureRM provider v4.
+
+  **Note!** \
+  Instead of putting the Subscription ID directly in the code, it's recommended to use an environment variable. Create an
+  environment variable named `ARM_SUBSCRIPTION_ID` with your Subscription ID as value and leave this variable set to `null`.
+  EOF
+  type        = string
+}
+
 variable "name_prefix" {
   description = <<-EOF
   A prefix that will be added to all created resources.
diff --git a/tests/virtual_network_gateway/versions.tf b/tests/virtual_network_gateway/versions.tf
index 85620563..a189cd83 100644
--- a/tests/virtual_network_gateway/versions.tf
+++ b/tests/virtual_network_gateway/versions.tf
@@ -14,6 +14,7 @@ terraform {
 }
 
 provider "azurerm" {
+  subscription_id = var.subscription_id
   features {
     resource_group {
       prevent_deletion_if_contains_resources = false