From 515876685b32ba9e65a53fea9c91c3cfc5c02ae7 Mon Sep 17 00:00:00 2001
From: Michael Shimkus <m.shimkus@f5.com>
Date: Tue, 29 Aug 2023 10:18:16 -0700
Subject: [PATCH 01/10] EC-139 - Document using a secret to store and retrieve
 ASM cookie settings

---
 examples/autoscale/bigiq/README.md | 53 ++++++++++++++++++++++++++++--
 examples/autoscale/payg/README.md  | 48 +++++++++++++++++++++++++--
 2 files changed, 96 insertions(+), 5 deletions(-)

diff --git a/examples/autoscale/bigiq/README.md b/examples/autoscale/bigiq/README.md
index be38193d..5db3601d 100644
--- a/examples/autoscale/bigiq/README.md
+++ b/examples/autoscale/bigiq/README.md
@@ -93,6 +93,8 @@ https://cloud.google.com/secret-manager/docs/creating-and-accessing-secrets)
 
 ## Important Configuration Notes
 
+-  This solution requires you to customize and host your own runtime-init configurations. For your customized the Runtime Configurations, use the **bigIpRuntimeInitConfig** input parameter to specify the new location of the BIG-IP Runtime-Init config. See [Changing the BIG-IP Deployment](#changing-the-big-ip-deployment) for more BIG-IP customization details.
+
 - By default, this solution does not create a custom BIG-IP WebUI user as instances are not intended to be managed directly. However, an SSH key is installed to provide CLI access for demonstration and debugging purposes. 
   - ***IMPORTANT:** Accessing or logging into the instances themselves is for demonstration and debugging purposes only. All configuration changes should be applied by updating the model via the template instead.*
   - See [Changing the BIG-IP Deployment](#changing-the-big-ip-deployment) for more details.
@@ -127,6 +129,8 @@ https://cloud.google.com/secret-manager/docs/creating-and-accessing-secrets)
 
 - If you have cloned this repository to modify the templates or BIG-IP config files and published to your own location, you can use the **templateBaseUrl** and **artifactLocation** input parameters to specify the new location of the customized templates and the **bigIpRuntimeInitConfig** input parameter to specify the new location of the BIG-IP Runtime-Init config. See main [/examples/README.md](../../README.md#cloud-configuration) for more template customization details. See [Changing the BIG-IP Deployment](#changing-the-big-ip-deployment) for more BIG-IP customization details.
 
+- Because this solution does not utilize BIG-IP Device Service Clustering (DSC), synchronizing ASM WAF cookie protection settings across instances is not supported. If you are deploying this solution into a production environment, F5 recommends customizing the default runtime-init configuration to install the cookie protection string on each BIG-IP instance at provisioning time. This requires creating an additional Google Secret Manager secret containing the cookie protection string. See customization example #1 under [Changing the BIG-IP Deployment](#changing-the-big-ip-deployment) for step-by-step instructions.
+
 - If you create multiple deployments of this solution that use the same BIG-IQ device for licensing, please use the **bigIpIpCidrRange** parameter to specify a unique CIDR range for each private management subnet. When deploying the existing network solution, please ensure that the subnetworks used for **bigIpIpCidrRange** have unique CIDR ranges. Google Cloud assigns MAC addresses using the private management subnet and BIG-IQ uses MAC addresses to assign the license. If two BIG-IPs share the same MAC address, there will be a conflict in licensing.
 
 - In this solution, the BIG-IP VE has the [LTM](https://f5.com/products/big-ip/local-traffic-manager-ltm) and [ASM](https://f5.com/products/big-ip/application-security-manager-asm) modules enabled to provide advanced traffic management and web application security functionality. 
@@ -245,6 +249,7 @@ Note: These are specified in the configuration file. See sample_autoscale.yaml
 | wafExternalHttpsUrl |  | string | WAF external HTTP URL. |
 | wafInternalHttpsUrl |  | string | WAF external HTTPS URL. |
 | wafPublicIp |  | string | WAF public IP. |
+
 ## Deploying this Solution
 
 See [Prerequisites](#prerequisites).
@@ -291,9 +296,51 @@ By default, this solution references the `runtime-init-conf-bigiq-with-app.yaml`
   - The **Full Stack** (autoscale.py) always **requires** customizing this file with your BIG-IQ Licensing configuration.
   - The **Existing Network Stack** (autoscale-existing-network.py) always **requires** customizing this file (with your BIG-IQ Licensing **AND** Virtual Service configuration pointing at your own application) and republishing before deploying
 
-
 **Example Customization 1:**
 
+To install the ASM WAF cookie protection string on each BIG-IP instance:
+
+  1. Export the cookie protection string from a running BIG-IP ASM WAF instance.
+      Example:
+      ```bash
+      BIGIP="192.168.1.245"
+      TOKEN=$(curl -sk https://${BIGIP}/mgmt/shared/authn/login -d '{"username": "admin", "password": "myBigIpPassword"}' | jq -r.token.token)
+
+      TASK_ID=$(curl -sk -X POST https://${BIGIP}/mgmt/tm/asm/tasks/export-data-protection -H "X-F5-Auth-Token: ${TOKEN}" -d'{"inline": true}' | jq -r .id)
+      COOKIE_PROTECTION=$(curl -sk -X GET https://${BIGIP}/mgmt/tm/asm/tasks/export-data-protection/${TASK_ID} -H "X-F5-Auth-Token: ${TOKEN}"  | jq .result.file)
+      ```
+  2. Create a Google Secret Manager secret using the previously acquired cookie protection string value. This step requires the gcloud CLI; you can also create the secret via the **AWS Console > Secrets Manager > Store a new secret** menu.
+      Example:
+      ```bash
+      # Ensure there is no newline at the end of the secret
+      $ echo -n 'COOKIE_PROTECTION' | gcloud secrets create mySecretId --data-file=- ; history -d $(history 1)
+      ```
+  3. Edit/modify the runtime-init config file [runtime-init-conf-bigiq-with-app.yaml](../bigip-configurations/runtime-init-conf-bigiq-with-app.yaml) with the new `COOKIE_PROTECTION` runtime parameter and post_onboard_enabled values. 
+
+      Example:
+      ```yaml
+      runtime_parameters:  
+        - name: COOKIE_PROTECTION
+          type: secret
+          secretProvider:
+            environment: gcp
+            secretId: mySecret
+            type: SecretsManager
+            version: latest
+      ```
+      ```yaml
+      post_onboard_enabled:
+        - name: import_data_protection
+          type: inline
+          commands:
+            - "id=$(curl -su 'admin:admin' -X POST http://localhost:8100/mgmt/tm/asm/tasks/import-data-protection -d '{\"importText\": \"{{{COOKIE_PROTECTION}}}\"}' | jq -r .id) && sleep 10 && echo data protection id: ${id} && status=$(curl -su 'admin:admin' http://localhost:8100/mgmt/tm/asm/tasks/import-data-protection/${id} | jq -r .status) && echo data protection status: ${status}"
+      ```
+  4. Publish/host the customized runtime-init config file at a location reachable by the BIG-IP at deploy time (for example, git, S3, etc.).
+  5. Update the **bigIpRuntimeInitConfig** input parameter to reference the URL of the customized configuration file.
+  6. If you are installing the cookie protection string to an existing deployment, follow the steps at [Updating this Solution](#updating-this-solution) to redeploy instances using the new configuration.
+
+**Example Customization 2:**
+
 To change the BIG-IQ Licensing configuration:
 
   1. Edit/modify the Declarative Onboarding (DO) declaration in the runtime-init config file [runtime-init-conf-bigiq-with-app.yaml](../bigip-configurations/runtime-init-conf-bigiq-with-app.yaml) with the new `License` values. 
@@ -318,7 +365,7 @@ To change the BIG-IQ Licensing configuration:
   4. Update the **bigIpRuntimeInitConfig** input parameter to reference the new URL or inline JSON of the updated configuration.
   6. Deploy or Re-Deploy the template.
 
-**Example Customization 2:**
+**Example Customization 3:**
 
 To change the Virtual Service configuration:
 
@@ -364,7 +411,7 @@ To change the Virtual Service configuration:
   4. Deploy or Re-Deploy.
 
 
-**Example Customization 3:**
+**Example Customization 4:**
 
 By default, this example logs to [Google Cloud Logging](https://clouddocs.f5.com/products/extensions/f5-telemetry-streaming/latest/setting-up-consumer.html#gcl) to:
   - logId: f5-waf-logs
diff --git a/examples/autoscale/payg/README.md b/examples/autoscale/payg/README.md
index 1ef39f3d..499919df 100644
--- a/examples/autoscale/payg/README.md
+++ b/examples/autoscale/payg/README.md
@@ -107,6 +107,8 @@ This solution leverages traditional Autoscale configuration management practices
 
 - If you have cloned this repository to modify the templates or BIG-IP config files and published to your own location, you can use the **templateBaseUrl** and **artifactLocation** input parameters to specify the new location of the customized templates and the **bigIpRuntimeInitConfig** input parameter to specify the new location of the BIG-IP Runtime-Init config. See main [/examples/README.md](../../README.md#cloud-configuration) for more template customization details. See [Changing the BIG-IP Deployment](#changing-the-big-ip-deployment) for more BIG-IP customization details.
 
+- Because this solution does not utilize BIG-IP Device Service Clustering (DSC), synchronizing ASM WAF cookie protection settings across instances is not supported. If you are deploying this solution into a production environment, F5 recommends customizing the default runtime-init configuration to install the cookie protection string on each BIG-IP instance at provisioning time. This requires creating an additional Google Secret Manager secret containing the cookie protection string. See customization example #1 under [Changing the BIG-IP Deployment](#changing-the-big-ip-deployment) for step-by-step instructions.
+
 - In this solution, the BIG-IP VE has the [LTM](https://f5.com/products/big-ip/local-traffic-manager-ltm) and [ASM](https://f5.com/products/big-ip/application-security-manager-asm) modules enabled to provide advanced traffic management and web application security functionality. 
 
 - You are required to specify which Availability Zones you are deploying the application in. See [Google Cloud Availability Zones](https://cloud.google.com/compute/docs/regions-zones) for a list of regions and their corresponding availability zones.
@@ -269,9 +271,51 @@ By default, this solution references the `runtime-init-conf-payg-with-app.yaml`
   - The **Full Stack** (autoscale.py) can use this file as is. This example configuration does not require any modifications to deploy successfully *(Disclaimer: "Successfully" implies the template deploys without errors and deploys BIG-IP WAFs capable of passing traffic. To be fully functional as designed, you would need to have satisfied the [Prerequisites](#prerequisites))*. However, in production, these files would commonly be customized. Some examples of small customizations or modifications are provided below. 
   - The **Existing Network Stack** (autoscale-existing-network.py) always **requires** customizing this file (with a Virtual Service configuration pointing at your own application) and republished before deploying.
 
-
 **Example Customization 1:**
 
+To install the ASM WAF cookie protection string on each BIG-IP instance:
+
+  1. Export the cookie protection string from a running BIG-IP ASM WAF instance.
+      Example:
+      ```bash
+      BIGIP="192.168.1.245"
+      TOKEN=$(curl -sk https://${BIGIP}/mgmt/shared/authn/login -d '{"username": "admin", "password": "myBigIpPassword"}' | jq -r.token.token)
+
+      TASK_ID=$(curl -sk -X POST https://${BIGIP}/mgmt/tm/asm/tasks/export-data-protection -H "X-F5-Auth-Token: ${TOKEN}" -d'{"inline": true}' | jq -r .id)
+      COOKIE_PROTECTION=$(curl -sk -X GET https://${BIGIP}/mgmt/tm/asm/tasks/export-data-protection/${TASK_ID} -H "X-F5-Auth-Token: ${TOKEN}"  | jq .result.file)
+      ```
+  2. Create an Google Secret Manager secret using the previously acquired cookie protection string value. This step requires the gcloud CLI; you can also create the secret via the **AWS Console > Secrets Manager > Store a new secret** menu.
+      Example:
+      ```bash
+      REGION='us-east-1'
+      aws secretsmanager create-secret --region ${REGION} --name mySecret --secret-string ${COOKIE_PROTECTION}
+      ```
+  3. Edit/modify the runtime-init config file [runtime-init-conf-payg-with-app.yaml](../bigip-configurations/runtime-init-conf-payg-with-app.yaml) with the new `COOKIE_PROTECTION` runtime parameter and post_onboard_enabled values. 
+
+      Example:
+      ```yaml
+      runtime_parameters:  
+        - name: COOKIE_PROTECTION
+          type: secret
+          secretProvider:
+            environment: gcp
+            secretId: mySecret
+            type: SecretsManager
+            version: latest
+      ```
+      ```yaml
+      post_onboard_enabled:
+        - name: import_data_protection
+          type: inline
+          commands:
+            - "id=$(curl -su 'admin:admin' -X POST http://localhost:8100/mgmt/tm/asm/tasks/import-data-protection -d '{\"importText\": \"{{{COOKIE_PROTECTION}}}\"}' | jq -r .id) && sleep 10 && echo data protection id: ${id} && status=$(curl -su 'admin:admin' http://localhost:8100/mgmt/tm/asm/tasks/import-data-protection/${id} | jq -r .status) && echo data protection status: ${status}"
+      ```
+  4. Publish/host the customized runtime-init config file at a location reachable by the BIG-IP at deploy time (for example, git, S3, etc.).
+  5. Update the **bigIpRuntimeInitConfig** input parameter to reference the URL of the customized configuration file.
+  6. If you are installing the cookie protection string to an existing deployment, follow the steps at [Updating this Solution](#updating-this-solution) to redeploy instances using the new configuration.
+
+**Example Customization 2:**
+
 To change the Virtual Service configuration:
 
   1. Edit/modify the Application Services 3 (AS3) declaration in the example runtime-init config file ` [runtime-init-conf-payg-with-app.yaml](../bigip-configurations/runtime-init-conf-payg-with-app.yaml) to point at your own application.  See AS3 [documentation](https://clouddocs.f5.com/products/extensions/f5-appsvcs-extension/latest/userguide/composing-a-declaration.html) for more details and examples.
@@ -315,7 +359,7 @@ To change the Virtual Service configuration:
   3. Update the **bigIpRuntimeInitConfig** input parameter to reference the new URL of the updated configuration.
   4. Deploy or Re-Deploy.
 
-**Example Customization 2:**
+**Example Customization 3ß:**
 
 By default, this example logs to [Google Cloud Logging](https://clouddocs.f5.com/products/extensions/f5-telemetry-streaming/latest/setting-up-consumer.html#gcl) to:
   - logId: f5-waf-logs

From 39bbbf18368047146314ffcdb6ec669d27c44039 Mon Sep 17 00:00:00 2001
From: Michael Shimkus <m.shimkus@f5.com>
Date: Mon, 23 Oct 2023 14:07:27 -0700
Subject: [PATCH 02/10] EC-348 - Support deploying into shared VPCs

---
 .../data/test_policies/shimkus.yaml           |  6 +--
 .../create_existing_network_stack.sh          | 12 +++---
 examples/autoscale/bigiq/README.md            |  9 +++--
 .../bigiq/autoscale-existing-network.py       | 35 +++++++++++-----
 .../sample_autoscale_existing_network.yaml    |  6 ++-
 examples/autoscale/payg/README.md             |  9 +++--
 .../payg/autoscale-existing-network.py        | 35 +++++++++++-----
 .../sample_autoscale_existing_network.yaml    |  6 ++-
 examples/failover/README.md                   | 14 ++++---
 .../failover/failover-existing-network.py     | 40 +++++++++++++------
 .../sample_failover_existing_network.yaml     | 20 ++++++++++
 examples/quickstart/README.md                 | 15 +++----
 .../quickstart/quickstart-existing-network.py | 38 +++++++++++++-----
 .../sample_quickstart_existing_network.yaml   | 26 ++++++++++++
 14 files changed, 195 insertions(+), 76 deletions(-)

diff --git a/automated-test-scripts/data/test_policies/shimkus.yaml b/automated-test-scripts/data/test_policies/shimkus.yaml
index bd7d50ac..8bc03e30 100644
--- a/automated-test-scripts/data/test_policies/shimkus.yaml
+++ b/automated-test-scripts/data/test_policies/shimkus.yaml
@@ -4,7 +4,7 @@
 google-autoscale-payg-example-test:
   test-url: "file://automated-test-scripts/f5-google-gdm-templates-v2/examples/autoscale/payg/daily_test.yaml"
   run: "random"
-  random-num-of-tests: 1
+  random-num-of-tests: 0
   parameters-files:
     - "automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/payg/full/demo_app.yaml"
     - "automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/payg/full/prod_app.yaml"
@@ -50,7 +50,7 @@ google-gdm-failover-example-test-byol:
 google-gdm-failover-example-test-payg:
   test-url: "file://automated-test-scripts/f5-google-gdm-templates-v2/examples/failover/daily_test_full.yaml"
   run: "random"
-  random-num-of-tests: 1
+  random-num-of-tests: 0
   parameters-files:
     - "automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/full/demo.yaml"
     - "automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/full/prod.yaml"
@@ -95,7 +95,7 @@ google-gdm-quickstart-test-byol:
 google-gdm-quickstart-test-payg:
   test-url: "file://automated-test-scripts/f5-google-gdm-templates-v2/examples/quickstart/daily_test_full.yaml"
   run: "random"
-  random-num-of-tests: 1
+  random-num-of-tests: 0
   parameters-files:
     - "automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/demo_app_1nic.yaml"
     - "automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/demo_app_2nic.yaml"
diff --git a/automated-test-scripts/f5-google-gdm-templates-v2/examples/quickstart/create_existing_network_stack.sh b/automated-test-scripts/f5-google-gdm-templates-v2/examples/quickstart/create_existing_network_stack.sh
index 1a1ba2a1..838c2fe7 100644
--- a/automated-test-scripts/f5-google-gdm-templates-v2/examples/quickstart/create_existing_network_stack.sh
+++ b/automated-test-scripts/f5-google-gdm-templates-v2/examples/quickstart/create_existing_network_stack.sh
@@ -11,19 +11,19 @@ if [[ "<PROVISION PUBLIC IP>" == "False" ]]; then
     src_ip_mgmt=$(gcloud compute networks subnets list --format json | jq -r --arg n "<UNIQUESTRING>-subnet0-subnet" '.[] | select(.name | contains($n)) | .ipCidrRange')
 fi
 
-mgmt_network='<UNIQUESTRING>-network0-network'
-mgmt_subnet='<UNIQUESTRING>-subnet0-subnet'
+mgmt_network='projects/f5-7656-pdsoleng-dev/global/networks/<UNIQUESTRING>-network0-network'
+mgmt_subnet='projects/f5-7656-pdsoleng-dev/regions/<REGION>/subnetworks/<UNIQUESTRING>-subnet0-subnet'
 external_network=''
 external_subnet=''
 internal_network=''
 internal_subnet=''
 if [[ <NUMBER NICS> -gt 1 ]]; then
-    external_network='<UNIQUESTRING>-network1-network'
-    external_subnet='<UNIQUESTRING>-subnet1-subnet'
+    external_network='projects/f5-7656-pdsoleng-dev/global/networks/<UNIQUESTRING>-network1-network'
+    external_subnet='projects/f5-7656-pdsoleng-dev/regions/<REGION>/subnetworks/<UNIQUESTRING>-subnet1-subnet'
 fi
 if [[ <NUMBER NICS> -gt 2 ]]; then
-    internal_network='<UNIQUESTRING>-network2-network'
-    internal_subnet='<UNIQUESTRING>-subnet2-subnet'
+    internal_network='projects/f5-7656-pdsoleng-dev/global/networks/<UNIQUESTRING>-network2-network'
+    internal_subnet='projects/f5-7656-pdsoleng-dev/regions/<REGION>/subnetworks/<UNIQUESTRING>-subnet2-subnet'
 fi
 
 # Add lic key if byol
diff --git a/examples/autoscale/bigiq/README.md b/examples/autoscale/bigiq/README.md
index 5db3601d..f905e220 100644
--- a/examples/autoscale/bigiq/README.md
+++ b/examples/autoscale/bigiq/README.md
@@ -114,7 +114,6 @@ https://cloud.google.com/secret-manager/docs/creating-and-accessing-secrets)
 
     ```myProjectName/global/images/myImageName```
 
-
 - This solution requires Internet access for: 
   - Downloading additional F5 software components used for onboarding and configuring the BIG-IP (via GitHub.com). *NOTE: access via web proxy is not currently supported. Other options include 1) hosting the file locally and modifying the runtime-init package url and configuration files to point to local URLs instead or 2) baking them into a custom image (BYOL images only), using the [F5 Image Generation Tool](https://clouddocs.f5.com/cloud/public/v1/ve-image-gen_index.html).*
   - Contacting native cloud services for various cloud integrations: 
@@ -137,6 +136,8 @@ https://cloud.google.com/secret-manager/docs/creating-and-accessing-secrets)
 
 - You are required to specify which Availability Zones you are deploying the application in. See [Google Cloud Availability Zones](https://cloud.google.com/compute/docs/regions-zones) for a list of regions and their corresponding availability zones.
 
+- When deploying the existing stack solution, you can provide network and subnet resource names in either simple format (`myNetworkName`) or as a self link (`projects/myVpcProjectName/global/networks/myNetworkName`), which can be used to deploy instances into a shared VPC. ***IMPORTANT***: When using self links, you **MUST** 1. have access to the specified VPCs, and 2. provide all network and subnet names in self link format. Failure to do so will result in an error. See the [Existing Network Parameters](#existing-network-parameters) for examples.
+
 - This deployment can send non-identifiable statistical information to F5 Networks to help us improve our templates. You can disable this functionality for this deployment by supplying **false** for the value of the **allowUsageAnalytics** input parameter. To disable the BIG-IP system from also sending information, you can disable it system-wide by setting the **autoPhonehome** system class property value to false in the F5 Declarative Onboarding declaration. See [Sending statistical information to F5](#sending-statistical-information-to-f5) and [Changing the BIG-IP Deployment](#changing-the-big-ip-deployment) for more BIG-IP customization details.
 
 
@@ -207,14 +208,14 @@ Note: These are specified in the configuration file. See sample_autoscale.yaml
 | group | No | f5group | string | Group Tag. |
 | owner | No | f5owner | string | Owner label. |
 | logId | No | f5-waf-logs | string | Enter the name of the Google Cloud log that will receive WAF events. |
-| networkName | **Yes** |  | string | Network name |
+| networkName | **Yes** |  | string | The existing network name. The network name can be either a simple name or a self link. Example: `myNetworkName` or `projects/myVpcProjectName/global/networks/myNetworkName` |
 | provisionPublicIp | No | true | boolean | Provision Public IP addresses for the BIG-IP Management interface. By default, this is set to true. If set to false, the solution will deploy a bastion host instead in order to provide access.  |
 | region | No | us-west1 | string | Google Cloud region used for this deployment, for example 'us-west1'. |
 | restrictedSrcAddressApp | **Yes** | | array | An IP address range (CIDR) that can be used to restrict access web traffic (80/443) to the BIG-IP instances, for example 'X.X.X.X/32' for a host, '0.0.0.0/0' for the Internet, etc. **NOTE**: The VPC CIDR is automatically added for internal use. |
 | restrictedSrcAddressMgmt | **Yes** | | array | An IP address range (CIDR) used to restrict SSH and management GUI access to the BIG-IP Management or bastion host instances. Provide a YAML list of addresses or networks in CIDR notation, for example, '- 55.55.55.55/32' for a host, '- 10.0.0.0/8' for a network, etc. NOTE: If using a Bastion Host (when ProvisionPublicIp = false), you must also include the Bastion's source network, for example '- 10.0.0.0/8'. **IMPORTANT**: The VPC CIDR is automatically added for internal use (access via bastion host, clustering, etc.). Please restrict the IP address range to your client, for example '- X.X.X.X/32'. Production should never expose the BIG-IP Management interface to the Internet. |
 | subnets | **Yes** |  | object | Subnet object which provides names for mgmt and app subnets |
-| subnets.mgmtSubnetName | **Yes** |  | string | Management subnet name | 
-| subnets.appSubnetName | **Yes** |  | string | Application subnet name |
+| subnets.mgmtSubnetName | **Yes** | | string | Management subnet name. The subnet name can be either a simple name or a self link. Example: `myMgmtSubnetName` or `projects/myVpcProjectName/regions/myRegion/subnetworks/myMgmtSubnetName` | 
+| subnets.appSubnetName | **Yes** | | string | Application subnet name. The subnet name can be either a simple name or a self link. Example: `myAppSubnetName` or `projects/myVpcProjectName/regions/myRegion/subnetworks/myAppSubnetName` |
 | uniqueString | No | myuniqstr | string | A prefix that will be used to name template resources. Because some resources require globally unique names, we recommend using a unique value. |
 | update | No | false | boolean This specifies when to add dependency statements to the autoscale related resources. By default, this is set to false. Specify false when first deploying and right before deleting. Specify True when updating the deployment. See [updating this solution](#updating-this-solution) section below.|
 | zones | No |  | array | Enter the Google availability zones where you want to deploy the BIG-IP VE instances, for example 'us-west1-a'. |
diff --git a/examples/autoscale/bigiq/autoscale-existing-network.py b/examples/autoscale/bigiq/autoscale-existing-network.py
index fa2de986..5f2903ab 100644
--- a/examples/autoscale/bigiq/autoscale-existing-network.py
+++ b/examples/autoscale/bigiq/autoscale-existing-network.py
@@ -5,6 +5,7 @@
 # pylint: disable=W,C,R
 
 """Creates the application."""
+import re
 COMPUTE_URL_BASE = 'https://www.googleapis.com/compute/v1/'
 
 
@@ -32,11 +33,15 @@ def create_bigip_deployment(context):
     prefix = context.properties['uniqueString']
     net_name = context.properties['networkName']
     subnet_name = context.properties['subnets']['mgmtSubnetName']
-    net_ref = COMPUTE_URL_BASE + 'projects/' + \
-              context.env['project'] + '/global/networks/' + net_name
-    sub_ref = COMPUTE_URL_BASE + 'projects/' + context.env['project'] + \
-          '/regions/' + context.properties['region'] + \
-          '/subnetworks/' + subnet_name
+    if context.shared_vpc == 'true':
+        net_ref = net_name
+        sub_ref = subnet_name
+    else:
+        net_ref = COMPUTE_URL_BASE + 'projects/' + \
+                context.env['project'] + '/global/networks/' + net_name
+        sub_ref = COMPUTE_URL_BASE + 'projects/' + context.env['project'] + \
+                '/regions/' + context.properties['region'] + \
+                '/subnetworks/' + subnet_name
     allow_usage_analytics = context.properties['allowUsageAnalytics'] if \
         'allowUsageAnalytics' in context.properties else True
     custom_image_id = context.properties['bigIpCustomImageId'] if \
@@ -137,11 +142,15 @@ def create_dag_deployment(context):
     prefix = context.properties['uniqueString']
     net_name = context.properties['networkName']
     subnet_name = context.properties['subnets']['mgmtSubnetName']
-    net_ref = COMPUTE_URL_BASE + 'projects/' + \
-              context.env['project'] + '/global/networks/' + net_name
-    sub_ref = COMPUTE_URL_BASE + 'projects/' + context.env['project'] + \
-          '/regions/' + context.properties['region'] + \
-          '/subnetworks/' + subnet_name
+    if context.shared_vpc == 'true':
+        net_ref = net_name
+        sub_ref = subnet_name
+    else:
+        net_ref = COMPUTE_URL_BASE + 'projects/' + \
+                context.env['project'] + '/global/networks/' + net_name
+        sub_ref = COMPUTE_URL_BASE + 'projects/' + context.env['project'] + \
+                '/regions/' + context.properties['region'] + \
+                '/subnetworks/' + subnet_name
 
     target_pool_name = generate_name(prefix, 'bigip-tp')
     instance_group_name = generate_name(prefix, 'bigip-igm')
@@ -321,6 +330,12 @@ def generate_config(context):
     bigip_igm_name = generate_name(prefix, 'bigip-igm')
     fr_name = generate_name(prefix, 'fr-01')
 
+    net_match = re.search(r'^projects/[a-z]([-a-z0-9]*[a-z0-9])?/global/networks/[a-z]([-a-z0-9]*[a-z0-9])?', \
+                context.properties['networkName'])
+    subnet_match = re.search(r'^projects/[a-z]([-a-z0-9]*[a-z0-9])?/regions/[a-z]([-a-z0-9]*[a-z0-9])/subnetworks/[a-z]([-a-z0-9]*[a-z0-9])?', \
+                context.properties['subnets']['mgmtSubnetName'])
+    context.shared_vpc = 'true' if net_match and subnet_match else 'false'
+
     resources = [create_bigip_deployment(context)] + \
                 [create_dag_deployment(context)] + \
                 [create_function_deployment(context)]
diff --git a/examples/autoscale/bigiq/sample_autoscale_existing_network.yaml b/examples/autoscale/bigiq/sample_autoscale_existing_network.yaml
index 2bcca610..7fa1874e 100644
--- a/examples/autoscale/bigiq/sample_autoscale_existing_network.yaml
+++ b/examples/autoscale/bigiq/sample_autoscale_existing_network.yaml
@@ -90,7 +90,7 @@ resources:
       group: f5group
       ###  (OPTIONAL) Enter the name of the Google Cloud log that will receive WAF events.
       logId: f5-waf-logs
-      ###  (REQUIRED) The existing network name. For example: 'myuniqstr-network'
+      ###  (REQUIRED) The existing network name. For example: 'myuniqstr-network' or 'projects/myVpcProjectName/global/networks/myuniqstr-network when deploying into a shared VPC'
       networkName:
       ###  (OPTIONAL) Provision Public IP addresses for the BIG-IP Management interface.
       #    By default, this is set to true. If set to false, the solution will deploy a bastion host
@@ -124,6 +124,10 @@ resources:
       #    subnets:
       #      mgmtSubnetName: myuniqstr-mgmt
       #      appSubnetName: myuniqstr-app
+      #    Or when deploying into a shared VPC:
+      #    subnets:
+      #      mgmtSubnetName: projects/myVpcProjectName/regions/us-west1/subnetworks/myuniqstr-mgmt
+      #      appSubnetName: projects/myVpcProjectName/regions/us-west1/subnetworks/myuniqstr-app
       subnets:
         mgmtSubnetName:
         appSubnetName:
diff --git a/examples/autoscale/payg/README.md b/examples/autoscale/payg/README.md
index 499919df..0c7f1cda 100644
--- a/examples/autoscale/payg/README.md
+++ b/examples/autoscale/payg/README.md
@@ -92,7 +92,6 @@ This solution leverages traditional Autoscale configuration management practices
 
     ```myProjectName/global/images/myImageName```
 
-
 - This solution requires Internet access for: 
   - Downloading additional F5 software components used for onboarding and configuring the BIG-IP (via GitHub.com). *NOTE: access via web proxy is not currently supported. Other options include 1) hosting the file locally and modifying the runtime-init package url and configuration files to point to local URLs instead or 2) baking them into a custom image (BYOL images only), using the [F5 Image Generation Tool](https://clouddocs.f5.com/cloud/public/v1/ve-image-gen_index.html).*
   - Contacting native cloud services for various cloud integrations: 
@@ -113,6 +112,8 @@ This solution leverages traditional Autoscale configuration management practices
 
 - You are required to specify which Availability Zones you are deploying the application in. See [Google Cloud Availability Zones](https://cloud.google.com/compute/docs/regions-zones) for a list of regions and their corresponding availability zones.
 
+- When deploying the existing stack solution, you can provide network and subnet resource names in either simple format (`myNetworkName`) or as a self link (`projects/myVpcProjectName/global/networks/myNetworkName`), which can be used to deploy instances into a shared VPC. ***IMPORTANT***: When using self links, you **MUST** 1. have access to the specified VPCs, and 2. provide all network and subnet names in self link format. Failure to do so will result in an error. See the [Existing Network Parameters](#existing-network-parameters) for examples.
+
 - This deployment can send non-identifiable statistical information to F5 Networks to help us improve our templates. You can disable this functionality for this deployment by supplying **false** for the value of the **allowUsageAnalytics** input parameter. To disable the BIG-IP system from also sending information, you can disable it system-wide by setting the **autoPhonehome** system class property value to false in the F5 Declarative Onboarding declaration. See [Sending statistical information to F5](#sending-statistical-information-to-f5) and [Changing the BIG-IP Deployment](#changing-the-big-ip-deployment) for more BIG-IP customization details.
 
 
@@ -182,14 +183,14 @@ Note: These are specified in the configuration file. See sample_autoscale.yaml
 | group | No | f5group | string | Group Tag. |
 | owner | No | f5owner | string | Owner label. |
 | logId | No | f5-waf-logs | string | Enter the name of the Google Cloud log that will receive WAF events. |
-| networkName | **Yes** |  | string | The existing network name. |
+| networkName | **Yes** |  | string | The existing network name. The network name can be either a simple name or a self link. Example: `myNetworkName` or `projects/myVpcProjectName/global/networks/myNetworkName` |
 | provisionPublicIp | No | true | boolean | Provision Public IP addresses for the BIG-IP Management interface. By default, this is set to true. If set to false, the solution will deploy a bastion host instead in order to provide access.  |
 | region | No | us-west1 | string | Google Cloud region used for this deployment, for example 'us-west1'. |
 | restrictedSrcAddressApp | **Yes** |  | array | An IP address range (CIDR) that can be used to restrict access web traffic (80/443) to the BIG-IP instances, for example 'X.X.X.X/32' for a host, '0.0.0.0/0' for the Internet, etc. **NOTE**: The VPC CIDR is automatically added for internal use. |
 | restrictedSrcAddressMgmt | **Yes** |  | array | An IP address range (CIDR) used to restrict SSH and management GUI access to the BIG-IP Management or bastion host instances. Provide a YAML list of addresses or networks in CIDR notation, for example, '- 55.55.55.55/32' for a host, '- 10.0.0.0/8' for a network, etc. NOTE: If using a Bastion Host (when ProvisionPublicIp = false), you must also include the Bastion's source network, for example '- 10.0.0.0/8'. **IMPORTANT**: The VPC CIDR is automatically added for internal use (access via bastion host, clustering, etc.). Please restrict the IP address range to your client, for example '- X.X.X.X/32'. Production should never expose the BIG-IP Management interface to the Internet. |
 | subnets | **Yes** | | object | Subnet object which provides names for mgmt and app subnets |
-| subnets.mgmtSubnetName | **Yes** | | string | Management subnet name | 
-| subnets.appSubnetName | **Yes** | | string | Application subnet name |
+| subnets.mgmtSubnetName | **Yes** | | string | Management subnet name. The subnet name can be either a simple name or a self link. Example: `myMgmtSubnetName` or `projects/myVpcProjectName/regions/myRegion/subnetworks/myMgmtSubnetName` | 
+| subnets.appSubnetName | **Yes** | | string | Application subnet name. The subnet name can be either a simple name or a self link. Example: `myAppSubnetName` or `projects/myVpcProjectName/regions/myRegion/subnetworks/myAppSubnetName` |
 | uniqueString | No | myuniqstr | string | A prefix that will be used to name template resources. Because some resources require globally unique names, we recommend using a unique value. |
 | update | No | false | boolean | This specifies when to add dependency statements to the autoscale related resources. By default, this is set to false. Specify false when first deploying and right before deleting. Specify True when updating the deployment. See [updating this solution](#updating-this-solution) section below.|
 | zones | No |  | array | Enter the Google availability zones where you want to deploy the BIG-IP VE instances, for example 'us-west1-a'. |
diff --git a/examples/autoscale/payg/autoscale-existing-network.py b/examples/autoscale/payg/autoscale-existing-network.py
index 4f239c95..d6a88683 100644
--- a/examples/autoscale/payg/autoscale-existing-network.py
+++ b/examples/autoscale/payg/autoscale-existing-network.py
@@ -5,6 +5,7 @@
 # pylint: disable=W,C,R
 
 """Creates the application."""
+import re
 COMPUTE_URL_BASE = 'https://www.googleapis.com/compute/v1/'
 
 
@@ -29,11 +30,15 @@ def create_bigip_deployment(context):
     prefix = context.properties['uniqueString']
     net_name = context.properties['networkName']
     subnet_name = context.properties['subnets']['mgmtSubnetName']
-    net_ref = COMPUTE_URL_BASE + 'projects/' + \
-              context.env['project'] + '/global/networks/' + net_name
-    sub_ref = COMPUTE_URL_BASE + 'projects/' + context.env['project'] + \
-          '/regions/' + context.properties['region'] + \
-          '/subnetworks/' + subnet_name
+    if context.shared_vpc == 'true':
+        net_ref = net_name
+        sub_ref = subnet_name
+    else:
+        net_ref = COMPUTE_URL_BASE + 'projects/' + \
+                context.env['project'] + '/global/networks/' + net_name
+        sub_ref = COMPUTE_URL_BASE + 'projects/' + context.env['project'] + \
+                '/regions/' + context.properties['region'] + \
+                '/subnetworks/' + subnet_name
     allow_usage_analytics = context.properties['allowUsageAnalytics'] if \
         'allowUsageAnalytics' in context.properties else True
     custom_image_id = context.properties['bigIpCustomImageId'] if \
@@ -132,11 +137,15 @@ def create_dag_deployment(context):
     prefix = context.properties['uniqueString']
     net_name = context.properties['networkName']
     subnet_name = context.properties['subnets']['mgmtSubnetName']
-    net_ref = COMPUTE_URL_BASE + 'projects/' + \
-              context.env['project'] + '/global/networks/' + net_name
-    sub_ref = COMPUTE_URL_BASE + 'projects/' + context.env['project'] + \
-          '/regions/' + context.properties['region'] + \
-          '/subnetworks/' + subnet_name
+    if context.shared_vpc == 'true':
+        net_ref = net_name
+        sub_ref = subnet_name
+    else:
+        net_ref = COMPUTE_URL_BASE + 'projects/' + \
+                context.env['project'] + '/global/networks/' + net_name
+        sub_ref = COMPUTE_URL_BASE + 'projects/' + context.env['project'] + \
+                '/regions/' + context.properties['region'] + \
+                '/subnetworks/' + subnet_name
     target_pool_name = generate_name(prefix, 'bigip-tp')
     instance_group_name = generate_name(prefix, 'bigip-igm')
     depends_on_array = []
@@ -242,6 +251,12 @@ def generate_config(context):
     deployment_name = generate_name(prefix, name)
     bigip_igm_name= generate_name(prefix, 'bigip-igm')
     fr_name = generate_name(prefix, 'fr-01')
+    
+    net_match = re.search(r'^projects/[a-z]([-a-z0-9]*[a-z0-9])?/global/networks/[a-z]([-a-z0-9]*[a-z0-9])?', \
+                context.properties['networkName'])
+    subnet_match = re.search(r'^projects/[a-z]([-a-z0-9]*[a-z0-9])?/regions/[a-z]([-a-z0-9]*[a-z0-9])/subnetworks/[a-z]([-a-z0-9]*[a-z0-9])?', \
+                context.properties['subnets']['mgmtSubnetName'])
+    context.shared_vpc = 'true' if net_match and subnet_match else 'false'
 
     resources = [create_bigip_deployment(context)] + \
                 [create_dag_deployment(context)]
diff --git a/examples/autoscale/payg/sample_autoscale_existing_network.yaml b/examples/autoscale/payg/sample_autoscale_existing_network.yaml
index 1a8e6e1f..fb5d1fa7 100644
--- a/examples/autoscale/payg/sample_autoscale_existing_network.yaml
+++ b/examples/autoscale/payg/sample_autoscale_existing_network.yaml
@@ -85,7 +85,7 @@ resources:
       group: f5group
       ###  (OPTIONAL) Enter the name of the Google Cloud log that will receive WAF events.
       logId: f5-waf-logs
-      ###  (REQUIRED) The existing network name. For example: 'myuniqstr-network'
+      ###  (REQUIRED) The existing network name. For example: 'myuniqstr-network' or 'projects/myVpcProjectName/global/networks/myuniqstr-network when deploying into a shared VPC'
       networkName:
       ###  (OPTIONAL) Provision Public IP addresses for the BIG-IP Management interface.
       #    By default, this is set to true. If set to false, the solution will deploy a bastion host
@@ -119,6 +119,10 @@ resources:
       #    subnets:
       #      mgmtSubnetName: myuniqstr-mgmt
       #      appSubnetName: myuniqstr-app
+      #    Or when deploying into a shared VPC:
+      #    subnets:
+      #      mgmtSubnetName: projects/myVpcProjectName/regions/us-west1/subnetworks/myuniqstr-mgmt
+      #      appSubnetName: projects/myVpcProjectName/regions/us-west1/subnetworks/myuniqstr-app
       subnets:
         mgmtSubnetName:
         appSubnetName:
diff --git a/examples/failover/README.md b/examples/failover/README.md
index 47a6ff8d..f1fa4108 100644
--- a/examples/failover/README.md
+++ b/examples/failover/README.md
@@ -110,6 +110,8 @@ https://cloud.google.com/secret-manager/docs/creating-and-accessing-secrets)
 
 - When specifying values for the **bigIpInstanceType** parameter, ensure that the instance type you select is appropriate for the 3 NIC deployment scenario. See [Google Machine Families](https://cloud.google.com/compute/docs/machine-types) for more information.
 
+- When deploying the existing stack solution, you can provide network and subnet resource names in either simple format (`myMgmtNetworkName`) or as a self link (`projects/myVpcProjectName/global/networks/myMgmtNetworkName`), which can be used to deploy instances into a shared VPC. ***IMPORTANT***: When using self links, you **MUST** 1. have access to the specified VPCs, and 2. provide all network and subnet names in self link format. Failure to do so will result in an error. See the [Existing Network Parameters](#existing-network-template-input-parameters) for examples.
+
 - **Important**: 
   - For multi-NIC deployments, this solution configures the second interface of the instance as the MGMT interface. This allows the first interface to be used by Google Cloud resources such as forwarding rules and load balancers for application traffic. To connect to the MGMT interface (nic1) get the IP address from the instance properties and use your management tool of choice. Note: The Google Cloud console and gcloud SSH connection options target nic0 and will not connect to the instance correctly.
   - Due to GCP specific networking, Self IPs are created with a /32 prefix vs. the usual subnet prefix. See [https://cloud.google.com/vpc/docs/create-use-multiple-interfaces#i_am_having_connectivity_issues_when_using_a_netmask_that_is_not_32](https://cloud.google.com/vpc/docs/create-use-multiple-interfaces#i_am_having_connectivity_issues_when_using_a_netmask_that_is_not_32). This means, to reach hosts on directly attached networks, you need to create an additional subnet prefix route to the subnet's local gateway. For example, for a typical Self IP 10.0.2.11/24 on a 10.0.2.0/24 subnet, create a route:
@@ -233,17 +235,17 @@ Note: These are specified in the configuration file. See sample_failover_existin
 | numNics | No | 3 | integer | Enter valid number of network interfaces (2-3) to create on the BIG-IP VE instance. |
 | owner | No | f5owner | string | Owner Tag. |
 | networks | **Yes** |  | Object | Networks object which provides names for mgmt and app networks |
-| networks.externalNetworkName | **Yes** |  | string | External network name. Required for 2 NIC deployments. |
-| networks.internalNetworkName | No |  | string | Internal network name. Required for 3 NIC deployments. |  
-| networks.mgmtNetworkName | No |  | string | Management network name. Required for 2 NIC deployments. | 
+| networks.externalNetworkName | **Yes** |  | string | External network name. Required for 2 NIC deployments. The network name can be either a simple name or a self link. Example: `myExternalNetworkName` or `projects/myVpcProjectName/global/networks/myExternalNetworkName` |
+| networks.internalNetworkName | No |  | string | Internal network name. Required for 3 NIC deployments. The network name can be either a simple name or a self link. Example: `myInternalNetworkName` or `projects/myVpcProjectName/global/networks/myInternalNetworkName` |  
+| networks.mgmtNetworkName | No |  | string | Management network name. Required for 2 NIC deployments. The network name can be either a simple name or a self link. Example: `myMgmtNetworkName` or `projects/myVpcProjectName/global/networks/myMgmtNetworkName` | 
 | provisionPublicIp | No | false | boolean | Provision Public IP address(es) for the BIG-IP Management interface(s). By default, this is set to true. If set to false, the solution will deploy a bastion host instead in order to provide access to the BIG-IP. |
 | region | No | us-west1 | string | Google Cloud region used for this deployment, for example 'us-west1'. |
 | restrictedSrcAddressApp | **Yes** |  | array | An IP address range (CIDR) that can be used to restrict access web traffic (80/443) to the BIG-IP instances, for example 'X.X.X.X/32' for a host, '0.0.0.0/0' for the Internet, etc. **NOTE**: The VPC CIDR is automatically added for internal use. |
 | restrictedSrcAddressMgmt | **Yes** |  | array | An IP address range (CIDR) used to restrict SSH and management GUI access to the BIG-IP Management or bastion host instances. Provide a YAML list of addresses or networks in CIDR notation, for example, '- 55.55.55.55/32' for a host, '- 10.0.0.0/8' for a network, etc. NOTE: If using a Bastion Host (when ProvisionPublicIp = false), you must also include the Bastion's source network, for example '- 10.0.0.0/8'. **IMPORTANT**: The VPC CIDR is automatically added for internal use (access via bastion host, clustering, etc.). Please restrict the IP address range to your client, for example '- X.X.X.X/32'. Production should never expose the BIG-IP Management interface to the Internet. |
 | subnets | **Yes** |  | object | Subnet object which provides names for mgmt and app subnets |
-| subnets.externalSubnetName | **Yes** |  | string | External network subnet name. Required for 2 NIC deployments. |
-| subnets.internalSubnetName | No |  | string | External network subnet name. Required for 3 NIC deployments. |  
-| subnets.mgmtSubnetName | **Yes** |  | string | External network subnet name. Required for 2 NIC deployments. | 
+| subnets.externalSubnetName | **Yes** |  | string | External network subnet name. Required for 2 NIC deployments. The subnet name can be either a simple name or a self link. Example: `myExternalSubnetName` or `projects/myVpcProjectName/regions/myRegion/subnetworks/myExternalSubnetName` |
+| subnets.internalSubnetName | No |  | string | External network subnet name. Required for 3 NIC deployments. The subnet name can be either a simple name or a self link. Example: `myInternalSubnetName` or `projects/myVpcProjectName/regions/myRegion/subnetworks/myInternalSubnetName` |  
+| subnets.mgmtSubnetName | **Yes** |  | string | External network subnet name. Required for 2 NIC deployments. The subnet name can be either a simple name or a self link. Example: `myMgmtSubnetName` or `projects/myVpcProjectName/regions/myRegion/subnetworks/myMgmtSubnetName` | 
 | uniqueString | No | myuniqstr | string | A prefix that will be used to name template resources. Because some resources require globally unique names, we recommend using a unique value. |
 | zones | No |  | array | Enter the Google availability zones where you want to deploy the BIG-IP VE, application, and bastion instances, for example 'us-west1-a'. |
 | zones[0] | No | us-west1-a | string | BIG-IP instance A zone name | 
diff --git a/examples/failover/failover-existing-network.py b/examples/failover/failover-existing-network.py
index 97f844f9..cb0d0067 100644
--- a/examples/failover/failover-existing-network.py
+++ b/examples/failover/failover-existing-network.py
@@ -4,6 +4,7 @@
 
 
 """Creates full stack for POC"""
+import re
 COMPUTE_URL_BASE = 'https://www.googleapis.com/compute/v1/'
 
 
@@ -55,12 +56,15 @@ def create_bigip_deployment(context, num_nics, instance_number):
             interface_description = 'Interface used for internal traffic'
             if nics == 2:
                 network_ip = context.properties['bigIpInternalSelfIp0' + str(instance_number)]
-
-        net_ref = COMPUTE_URL_BASE + 'projects/' + \
-                  context.env['project'] + '/global/networks/' + net_name
-        sub_ref = COMPUTE_URL_BASE + 'projects/' + context.env['project'] + \
-                  '/regions/' + context.properties['region'] + \
-                  '/subnetworks/' + subnet_name
+        if context.shared_vpc == 'true':
+            net_ref = net_name
+            sub_ref = subnet_name
+        else:
+            net_ref = COMPUTE_URL_BASE + 'projects/' + \
+                    context.env['project'] + '/global/networks/' + net_name
+            sub_ref = COMPUTE_URL_BASE + 'projects/' + context.env['project'] + \
+                    '/regions/' + context.properties['region'] + \
+                    '/subnetworks/' + subnet_name
         interface_config = {
             'description': interface_description,
             'network': net_ref,
@@ -181,13 +185,17 @@ def create_dag_deployment(context, num_nics):
     else:
         app_net_name = context.properties['networks']['externalNetworkName']
         int_net_name = context.properties['networks']['internalNetworkName']
-    mgmt_net_ref = COMPUTE_URL_BASE + 'projects/' + \
-                   context.env['project'] + '/global/networks/' + mgmt_net_name
-    external_net_ref = COMPUTE_URL_BASE + 'projects/' + \
-                       context.env['project'] + '/global/networks/' + ext_net_name
-    internal_net_ref = COMPUTE_URL_BASE + 'projects/' + \
-                       context.env['project'] + '/global/networks/' + int_net_name
-
+    if context.shared_vpc == 'true':
+        mgmt_net_ref = mgmt_net_name
+        external_net_ref = ext_net_name
+        internal_net_ref = int_net_name
+    else:
+        mgmt_net_ref = COMPUTE_URL_BASE + 'projects/' + \
+                    context.env['project'] + '/global/networks/' + mgmt_net_name
+        external_net_ref = COMPUTE_URL_BASE + 'projects/' + \
+                        context.env['project'] + '/global/networks/' + ext_net_name
+        internal_net_ref = COMPUTE_URL_BASE + 'projects/' + \
+                        context.env['project'] + '/global/networks/' + int_net_name
     int_net_cidr = '10.0.' + str(num_nics - 1) + '.0/24'
     mgmt_port = 8443
     public_ip_name = generate_name(prefix, 'public-ip-01')
@@ -352,6 +360,12 @@ def generate_config(context):
     bigip_instance_name2 = generate_name(prefix, 'bigip-vm-02')
     fr_name = generate_name(prefix, 'fr-01')
 
+    net_match = re.search(r'^projects/[a-z]([-a-z0-9]*[a-z0-9])?/global/networks/[a-z]([-a-z0-9]*[a-z0-9])?', \
+                context.properties['networks']['mgmtNetworkName'])
+    subnet_match = re.search(r'^projects/[a-z]([-a-z0-9]*[a-z0-9])?/regions/[a-z]([-a-z0-9]*[a-z0-9])/subnetworks/[a-z]([-a-z0-9]*[a-z0-9])?', \
+                context.properties['subnets']['mgmtSubnetName'])
+    context.shared_vpc = 'true' if net_match and subnet_match else 'false'
+
     resources = create_bigip_deployment(context, num_nics, 1) + \
                 create_bigip_deployment(context, num_nics, 2) + \
                 create_dag_deployment(context, num_nics)
diff --git a/examples/failover/sample_failover_existing_network.yaml b/examples/failover/sample_failover_existing_network.yaml
index fe99f9b0..8ee7c6e0 100644
--- a/examples/failover/sample_failover_existing_network.yaml
+++ b/examples/failover/sample_failover_existing_network.yaml
@@ -113,6 +113,16 @@ resources:
       #         mgmtNetworkName: myuniqstr-mgmt
       #         externalNetworkName: myuniqstr-external
       #         internalNetworkName: myuniqstr-internal
+      #    Or when deploying into a shared VPC:
+      #    For a 2 NIC Deployment
+      #       networks:
+      #         mgmtNetworkName: projects/myVpcProjectName/global/networks/myuniqstr-mgmt
+      #         externalNetworkName: projects/myVpcProjectName/global/networks/myuniqstr-external
+      #    For a 3 NIC Deployment
+      #       networks:
+      #         mgmtNetworkName: projects/myVpcProjectName/global/networks/myuniqstr-mgmt
+      #         externalNetworkName: projects/myVpcProjectName/global/networks/myuniqstr-external
+      #         internalNetworkName: projects/myVpcProjectName/global/networks/myuniqstr-internal
       networks:
         mgmtNetworkName:
         externalNetworkName:
@@ -158,6 +168,16 @@ resources:
       #       mgmtSubnetName: myuniqstr-mgmt
       #       externalSubnetName: myuniqstr-external
       #       internalSubnetName: myuniqstr-internal
+      #    Or when deploying into a shared VPC:
+      #    For 2 NIC Deployment
+      #     subnets:
+      #       mgmtSubnetName: projects/myVpcProjectName/regions/us-west1/subnetworks/myuniqstr-mgmt
+      #       externalSubnetName: projects/myVpcProjectName/regions/us-west1/subnetworks/myuniqstr-external
+      #    For a 3 NIC Deployment
+      #     subnets:
+      #       mgmtSubnetName: projects/myVpcProjectName/regions/us-west1/subnetworks/myuniqstr-mgmt
+      #       externalSubnetName: projects/myVpcProjectName/regions/us-west1/subnetworks/myuniqstr-external
+      #       internalSubnetName: projects/myVpcProjectName/regions/us-west1/subnetworks/myuniqstr-internal
       subnets:
         mgmtSubnetName:
         externalSubnetName:
diff --git a/examples/quickstart/README.md b/examples/quickstart/README.md
index b0dff2c7..dfd6da6a 100644
--- a/examples/quickstart/README.md
+++ b/examples/quickstart/README.md
@@ -93,9 +93,10 @@ By default, this solution creates a 3 VPC Networks, an example Web Application i
 
     ```myProjectName/global/images/myImageName```
 
-
 - When specifying values for the **bigIpInstanceType** and **numNics** parameters, ensure that the instance type you select is appropriate for the deployment scenario. See [Google Machine Families](https://cloud.google.com/compute/docs/machine-types) for more information.
 
+- When deploying the existing stack solution, you can provide network and subnet resource names in either simple format (`myMgmtNetworkName`) or as a self link (`projects/myVpcProjectName/global/networks/myMgmtNetworkName`), which can be used to deploy instances into a shared VPC. ***IMPORTANT***: When using self links, you **MUST** 1. have access to the specified VPCs, and 2. provide all network and subnet names in self link format. Failure to do so will result in an error. See the [Existing Network Parameters](#existing-network-template-input-parameters) for examples.
+
 - **Important**: 
   - For multi-NIC deployments, this solution configures the second interface of the instance as the MGMT interface. This allows the first interface to be used by Google Cloud resources such as forwarding rules and load balancers for application traffic. To connect to the MGMT interface (nic1) get the IP address from the instance properties and use your management tool of choice. Note: The Google Cloud console and gcloud SSH connection options target nic0 and will not connect to the instance correctly.
   - Due to GCP specific networking, Self IPs are created with a /32 prefix vs. the usual subnet prefix. See [https://cloud.google.com/vpc/docs/create-use-multiple-interfaces#i_am_having_connectivity_issues_when_using_a_netmask_that_is_not_32](https://cloud.google.com/vpc/docs/create-use-multiple-interfaces#i_am_having_connectivity_issues_when_using_a_netmask_that_is_not_32). This means, to reach hosts on directly attached networks, you need to create an additional subnet prefix route to the subnet's local gateway. For example, for a typical Self IP 10.0.2.11/24 on a 10.0.2.0/24 subnet, create a route:
@@ -196,17 +197,17 @@ These are specified in the configuration file. See sample_quickstart-existing-ne
 | numNics | No | 3 | integer | Enter valid number of network interfaces (1-3) to create on the BIG-IP VE instance. |
 | owner | No | f5owner | string | Owner Tag. |
 | networks | **Yes** |  | object | Networks object which provides names for the networks |
-| networks.mgmtNetworkName | **Yes** |  | string | Management network name. Required for 1 NIC deployments. | 
-| networks.externalNetworkName | **Yes** |  | string | External network name. Required for 2 NIC deployments. |
-| networks.internalNetworkName | **Yes** |  | string | Internal network name. Required for 3 NIC deployments. |  
+| networks.mgmtNetworkName | **Yes** |  | string | Management network name. Required for 1 NIC deployments. The network name can be either a simple name or a self link. Example: `myMgmtNetworkName` or `projects/myVpcProjectName/global/networks/myMgmtNetworkName` | 
+| networks.externalNetworkName | **Yes** |  | string | External network name. Required for 2 NIC deployments. The network name can be either a simple name or a self link. Example: `myExternalNetworkName` or `projects/myVpcProjectName/global/networks/myExternalNetworkName` |
+| networks.internalNetworkName | **Yes** |  | string | Internal network name. Required for 3 NIC deployments. The network name can be either a simple name or a self link. Example: `myInternalNetworkName` or `projects/myVpcProjectName/global/networks/myInternalNetworkName` |  
 | provisionPublicIp | No | false | boolean | Provision Public IP address(es) for the BIG-IP Management interface(s). By default, this is set to true. If set to false, the solution will deploy a bastion host instead in order to provide access to the BIG-IP. |
 | region | No | us-west1 | string | The cloud region used for this deployment, for example us-west1. |
 | restrictedSrcAddressApp | **Yes** |  | array | An IP address range (CIDR) that can be used to restrict access web traffic (80/443) to the BIG-IP instances, for example 'X.X.X.X/32' for a host, '0.0.0.0/0' for the Internet, etc. **NOTE**: The VPC CIDR is automatically added for internal use. |
 | restrictedSrcAddressMgmt | **Yes** |  | array | An IP address range (CIDR) used to restrict SSH and management GUI access to the BIG-IP Management or bastion host instances. Provide a YAML list of addresses or networks in CIDR notation, for example, '- 55.55.55.55/32' for a host, '- 10.0.0.0/8' for a network, etc. NOTE: If using a Bastion Host (when ProvisionPublicIp = false), you must also include the Bastion's source network, for example '- 10.0.0.0/8'. **IMPORTANT**: The VPC CIDR is automatically added for internal use (access via bastion host, clustering, etc.). Please restrict the IP address range to your client, for example '- X.X.X.X/32'. Production should never expose the BIG-IP Management interface to the Internet. |
 | subnets | **Yes** |  | object | Subnet object which provides names for the subnets |
-| subnets.mgmtSubnetName | **Yes** |  | string | Management Network subnet name. Required for 1 NIC deployments. | 
-| subnets.externalSubnetName | **Yes** |  | string | External Network subnet name. Required for 2 NIC deployments. |
-| subnets.internalSubnetName | **Yes** |  | string | Internal Network subnet name. Required for 3 NIC deployments. | 
+| subnets.mgmtSubnetName | **Yes** |  | string | Management Network subnet name. Required for 1 NIC deployments. The subnet name can be either a simple name or a self link. Example: `myMgmtSubnetName` or `projects/myVpcProjectName/regions/myRegion/subnetworks/myMgmtSubnetName` | 
+| subnets.externalSubnetName | **Yes** |  | string | External Network subnet name. Required for 2 NIC deployments. Required for 1 NIC deployments. The subnet name can be either a simple name or a self link. Example: `myExternalSubnetName` or `projects/myVpcProjectName/regions/myRegion/subnetworks/myExternalSubnetName` |
+| subnets.internalSubnetName | **Yes** |  | string | Internal Network subnet name. Required for 3 NIC deployments. Required for 1 NIC deployments. The subnet name can be either a simple name or a self link. Example: `myInternalSubnetName` or `projects/myVpcProjectName/regions/myRegion/subnetworks/myInternalSubnetName` | 
 | uniqueString | No | myuniqstr | string | A prefix that will be used to name template resources. Because some resources require globally unique names, we recommend using a unique value. |
 | zone | No | us-west1-a | string | Enter the availability zone where you want to deploy the application, for example 'us-west1-a'. |
 
diff --git a/examples/quickstart/quickstart-existing-network.py b/examples/quickstart/quickstart-existing-network.py
index 3d50b30b..b6a75814 100644
--- a/examples/quickstart/quickstart-existing-network.py
+++ b/examples/quickstart/quickstart-existing-network.py
@@ -4,6 +4,7 @@
 
 
 """Creates full stack for POC"""
+import re
 COMPUTE_URL_BASE = 'https://www.googleapis.com/compute/v1/'
 
 
@@ -53,11 +54,15 @@ def create_bigip_deployment(context):
             net_name = context.properties['networks']['internalNetworkName']
             subnet_name = context.properties['subnets']['internalSubnetName']
             interface_description = 'Interface used for internal traffic'
-        net_ref = COMPUTE_URL_BASE + 'projects/' + \
-                  context.env['project'] + '/global/networks/' + net_name
-        sub_ref = COMPUTE_URL_BASE + 'projects/' + context.env['project'] + \
-                  '/regions/' + context.properties['region'] + \
-                  '/subnetworks/' + subnet_name
+        if context.shared_vpc == 'true':
+            net_ref = net_name
+            sub_ref = subnet_name
+        else:
+            net_ref = COMPUTE_URL_BASE + 'projects/' + \
+                    context.env['project'] + '/global/networks/' + net_name
+            sub_ref = COMPUTE_URL_BASE + 'projects/' + context.env['project'] + \
+                    '/regions/' + context.properties['region'] + \
+                    '/subnetworks/' + subnet_name
         interface_config = {
             'description': interface_description,
             'network': net_ref,
@@ -147,12 +152,17 @@ def create_dag_deployment(context):
     else:
         ext_net_name = context.properties['networks']['externalNetworkName']
         int_net_name = context.properties['networks']['internalNetworkName']
-    mgmt_net_ref = COMPUTE_URL_BASE + 'projects/' + \
-                   context.env['project'] + '/global/networks/' + mgmt_net_name
-    external_net_ref = COMPUTE_URL_BASE + 'projects/' + \
-                       context.env['project'] + '/global/networks/' + ext_net_name
-    internal_net_ref = COMPUTE_URL_BASE + 'projects/' + \
-                       context.env['project'] + '/global/networks/' + int_net_name
+    if context.shared_vpc == 'true':
+        mgmt_net_ref = mgmt_net_name
+        external_net_ref = ext_net_name
+        internal_net_ref = int_net_name
+    else:
+        mgmt_net_ref = COMPUTE_URL_BASE + 'projects/' + \
+                    context.env['project'] + '/global/networks/' + mgmt_net_name
+        external_net_ref = COMPUTE_URL_BASE + 'projects/' + \
+                        context.env['project'] + '/global/networks/' + ext_net_name
+        internal_net_ref = COMPUTE_URL_BASE + 'projects/' + \
+                        context.env['project'] + '/global/networks/' + int_net_name
     int_net_cidr = '10.0.' + str(context.properties['numNics'] - 1) + '.0/24'
     mgmt_port = 8443
     depends_on_array = []
@@ -281,6 +291,12 @@ def generate_config(context):
     bigip_instance_name= generate_name(prefix, 'bigip-vm-01')
     fr_name = generate_name(prefix, 'fr-01')
 
+    net_match = re.search(r'^projects/[a-z]([-a-z0-9]*[a-z0-9])?/global/networks/[a-z]([-a-z0-9]*[a-z0-9])?', \
+                context.properties['networks']['mgmtNetworkName'])
+    subnet_match = re.search(r'^projects/[a-z]([-a-z0-9]*[a-z0-9])?/regions/[a-z]([-a-z0-9]*[a-z0-9])/subnetworks/[a-z]([-a-z0-9]*[a-z0-9])?', \
+                context.properties['subnets']['mgmtSubnetName'])
+    context.shared_vpc = 'true' if net_match and subnet_match else 'false'
+
     resources = create_bigip_deployment(context) + create_dag_deployment(context)
     outputs = []
     mgmt_nic_index = '0' if context.properties['numNics'] == 1 else '1'
diff --git a/examples/quickstart/sample_quickstart_existing_network.yaml b/examples/quickstart/sample_quickstart_existing_network.yaml
index e505dbf6..faa9f5db 100644
--- a/examples/quickstart/sample_quickstart_existing_network.yaml
+++ b/examples/quickstart/sample_quickstart_existing_network.yaml
@@ -82,6 +82,19 @@ resources:
       #         mgmtNetworkName: myuniqstr-mgmt
       #         externalNetworkName: myuniqstr-external
       #         internalNetworkName: myuniqstr-internal
+      #    Or when deploying into a shared VPC:
+      #    For a 1 NIC Deployment.
+      #       networks:
+      #         mgmtNetworkName: projects/myVpcProjectName/global/networks/myuniqstr-mgmt
+      #    For a 2 NIC Deployment
+      #       networks:
+      #         mgmtNetworkName: projects/myVpcProjectName/global/networks/myuniqstr-mgmt
+      #         externalNetworkName: projects/myVpcProjectName/global/networks/myuniqstr-external
+      #    For a 3 NIC Deployment
+      #       networks:
+      #         mgmtNetworkName: projects/myVpcProjectName/global/networks/myuniqstr-mgmt
+      #         externalNetworkName: projects/myVpcProjectName/global/networks/myuniqstr-external
+      #         internalNetworkName: projects/myVpcProjectName/global/networks/myuniqstr-internal
       networks:
         mgmtNetworkName:
         externalNetworkName:
@@ -130,6 +143,19 @@ resources:
       #       mgmtSubnetName: myuniqstr-mgmt
       #       externalSubnetName: myuniqstr-external
       #       internalSubnetName: myuniqstr-internal
+      #    Or when deploying into a shared VPC:
+      #    For 1 NIC Deployment
+      #     subnets:
+      #       mgmtSubnetName: projects/myVpcProjectName/regions/us-west1/subnetworks/myuniqstr-mgmt
+      #    For 2 NIC Deployment
+      #     subnets:
+      #       mgmtSubnetName: projects/myVpcProjectName/regions/us-west1/subnetworks/myuniqstr-mgmt
+      #       externalSubnetName: projects/myVpcProjectName/regions/us-west1/subnetworks/myuniqstr-external
+      #    For a 3 NIC Deployment
+      #     subnets:
+      #       mgmtSubnetName: projects/myVpcProjectName/regions/us-west1/subnetworks/myuniqstr-mgmt
+      #       externalSubnetName: projects/myVpcProjectName/regions/us-west1/subnetworks/myuniqstr-external
+      #       internalSubnetName: projects/myVpcProjectName/regions/us-west1/subnetworks/myuniqstr-internal
       subnets:
         mgmtSubnetName:
         externalSubnetName:

From 5e3a599c0cc144c0ce2159730584f9391b537d31 Mon Sep 17 00:00:00 2001
From: Michael Shimkus <m.shimkus@f5.com>
Date: Fri, 15 Dec 2023 12:18:26 -0800
Subject: [PATCH 03/10] update runtime and AT versions

---
 Makefile                                             |  2 +-
 .../runtime-init-conf-bigiq-with-app.yaml            |  8 ++++----
 .../runtime-init-conf-payg-with-app.yaml             |  8 ++++----
 examples/autoscale/bigiq/autoscale.py.schema         |  2 +-
 examples/autoscale/bigiq/sample_autoscale.yaml       |  2 +-
 examples/autoscale/payg/autoscale.py.schema          |  2 +-
 examples/autoscale/payg/sample_autoscale.yaml        |  2 +-
 ...time-init-conf-2nic-byol-instance01-with-app.yaml | 12 ++++++------
 .../runtime-init-conf-2nic-byol-instance01.yaml      | 12 ++++++------
 ...time-init-conf-2nic-byol-instance02-with-app.yaml | 12 ++++++------
 .../runtime-init-conf-2nic-byol-instance02.yaml      | 12 ++++++------
 ...time-init-conf-2nic-payg-instance01-with-app.yaml | 12 ++++++------
 .../runtime-init-conf-2nic-payg-instance01.yaml      | 12 ++++++------
 ...time-init-conf-2nic-payg-instance02-with-app.yaml | 12 ++++++------
 .../runtime-init-conf-2nic-payg-instance02.yaml      | 12 ++++++------
 ...time-init-conf-3nic-byol-instance01-with-app.yaml | 12 ++++++------
 .../runtime-init-conf-3nic-byol-instance01.yaml      | 12 ++++++------
 ...time-init-conf-3nic-byol-instance02-with-app.yaml | 12 ++++++------
 .../runtime-init-conf-3nic-byol-instance02.yaml      | 12 ++++++------
 ...time-init-conf-3nic-payg-instance01-with-app.yaml | 12 ++++++------
 .../runtime-init-conf-3nic-payg-instance01.yaml      | 12 ++++++------
 ...time-init-conf-3nic-payg-instance02-with-app.yaml | 12 ++++++------
 .../runtime-init-conf-3nic-payg-instance02.yaml      | 12 ++++++------
 .../runtime-init-conf-1nic-byol-with-app.yaml        |  8 ++++----
 .../runtime-init-conf-1nic-byol.yaml                 |  8 ++++----
 .../runtime-init-conf-1nic-payg-with-app.yaml        |  8 ++++----
 .../runtime-init-conf-1nic-payg.yaml                 |  8 ++++----
 .../runtime-init-conf-2nic-byol-with-app.yaml        |  8 ++++----
 .../runtime-init-conf-2nic-byol.yaml                 |  8 ++++----
 .../runtime-init-conf-2nic-payg-with-app.yaml        |  8 ++++----
 .../runtime-init-conf-2nic-payg.yaml                 |  8 ++++----
 .../runtime-init-conf-3nic-byol-with-app.yaml        |  8 ++++----
 .../runtime-init-conf-3nic-byol.yaml                 |  8 ++++----
 .../runtime-init-conf-3nic-payg-with-app.yaml        |  8 ++++----
 .../runtime-init-conf-3nic-payg.yaml                 |  8 ++++----
 examples/quickstart/quickstart.py.schema             |  2 +-
 examples/quickstart/sample_quickstart.yaml           |  2 +-
 37 files changed, 159 insertions(+), 159 deletions(-)

diff --git a/Makefile b/Makefile
index 62b5f026..38ba3607 100644
--- a/Makefile
+++ b/Makefile
@@ -66,4 +66,4 @@ run_expected_outputs_diff:
 
 run_sync_at_metadata:
 	echo "Syncing AT component metadata"
-	cd ${SYNC_AT_DIR} && ./sync_at_components_metadata.sh --config-directories ../../examples/autoscale/bigip-configurations,../../examples/quickstart/bigip-configurations,../../examples/failover/bigip-configurations --template-directory ../../examples --runtime-init-package-url https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v1.6.2/dist/f5-bigip-runtime-init-1.6.2-1.gz.run --cloud gcp
+	cd ${SYNC_AT_DIR} && ./sync_at_components_metadata.sh --config-directories ../../examples/autoscale/bigip-configurations,../../examples/quickstart/bigip-configurations,../../examples/failover/bigip-configurations --template-directory ../../examples --runtime-init-package-url https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.0/dist/f5-bigip-runtime-init-2.0.0-1.gz.run --cloud gcp
diff --git a/examples/autoscale/bigip-configurations/runtime-init-conf-bigiq-with-app.yaml b/examples/autoscale/bigip-configurations/runtime-init-conf-bigiq-with-app.yaml
index 50e0c942..57d1df7e 100644
--- a/examples/autoscale/bigip-configurations/runtime-init-conf-bigiq-with-app.yaml
+++ b/examples/autoscale/bigip-configurations/runtime-init-conf-bigiq-with-app.yaml
@@ -58,11 +58,11 @@ bigip_ready_enabled: []
 extension_packages:
   install_operations:
     - extensionType: do
-      extensionVersion: 1.39.0
-      extensionHash: 4a67449195a53683a159b42857edd49a757da1a5a2029ccf94c4d6aa11ae4cda
+      extensionVersion: 1.41.0
+      extensionHash: 3044e7ea1c8d7e10f51ec14a895374a956b3cbe3251dd6916f4f97da65d0a8e6
     - extensionType: as3
-      extensionVersion: 3.46.0
-      extensionHash: 9550bcdcd1ffe1f002fa5e3c71b8818877d9c7e161f5c68027c82ad85e56e924
+      extensionVersion: 3.48.0
+      extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: ts
       extensionVersion: 1.33.0
       extensionHash: 573d8cf589d545b272250ea19c9c124cf8ad5bcdd169dbe2139e82ce4d51a449
diff --git a/examples/autoscale/bigip-configurations/runtime-init-conf-payg-with-app.yaml b/examples/autoscale/bigip-configurations/runtime-init-conf-payg-with-app.yaml
index edcb27d6..d74dec2a 100644
--- a/examples/autoscale/bigip-configurations/runtime-init-conf-payg-with-app.yaml
+++ b/examples/autoscale/bigip-configurations/runtime-init-conf-payg-with-app.yaml
@@ -42,11 +42,11 @@ bigip_ready_enabled: []
 extension_packages:
   install_operations:
     - extensionType: do
-      extensionVersion: 1.39.0
-      extensionHash: 4a67449195a53683a159b42857edd49a757da1a5a2029ccf94c4d6aa11ae4cda
+      extensionVersion: 1.41.0
+      extensionHash: 3044e7ea1c8d7e10f51ec14a895374a956b3cbe3251dd6916f4f97da65d0a8e6
     - extensionType: as3
-      extensionVersion: 3.46.0
-      extensionHash: 9550bcdcd1ffe1f002fa5e3c71b8818877d9c7e161f5c68027c82ad85e56e924
+      extensionVersion: 3.48.0
+      extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: ts
       extensionVersion: 1.33.0
       extensionHash: 573d8cf589d545b272250ea19c9c124cf8ad5bcdd169dbe2139e82ce4d51a449
diff --git a/examples/autoscale/bigiq/autoscale.py.schema b/examples/autoscale/bigiq/autoscale.py.schema
index 1192e04c..c9eb907c 100644
--- a/examples/autoscale/bigiq/autoscale.py.schema
+++ b/examples/autoscale/bigiq/autoscale.py.schema
@@ -71,7 +71,7 @@ properties:
     description: Supply a URL to the bigip-runtime-init configuration file in YAML or JSON format, or an escaped JSON string to use for f5-bigip-runtime-init configuration.
     type: string
   bigIpRuntimeInitPackageUrl:
-    default: https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v1.6.2/dist/f5-bigip-runtime-init-1.6.2-1.gz.run
+    default: https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.0/dist/f5-bigip-runtime-init-2.0.0-1.gz.run
     description: URL for BIG-IP Runtime Init package
     type: string
   bigIqSecretId:
diff --git a/examples/autoscale/bigiq/sample_autoscale.yaml b/examples/autoscale/bigiq/sample_autoscale.yaml
index 8f24599e..c3285c52 100644
--- a/examples/autoscale/bigiq/sample_autoscale.yaml
+++ b/examples/autoscale/bigiq/sample_autoscale.yaml
@@ -51,7 +51,7 @@ resources:
         https://raw.githubusercontent.com/F5Networks/f5-google-gdm-templates-v2/v2.9.0.0/examples/autoscale/bigip-configurations/runtime-init-conf-bigiq-with-app.yaml
       ###  (OPTIONAL) Supply a URL for the bigip-runtime-init package.
       bigIpRuntimeInitPackageUrl: >-
-        https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v1.6.2/dist/f5-bigip-runtime-init-1.6.2-1.gz.run
+        https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.0/dist/f5-bigip-runtime-init-2.0.0-1.gz.run
       ###  (OPTIONAL) The name of a public F5 Marketplace image to deploy.
       #    If you would like to view all available public images, run the following gcloud command:
       #    gcloud compute images list --project f5-7626-networks-public --filter="name~f5"
diff --git a/examples/autoscale/payg/autoscale.py.schema b/examples/autoscale/payg/autoscale.py.schema
index 213dfc55..f1fa7d3b 100644
--- a/examples/autoscale/payg/autoscale.py.schema
+++ b/examples/autoscale/payg/autoscale.py.schema
@@ -65,7 +65,7 @@ properties:
     description: Supply a URL to the bigip-runtime-init configuration file in YAML or JSON format, or an escaped JSON string to use for f5-bigip-runtime-init configuration.
     type: string
   bigIpRuntimeInitPackageUrl:
-    default: https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v1.6.2/dist/f5-bigip-runtime-init-1.6.2-1.gz.run
+    default: https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.0/dist/f5-bigip-runtime-init-2.0.0-1.gz.run
     description: URL for BIG-IP Runtime Init package
     type: string
   cost:
diff --git a/examples/autoscale/payg/sample_autoscale.yaml b/examples/autoscale/payg/sample_autoscale.yaml
index c633330c..56d932a1 100644
--- a/examples/autoscale/payg/sample_autoscale.yaml
+++ b/examples/autoscale/payg/sample_autoscale.yaml
@@ -49,7 +49,7 @@ resources:
         https://raw.githubusercontent.com/F5Networks/f5-google-gdm-templates-v2/v2.9.0.0/examples/autoscale/bigip-configurations/runtime-init-conf-payg-with-app.yaml
       ###  (OPTIONAL) Supply a URL for the bigip-runtime-init package.
       bigIpRuntimeInitPackageUrl: >-
-        https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v1.6.2/dist/f5-bigip-runtime-init-1.6.2-1.gz.run
+        https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.0/dist/f5-bigip-runtime-init-2.0.0-1.gz.run
       ###  (OPTIONAL) The name of a public F5 Marketplace image to deploy.
       #    If you would like to view all available public images, run the following gcloud command:
       #    gcloud compute images list --project f5-7626-networks-public --filter="name~f5"
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance01-with-app.yaml b/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance01-with-app.yaml
index c94b511e..016033e0 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance01-with-app.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance01-with-app.yaml
@@ -4,14 +4,14 @@ controls:
 extension_packages:
   install_operations:
     - extensionType: do
-      extensionVersion: 1.39.0
-      extensionHash: 4a67449195a53683a159b42857edd49a757da1a5a2029ccf94c4d6aa11ae4cda
+      extensionVersion: 1.41.0
+      extensionHash: 3044e7ea1c8d7e10f51ec14a895374a956b3cbe3251dd6916f4f97da65d0a8e6
     - extensionType: as3
-      extensionVersion: 3.46.0
-      extensionHash: 9550bcdcd1ffe1f002fa5e3c71b8818877d9c7e161f5c68027c82ad85e56e924
+      extensionVersion: 3.48.0
+      extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 1.15.0
-      extensionHash: 57bbb114eab4e3c73bec6a0f85041ab5317ad881337ffd385b794513fa9df3b3
+      extensionVersion: 2.0.0
+      extensionHash: 57659a3acae2a60045e2aa5636d3e23530f0724d77a008f0b716309bf955de8a
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance01.yaml b/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance01.yaml
index 4882f13b..6c2410d7 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance01.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance01.yaml
@@ -4,14 +4,14 @@ controls:
 extension_packages:
   install_operations:
     - extensionType: do
-      extensionVersion: 1.39.0
-      extensionHash: 4a67449195a53683a159b42857edd49a757da1a5a2029ccf94c4d6aa11ae4cda
+      extensionVersion: 1.41.0
+      extensionHash: 3044e7ea1c8d7e10f51ec14a895374a956b3cbe3251dd6916f4f97da65d0a8e6
     - extensionType: as3
-      extensionVersion: 3.46.0
-      extensionHash: 9550bcdcd1ffe1f002fa5e3c71b8818877d9c7e161f5c68027c82ad85e56e924
+      extensionVersion: 3.48.0
+      extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 1.15.0
-      extensionHash: 57bbb114eab4e3c73bec6a0f85041ab5317ad881337ffd385b794513fa9df3b3
+      extensionVersion: 2.0.0
+      extensionHash: 57659a3acae2a60045e2aa5636d3e23530f0724d77a008f0b716309bf955de8a
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance02-with-app.yaml b/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance02-with-app.yaml
index 1204c8cf..21fddbf4 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance02-with-app.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance02-with-app.yaml
@@ -4,14 +4,14 @@ controls:
 extension_packages:
   install_operations:
     - extensionType: do
-      extensionVersion: 1.39.0
-      extensionHash: 4a67449195a53683a159b42857edd49a757da1a5a2029ccf94c4d6aa11ae4cda
+      extensionVersion: 1.41.0
+      extensionHash: 3044e7ea1c8d7e10f51ec14a895374a956b3cbe3251dd6916f4f97da65d0a8e6
     - extensionType: as3
-      extensionVersion: 3.46.0
-      extensionHash: 9550bcdcd1ffe1f002fa5e3c71b8818877d9c7e161f5c68027c82ad85e56e924
+      extensionVersion: 3.48.0
+      extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 1.15.0
-      extensionHash: 57bbb114eab4e3c73bec6a0f85041ab5317ad881337ffd385b794513fa9df3b3
+      extensionVersion: 2.0.0
+      extensionHash: 57659a3acae2a60045e2aa5636d3e23530f0724d77a008f0b716309bf955de8a
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance02.yaml b/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance02.yaml
index c42aa361..d304220e 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance02.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance02.yaml
@@ -4,14 +4,14 @@ controls:
 extension_packages:
   install_operations:
     - extensionType: do
-      extensionVersion: 1.39.0
-      extensionHash: 4a67449195a53683a159b42857edd49a757da1a5a2029ccf94c4d6aa11ae4cda
+      extensionVersion: 1.41.0
+      extensionHash: 3044e7ea1c8d7e10f51ec14a895374a956b3cbe3251dd6916f4f97da65d0a8e6
     - extensionType: as3
-      extensionVersion: 3.46.0
-      extensionHash: 9550bcdcd1ffe1f002fa5e3c71b8818877d9c7e161f5c68027c82ad85e56e924
+      extensionVersion: 3.48.0
+      extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 1.15.0
-      extensionHash: 57bbb114eab4e3c73bec6a0f85041ab5317ad881337ffd385b794513fa9df3b3
+      extensionVersion: 2.0.0
+      extensionHash: 57659a3acae2a60045e2aa5636d3e23530f0724d77a008f0b716309bf955de8a
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance01-with-app.yaml b/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance01-with-app.yaml
index 787d46cd..e226bc6c 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance01-with-app.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance01-with-app.yaml
@@ -4,14 +4,14 @@ controls:
 extension_packages:
   install_operations:
     - extensionType: do
-      extensionVersion: 1.39.0
-      extensionHash: 4a67449195a53683a159b42857edd49a757da1a5a2029ccf94c4d6aa11ae4cda
+      extensionVersion: 1.41.0
+      extensionHash: 3044e7ea1c8d7e10f51ec14a895374a956b3cbe3251dd6916f4f97da65d0a8e6
     - extensionType: as3
-      extensionVersion: 3.46.0
-      extensionHash: 9550bcdcd1ffe1f002fa5e3c71b8818877d9c7e161f5c68027c82ad85e56e924
+      extensionVersion: 3.48.0
+      extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 1.15.0
-      extensionHash: 57bbb114eab4e3c73bec6a0f85041ab5317ad881337ffd385b794513fa9df3b3
+      extensionVersion: 2.0.0
+      extensionHash: 57659a3acae2a60045e2aa5636d3e23530f0724d77a008f0b716309bf955de8a
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance01.yaml b/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance01.yaml
index e031b940..bae6b9bd 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance01.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance01.yaml
@@ -4,14 +4,14 @@ controls:
 extension_packages:
   install_operations:
     - extensionType: do
-      extensionVersion: 1.39.0
-      extensionHash: 4a67449195a53683a159b42857edd49a757da1a5a2029ccf94c4d6aa11ae4cda
+      extensionVersion: 1.41.0
+      extensionHash: 3044e7ea1c8d7e10f51ec14a895374a956b3cbe3251dd6916f4f97da65d0a8e6
     - extensionType: as3
-      extensionVersion: 3.46.0
-      extensionHash: 9550bcdcd1ffe1f002fa5e3c71b8818877d9c7e161f5c68027c82ad85e56e924
+      extensionVersion: 3.48.0
+      extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 1.15.0
-      extensionHash: 57bbb114eab4e3c73bec6a0f85041ab5317ad881337ffd385b794513fa9df3b3
+      extensionVersion: 2.0.0
+      extensionHash: 57659a3acae2a60045e2aa5636d3e23530f0724d77a008f0b716309bf955de8a
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance02-with-app.yaml b/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance02-with-app.yaml
index c090a9b0..3ad631cd 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance02-with-app.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance02-with-app.yaml
@@ -4,14 +4,14 @@ controls:
 extension_packages:
   install_operations:
     - extensionType: do
-      extensionVersion: 1.39.0
-      extensionHash: 4a67449195a53683a159b42857edd49a757da1a5a2029ccf94c4d6aa11ae4cda
+      extensionVersion: 1.41.0
+      extensionHash: 3044e7ea1c8d7e10f51ec14a895374a956b3cbe3251dd6916f4f97da65d0a8e6
     - extensionType: as3
-      extensionVersion: 3.46.0
-      extensionHash: 9550bcdcd1ffe1f002fa5e3c71b8818877d9c7e161f5c68027c82ad85e56e924
+      extensionVersion: 3.48.0
+      extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 1.15.0
-      extensionHash: 57bbb114eab4e3c73bec6a0f85041ab5317ad881337ffd385b794513fa9df3b3
+      extensionVersion: 2.0.0
+      extensionHash: 57659a3acae2a60045e2aa5636d3e23530f0724d77a008f0b716309bf955de8a
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance02.yaml b/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance02.yaml
index 79870b6c..342df281 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance02.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance02.yaml
@@ -4,14 +4,14 @@ controls:
 extension_packages:
   install_operations:
     - extensionType: do
-      extensionVersion: 1.39.0
-      extensionHash: 4a67449195a53683a159b42857edd49a757da1a5a2029ccf94c4d6aa11ae4cda
+      extensionVersion: 1.41.0
+      extensionHash: 3044e7ea1c8d7e10f51ec14a895374a956b3cbe3251dd6916f4f97da65d0a8e6
     - extensionType: as3
-      extensionVersion: 3.46.0
-      extensionHash: 9550bcdcd1ffe1f002fa5e3c71b8818877d9c7e161f5c68027c82ad85e56e924
+      extensionVersion: 3.48.0
+      extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 1.15.0
-      extensionHash: 57bbb114eab4e3c73bec6a0f85041ab5317ad881337ffd385b794513fa9df3b3
+      extensionVersion: 2.0.0
+      extensionHash: 57659a3acae2a60045e2aa5636d3e23530f0724d77a008f0b716309bf955de8a
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance01-with-app.yaml b/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance01-with-app.yaml
index 7f691593..ee76c04b 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance01-with-app.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance01-with-app.yaml
@@ -4,14 +4,14 @@ controls:
 extension_packages:
   install_operations:
     - extensionType: do
-      extensionVersion: 1.39.0
-      extensionHash: 4a67449195a53683a159b42857edd49a757da1a5a2029ccf94c4d6aa11ae4cda
+      extensionVersion: 1.41.0
+      extensionHash: 3044e7ea1c8d7e10f51ec14a895374a956b3cbe3251dd6916f4f97da65d0a8e6
     - extensionType: as3
-      extensionVersion: 3.46.0
-      extensionHash: 9550bcdcd1ffe1f002fa5e3c71b8818877d9c7e161f5c68027c82ad85e56e924
+      extensionVersion: 3.48.0
+      extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 1.15.0
-      extensionHash: 57bbb114eab4e3c73bec6a0f85041ab5317ad881337ffd385b794513fa9df3b3
+      extensionVersion: 2.0.0
+      extensionHash: 57659a3acae2a60045e2aa5636d3e23530f0724d77a008f0b716309bf955de8a
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance01.yaml b/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance01.yaml
index b1c46399..74e4e73a 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance01.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance01.yaml
@@ -4,14 +4,14 @@ controls:
 extension_packages:
   install_operations:
     - extensionType: do
-      extensionVersion: 1.39.0
-      extensionHash: 4a67449195a53683a159b42857edd49a757da1a5a2029ccf94c4d6aa11ae4cda
+      extensionVersion: 1.41.0
+      extensionHash: 3044e7ea1c8d7e10f51ec14a895374a956b3cbe3251dd6916f4f97da65d0a8e6
     - extensionType: as3
-      extensionVersion: 3.46.0
-      extensionHash: 9550bcdcd1ffe1f002fa5e3c71b8818877d9c7e161f5c68027c82ad85e56e924
+      extensionVersion: 3.48.0
+      extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 1.15.0
-      extensionHash: 57bbb114eab4e3c73bec6a0f85041ab5317ad881337ffd385b794513fa9df3b3
+      extensionVersion: 2.0.0
+      extensionHash: 57659a3acae2a60045e2aa5636d3e23530f0724d77a008f0b716309bf955de8a
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance02-with-app.yaml b/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance02-with-app.yaml
index 5a3a51d9..1b0e2c74 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance02-with-app.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance02-with-app.yaml
@@ -4,14 +4,14 @@ controls:
 extension_packages:
   install_operations:
     - extensionType: do
-      extensionVersion: 1.39.0
-      extensionHash: 4a67449195a53683a159b42857edd49a757da1a5a2029ccf94c4d6aa11ae4cda
+      extensionVersion: 1.41.0
+      extensionHash: 3044e7ea1c8d7e10f51ec14a895374a956b3cbe3251dd6916f4f97da65d0a8e6
     - extensionType: as3
-      extensionVersion: 3.46.0
-      extensionHash: 9550bcdcd1ffe1f002fa5e3c71b8818877d9c7e161f5c68027c82ad85e56e924
+      extensionVersion: 3.48.0
+      extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 1.15.0
-      extensionHash: 57bbb114eab4e3c73bec6a0f85041ab5317ad881337ffd385b794513fa9df3b3
+      extensionVersion: 2.0.0
+      extensionHash: 57659a3acae2a60045e2aa5636d3e23530f0724d77a008f0b716309bf955de8a
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance02.yaml b/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance02.yaml
index 7b0c1afd..3d3f925b 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance02.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance02.yaml
@@ -4,14 +4,14 @@ controls:
 extension_packages:
   install_operations:
     - extensionType: do
-      extensionVersion: 1.39.0
-      extensionHash: 4a67449195a53683a159b42857edd49a757da1a5a2029ccf94c4d6aa11ae4cda
+      extensionVersion: 1.41.0
+      extensionHash: 3044e7ea1c8d7e10f51ec14a895374a956b3cbe3251dd6916f4f97da65d0a8e6
     - extensionType: as3
-      extensionVersion: 3.46.0
-      extensionHash: 9550bcdcd1ffe1f002fa5e3c71b8818877d9c7e161f5c68027c82ad85e56e924
+      extensionVersion: 3.48.0
+      extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 1.15.0
-      extensionHash: 57bbb114eab4e3c73bec6a0f85041ab5317ad881337ffd385b794513fa9df3b3
+      extensionVersion: 2.0.0
+      extensionHash: 57659a3acae2a60045e2aa5636d3e23530f0724d77a008f0b716309bf955de8a
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance01-with-app.yaml b/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance01-with-app.yaml
index 9a5a9859..58ca4321 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance01-with-app.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance01-with-app.yaml
@@ -4,14 +4,14 @@ controls:
 extension_packages:
   install_operations:
     - extensionType: do
-      extensionVersion: 1.39.0
-      extensionHash: 4a67449195a53683a159b42857edd49a757da1a5a2029ccf94c4d6aa11ae4cda
+      extensionVersion: 1.41.0
+      extensionHash: 3044e7ea1c8d7e10f51ec14a895374a956b3cbe3251dd6916f4f97da65d0a8e6
     - extensionType: as3
-      extensionVersion: 3.46.0
-      extensionHash: 9550bcdcd1ffe1f002fa5e3c71b8818877d9c7e161f5c68027c82ad85e56e924
+      extensionVersion: 3.48.0
+      extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 1.15.0
-      extensionHash: 57bbb114eab4e3c73bec6a0f85041ab5317ad881337ffd385b794513fa9df3b3
+      extensionVersion: 2.0.0
+      extensionHash: 57659a3acae2a60045e2aa5636d3e23530f0724d77a008f0b716309bf955de8a
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance01.yaml b/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance01.yaml
index 8eead99b..790d38a7 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance01.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance01.yaml
@@ -4,14 +4,14 @@ controls:
 extension_packages:
   install_operations:
     - extensionType: do
-      extensionVersion: 1.39.0
-      extensionHash: 4a67449195a53683a159b42857edd49a757da1a5a2029ccf94c4d6aa11ae4cda
+      extensionVersion: 1.41.0
+      extensionHash: 3044e7ea1c8d7e10f51ec14a895374a956b3cbe3251dd6916f4f97da65d0a8e6
     - extensionType: as3
-      extensionVersion: 3.46.0
-      extensionHash: 9550bcdcd1ffe1f002fa5e3c71b8818877d9c7e161f5c68027c82ad85e56e924
+      extensionVersion: 3.48.0
+      extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 1.15.0
-      extensionHash: 57bbb114eab4e3c73bec6a0f85041ab5317ad881337ffd385b794513fa9df3b3
+      extensionVersion: 2.0.0
+      extensionHash: 57659a3acae2a60045e2aa5636d3e23530f0724d77a008f0b716309bf955de8a
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance02-with-app.yaml b/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance02-with-app.yaml
index d8d01813..30492645 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance02-with-app.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance02-with-app.yaml
@@ -4,14 +4,14 @@ controls:
 extension_packages:
   install_operations:
     - extensionType: do
-      extensionVersion: 1.39.0
-      extensionHash: 4a67449195a53683a159b42857edd49a757da1a5a2029ccf94c4d6aa11ae4cda
+      extensionVersion: 1.41.0
+      extensionHash: 3044e7ea1c8d7e10f51ec14a895374a956b3cbe3251dd6916f4f97da65d0a8e6
     - extensionType: as3
-      extensionVersion: 3.46.0
-      extensionHash: 9550bcdcd1ffe1f002fa5e3c71b8818877d9c7e161f5c68027c82ad85e56e924
+      extensionVersion: 3.48.0
+      extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 1.15.0
-      extensionHash: 57bbb114eab4e3c73bec6a0f85041ab5317ad881337ffd385b794513fa9df3b3
+      extensionVersion: 2.0.0
+      extensionHash: 57659a3acae2a60045e2aa5636d3e23530f0724d77a008f0b716309bf955de8a
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance02.yaml b/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance02.yaml
index e9daca18..33a8db99 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance02.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance02.yaml
@@ -4,14 +4,14 @@ controls:
 extension_packages:
   install_operations:
     - extensionType: do
-      extensionVersion: 1.39.0
-      extensionHash: 4a67449195a53683a159b42857edd49a757da1a5a2029ccf94c4d6aa11ae4cda
+      extensionVersion: 1.41.0
+      extensionHash: 3044e7ea1c8d7e10f51ec14a895374a956b3cbe3251dd6916f4f97da65d0a8e6
     - extensionType: as3
-      extensionVersion: 3.46.0
-      extensionHash: 9550bcdcd1ffe1f002fa5e3c71b8818877d9c7e161f5c68027c82ad85e56e924
+      extensionVersion: 3.48.0
+      extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 1.15.0
-      extensionHash: 57bbb114eab4e3c73bec6a0f85041ab5317ad881337ffd385b794513fa9df3b3
+      extensionVersion: 2.0.0
+      extensionHash: 57659a3acae2a60045e2aa5636d3e23530f0724d77a008f0b716309bf955de8a
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/quickstart/bigip-configurations/runtime-init-conf-1nic-byol-with-app.yaml b/examples/quickstart/bigip-configurations/runtime-init-conf-1nic-byol-with-app.yaml
index 7bf1deee..1de83427 100644
--- a/examples/quickstart/bigip-configurations/runtime-init-conf-1nic-byol-with-app.yaml
+++ b/examples/quickstart/bigip-configurations/runtime-init-conf-1nic-byol-with-app.yaml
@@ -28,11 +28,11 @@ bigip_ready_enabled: []
 extension_packages:
   install_operations:
     - extensionType: do
-      extensionVersion: 1.39.0
-      extensionHash: 4a67449195a53683a159b42857edd49a757da1a5a2029ccf94c4d6aa11ae4cda
+      extensionVersion: 1.41.0
+      extensionHash: 3044e7ea1c8d7e10f51ec14a895374a956b3cbe3251dd6916f4f97da65d0a8e6
     - extensionType: as3
-      extensionVersion: 3.46.0
-      extensionHash: 9550bcdcd1ffe1f002fa5e3c71b8818877d9c7e161f5c68027c82ad85e56e924
+      extensionVersion: 3.48.0
+      extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: ts
       extensionVersion: 1.33.0
       extensionHash: 573d8cf589d545b272250ea19c9c124cf8ad5bcdd169dbe2139e82ce4d51a449
diff --git a/examples/quickstart/bigip-configurations/runtime-init-conf-1nic-byol.yaml b/examples/quickstart/bigip-configurations/runtime-init-conf-1nic-byol.yaml
index 7dc6a614..679ec6c6 100644
--- a/examples/quickstart/bigip-configurations/runtime-init-conf-1nic-byol.yaml
+++ b/examples/quickstart/bigip-configurations/runtime-init-conf-1nic-byol.yaml
@@ -22,11 +22,11 @@ bigip_ready_enabled: []
 extension_packages:
   install_operations:
     - extensionType: do
-      extensionVersion: 1.39.0
-      extensionHash: 4a67449195a53683a159b42857edd49a757da1a5a2029ccf94c4d6aa11ae4cda
+      extensionVersion: 1.41.0
+      extensionHash: 3044e7ea1c8d7e10f51ec14a895374a956b3cbe3251dd6916f4f97da65d0a8e6
     - extensionType: as3
-      extensionVersion: 3.46.0
-      extensionHash: 9550bcdcd1ffe1f002fa5e3c71b8818877d9c7e161f5c68027c82ad85e56e924
+      extensionVersion: 3.48.0
+      extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: ts
       extensionVersion: 1.33.0
       extensionHash: 573d8cf589d545b272250ea19c9c124cf8ad5bcdd169dbe2139e82ce4d51a449
diff --git a/examples/quickstart/bigip-configurations/runtime-init-conf-1nic-payg-with-app.yaml b/examples/quickstart/bigip-configurations/runtime-init-conf-1nic-payg-with-app.yaml
index 54d88b5b..ff199d23 100644
--- a/examples/quickstart/bigip-configurations/runtime-init-conf-1nic-payg-with-app.yaml
+++ b/examples/quickstart/bigip-configurations/runtime-init-conf-1nic-payg-with-app.yaml
@@ -25,11 +25,11 @@ bigip_ready_enabled: []
 extension_packages:
   install_operations:
     - extensionType: do
-      extensionVersion: 1.39.0
-      extensionHash: 4a67449195a53683a159b42857edd49a757da1a5a2029ccf94c4d6aa11ae4cda
+      extensionVersion: 1.41.0
+      extensionHash: 3044e7ea1c8d7e10f51ec14a895374a956b3cbe3251dd6916f4f97da65d0a8e6
     - extensionType: as3
-      extensionVersion: 3.46.0
-      extensionHash: 9550bcdcd1ffe1f002fa5e3c71b8818877d9c7e161f5c68027c82ad85e56e924
+      extensionVersion: 3.48.0
+      extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: ts
       extensionVersion: 1.33.0
       extensionHash: 573d8cf589d545b272250ea19c9c124cf8ad5bcdd169dbe2139e82ce4d51a449
diff --git a/examples/quickstart/bigip-configurations/runtime-init-conf-1nic-payg.yaml b/examples/quickstart/bigip-configurations/runtime-init-conf-1nic-payg.yaml
index efa212e7..05486d7a 100644
--- a/examples/quickstart/bigip-configurations/runtime-init-conf-1nic-payg.yaml
+++ b/examples/quickstart/bigip-configurations/runtime-init-conf-1nic-payg.yaml
@@ -19,11 +19,11 @@ bigip_ready_enabled: []
 extension_packages:
   install_operations:
     - extensionType: do
-      extensionVersion: 1.39.0
-      extensionHash: 4a67449195a53683a159b42857edd49a757da1a5a2029ccf94c4d6aa11ae4cda
+      extensionVersion: 1.41.0
+      extensionHash: 3044e7ea1c8d7e10f51ec14a895374a956b3cbe3251dd6916f4f97da65d0a8e6
     - extensionType: as3
-      extensionVersion: 3.46.0
-      extensionHash: 9550bcdcd1ffe1f002fa5e3c71b8818877d9c7e161f5c68027c82ad85e56e924
+      extensionVersion: 3.48.0
+      extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: ts
       extensionVersion: 1.33.0
       extensionHash: 573d8cf589d545b272250ea19c9c124cf8ad5bcdd169dbe2139e82ce4d51a449
diff --git a/examples/quickstart/bigip-configurations/runtime-init-conf-2nic-byol-with-app.yaml b/examples/quickstart/bigip-configurations/runtime-init-conf-2nic-byol-with-app.yaml
index caf0619d..ab17f709 100644
--- a/examples/quickstart/bigip-configurations/runtime-init-conf-2nic-byol-with-app.yaml
+++ b/examples/quickstart/bigip-configurations/runtime-init-conf-2nic-byol-with-app.yaml
@@ -52,11 +52,11 @@ bigip_ready_enabled: []
 extension_packages:
   install_operations:
     - extensionType: do
-      extensionVersion: 1.39.0
-      extensionHash: 4a67449195a53683a159b42857edd49a757da1a5a2029ccf94c4d6aa11ae4cda
+      extensionVersion: 1.41.0
+      extensionHash: 3044e7ea1c8d7e10f51ec14a895374a956b3cbe3251dd6916f4f97da65d0a8e6
     - extensionType: as3
-      extensionVersion: 3.46.0
-      extensionHash: 9550bcdcd1ffe1f002fa5e3c71b8818877d9c7e161f5c68027c82ad85e56e924
+      extensionVersion: 3.48.0
+      extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: ts
       extensionVersion: 1.33.0
       extensionHash: 573d8cf589d545b272250ea19c9c124cf8ad5bcdd169dbe2139e82ce4d51a449
diff --git a/examples/quickstart/bigip-configurations/runtime-init-conf-2nic-byol.yaml b/examples/quickstart/bigip-configurations/runtime-init-conf-2nic-byol.yaml
index 04910ae1..8644284a 100644
--- a/examples/quickstart/bigip-configurations/runtime-init-conf-2nic-byol.yaml
+++ b/examples/quickstart/bigip-configurations/runtime-init-conf-2nic-byol.yaml
@@ -46,11 +46,11 @@ bigip_ready_enabled: []
 extension_packages:
   install_operations:
     - extensionType: do
-      extensionVersion: 1.39.0
-      extensionHash: 4a67449195a53683a159b42857edd49a757da1a5a2029ccf94c4d6aa11ae4cda
+      extensionVersion: 1.41.0
+      extensionHash: 3044e7ea1c8d7e10f51ec14a895374a956b3cbe3251dd6916f4f97da65d0a8e6
     - extensionType: as3
-      extensionVersion: 3.46.0
-      extensionHash: 9550bcdcd1ffe1f002fa5e3c71b8818877d9c7e161f5c68027c82ad85e56e924
+      extensionVersion: 3.48.0
+      extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: ts
       extensionVersion: 1.33.0
       extensionHash: 573d8cf589d545b272250ea19c9c124cf8ad5bcdd169dbe2139e82ce4d51a449
diff --git a/examples/quickstart/bigip-configurations/runtime-init-conf-2nic-payg-with-app.yaml b/examples/quickstart/bigip-configurations/runtime-init-conf-2nic-payg-with-app.yaml
index 80cd6fda..93fe96be 100644
--- a/examples/quickstart/bigip-configurations/runtime-init-conf-2nic-payg-with-app.yaml
+++ b/examples/quickstart/bigip-configurations/runtime-init-conf-2nic-payg-with-app.yaml
@@ -49,11 +49,11 @@ bigip_ready_enabled: []
 extension_packages:
   install_operations:
     - extensionType: do
-      extensionVersion: 1.39.0
-      extensionHash: 4a67449195a53683a159b42857edd49a757da1a5a2029ccf94c4d6aa11ae4cda
+      extensionVersion: 1.41.0
+      extensionHash: 3044e7ea1c8d7e10f51ec14a895374a956b3cbe3251dd6916f4f97da65d0a8e6
     - extensionType: as3
-      extensionVersion: 3.46.0
-      extensionHash: 9550bcdcd1ffe1f002fa5e3c71b8818877d9c7e161f5c68027c82ad85e56e924
+      extensionVersion: 3.48.0
+      extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: ts
       extensionVersion: 1.33.0
       extensionHash: 573d8cf589d545b272250ea19c9c124cf8ad5bcdd169dbe2139e82ce4d51a449
diff --git a/examples/quickstart/bigip-configurations/runtime-init-conf-2nic-payg.yaml b/examples/quickstart/bigip-configurations/runtime-init-conf-2nic-payg.yaml
index 6125adf9..d1a375eb 100644
--- a/examples/quickstart/bigip-configurations/runtime-init-conf-2nic-payg.yaml
+++ b/examples/quickstart/bigip-configurations/runtime-init-conf-2nic-payg.yaml
@@ -43,11 +43,11 @@ bigip_ready_enabled: []
 extension_packages:
   install_operations:
     - extensionType: do
-      extensionVersion: 1.39.0
-      extensionHash: 4a67449195a53683a159b42857edd49a757da1a5a2029ccf94c4d6aa11ae4cda
+      extensionVersion: 1.41.0
+      extensionHash: 3044e7ea1c8d7e10f51ec14a895374a956b3cbe3251dd6916f4f97da65d0a8e6
     - extensionType: as3
-      extensionVersion: 3.46.0
-      extensionHash: 9550bcdcd1ffe1f002fa5e3c71b8818877d9c7e161f5c68027c82ad85e56e924
+      extensionVersion: 3.48.0
+      extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: ts
       extensionVersion: 1.33.0
       extensionHash: 573d8cf589d545b272250ea19c9c124cf8ad5bcdd169dbe2139e82ce4d51a449
diff --git a/examples/quickstart/bigip-configurations/runtime-init-conf-3nic-byol-with-app.yaml b/examples/quickstart/bigip-configurations/runtime-init-conf-3nic-byol-with-app.yaml
index b4970271..372b1374 100644
--- a/examples/quickstart/bigip-configurations/runtime-init-conf-3nic-byol-with-app.yaml
+++ b/examples/quickstart/bigip-configurations/runtime-init-conf-3nic-byol-with-app.yaml
@@ -68,11 +68,11 @@ bigip_ready_enabled: []
 extension_packages:
   install_operations:
     - extensionType: do
-      extensionVersion: 1.39.0
-      extensionHash: 4a67449195a53683a159b42857edd49a757da1a5a2029ccf94c4d6aa11ae4cda
+      extensionVersion: 1.41.0
+      extensionHash: 3044e7ea1c8d7e10f51ec14a895374a956b3cbe3251dd6916f4f97da65d0a8e6
     - extensionType: as3
-      extensionVersion: 3.46.0
-      extensionHash: 9550bcdcd1ffe1f002fa5e3c71b8818877d9c7e161f5c68027c82ad85e56e924
+      extensionVersion: 3.48.0
+      extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: ts
       extensionVersion: 1.33.0
       extensionHash: 573d8cf589d545b272250ea19c9c124cf8ad5bcdd169dbe2139e82ce4d51a449
diff --git a/examples/quickstart/bigip-configurations/runtime-init-conf-3nic-byol.yaml b/examples/quickstart/bigip-configurations/runtime-init-conf-3nic-byol.yaml
index 526031bd..d9e0f291 100644
--- a/examples/quickstart/bigip-configurations/runtime-init-conf-3nic-byol.yaml
+++ b/examples/quickstart/bigip-configurations/runtime-init-conf-3nic-byol.yaml
@@ -62,11 +62,11 @@ bigip_ready_enabled: []
 extension_packages:
   install_operations:
     - extensionType: do
-      extensionVersion: 1.39.0
-      extensionHash: 4a67449195a53683a159b42857edd49a757da1a5a2029ccf94c4d6aa11ae4cda
+      extensionVersion: 1.41.0
+      extensionHash: 3044e7ea1c8d7e10f51ec14a895374a956b3cbe3251dd6916f4f97da65d0a8e6
     - extensionType: as3
-      extensionVersion: 3.46.0
-      extensionHash: 9550bcdcd1ffe1f002fa5e3c71b8818877d9c7e161f5c68027c82ad85e56e924
+      extensionVersion: 3.48.0
+      extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: ts
       extensionVersion: 1.33.0
       extensionHash: 573d8cf589d545b272250ea19c9c124cf8ad5bcdd169dbe2139e82ce4d51a449
diff --git a/examples/quickstart/bigip-configurations/runtime-init-conf-3nic-payg-with-app.yaml b/examples/quickstart/bigip-configurations/runtime-init-conf-3nic-payg-with-app.yaml
index 3c112127..6028ad34 100644
--- a/examples/quickstart/bigip-configurations/runtime-init-conf-3nic-payg-with-app.yaml
+++ b/examples/quickstart/bigip-configurations/runtime-init-conf-3nic-payg-with-app.yaml
@@ -65,11 +65,11 @@ bigip_ready_enabled: []
 extension_packages:
   install_operations:
     - extensionType: do
-      extensionVersion: 1.39.0
-      extensionHash: 4a67449195a53683a159b42857edd49a757da1a5a2029ccf94c4d6aa11ae4cda
+      extensionVersion: 1.41.0
+      extensionHash: 3044e7ea1c8d7e10f51ec14a895374a956b3cbe3251dd6916f4f97da65d0a8e6
     - extensionType: as3
-      extensionVersion: 3.46.0
-      extensionHash: 9550bcdcd1ffe1f002fa5e3c71b8818877d9c7e161f5c68027c82ad85e56e924
+      extensionVersion: 3.48.0
+      extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: ts
       extensionVersion: 1.33.0
       extensionHash: 573d8cf589d545b272250ea19c9c124cf8ad5bcdd169dbe2139e82ce4d51a449
diff --git a/examples/quickstart/bigip-configurations/runtime-init-conf-3nic-payg.yaml b/examples/quickstart/bigip-configurations/runtime-init-conf-3nic-payg.yaml
index 8bdcd45a..d308f578 100644
--- a/examples/quickstart/bigip-configurations/runtime-init-conf-3nic-payg.yaml
+++ b/examples/quickstart/bigip-configurations/runtime-init-conf-3nic-payg.yaml
@@ -59,11 +59,11 @@ bigip_ready_enabled: []
 extension_packages:
   install_operations:
     - extensionType: do
-      extensionVersion: 1.39.0
-      extensionHash: 4a67449195a53683a159b42857edd49a757da1a5a2029ccf94c4d6aa11ae4cda
+      extensionVersion: 1.41.0
+      extensionHash: 3044e7ea1c8d7e10f51ec14a895374a956b3cbe3251dd6916f4f97da65d0a8e6
     - extensionType: as3
-      extensionVersion: 3.46.0
-      extensionHash: 9550bcdcd1ffe1f002fa5e3c71b8818877d9c7e161f5c68027c82ad85e56e924
+      extensionVersion: 3.48.0
+      extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: ts
       extensionVersion: 1.33.0
       extensionHash: 573d8cf589d545b272250ea19c9c124cf8ad5bcdd169dbe2139e82ce4d51a449
diff --git a/examples/quickstart/quickstart.py.schema b/examples/quickstart/quickstart.py.schema
index 86495631..e2b733ed 100644
--- a/examples/quickstart/quickstart.py.schema
+++ b/examples/quickstart/quickstart.py.schema
@@ -49,7 +49,7 @@ properties:
     description: Supply a URL to the bigip-runtime-init configuration file in YAML or JSON format, or an escaped JSON string to use for f5-bigip-runtime-init configuration.
     type: string
   bigIpRuntimeInitPackageUrl:
-    default: https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v1.6.2/dist/f5-bigip-runtime-init-1.6.2-1.gz.run
+    default: https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.0/dist/f5-bigip-runtime-init-2.0.0-1.gz.run
     description: URL for BIG-IP Runtime Init package
     type: string
   cost:
diff --git a/examples/quickstart/sample_quickstart.yaml b/examples/quickstart/sample_quickstart.yaml
index fadaa432..9c819bf3 100644
--- a/examples/quickstart/sample_quickstart.yaml
+++ b/examples/quickstart/sample_quickstart.yaml
@@ -59,7 +59,7 @@ resources:
         https://raw.githubusercontent.com/F5Networks/f5-google-gdm-templates-v2/v2.9.0.0/examples/quickstart/bigip-configurations/runtime-init-conf-3nic-payg-with-app.yaml
       ###  (OPTIONAL) Supply a URL for the bigip-runtime-init package
       bigIpRuntimeInitPackageUrl: >-
-        https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v1.6.2/dist/f5-bigip-runtime-init-1.6.2-1.gz.run
+        https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.0/dist/f5-bigip-runtime-init-2.0.0-1.gz.run
       ###  (OPTIONAL) BIG-IP service account email.
       #    Supply an email of an existing service account to be assigned to the BIG-IP instance.
       #    Uncomment the parameter below and replace 'your-service-account@yourproject' value

From 2b1cbbc31583a9a8b5d87604d5db2ebee03262cc Mon Sep 17 00:00:00 2001
From: Michael Shimkus <m.shimkus@f5.com>
Date: Tue, 19 Dec 2023 10:53:38 -0800
Subject: [PATCH 04/10] update image version

---
 .../examples/autoscale/bigiq/existing/defaults.yaml       | 2 +-
 .../examples/autoscale/bigiq/existing/demo.yaml           | 2 +-
 .../examples/autoscale/bigiq/existing/prod.yaml           | 2 +-
 .../examples/autoscale/bigiq/full/defaults.yaml           | 2 +-
 .../examples/autoscale/bigiq/full/demo_app.yaml           | 2 +-
 .../examples/autoscale/bigiq/full/prod_app.yaml           | 2 +-
 .../examples/autoscale/payg/existing/defaults.yaml        | 2 +-
 .../examples/autoscale/payg/existing/demo.yaml            | 2 +-
 .../examples/autoscale/payg/existing/prod.yaml            | 2 +-
 .../examples/autoscale/payg/full/defaults.yaml            | 2 +-
 .../examples/autoscale/payg/full/demo_app.yaml            | 2 +-
 .../examples/autoscale/payg/full/prod_app.yaml            | 2 +-
 .../examples/failover/byol/existing/demo.yaml             | 2 +-
 .../examples/failover/byol/existing/demo_app.yaml         | 2 +-
 .../examples/failover/byol/existing/prod.yaml             | 2 +-
 .../examples/failover/byol/existing/prod_app.yaml         | 2 +-
 .../examples/failover/byol/full/demo.yaml                 | 2 +-
 .../examples/failover/byol/full/demo_app.yaml             | 2 +-
 .../examples/failover/byol/full/prod.yaml                 | 2 +-
 .../examples/failover/byol/full/prod_app.yaml             | 2 +-
 .../examples/failover/payg/existing/defaults.yaml         | 2 +-
 .../examples/failover/payg/existing/demo.yaml             | 2 +-
 .../examples/failover/payg/existing/demo_app.yaml         | 2 +-
 .../examples/failover/payg/existing/prod.yaml             | 2 +-
 .../examples/failover/payg/existing/prod_app.yaml         | 2 +-
 .../examples/failover/payg/full/defaults.yaml             | 2 +-
 .../examples/failover/payg/full/demo.yaml                 | 2 +-
 .../examples/failover/payg/full/demo_app.yaml             | 2 +-
 .../examples/failover/payg/full/prod.yaml                 | 2 +-
 .../examples/failover/payg/full/prod_app.yaml             | 2 +-
 .../modules/bigip-autoscale/postpub_parameters.yaml       | 2 +-
 .../modules/bigip-autoscale/postpub_parameters1.yaml      | 2 +-
 .../modules/bigip-autoscale/prepub_parameters.yaml        | 2 +-
 .../modules/bigip-autoscale/prepub_parameters1.yaml       | 2 +-
 .../examples/modules/bigip-standalone/parameters.yaml     | 2 +-
 .../modules/bigip-standalone/postpub_parameters.yaml      | 2 +-
 .../modules/bigip-standalone/postpub_parameters1.yaml     | 2 +-
 .../modules/bigip-standalone/postpub_parameters2.yaml     | 2 +-
 .../modules/bigip-standalone/prepub_parameters1.yaml      | 2 +-
 .../modules/bigip-standalone/prepub_parameters2.yaml      | 2 +-
 .../modules/bigip-standalone/prepub_parameters3.yaml      | 2 +-
 .../modules/bigip-standalone/prepub_parameters4.yaml      | 2 +-
 .../modules/bigip-standalone/prepub_parameters5.yaml      | 2 +-
 .../modules/bigip-standalone/prepub_parameters6.yaml      | 2 +-
 .../examples/modules/function/prepub_parameters3.yaml     | 2 +-
 .../examples/quickstart/byol/existing/demo_1nic.yaml      | 2 +-
 .../examples/quickstart/byol/existing/demo_2nic.yaml      | 2 +-
 .../examples/quickstart/byol/existing/demo_3nic.yaml      | 2 +-
 .../examples/quickstart/byol/existing/demo_app_1nic.yaml  | 2 +-
 .../examples/quickstart/byol/existing/demo_app_2nic.yaml  | 2 +-
 .../examples/quickstart/byol/existing/demo_app_3nic.yaml  | 2 +-
 .../examples/quickstart/byol/existing/prod_1nic.yaml      | 2 +-
 .../examples/quickstart/byol/existing/prod_2nic.yaml      | 2 +-
 .../examples/quickstart/byol/existing/prod_3nic.yaml      | 2 +-
 .../examples/quickstart/byol/existing/prod_app_1nic.yaml  | 2 +-
 .../examples/quickstart/byol/existing/prod_app_2nic.yaml  | 2 +-
 .../examples/quickstart/byol/existing/prod_app_3nic.yaml  | 2 +-
 .../examples/quickstart/byol/full/demo_1nic.yaml          | 2 +-
 .../examples/quickstart/byol/full/demo_2nic.yaml          | 2 +-
 .../examples/quickstart/byol/full/demo_3nic.yaml          | 2 +-
 .../examples/quickstart/byol/full/demo_app_1nic.yaml      | 2 +-
 .../examples/quickstart/byol/full/demo_app_2nic.yaml      | 2 +-
 .../examples/quickstart/byol/full/demo_app_3nic.yaml      | 2 +-
 .../examples/quickstart/byol/full/prod_1nic.yaml          | 2 +-
 .../examples/quickstart/byol/full/prod_2nic.yaml          | 2 +-
 .../examples/quickstart/byol/full/prod_3nic.yaml          | 2 +-
 .../examples/quickstart/byol/full/prod_app_1nic.yaml      | 2 +-
 .../examples/quickstart/byol/full/prod_app_2nic.yaml      | 2 +-
 .../examples/quickstart/byol/full/prod_app_3nic.yaml      | 2 +-
 .../examples/quickstart/payg/existing/defaults.yaml       | 2 +-
 .../examples/quickstart/payg/existing/demo_1nic.yaml      | 2 +-
 .../examples/quickstart/payg/existing/demo_2nic.yaml      | 2 +-
 .../examples/quickstart/payg/existing/demo_3nic.yaml      | 2 +-
 .../examples/quickstart/payg/existing/demo_app_1nic.yaml  | 2 +-
 .../examples/quickstart/payg/existing/demo_app_2nic.yaml  | 2 +-
 .../examples/quickstart/payg/existing/demo_app_3nic.yaml  | 2 +-
 .../examples/quickstart/payg/existing/prod_1nic.yaml      | 2 +-
 .../examples/quickstart/payg/existing/prod_2nic.yaml      | 2 +-
 .../examples/quickstart/payg/existing/prod_3nic.yaml      | 2 +-
 .../examples/quickstart/payg/existing/prod_app_1nic.yaml  | 2 +-
 .../examples/quickstart/payg/existing/prod_app_2nic.yaml  | 2 +-
 .../examples/quickstart/payg/existing/prod_app_3nic.yaml  | 2 +-
 .../examples/quickstart/payg/full/defaults.yaml           | 2 +-
 .../examples/quickstart/payg/full/demo_1nic.yaml          | 2 +-
 .../examples/quickstart/payg/full/demo_2nic.yaml          | 2 +-
 .../examples/quickstart/payg/full/demo_3nic.yaml          | 2 +-
 .../examples/quickstart/payg/full/demo_app_1nic.yaml      | 2 +-
 .../examples/quickstart/payg/full/demo_app_2nic.yaml      | 2 +-
 .../examples/quickstart/payg/full/demo_app_3nic.yaml      | 2 +-
 .../examples/quickstart/payg/full/prod_1nic.yaml          | 2 +-
 .../examples/quickstart/payg/full/prod_2nic.yaml          | 2 +-
 .../examples/quickstart/payg/full/prod_3nic.yaml          | 2 +-
 .../examples/quickstart/payg/full/prod_app_1nic.yaml      | 2 +-
 .../examples/quickstart/payg/full/prod_app_2nic.yaml      | 2 +-
 .../examples/quickstart/payg/full/prod_app_3nic.yaml      | 2 +-
 cloud-tools                                               | 2 +-
 examples/autoscale/bigiq/README.md                        | 8 ++++----
 .../autoscale/bigiq/autoscale-existing-network.py.schema  | 2 +-
 examples/autoscale/bigiq/autoscale.py.schema              | 2 +-
 examples/autoscale/bigiq/sample_autoscale.yaml            | 2 +-
 .../bigiq/sample_autoscale_existing_network.yaml          | 2 +-
 examples/autoscale/payg/README.md                         | 8 ++++----
 .../autoscale/payg/autoscale-existing-network.py.schema   | 2 +-
 examples/autoscale/payg/autoscale.py.schema               | 2 +-
 examples/autoscale/payg/sample_autoscale.yaml             | 2 +-
 .../autoscale/payg/sample_autoscale_existing_network.yaml | 2 +-
 examples/failover/README.md                               | 8 ++++----
 examples/failover/failover-existing-network.py.schema     | 2 +-
 examples/failover/failover.py.schema                      | 2 +-
 examples/failover/sample_failover.yaml                    | 2 +-
 examples/failover/sample_failover_existing_network.yaml   | 2 +-
 examples/quickstart/README.md                             | 8 ++++----
 examples/quickstart/quickstart-existing-network.py.schema | 2 +-
 examples/quickstart/quickstart.py.schema                  | 2 +-
 examples/quickstart/sample_quickstart.yaml                | 2 +-
 .../quickstart/sample_quickstart_existing_network.yaml    | 2 +-
 116 files changed, 128 insertions(+), 128 deletions(-)

diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/bigiq/existing/defaults.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/bigiq/existing/defaults.yaml
index 814a2157..265e7f18 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/bigiq/existing/defaults.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/bigiq/existing/defaults.yaml
@@ -7,7 +7,7 @@ AZ SHORT NAME: us-w1
 BIGIP IP CIDR RANGE: 10.0.20.0/24
 BIGIQ LICENSE POOL: production
 ENABLE FLOW LOGS: ''
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE TEMPLATE VERSION UPDATE: 2
 INSTANCE TEMPLATE VERSION: 1
 INSTANCE TYPE: n1-standard-8
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/bigiq/existing/demo.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/bigiq/existing/demo.yaml
index c2f831e3..6753a31f 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/bigiq/existing/demo.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/bigiq/existing/demo.yaml
@@ -8,7 +8,7 @@ BASTION AUTOSCALE: true
 BIGIP IP CIDR RANGE: 10.0.20.0/24
 CUSTOM IMAGE ID: ''
 ENABLE FLOW LOGS: ''
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE TEMPLATE VERSION UPDATE: 2
 INSTANCE TEMPLATE VERSION: 1
 INSTANCE TYPE: n1-standard-8
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/bigiq/existing/prod.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/bigiq/existing/prod.yaml
index 50077f26..b5c1dfed 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/bigiq/existing/prod.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/bigiq/existing/prod.yaml
@@ -7,7 +7,7 @@ AZ SHORT NAME: us-w2
 BIGIP IP CIDR RANGE: 10.0.21.0/24
 CUSTOM IMAGE ID: 'f5-7626-networks-public/global/images/<IMAGE NAME>'
 ENABLE FLOW LOGS: ''
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE TEMPLATE VERSION UPDATE: 2
 INSTANCE TEMPLATE VERSION: 1
 INSTANCE TYPE: n1-standard-8
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/bigiq/full/defaults.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/bigiq/full/defaults.yaml
index 5b8ab2a4..b99aa4b6 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/bigiq/full/defaults.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/bigiq/full/defaults.yaml
@@ -6,7 +6,7 @@ AVAILABILITY ZONE 2: <REGION>-b
 AZ SHORT NAME: us-w1
 BIGIQ LICENSE POOL: production
 ENABLE FLOW LOGS: ''
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE TEMPLATE VERSION UPDATE: 2
 INSTANCE TEMPLATE VERSION: 1
 INSTANCE TYPE: n1-standard-8
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/bigiq/full/demo_app.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/bigiq/full/demo_app.yaml
index 6dafc62c..9cbbfe64 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/bigiq/full/demo_app.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/bigiq/full/demo_app.yaml
@@ -7,7 +7,7 @@ AZ SHORT NAME: us-w2
 BIGIP IP CIDR RANGE: 10.0.11.0/24
 BIGIQ LICENSE POOL: production
 ENABLE FLOW LOGS: ''
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE TEMPLATE VERSION UPDATE: 2
 INSTANCE TEMPLATE VERSION: 1
 INSTANCE TYPE: n1-standard-8
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/bigiq/full/prod_app.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/bigiq/full/prod_app.yaml
index ba00241c..ff93dc8c 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/bigiq/full/prod_app.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/bigiq/full/prod_app.yaml
@@ -8,7 +8,7 @@ BASTION AUTOSCALE: true
 BIGIP IP CIDR RANGE: 10.0.10.0/24
 BIGIQ LICENSE POOL: production
 ENABLE FLOW LOGS: ''
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE TEMPLATE VERSION UPDATE: 2
 INSTANCE TEMPLATE VERSION: 1
 INSTANCE TYPE: n1-standard-8
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/payg/existing/defaults.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/payg/existing/defaults.yaml
index 4f6febc9..2545ba90 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/payg/existing/defaults.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/payg/existing/defaults.yaml
@@ -6,7 +6,7 @@ AVAILABILITY ZONE 2: <REGION>-b
 AZ SHORT NAME: us-w1
 BIGIP IP CIDR RANGE: 10.0.20.0/24
 ENABLE FLOW LOGS: ''
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE TEMPLATE VERSION UPDATE: 2
 INSTANCE TEMPLATE VERSION: 1
 INSTANCE TYPE: n1-standard-8
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/payg/existing/demo.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/payg/existing/demo.yaml
index cae4c3ce..29bc40a2 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/payg/existing/demo.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/payg/existing/demo.yaml
@@ -8,7 +8,7 @@ BASTION AUTOSCALE: true
 BIGIP IP CIDR RANGE: 10.0.20.0/24
 CUSTOM IMAGE ID: ''
 ENABLE FLOW LOGS: ''
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE TEMPLATE VERSION UPDATE: 2
 INSTANCE TEMPLATE VERSION: 1
 INSTANCE TYPE: n1-standard-8
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/payg/existing/prod.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/payg/existing/prod.yaml
index 2cc1ca5d..255d6781 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/payg/existing/prod.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/payg/existing/prod.yaml
@@ -7,7 +7,7 @@ AZ SHORT NAME: us-w2
 BIGIP IP CIDR RANGE: 10.0.21.0/24
 CUSTOM IMAGE ID: ''
 ENABLE FLOW LOGS: ''
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE TEMPLATE VERSION UPDATE: 2
 INSTANCE TEMPLATE VERSION: 1
 INSTANCE TYPE: n1-standard-8
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/payg/full/defaults.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/payg/full/defaults.yaml
index a0987d46..f5840aee 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/payg/full/defaults.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/payg/full/defaults.yaml
@@ -5,7 +5,7 @@ AVAILABILITY ZONE 1: <REGION>-a
 AVAILABILITY ZONE 2: <REGION>-b
 AZ SHORT NAME: us-w1
 ENABLE FLOW LOGS: ''
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE TEMPLATE VERSION UPDATE: 2
 INSTANCE TEMPLATE VERSION: 1
 INSTANCE TYPE: n1-standard-8
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/payg/full/demo_app.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/payg/full/demo_app.yaml
index 72d9aa0c..68712930 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/payg/full/demo_app.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/payg/full/demo_app.yaml
@@ -5,7 +5,7 @@ AVAILABILITY ZONE 1: <REGION>-a
 AVAILABILITY ZONE 2: <REGION>-b
 AZ SHORT NAME: us-w2
 ENABLE FLOW LOGS: ''
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE TEMPLATE VERSION UPDATE: 2
 INSTANCE TEMPLATE VERSION: 1
 INSTANCE TYPE: n1-standard-8
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/payg/full/prod_app.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/payg/full/prod_app.yaml
index abbcf557..9759121b 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/payg/full/prod_app.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/payg/full/prod_app.yaml
@@ -6,7 +6,7 @@ AVAILABILITY ZONE 2: <REGION>-b
 AZ SHORT NAME: us-w1
 BASTION AUTOSCALE: true
 ENABLE FLOW LOGS: ''
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE TEMPLATE VERSION UPDATE: 2
 INSTANCE TEMPLATE VERSION: 1
 INSTANCE TYPE: n1-standard-8
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/existing/demo.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/existing/demo.yaml
index f16740b0..74ebeffb 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/existing/demo.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/existing/demo.yaml
@@ -11,7 +11,7 @@ BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bi
 BIGIP RUNTIME INIT CONFIG 2: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config2.yaml
 CUSTOM IMAGE ID: ''
 DESCRIPTION: ''
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE NAME: <UNIQUESTRING>-bigip-vm-01
 INSTANCE NAME2: <UNIQUESTRING>-bigip-vm-02
 INSTANCE TYPE: n1-standard-16
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/existing/demo_app.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/existing/demo_app.yaml
index f564dbea..1020f92d 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/existing/demo_app.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/existing/demo_app.yaml
@@ -11,7 +11,7 @@ BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bi
 BIGIP RUNTIME INIT CONFIG 2: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config2.yaml
 CUSTOM IMAGE ID: ''
 DESCRIPTION: ''
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE NAME: <UNIQUESTRING>-bigip-vm-01
 INSTANCE NAME2: <UNIQUESTRING>-bigip-vm-02
 INSTANCE TYPE: n1-standard-16
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/existing/prod.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/existing/prod.yaml
index 8b0b2900..c622d08a 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/existing/prod.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/existing/prod.yaml
@@ -11,7 +11,7 @@ BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bi
 BIGIP RUNTIME INIT CONFIG 2: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config2.yaml
 CUSTOM IMAGE ID: 'f5-7626-networks-public/global/images/<IMAGE NAME>'
 DESCRIPTION: ''
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE NAME: <UNIQUESTRING>-bigip-vm-01
 INSTANCE NAME2: <UNIQUESTRING>-bigip-vm-02
 INSTANCE TYPE: n1-standard-16
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/existing/prod_app.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/existing/prod_app.yaml
index 3d9e1c15..f7b63204 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/existing/prod_app.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/existing/prod_app.yaml
@@ -11,7 +11,7 @@ BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bi
 BIGIP RUNTIME INIT CONFIG 2: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config2.yaml
 CUSTOM IMAGE ID: 'f5-7626-networks-public/global/images/<IMAGE NAME>'
 DESCRIPTION: ''
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE NAME: <UNIQUESTRING>-bigip-vm-01
 INSTANCE NAME2: <UNIQUESTRING>-bigip-vm-02
 INSTANCE TYPE: n1-standard-16
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/full/demo.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/full/demo.yaml
index ae94b9da..21143497 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/full/demo.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/full/demo.yaml
@@ -6,7 +6,7 @@ AVAILABILITY ZONE BIGIP 1: <REGION>-a
 AVAILABILITY ZONE BIGIP 2: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config.yaml
 BIGIP RUNTIME INIT CONFIG 2: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config2.yaml
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE NAME: <UNIQUESTRING>-bigip-vm-01
 INSTANCE NAME2: <UNIQUESTRING>-bigip-vm-02
 INSTANCE TYPE: n1-standard-16
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/full/demo_app.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/full/demo_app.yaml
index bd4e3e1c..41719eb8 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/full/demo_app.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/full/demo_app.yaml
@@ -6,7 +6,7 @@ AVAILABILITY ZONE BIGIP 1: <REGION>-a
 AVAILABILITY ZONE BIGIP 2: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config.yaml
 BIGIP RUNTIME INIT CONFIG 2: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config2.yaml
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE NAME: <UNIQUESTRING>-bigip-vm-01
 INSTANCE NAME2: <UNIQUESTRING>-bigip-vm-02
 INSTANCE TYPE: n1-standard-16
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/full/prod.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/full/prod.yaml
index 2522798c..22fd90f4 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/full/prod.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/full/prod.yaml
@@ -6,7 +6,7 @@ AVAILABILITY ZONE BIGIP 1: <REGION>-a
 AVAILABILITY ZONE BIGIP 2: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config.yaml
 BIGIP RUNTIME INIT CONFIG 2: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config2.yaml
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE NAME: <UNIQUESTRING>-bigip-vm-01
 INSTANCE NAME2: <UNIQUESTRING>-bigip-vm-02
 INSTANCE TYPE: n1-standard-16
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/full/prod_app.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/full/prod_app.yaml
index 2f0fec2e..b3df6014 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/full/prod_app.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/full/prod_app.yaml
@@ -6,7 +6,7 @@ AVAILABILITY ZONE BIGIP 1: <REGION>-a
 AVAILABILITY ZONE BIGIP 2: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config.yaml
 BIGIP RUNTIME INIT CONFIG 2: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config2.yaml
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE NAME: <UNIQUESTRING>-bigip-vm-01
 INSTANCE NAME2: <UNIQUESTRING>-bigip-vm-02
 INSTANCE TYPE: n1-standard-16
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/existing/defaults.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/existing/defaults.yaml
index 43e54e7e..f76abc17 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/existing/defaults.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/existing/defaults.yaml
@@ -5,7 +5,7 @@ AVAILABILITY ZONE BIGIP 2: <REGION>-b
 BIGIP IP CIDR RANGE: 10.0.21.0/24
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config.yaml
 BIGIP RUNTIME INIT CONFIG 2: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config2.yaml
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE NAME: <UNIQUESTRING>-bigip-vm-01
 INSTANCE NAME2: <UNIQUESTRING>-bigip-vm-02
 INSTANCE TYPE: n1-standard-16
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/existing/demo.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/existing/demo.yaml
index 003b1ff4..fbd1cb0c 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/existing/demo.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/existing/demo.yaml
@@ -9,7 +9,7 @@ BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bi
 BIGIP RUNTIME INIT CONFIG 2: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config2.yaml
 CUSTOM IMAGE ID: ''
 DESCRIPTION: ''
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE NAME: <UNIQUESTRING>-bigip-vm-01
 INSTANCE NAME2: <UNIQUESTRING>-bigip-vm-02
 INSTANCE TYPE: n1-standard-16
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/existing/demo_app.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/existing/demo_app.yaml
index 43c1df38..3dbad10d 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/existing/demo_app.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/existing/demo_app.yaml
@@ -9,7 +9,7 @@ BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bi
 BIGIP RUNTIME INIT CONFIG 2: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config2.yaml
 CUSTOM IMAGE ID: ''
 DESCRIPTION: ''
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE NAME: <UNIQUESTRING>-bigip-vm-01
 INSTANCE NAME2: <UNIQUESTRING>-bigip-vm-02
 INSTANCE TYPE: n1-standard-16
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/existing/prod.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/existing/prod.yaml
index 2a6d1508..a0f24d2a 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/existing/prod.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/existing/prod.yaml
@@ -9,7 +9,7 @@ BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bi
 BIGIP RUNTIME INIT CONFIG 2: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config2.yaml
 CUSTOM IMAGE ID: 'f5-7626-networks-public/global/images/<IMAGE NAME>'
 DESCRIPTION: ''
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE NAME: <UNIQUESTRING>-bigip-vm-01
 INSTANCE NAME2: <UNIQUESTRING>-bigip-vm-02
 INSTANCE TYPE: n1-standard-16
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/existing/prod_app.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/existing/prod_app.yaml
index 91ff5ec4..d15ddd9e 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/existing/prod_app.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/existing/prod_app.yaml
@@ -9,7 +9,7 @@ BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bi
 BIGIP RUNTIME INIT CONFIG 2: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config2.yaml
 CUSTOM IMAGE ID: 'f5-7626-networks-public/global/images/<IMAGE NAME>'
 DESCRIPTION: ''
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE NAME: <UNIQUESTRING>-bigip-vm-01
 INSTANCE NAME2: <UNIQUESTRING>-bigip-vm-02
 INSTANCE TYPE: n1-standard-16
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/full/defaults.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/full/defaults.yaml
index f985a471..95bca2bb 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/full/defaults.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/full/defaults.yaml
@@ -4,7 +4,7 @@ AVAILABILITY ZONE BIGIP 1: <REGION>-a
 AVAILABILITY ZONE BIGIP 2: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config.yaml
 BIGIP RUNTIME INIT CONFIG 2: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config2.yaml
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE NAME: <UNIQUESTRING>-bigip-vm-01
 INSTANCE NAME2: <UNIQUESTRING>-bigip-vm-02
 INSTANCE TYPE: n1-standard-16
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/full/demo.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/full/demo.yaml
index f0e46912..ea34372f 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/full/demo.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/full/demo.yaml
@@ -4,7 +4,7 @@ AVAILABILITY ZONE BIGIP 1: <REGION>-a
 AVAILABILITY ZONE BIGIP 2: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config.yaml
 BIGIP RUNTIME INIT CONFIG 2: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config2.yaml
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE NAME: <UNIQUESTRING>-bigip-vm-01
 INSTANCE NAME2: <UNIQUESTRING>-bigip-vm-02
 INSTANCE TYPE: n1-standard-16
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/full/demo_app.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/full/demo_app.yaml
index 5539e54b..23472da2 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/full/demo_app.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/full/demo_app.yaml
@@ -4,7 +4,7 @@ AVAILABILITY ZONE BIGIP 1: <REGION>-a
 AVAILABILITY ZONE BIGIP 2: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config.yaml
 BIGIP RUNTIME INIT CONFIG 2: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config2.yaml
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE NAME: <UNIQUESTRING>-bigip-vm-01
 INSTANCE NAME2: <UNIQUESTRING>-bigip-vm-02
 INSTANCE TYPE: n1-standard-16
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/full/prod.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/full/prod.yaml
index 3400b662..2a3f3c94 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/full/prod.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/full/prod.yaml
@@ -4,7 +4,7 @@ AVAILABILITY ZONE BIGIP 1: <REGION>-c
 AVAILABILITY ZONE BIGIP 2: <REGION>-d
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config.yaml
 BIGIP RUNTIME INIT CONFIG 2: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config2.yaml
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE NAME: <UNIQUESTRING>-bigip-vm-01
 INSTANCE NAME2: <UNIQUESTRING>-bigip-vm-02
 INSTANCE TYPE: n1-standard-16
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/full/prod_app.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/full/prod_app.yaml
index 657f5e05..9c5e1f76 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/full/prod_app.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/full/prod_app.yaml
@@ -4,7 +4,7 @@ AVAILABILITY ZONE BIGIP 1: <REGION>-c
 AVAILABILITY ZONE BIGIP 2: <REGION>-d
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config.yaml
 BIGIP RUNTIME INIT CONFIG 2: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config2.yaml
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE NAME: <UNIQUESTRING>-bigip-vm-01
 INSTANCE NAME2: <UNIQUESTRING>-bigip-vm-02
 INSTANCE TYPE: n1-standard-16
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-autoscale/postpub_parameters.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-autoscale/postpub_parameters.yaml
index 5260d6ac..0f760468 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-autoscale/postpub_parameters.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-autoscale/postpub_parameters.yaml
@@ -16,7 +16,7 @@ NUM INTERNAL FORWARDING RULES: 1
 MGMT PORT: 8443
 ENABLE FLOW LOGS: ''
 HOST NAME: test.example.com
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE TYPE: n1-standard-8
 BIGIP RUNTIME INIT CONFIG: 'https://ak-metadata-package-poc.s3.amazonaws.com/runtime-init-gcp-conf.yaml'
 SCALING MAX: 8
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-autoscale/postpub_parameters1.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-autoscale/postpub_parameters1.yaml
index 62772f4a..0a270a60 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-autoscale/postpub_parameters1.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-autoscale/postpub_parameters1.yaml
@@ -16,7 +16,7 @@ NUM INTERNAL FORWARDING RULES: 1
 MGMT PORT: 8443
 ENABLE FLOW LOGS: ''
 HOST NAME: test.example.com
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE TYPE: n1-standard-8
 BIGIP RUNTIME INIT CONFIG: 'https://ak-metadata-package-poc.s3.amazonaws.com/runtime-init-gcp-conf.yaml'
 SCALING MAX: 8
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-autoscale/prepub_parameters.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-autoscale/prepub_parameters.yaml
index 3cefc4af..c7c0a7a8 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-autoscale/prepub_parameters.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-autoscale/prepub_parameters.yaml
@@ -16,7 +16,7 @@ NUM INTERNAL FORWARDING RULES: 1
 MGMT PORT: 8443
 ENABLE FLOW LOGS: ''
 HOST NAME: test.example.com
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE TYPE: n1-standard-8
 BIGIP RUNTIME INIT CONFIG: 'https://ak-metadata-package-poc.s3.amazonaws.com/runtime-init-gcp-conf.yaml'
 SCALING MAX: 8
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-autoscale/prepub_parameters1.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-autoscale/prepub_parameters1.yaml
index 7acb7dfa..c51b993d 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-autoscale/prepub_parameters1.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-autoscale/prepub_parameters1.yaml
@@ -16,7 +16,7 @@ NUM INTERNAL FORWARDING RULES: 1
 MGMT PORT: 8443
 ENABLE FLOW LOGS: ''
 HOST NAME: test.example.com
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE TYPE: n1-standard-8
 BIGIP RUNTIME INIT CONFIG: 'https://ak-metadata-package-poc.s3.amazonaws.com/runtime-init-gcp-conf.yaml'
 SCALING MAX: 8
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-standalone/parameters.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-standalone/parameters.yaml
index 099b7a37..cc4127bf 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-standalone/parameters.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-standalone/parameters.yaml
@@ -12,7 +12,7 @@ DAG STACK NAME: <UNIQUESTRING>-dag
 DAG TEMPLATE URL: file://$PWD/examples/modules/dag/dag.py
 DESCRIPTION: <UNIQUESTRING>-network
 HOST NAME: test.example.com
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-standalone/postpub_parameters.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-standalone/postpub_parameters.yaml
index 3339d3dc..c86f6f19 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-standalone/postpub_parameters.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-standalone/postpub_parameters.yaml
@@ -13,7 +13,7 @@ DAG STACK NAME: <UNIQUESTRING>-dag
 DAG TEMPLATE URL: https://raw.githubusercontent.com/F5Networks/f5-google-gdm-templates-v2/main/examples/modules/dag/dag.py
 DESCRIPTION: network-<DEWPOINT JOB ID>
 HOST NAME: test.example.com
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-standalone/postpub_parameters1.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-standalone/postpub_parameters1.yaml
index 147db27c..633bdef7 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-standalone/postpub_parameters1.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-standalone/postpub_parameters1.yaml
@@ -13,7 +13,7 @@ DAG STACK NAME: <UNIQUESTRING>-dag
 DAG TEMPLATE URL: https://raw.githubusercontent.com/F5Networks/f5-google-gdm-templates-v2/main/examples/modules/dag/dag.py
 DESCRIPTION: network-<DEWPOINT JOB ID>
 HOST NAME: test.example.com
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-standalone/postpub_parameters2.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-standalone/postpub_parameters2.yaml
index 05a713f3..3f7f5985 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-standalone/postpub_parameters2.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-standalone/postpub_parameters2.yaml
@@ -14,7 +14,7 @@ DAG STACK NAME: <UNIQUESTRING>-dag
 DAG TEMPLATE URL: https://raw.githubusercontent.com/F5Networks/f5-google-gdm-templates-v2/main/examples/modules/dag/dag.py
 DESCRIPTION: network-<DEWPOINT JOB ID>
 HOST NAME: test.example.com
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-standalone/prepub_parameters1.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-standalone/prepub_parameters1.yaml
index cbd5130e..21ab1ad8 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-standalone/prepub_parameters1.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-standalone/prepub_parameters1.yaml
@@ -13,7 +13,7 @@ DAG STACK NAME: <UNIQUESTRING>-dag
 DAG TEMPLATE URL: file://$PWD/examples/modules/dag/dag.py
 DESCRIPTION: network-<DEWPOINT JOB ID>
 HOST NAME: test.example.com
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-standalone/prepub_parameters2.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-standalone/prepub_parameters2.yaml
index 88f1b9bc..873f7f6f 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-standalone/prepub_parameters2.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-standalone/prepub_parameters2.yaml
@@ -12,7 +12,7 @@ DAG STACK NAME: <UNIQUESTRING>-dag
 DAG TEMPLATE URL: file://$PWD/examples/modules/dag/dag.py
 DESCRIPTION: network-<DEWPOINT JOB ID>
 HOST NAME: test.example.com
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-standalone/prepub_parameters3.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-standalone/prepub_parameters3.yaml
index 77703571..0c94850f 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-standalone/prepub_parameters3.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-standalone/prepub_parameters3.yaml
@@ -13,7 +13,7 @@ DAG STACK NAME: <UNIQUESTRING>-dag
 DAG TEMPLATE URL: file://$PWD/examples/modules/dag/dag.py
 DESCRIPTION: network-<DEWPOINT JOB ID>
 HOST NAME: test.example.com
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-standalone/prepub_parameters4.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-standalone/prepub_parameters4.yaml
index 139d0deb..cb755fed 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-standalone/prepub_parameters4.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-standalone/prepub_parameters4.yaml
@@ -12,7 +12,7 @@ DAG STACK NAME: <UNIQUESTRING>-dag
 DAG TEMPLATE URL: file://$PWD/examples/modules/dag/dag.py
 DESCRIPTION: network-<DEWPOINT JOB ID>
 HOST NAME: test.example.com
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-standalone/prepub_parameters5.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-standalone/prepub_parameters5.yaml
index 388cab7b..38ccc892 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-standalone/prepub_parameters5.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-standalone/prepub_parameters5.yaml
@@ -13,7 +13,7 @@ DAG STACK NAME: <UNIQUESTRING>-dag
 DAG TEMPLATE URL: file://$PWD/examples/modules/dag/dag.py
 DESCRIPTION: network-<DEWPOINT JOB ID>
 HOST NAME: test.example.com
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-standalone/prepub_parameters6.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-standalone/prepub_parameters6.yaml
index 3b6282b9..d96d41fc 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-standalone/prepub_parameters6.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/bigip-standalone/prepub_parameters6.yaml
@@ -12,7 +12,7 @@ DAG STACK NAME: <UNIQUESTRING>-dag
 DAG TEMPLATE URL: file://$PWD/examples/modules/dag/dag.py
 DESCRIPTION: network-<DEWPOINT JOB ID>
 HOST NAME: test.example.com
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/function/prepub_parameters3.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/function/prepub_parameters3.yaml
index 79a67663..ca6f5dc2 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/function/prepub_parameters3.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/modules/function/prepub_parameters3.yaml
@@ -13,7 +13,7 @@ RUNTIME INIT UPDATE: 'update_<DEWPOINT JOB ID>-runtime.yaml'
 APP CONTAINER NAME: 'f5devcentral/f5-demo-app:latest'
 BIGIP VERSION: 16-1-2-2-0-0-28
 ENABLE FLOW LOGS: ''
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 IMAGE SUFFIX: '210623021328'
 IMAGE TYPE: all-modules-2boot-loc
 INSTANCE TEMPLATE VERSION: 1
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/demo_1nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/demo_1nic.yaml
index 9a064e17..89a6fed6 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/demo_1nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/demo_1nic.yaml
@@ -2,7 +2,7 @@ AUTOFILL EVAL LICENSE KEY: null
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
 CUSTOM IMAGE ID: ''
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/demo_2nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/demo_2nic.yaml
index 2bf292c9..16367154 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/demo_2nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/demo_2nic.yaml
@@ -2,7 +2,7 @@ AUTOFILL EVAL LICENSE KEY: null
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
 CUSTOM IMAGE ID: ''
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/demo_3nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/demo_3nic.yaml
index 0d402710..4c21ced7 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/demo_3nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/demo_3nic.yaml
@@ -2,7 +2,7 @@ AUTOFILL EVAL LICENSE KEY: null
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
 CUSTOM IMAGE ID: ''
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/demo_app_1nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/demo_app_1nic.yaml
index 4e2875df..8c07a371 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/demo_app_1nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/demo_app_1nic.yaml
@@ -2,7 +2,7 @@ AUTOFILL EVAL LICENSE KEY: null
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
 CUSTOM IMAGE ID: ''
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/demo_app_2nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/demo_app_2nic.yaml
index 3c10da35..45e0b0f5 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/demo_app_2nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/demo_app_2nic.yaml
@@ -2,7 +2,7 @@ AUTOFILL EVAL LICENSE KEY: null
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
 CUSTOM IMAGE ID: ''
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/demo_app_3nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/demo_app_3nic.yaml
index 245d75bf..4c94a26a 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/demo_app_3nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/demo_app_3nic.yaml
@@ -2,7 +2,7 @@ AUTOFILL EVAL LICENSE KEY: null
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
 CUSTOM IMAGE ID: ''
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/prod_1nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/prod_1nic.yaml
index 4f4087a3..46eb5e30 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/prod_1nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/prod_1nic.yaml
@@ -2,7 +2,7 @@ AUTOFILL EVAL LICENSE KEY: null
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
 CUSTOM IMAGE ID: 'f5-7626-networks-public/global/images/<IMAGE NAME>'
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/prod_2nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/prod_2nic.yaml
index 33b1634f..3f9a9fa8 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/prod_2nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/prod_2nic.yaml
@@ -2,7 +2,7 @@ AUTOFILL EVAL LICENSE KEY: null
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
 CUSTOM IMAGE ID: 'f5-7626-networks-public/global/images/<IMAGE NAME>'
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/prod_3nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/prod_3nic.yaml
index 8cdc78dd..2f5a0100 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/prod_3nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/prod_3nic.yaml
@@ -2,7 +2,7 @@ AUTOFILL EVAL LICENSE KEY: null
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
 CUSTOM IMAGE ID: 'f5-7626-networks-public/global/images/<IMAGE NAME>'
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/prod_app_1nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/prod_app_1nic.yaml
index 0938ba50..f2cfcd09 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/prod_app_1nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/prod_app_1nic.yaml
@@ -2,7 +2,7 @@ AUTOFILL EVAL LICENSE KEY: null
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
 CUSTOM IMAGE ID: 'f5-7626-networks-public/global/images/<IMAGE NAME>'
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/prod_app_2nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/prod_app_2nic.yaml
index d11fc023..d2955d08 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/prod_app_2nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/prod_app_2nic.yaml
@@ -2,7 +2,7 @@ AUTOFILL EVAL LICENSE KEY: null
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
 CUSTOM IMAGE ID: 'f5-7626-networks-public/global/images/<IMAGE NAME>'
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/prod_app_3nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/prod_app_3nic.yaml
index 97296111..c43ac9fa 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/prod_app_3nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/prod_app_3nic.yaml
@@ -2,7 +2,7 @@ AUTOFILL EVAL LICENSE KEY: null
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
 CUSTOM IMAGE ID: 'f5-7626-networks-public/global/images/<IMAGE NAME>'
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/demo_1nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/demo_1nic.yaml
index bdd07953..fcf5f941 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/demo_1nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/demo_1nic.yaml
@@ -1,7 +1,7 @@
 AUTOFILL EVAL LICENSE KEY: null
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/demo_2nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/demo_2nic.yaml
index b4ffa17b..6daf9be3 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/demo_2nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/demo_2nic.yaml
@@ -1,7 +1,7 @@
 AUTOFILL EVAL LICENSE KEY: null
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/demo_3nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/demo_3nic.yaml
index 2752aade..73740f34 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/demo_3nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/demo_3nic.yaml
@@ -1,7 +1,7 @@
 AUTOFILL EVAL LICENSE KEY: null
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/demo_app_1nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/demo_app_1nic.yaml
index 0b6fc483..f02de590 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/demo_app_1nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/demo_app_1nic.yaml
@@ -1,7 +1,7 @@
 AUTOFILL EVAL LICENSE KEY: null
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/demo_app_2nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/demo_app_2nic.yaml
index 19acf8f4..3f5520a1 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/demo_app_2nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/demo_app_2nic.yaml
@@ -1,7 +1,7 @@
 AUTOFILL EVAL LICENSE KEY: null
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/demo_app_3nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/demo_app_3nic.yaml
index 5dbd4518..62444c71 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/demo_app_3nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/demo_app_3nic.yaml
@@ -1,7 +1,7 @@
 AUTOFILL EVAL LICENSE KEY: null
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/prod_1nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/prod_1nic.yaml
index 95bf6127..a1f19e4c 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/prod_1nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/prod_1nic.yaml
@@ -1,7 +1,7 @@
 AUTOFILL EVAL LICENSE KEY: null
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/prod_2nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/prod_2nic.yaml
index 262915df..bb546565 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/prod_2nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/prod_2nic.yaml
@@ -1,7 +1,7 @@
 AUTOFILL EVAL LICENSE KEY: null
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/prod_3nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/prod_3nic.yaml
index 11d95dbb..f140f60d 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/prod_3nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/prod_3nic.yaml
@@ -1,7 +1,7 @@
 AUTOFILL EVAL LICENSE KEY: null
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/prod_app_1nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/prod_app_1nic.yaml
index f1c02d50..79fb9500 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/prod_app_1nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/prod_app_1nic.yaml
@@ -1,7 +1,7 @@
 AUTOFILL EVAL LICENSE KEY: null
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/prod_app_2nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/prod_app_2nic.yaml
index 925428e1..e348e16f 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/prod_app_2nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/prod_app_2nic.yaml
@@ -1,7 +1,7 @@
 AUTOFILL EVAL LICENSE KEY: null
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/prod_app_3nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/prod_app_3nic.yaml
index 9431ba09..73fd7a1a 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/prod_app_3nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/prod_app_3nic.yaml
@@ -1,7 +1,7 @@
 AUTOFILL EVAL LICENSE KEY: null
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/defaults.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/defaults.yaml
index 1b7657aa..72492eda 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/defaults.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/defaults.yaml
@@ -1,7 +1,7 @@
 ---
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config.yaml
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/demo_1nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/demo_1nic.yaml
index 897ca50d..f935d2b6 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/demo_1nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/demo_1nic.yaml
@@ -2,7 +2,7 @@
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
 CUSTOM IMAGE ID: ''
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/demo_2nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/demo_2nic.yaml
index 1441f4e7..4a4510ad 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/demo_2nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/demo_2nic.yaml
@@ -1,7 +1,7 @@
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
 CUSTOM IMAGE ID: ''
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/demo_3nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/demo_3nic.yaml
index fbd5c14d..58178164 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/demo_3nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/demo_3nic.yaml
@@ -1,7 +1,7 @@
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
 CUSTOM IMAGE ID: ''
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/demo_app_1nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/demo_app_1nic.yaml
index b4b8d26c..58297ff2 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/demo_app_1nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/demo_app_1nic.yaml
@@ -2,7 +2,7 @@
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
 CUSTOM IMAGE ID: ''
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/demo_app_2nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/demo_app_2nic.yaml
index 7481303d..15486400 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/demo_app_2nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/demo_app_2nic.yaml
@@ -1,7 +1,7 @@
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
 CUSTOM IMAGE ID: ''
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/demo_app_3nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/demo_app_3nic.yaml
index b16ec9fc..da6afee3 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/demo_app_3nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/demo_app_3nic.yaml
@@ -1,7 +1,7 @@
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
 CUSTOM IMAGE ID: ''
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/prod_1nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/prod_1nic.yaml
index 696ccc58..e3636ce0 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/prod_1nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/prod_1nic.yaml
@@ -2,7 +2,7 @@
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
 CUSTOM IMAGE ID: 'f5-7626-networks-public/global/images/<IMAGE NAME>'
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/prod_2nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/prod_2nic.yaml
index 5996ef84..c8702edb 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/prod_2nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/prod_2nic.yaml
@@ -1,7 +1,7 @@
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
 CUSTOM IMAGE ID: 'f5-7626-networks-public/global/images/<IMAGE NAME>'
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/prod_3nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/prod_3nic.yaml
index 88216c88..c265ba98 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/prod_3nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/prod_3nic.yaml
@@ -1,7 +1,7 @@
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
 CUSTOM IMAGE ID: 'f5-7626-networks-public/global/images/<IMAGE NAME>'
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/prod_app_1nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/prod_app_1nic.yaml
index 701df826..b60941fc 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/prod_app_1nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/prod_app_1nic.yaml
@@ -2,7 +2,7 @@
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
 CUSTOM IMAGE ID: 'f5-7626-networks-public/global/images/<IMAGE NAME>'
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/prod_app_2nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/prod_app_2nic.yaml
index 8c3d5885..c2c76bc7 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/prod_app_2nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/prod_app_2nic.yaml
@@ -1,7 +1,7 @@
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
 CUSTOM IMAGE ID: 'f5-7626-networks-public/global/images/<IMAGE NAME>'
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/prod_app_3nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/prod_app_3nic.yaml
index 080cac1d..fac7088d 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/prod_app_3nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/prod_app_3nic.yaml
@@ -1,7 +1,7 @@
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
 CUSTOM IMAGE ID: 'f5-7626-networks-public/global/images/<IMAGE NAME>'
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/defaults.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/defaults.yaml
index c98e29b4..6dd29872 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/defaults.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/defaults.yaml
@@ -1,7 +1,7 @@
 ---
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/demo_1nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/demo_1nic.yaml
index 3c86d733..af6eb743 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/demo_1nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/demo_1nic.yaml
@@ -1,7 +1,7 @@
 ---
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/demo_2nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/demo_2nic.yaml
index bb0933a7..b6d17e9b 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/demo_2nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/demo_2nic.yaml
@@ -1,6 +1,6 @@
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/demo_3nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/demo_3nic.yaml
index 3e753aa1..b3c451b1 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/demo_3nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/demo_3nic.yaml
@@ -1,6 +1,6 @@
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/demo_app_1nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/demo_app_1nic.yaml
index 32489076..de116b89 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/demo_app_1nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/demo_app_1nic.yaml
@@ -1,7 +1,7 @@
 ---
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/demo_app_2nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/demo_app_2nic.yaml
index 1b3fc69f..56fd111c 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/demo_app_2nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/demo_app_2nic.yaml
@@ -1,6 +1,6 @@
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/demo_app_3nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/demo_app_3nic.yaml
index bb9d9e4c..40cad2f4 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/demo_app_3nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/demo_app_3nic.yaml
@@ -1,6 +1,6 @@
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/prod_1nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/prod_1nic.yaml
index 7e4513ed..a44d5a40 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/prod_1nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/prod_1nic.yaml
@@ -1,7 +1,7 @@
 ---
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/prod_2nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/prod_2nic.yaml
index 312bc79c..1564d480 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/prod_2nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/prod_2nic.yaml
@@ -1,6 +1,6 @@
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/prod_3nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/prod_3nic.yaml
index 6cdfb268..541c8ae5 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/prod_3nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/prod_3nic.yaml
@@ -1,6 +1,6 @@
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/prod_app_1nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/prod_app_1nic.yaml
index 5d32c127..17e45ddd 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/prod_app_1nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/prod_app_1nic.yaml
@@ -1,7 +1,7 @@
 ---
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/prod_app_2nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/prod_app_2nic.yaml
index 3fa68fe1..299e71fe 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/prod_app_2nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/prod_app_2nic.yaml
@@ -1,6 +1,6 @@
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/prod_app_3nic.yaml b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/prod_app_3nic.yaml
index d9326092..86c75466 100644
--- a/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/prod_app_3nic.yaml
+++ b/automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/prod_app_3nic.yaml
@@ -1,6 +1,6 @@
 AVAILABILITY ZONE: <REGION>-b
 BIGIP RUNTIME INIT CONFIG: https://storage.googleapis.com/<STACK NAME>-bucket/bigip-configurations/<STACK NAME>-config-with-app.yaml
-IMAGE NAME: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+IMAGE NAME: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
 INSTANCE NAME: bigip-vm-01
 INSTANCE TYPE: n1-standard-16
 INTERFACE NAME: Interface
diff --git a/cloud-tools b/cloud-tools
index 47baeab0..8aa9aa06 160000
--- a/cloud-tools
+++ b/cloud-tools
@@ -1 +1 @@
-Subproject commit 47baeab0ca02a69625b1f9778cba36d98bec3d4f
+Subproject commit 8aa9aa0652570eb884c7226366b5a13f75d9c495
diff --git a/examples/autoscale/bigiq/README.md b/examples/autoscale/bigiq/README.md
index f905e220..36e99e04 100644
--- a/examples/autoscale/bigiq/README.md
+++ b/examples/autoscale/bigiq/README.md
@@ -156,7 +156,7 @@ Note: These are specified in the configuration file. See sample_autoscale.yaml
 | application | No | f5app | string | Application label. |
 | bigIpCoolDownPeriodSec | No | 60 | integer | Number of seconds Google Autoscaler waits to start checking BIG-IP instances on first boot. |
 | bigIpCustomImageId | No |  | string | Identifier of a non marketplace custom image (for example, clones or those created by the F5 BIG-IP Image Generator), starting with the project name. Example value: `myProjectName/global/images/myImageName` |
-| bigIpImageName | No | f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920 | string | Name of public BIG-IP image found in the Google Cloud Marketplace. Example value: `f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920`. You can find the names of F5 marketplace images in the README for this template or by running the command: `gcloud compute images list --project f5-7626-networks-public --filter="name~f5"`. |
+| bigIpImageName | No | f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828 | string | Name of public BIG-IP image found in the Google Cloud Marketplace. Example value: `f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828`. You can find the names of F5 marketplace images in the README for this template or by running the command: `gcloud compute images list --project f5-7626-networks-public --filter="name~f5"`. |
 | bigIpInstanceTemplateVersion | No |  1 | integer | Version of the instance template to create. When updating deployment properties of the BIG-IP instances, you must provide a unique value for this parameter. |
 | bigIpInstanceType | No | | n1-standard-8 | string | Instance type assigned to the application, for example '| n1-standard-8'. |
 | bigIpIpCidrRange | No | 10.0.0.0/24 | string | IP CIDR range used by the management network of the BIG-IP, for example '10.0.0.0/24'. |
@@ -191,7 +191,7 @@ Note: These are specified in the configuration file. See sample_autoscale.yaml
 | application | No | f5app | string | Application label. |
 | bigIpCoolDownPeriodSec | No | 60 | integer | Number of seconds Google Autoscaler waits to start checking BIG-IP instances on first boot. |
 | bigIpCustomImageId | No |  | string | Identifier of a non marketplace custom image (for example, clones or those created by the F5 BIG-IP Image Generator), starting with the project name. Example value: `myProjectName/global/images/myImageName` |
-| bigIpImageName | No | f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920 | string | Name of public BIG-IP image found in the Google Cloud Marketplace. Example value: `f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920`. You can find the names of F5 marketplace images in the README for this template or by running the command: `gcloud compute images list --project f5-7626-networks-public --filter="name~f5"`. |
+| bigIpImageName | No | f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828 | string | Name of public BIG-IP image found in the Google Cloud Marketplace. Example value: `f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828`. You can find the names of F5 marketplace images in the README for this template or by running the command: `gcloud compute images list --project f5-7626-networks-public --filter="name~f5"`. |
 | bigIpInstanceTemplateVersion | No |  1 | integer | Version of the instance template to create. When updating deployment properties of the BIG-IP instances, you must provide a unique value for this parameter. |
 | bigIpInstanceType | No | | n1-standard-8 | string | Instance type assigned to the application, for example '| n1-standard-8'. |
 | bigIpIpCidrRange | No | 10.0.0.0/24 | string | IP CIDR range used by the management network of the BIG-IP, for example '10.0.0.0/24'. |
@@ -818,8 +818,8 @@ These templates have only been explicitly tested and validated with the followin
 
 | Google BIG-IP Image Version | BIG-IP Version         |
 | --------------------------- | ---------------------- |
-| 16-1-3-3-0-0-3              | 16.1.3.3 Build 0.0.3  |
-| 14-1-5-3-0-0-5              | 14.1.5.3 Build 0.0.5  |
+| 17-1-1-0-2-6                | 17.1.1 Build 0.2.6     |
+| 16-1-4-1-0-53-5             | 16.1.4.1 Build 0.53.5  |
 
 These templates leverage Runtime-Init, which requires BIG-IP Versions 14.1.2.6 and up, and are assumed compatible to work. 
 
diff --git a/examples/autoscale/bigiq/autoscale-existing-network.py.schema b/examples/autoscale/bigiq/autoscale-existing-network.py.schema
index edd3d6de..aea1a330 100644
--- a/examples/autoscale/bigiq/autoscale-existing-network.py.schema
+++ b/examples/autoscale/bigiq/autoscale-existing-network.py.schema
@@ -46,7 +46,7 @@ properties:
     description: Minimum number of BIG-IP instances you want available in the Auto Scale Group.
     type: integer
   bigIpImageName:
-    default: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+    default: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
     description: BIG-IP image name
     type: string
   bigIpInstanceTemplateVersion:
diff --git a/examples/autoscale/bigiq/autoscale.py.schema b/examples/autoscale/bigiq/autoscale.py.schema
index c9eb907c..e66d659a 100644
--- a/examples/autoscale/bigiq/autoscale.py.schema
+++ b/examples/autoscale/bigiq/autoscale.py.schema
@@ -51,7 +51,7 @@ properties:
     description: Minimum number of BIG-IP instances you want available in the Auto Scale Group.
     type: integer
   bigIpImageName:
-    default: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+    default: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
     description: BIG-IP image name
     type: string
   bigIpInstanceTemplateVersion:
diff --git a/examples/autoscale/bigiq/sample_autoscale.yaml b/examples/autoscale/bigiq/sample_autoscale.yaml
index c3285c52..77234fe6 100644
--- a/examples/autoscale/bigiq/sample_autoscale.yaml
+++ b/examples/autoscale/bigiq/sample_autoscale.yaml
@@ -55,7 +55,7 @@ resources:
       ###  (OPTIONAL) The name of a public F5 Marketplace image to deploy.
       #    If you would like to view all available public images, run the following gcloud command:
       #    gcloud compute images list --project f5-7626-networks-public --filter="name~f5"
-      bigIpImageName: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+      bigIpImageName: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
       ###  (OPTIONAL) Version of the instance template to create. When updating deployment properties
       #    of the BIG-IP instances, you must provide a unique value for this parameter.
       bigIpInstanceTemplateVersion: 1
diff --git a/examples/autoscale/bigiq/sample_autoscale_existing_network.yaml b/examples/autoscale/bigiq/sample_autoscale_existing_network.yaml
index 7fa1874e..f1179812 100644
--- a/examples/autoscale/bigiq/sample_autoscale_existing_network.yaml
+++ b/examples/autoscale/bigiq/sample_autoscale_existing_network.yaml
@@ -52,7 +52,7 @@ resources:
       ###  (OPTIONAL) The name of a public F5 Marketplace image to deploy.
       #    If you would like to view all available public images, run the following gcloud command:
       #    gcloud compute images list --project f5-7626-networks-public --filter="name~f5"
-      bigIpImageName: f5-bigip-16-1-3-3-0-0-3-byol-all-modules-2boot-loc-21222235920
+      bigIpImageName: f5-bigip-17-1-1-0-2-6-byol-all-modules-2boot-loc-231101131828
       ###  (OPTIONAL) Version of the instance template to create. When updating deployment properties
       #    of the BIG-IP instances, you must provide a unique value for this parameter.
       bigIpInstanceTemplateVersion: 1
diff --git a/examples/autoscale/payg/README.md b/examples/autoscale/payg/README.md
index 0c7f1cda..ab2c0235 100644
--- a/examples/autoscale/payg/README.md
+++ b/examples/autoscale/payg/README.md
@@ -134,7 +134,7 @@ Note: These are specified in the configuration file. See sample_autoscale.yaml
 | application | No | f5app | string | Application label. |
 | bigIpCustomImageId | No |  | string | Identifier of a non marketplace custom image (for example, clones), starting with the project name. Example value: `myProjectName/global/images/myImageName` |
 | bigIpCoolDownPeriodSec | No | 60 | integer | Number of seconds Google Autoscaler waits to start checking BIG-IP instances on first boot. |
-| bigIpImageName | No | f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728 | string | Name of BIG-IP custom image found in the Google Cloud Marketplace. Example value: `f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728`. You can find the names of F5 marketplace images in the README for this template or by running the command: `gcloud compute images list --project f5-7626-networks-public --filter="name~f5"`. |
+| bigIpImageName | No | f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547 | string | Name of BIG-IP custom image found in the Google Cloud Marketplace. Example value: `f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547`. You can find the names of F5 marketplace images in the README for this template or by running the command: `gcloud compute images list --project f5-7626-networks-public --filter="name~f5"`. |
 | bigIpInstanceTemplateVersion | No | 1 | integer | Version of the instance template to create. When updating deployment properties of the BIG-IP instances, you must provide a unique value for this parameter. |
 | bigIpInstanceType | No | n1-standard-8 | string | Instance type assigned to the application, for example 'n1-standard-4'. |
 | bigIpRuntimeInitConfig | No | https://raw.githubusercontent.com/F5Networks/f5-google-gdm-templates-v2/v2.9.0.0/examples/autoscale/bigip-configurations/runtime-init-conf-payg-with-app.yaml | string | Supply a URL to the bigip-runtime-init configuration file in YAML or JSON format. |
@@ -168,7 +168,7 @@ Note: These are specified in the configuration file. See sample_autoscale.yaml
 | application | No | f5app | string | Application label. |
 | bigIpCoolDownPeriodSec | No | 60 | integer | Number of seconds Google Autoscaler waits to start checking BIG-IP instances on first boot. |
 | bigIpCustomImageId | No |  | string | Identifier of a custom image, starting with the project name, used to create the BIG-IP instance(s). Example value: `myProjectName/global/images/myImageName`. You can find the names of F5 marketplace images by running the command: `gcloud compute images list --project myProjectName --filter="name~myImageName"`. |
-| bigIpImageName | No | f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728 | string | Name of a public BIG-IP image found in Google Cloud Marketplace. Example value: `f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728`. You can find the names of F5 marketplace images in the README for this template or by running the command: `gcloud compute images list --project f5-7626-networks-public --filter="name~f5"`. |
+| bigIpImageName | No | f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547 | string | Name of a public BIG-IP image found in Google Cloud Marketplace. Example value: `f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547`. You can find the names of F5 marketplace images in the README for this template or by running the command: `gcloud compute images list --project f5-7626-networks-public --filter="name~f5"`. |
 | bigIpInstanceTemplateVersion | No | 1 | integer | Version of the instance template to create. When updating deployment properties of the BIG-IP instances, you must provide a unique value for this parameter. |
 | bigIpInstanceType | No | n1-standard-8 | string | Instance type assigned to the application, for example 'n1-standard-4'. |
 | bigIpRuntimeInitConfig | No | https://raw.githubusercontent.com/F5Networks/f5-google-gdm-templates-v2/v2.9.0.0/examples/autoscale/bigip-configurations/runtime-init-conf-payg-with-app.yaml | string | Supply a URL to the bigip-runtime-init configuration file in YAML or JSON format. |
@@ -767,8 +767,8 @@ These templates have been tested and validated with the following versions of BI
 
 | Google BIG-IP Image Version | BIG-IP Version         |
 | --------------------------- | ---------------------- |
-| 16-1-3-3-0-0-3              | 16.1.3.3 Build 0.0.3  |
-| 14-1-5-3-0-0-5              | 14.1.5.3 Build 0.0.5  |
+| 17-1-1-0-2-6                | 17.1.1 Build 0.2.6     |
+| 16-1-4-1-0-53-5             | 16.1.4.1 Build 0.53.5  |
 
 ***Note**: Due to an issue with the default ca-bundle, you may not host F5 BIG-IP Runtime Init configuration files in a Google Storage bucket when deploying BIG-IP v14 images.*
 
diff --git a/examples/autoscale/payg/autoscale-existing-network.py.schema b/examples/autoscale/payg/autoscale-existing-network.py.schema
index b419e1f9..73ade3cc 100644
--- a/examples/autoscale/payg/autoscale-existing-network.py.schema
+++ b/examples/autoscale/payg/autoscale-existing-network.py.schema
@@ -44,7 +44,7 @@ properties:
     description: Minimum number of BIG-IP instances you want available in the Auto Scale Group.
     type: integer
   bigIpImageName:
-    default: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+    default: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
     description: BIG-IP image name
     type: string
   bigIpInstanceTemplateVersion:
diff --git a/examples/autoscale/payg/autoscale.py.schema b/examples/autoscale/payg/autoscale.py.schema
index f1fa7d3b..67758b8b 100644
--- a/examples/autoscale/payg/autoscale.py.schema
+++ b/examples/autoscale/payg/autoscale.py.schema
@@ -49,7 +49,7 @@ properties:
     description: Minimum number of BIG-IP instances you want available in the Auto Scale Group.
     type: integer
   bigIpImageName:
-    default: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+    default: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
     description: BIG-IP image name
     type: string
   bigIpInstanceTemplateVersion:
diff --git a/examples/autoscale/payg/sample_autoscale.yaml b/examples/autoscale/payg/sample_autoscale.yaml
index 56d932a1..0e926a31 100644
--- a/examples/autoscale/payg/sample_autoscale.yaml
+++ b/examples/autoscale/payg/sample_autoscale.yaml
@@ -53,7 +53,7 @@ resources:
       ###  (OPTIONAL) The name of a public F5 Marketplace image to deploy.
       #    If you would like to view all available public images, run the following gcloud command:
       #    gcloud compute images list --project f5-7626-networks-public --filter="name~f5"
-      bigIpImageName: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+      bigIpImageName: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
       ###  (OPTIONAL) Version of the instance template to create. When updating deployment properties
       #    of the BIG-IP instances, you must provide a unique value for this parameter.
       bigIpInstanceTemplateVersion: 1
diff --git a/examples/autoscale/payg/sample_autoscale_existing_network.yaml b/examples/autoscale/payg/sample_autoscale_existing_network.yaml
index fb5d1fa7..682f6582 100644
--- a/examples/autoscale/payg/sample_autoscale_existing_network.yaml
+++ b/examples/autoscale/payg/sample_autoscale_existing_network.yaml
@@ -51,7 +51,7 @@ resources:
       ###  (OPTIONAL) The name of a public F5 Marketplace image to deploy.
       #    If you would like to view all available public images, run the following gcloud command:
       #    gcloud compute images list --project f5-7626-networks-public --filter="name~f5"
-      bigIpImageName: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+      bigIpImageName: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
       ###  (OPTIONAL) Version of the instance template to create. When updating deployment properties
       # o f the BIG-IP instances, you must provide a unique value for this parameter.
       bigIpInstanceTemplateVersion: 1
diff --git a/examples/failover/README.md b/examples/failover/README.md
index f1fa4108..17e83f50 100644
--- a/examples/failover/README.md
+++ b/examples/failover/README.md
@@ -168,7 +168,7 @@ Note: These are specified in the configuration file. See sample_quickstart.yaml
 | bigIpCustomImageId | No |  | string | Identifier of a non marketplace custom image (for example, clones or those created by the F5 BIG-IP Image Generator), starting with the project name. Example value: `myProjectName/global/images/myImageName` |
 | bigIpHostname01 | No | failover01.local | string | Supply the hostname you would like to use for the BIG-IP instance. The hostname must be in fqdn format and contain fewer than 63 characters. |
 | bigIpHostname02 | No | failover02.local | string | Supply the hostname you would like to use for the BIG-IP instance. The hostname must be in fqdn format and contain fewer than 63 characters. |
-| bigIpImageName | No | f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728 | string | Name of a public BIG-IP image found in Google Cloud Marketplace. Example value: `f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728`. You can find the names of F5 marketplace images in the README for this template or by running the command: `gcloud compute images list --project f5-7626-networks-public --filter="name~f5"`. |
+| bigIpImageName | No | f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547 | string | Name of a public BIG-IP image found in Google Cloud Marketplace. Example value: `f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547`. You can find the names of F5 marketplace images in the README for this template or by running the command: `gcloud compute images list --project f5-7626-networks-public --filter="name~f5"`. |
 | bigIpInstanceType | No | n1-standard-8 | string | Instance type assigned to the application, for example 'n1-standard-8'. |
 | bigIpExternalSelfIp01 | No | 10.0.1.11 | string | External Private IP Address for BIGIP Instance A. IP address parameter must be in the form x.x.x.x. |
 | bigIpExternalSelfIp02 | No | 10.0.1.12 | string | External Private IP Address for BIGIP Instance B. IP address parameter must be in the form x.x.x.x. |
@@ -211,7 +211,7 @@ Note: These are specified in the configuration file. See sample_failover_existin
 | bigIpCustomImageId | No |  | string | Identifier of a non marketplace custom image (for example, clones or those created by the F5 BIG-IP Image Generator), starting with the project name. Example value: `myProjectName/global/images/myImageName` |
 | bigIpHostname01 | No | failover01.local | string | Supply the hostname you would like to use for the BIG-IP instance. The hostname must be in fqdn format and contain fewer than 63 characters. |
 | bigIpHostname02 | No | failover02.local | string | Supply the hostname you would like to use for the BIG-IP instance. The hostname must be in fqdn format and contain fewer than 63 characters. |
-| bigIpImageName | No | f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728 | string | Name of a public BIG-IP image found in Google Cloud Marketplace. Example value: `f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728`. You can find the names of F5 marketplace images in the README for this template or by running the command: `gcloud compute images list --project f5-7626-networks-public --filter="name~f5"`. |
+| bigIpImageName | No | f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547 | string | Name of a public BIG-IP image found in Google Cloud Marketplace. Example value: `f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547`. You can find the names of F5 marketplace images in the README for this template or by running the command: `gcloud compute images list --project f5-7626-networks-public --filter="name~f5"`. |
 | bigIpInstanceType | No | n1-standard-8 | string | Instance type assigned to the application, for example 'n1-standard-8'. |
 | bigIpExternalSelfIp01 | No | 10.0.1.11 | string | External Private IP Address for BIGIP Instance A. IP address parameter must be in the form x.x.x.x. |
 | bigIpExternalSelfIp02 | No | 10.0.1.12 | string | External Private IP Address for BIGIP Instance B. IP address parameter must be in the form x.x.x.x. |
@@ -771,8 +771,8 @@ These templates have been tested and validated with the following versions of BI
 
 | Google BIG-IP Image Version | BIG-IP Version         |
 | --------------------------- | ---------------------- |
-| 16-1-3-3-0-0-3              | 16.1.3.3 Build 0.0.3  |
-| 14-1-5-3-0-0-5              | 14.1.5.3 Build 0.0.5  |
+| 17-1-1-0-2-6                | 17.1.1 Build 0.2.6     |
+| 16-1-4-1-0-53-5             | 16.1.4.1 Build 0.53.5  |
 
 **Note**: Due to an issue (ID 1013209) with the default ca-bundle, you may not host F5 BIG-IP Runtime Init configuration files in a Google Storage bucket when deploying BIG-IP v14 images.
 
diff --git a/examples/failover/failover-existing-network.py.schema b/examples/failover/failover-existing-network.py.schema
index 9f79ce16..73ab4332 100644
--- a/examples/failover/failover-existing-network.py.schema
+++ b/examples/failover/failover-existing-network.py.schema
@@ -53,7 +53,7 @@ properties:
     description: Management interface private IP address for bigip-vm-02.
     type: string
   bigIpImageName:
-    default: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+    default: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
     description: BIG-IP image name
     type: string
   bigIpInstanceType:
diff --git a/examples/failover/failover.py.schema b/examples/failover/failover.py.schema
index 8137f563..50048bf4 100644
--- a/examples/failover/failover.py.schema
+++ b/examples/failover/failover.py.schema
@@ -59,7 +59,7 @@ properties:
     description: Management interface private IP address for bigip-vm-02.
     type: string
   bigIpImageName:
-    default: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+    default: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
     description: BIG-IP image name
     type: string
   bigIpInstanceType:
diff --git a/examples/failover/sample_failover.yaml b/examples/failover/sample_failover.yaml
index 073ff503..876fa401 100644
--- a/examples/failover/sample_failover.yaml
+++ b/examples/failover/sample_failover.yaml
@@ -64,7 +64,7 @@ resources:
       ###  (OPTIONAL) The name of a public F5 Marketplace image to deploy.
       #    If you would like to view all available public images, run the following gcloud command:
       #    gcloud compute images list --project f5-7626-networks-public --filter="name~f5"
-      bigIpImageName: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+      bigIpImageName: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
       ###  (OPTIONAL) Instance type assigned to BIG-IP, for example 'n1-standard-8'.
       bigIpInstanceType: n1-standard-8
       ###  (OPTIONAL) Uncomment the parameter below to supply the F5 BYOL license key for BIG-IP instance 01.
diff --git a/examples/failover/sample_failover_existing_network.yaml b/examples/failover/sample_failover_existing_network.yaml
index 8ee7c6e0..760e8b86 100644
--- a/examples/failover/sample_failover_existing_network.yaml
+++ b/examples/failover/sample_failover_existing_network.yaml
@@ -55,7 +55,7 @@ resources:
       ###  (OPTIONAL) Supply the hostname you would like to use for the BIG-IP instance. The hostname must contain fewer than 63 characters.
       bigIpHostname02: failover02.local
       ###  (OPTIONAL) The name of a public F5 Marketplace image to deploy. If you would like to view all available public images, run the following command from the 'gcloud' command line: '''gcloud compute images list --project f5-7626-networks-public --filter="name~f5"'''
-      bigIpImageName: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+      bigIpImageName: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
       ###  (OPTIONAL) Instance type assigned to BIG-IP, for example 'n1-standard-8'.
       bigIpInstanceType: n1-standard-8
       ###  (OPTIONAL) Uncomment the parameter below to supply the F5 BYOL license key for BIG-IP instance 01.
diff --git a/examples/quickstart/README.md b/examples/quickstart/README.md
index dfd6da6a..85cc1399 100644
--- a/examples/quickstart/README.md
+++ b/examples/quickstart/README.md
@@ -156,7 +156,7 @@ These are specified in the configuration file. See sample_quickstart.yaml
 | application | No | f5app | string | Application Tag. |
 | bigIpCustomImageId | No |  | string | Supply the identifier of a non marketplace custom image (for example, clones or those created by the F5 BIG-IP Image Generator), starting with the project name, used to create the BIG-IP instance(s). Example value: `myProjectName/global/images/myImageName` |
 | bigIpHostname | No | bigip01.local | string | Supply the hostname you would like to use for the BIG-IP instance. The hostname must be in fqdn format and contain fewer than 63 characters. |
-| bigIpImageName | No | f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728 | string | Name of a public BIG-IP image found in Google Cloud Marketplace. Example value: `f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728`. You can find the names of F5 marketplace images in the README for this template or by running the command: `gcloud compute images list --project f5-7626-networks-public --filter="name~f5"`. |
+| bigIpImageName | No | f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547 | string | Name of a public BIG-IP image found in Google Cloud Marketplace. Example value: `f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547`. You can find the names of F5 marketplace images in the README for this template or by running the command: `gcloud compute images list --project f5-7626-networks-public --filter="name~f5"`. |
 | bigIpInstanceType | No | n1-standard-8 | string | Instance type assigned to the application, for example 'n1-standard-4'. |
 | bigIpLicenseKey | No |  | string | Supply the F5 BYOL license key for the BIG-IP instance if deploying a BYOL image. |
 | bigIpRuntimeInitConfig | No | https://raw.githubusercontent.com/F5Networks/f5-google-gdm-templates-v2/v2.9.0.0/examples/quickstart/bigip-configurations/runtime-init-conf-3nic-payg-with-app.yaml | string | Supply a URL to the bigip-runtime-init configuration file in YAML or JSON format. |
@@ -185,7 +185,7 @@ These are specified in the configuration file. See sample_quickstart-existing-ne
 | application | No | f5app | string | Application label. |
 | bigIpCustomImageId | No |  | string | Identifier of a non marketplace custom image (for example, clones or those created by the F5 BIG-IP Image Generator), starting with the project name, used to create the BIG-IP instance(s). Example value: `myProjectName/global/images/myImageName` |
 | bigIpHostname | No | bigip01.local | string | Supply the hostname you would like to use for the BIG-IP instance. The hostname must be in fqdn format and contain fewer than 63 characters. |
-| bigIpImageName | No | f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728 | string | Name of a public BIG-IP image found in Google Cloud Marketplace. Example value: `f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728`. You can find the names of F5 marketplace images in the README for this template or by running the command: `gcloud compute images list --project f5-7626-networks-public --filter="name~f5"`. |
+| bigIpImageName | No | f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547 | string | Name of a public BIG-IP image found in Google Cloud Marketplace. Example value: `f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547`. You can find the names of F5 marketplace images in the README for this template or by running the command: `gcloud compute images list --project f5-7626-networks-public --filter="name~f5"`. |
 | bigIpInstanceType | No | n1-standard-8 | string | Instance type assigned to the application, for example 'n1-standard-4'. |
 | bigIpLicenseKey | No |  | string | Supply the F5 BYOL license key for the BIG-IP instance if deploying a BYOL image. |
 | bigIpRuntimeInitConfig | No | https://raw.githubusercontent.com/F5Networks/f5-google-gdm-templates-v2/v2.9.0.0/examples/quickstart/bigip-configurations/runtime-init-conf-3nic-payg-with-app.yaml | string | Supply a URL to the bigip-runtime-init configuration file in YAML or JSON format. |
@@ -684,8 +684,8 @@ These templates have been tested and validated with the following versions of BI
 
 | Google BIG-IP Image Version | BIG-IP Version         |
 | --------------------------- | ---------------------- |
-| 16-1-3-3-0-0-3              | 16.1.3.3 Build 0.0.3  |
-| 14-1-5-3-0-0-5              | 14.1.5.3 Build 0.0.5  |
+| 17-1-1-0-2-6                | 17.1.1 Build 0.2.6     |
+| 16-1-4-1-0-53-5             | 16.1.4.1 Build 0.53.5  |
 
 **Note**: Due to an issue (ID 1013209) with the default ca-bundle, you may not host F5 BIG-IP Runtime Init configuration files in a Google Storage bucket when deploying BIG-IP v14 images.
 
diff --git a/examples/quickstart/quickstart-existing-network.py.schema b/examples/quickstart/quickstart-existing-network.py.schema
index 59fb4a05..42dc556b 100644
--- a/examples/quickstart/quickstart-existing-network.py.schema
+++ b/examples/quickstart/quickstart-existing-network.py.schema
@@ -32,7 +32,7 @@ properties:
     description: Supply the hostname you would like to use for the BIG-IP instance. The hostname must contain fewer than 63 characters.
     type: string
   bigIpImageName:
-    default: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+    default: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
     description: BIG-IP image name
     type: string
   bigIpInstanceType:
diff --git a/examples/quickstart/quickstart.py.schema b/examples/quickstart/quickstart.py.schema
index e2b733ed..bfc69cfb 100644
--- a/examples/quickstart/quickstart.py.schema
+++ b/examples/quickstart/quickstart.py.schema
@@ -37,7 +37,7 @@ properties:
     description: Supply the hostname you would like to use for the BIG-IP instance. The hostname must contain fewer than 63 characters.
     type: string
   bigIpImageName:
-    default: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+    default: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
     description: BIG-IP image name
     type: string
   bigIpInstanceType:
diff --git a/examples/quickstart/sample_quickstart.yaml b/examples/quickstart/sample_quickstart.yaml
index 9c819bf3..563d7448 100644
--- a/examples/quickstart/sample_quickstart.yaml
+++ b/examples/quickstart/sample_quickstart.yaml
@@ -48,7 +48,7 @@ resources:
       ###  (OPTIONAL) The name of a public F5 Marketplace image to deploy.
       #    If you would like to view all available public images, run the following gcloud command:
       #    gcloud compute images list --project f5-7626-networks-public --filter="name~f5"
-      bigIpImageName: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+      bigIpImageName: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
       ###  (OPTIONAL) Instance type assigned to BIG-IP, for example 'n1-standard-8'.
       bigIpInstanceType: n1-standard-8
       ###  (OPTIONAL) Uncomment the parameter below to supply the F5 BYOL license key for BIG-IP instance.
diff --git a/examples/quickstart/sample_quickstart_existing_network.yaml b/examples/quickstart/sample_quickstart_existing_network.yaml
index faa9f5db..a419e715 100644
--- a/examples/quickstart/sample_quickstart_existing_network.yaml
+++ b/examples/quickstart/sample_quickstart_existing_network.yaml
@@ -44,7 +44,7 @@ resources:
       ###  (OPTIONAL) The name of a public F5 Marketplace image to deploy.
       #    If you would like to view all available public images, run the following gcloud command:
       #    gcloud compute images list --project f5-7626-networks-public --filter="name~f5"
-      bigIpImageName: f5-bigip-16-1-3-3-0-0-3-payg-best-plus-25mbps-221222234728
+      bigIpImageName: f5-bigip-17-1-1-0-2-6-payg-best-plus-25mbps-231101130547
       ###  (OPTIONAL) Instance type assigned to BIG-IP, for example 'n1-standard-8'.
       bigIpInstanceType: n1-standard-8
       ###  (OPTIONAL) Uncomment the parameter below to supply the F5 BYOL license key for BIG-IP instance.

From 7b23fccb6b38f3c4b838cfc38b3d25a92dfe5326 Mon Sep 17 00:00:00 2001
From: Michael Shimkus <m.shimkus@f5.com>
Date: Tue, 19 Dec 2023 11:25:10 -0800
Subject: [PATCH 05/10] update runtime default version

---
 examples/autoscale/bigiq/README.md                            | 4 ++--
 examples/autoscale/bigiq/autoscale-existing-network.py.schema | 2 +-
 .../autoscale/bigiq/sample_autoscale_existing_network.yaml    | 2 +-
 examples/autoscale/payg/README.md                             | 4 ++--
 examples/autoscale/payg/autoscale-existing-network.py.schema  | 2 +-
 .../autoscale/payg/sample_autoscale_existing_network.yaml     | 2 +-
 examples/failover/README.md                                   | 4 ++--
 examples/failover/failover-existing-network.py.schema         | 2 +-
 examples/failover/failover.py.schema                          | 2 +-
 examples/failover/sample_failover.yaml                        | 2 +-
 examples/failover/sample_failover_existing_network.yaml       | 2 +-
 examples/modules/bigip-autoscale/bigip_autoscale.py.schema    | 2 +-
 examples/modules/bigip-standalone/bigip_standalone.py.schema  | 2 +-
 examples/quickstart/README.md                                 | 4 ++--
 examples/quickstart/quickstart-existing-network.py.schema     | 2 +-
 examples/quickstart/sample_quickstart_existing_network.yaml   | 2 +-
 16 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/examples/autoscale/bigiq/README.md b/examples/autoscale/bigiq/README.md
index 36e99e04..ef8574ad 100644
--- a/examples/autoscale/bigiq/README.md
+++ b/examples/autoscale/bigiq/README.md
@@ -161,7 +161,7 @@ Note: These are specified in the configuration file. See sample_autoscale.yaml
 | bigIpInstanceType | No | | n1-standard-8 | string | Instance type assigned to the application, for example '| n1-standard-8'. |
 | bigIpIpCidrRange | No | 10.0.0.0/24 | string | IP CIDR range used by the management network of the BIG-IP, for example '10.0.0.0/24'. |
 | bigIpRuntimeInitConfig | No | https://raw.githubusercontent.com/F5Networks/f5-google-gdm-templates-v2/v2.9.0.0/examples/autoscale/bigip-configurations/runtime-init-conf-bigiq-with-app.yaml | string | Supply a URL to the bigip-runtime-init configuration file in YAML or JSON format. |
-| bigIpRuntimeInitPackageUrl | No | https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v1.5.1/dist/f5-bigip-runtime-init-1.5.1-1.gz.run | string | Supply a URL to the bigip-runtime-init package. |
+| bigIpRuntimeInitPackageUrl | No | https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.0/dist/f5-bigip-runtime-init-2.0.0-1.gz.run | string | Supply a URL to the bigip-runtime-init package. |
 | bigIpScaleOutCpuThreshold | No | 0.8 | integer | High CPU Percentage threshold to begin scaling out BIG-IP VE instances. |
 | bigIpScalingMaxSize | No | 8 | integer | Maximum number of BIG-IP instances that can be created in the Auto Scale Group. |
 | bigIpScalingMinSize | No | 1 | integer | Minimum number of BIG-IP instances you want available in the Auto Scale Group. |
@@ -196,7 +196,7 @@ Note: These are specified in the configuration file. See sample_autoscale.yaml
 | bigIpInstanceType | No | | n1-standard-8 | string | Instance type assigned to the application, for example '| n1-standard-8'. |
 | bigIpIpCidrRange | No | 10.0.0.0/24 | string | IP CIDR range used by the management network of the BIG-IP, for example '10.0.0.0/24'. |
 | bigIpRuntimeInitConfig | No | https://raw.githubusercontent.com/F5Networks/f5-google-gdm-templates-v2/v2.9.0.0/examples/autoscale/bigip-configurations/runtime-init-conf-bigiq-with-app.yaml | string | Supply a URL to the bigip-runtime-init configuration file in YAML or JSON format. |
-| bigIpRuntimeInitPackageUrl | No | https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v1.5.1/dist/f5-bigip-runtime-init-1.5.1-1.gz.run | string | Supply a URL to the bigip-runtime-init package. |
+| bigIpRuntimeInitPackageUrl | No | https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.0/dist/f5-bigip-runtime-init-2.0.0-1.gz.run | string | Supply a URL to the bigip-runtime-init package. |
 | bigIpScaleOutCpuThreshold | No | 0.8 | integer | High CPU Percentage threshold to begin scaling out BIG-IP VE instances. |
 | bigIpScalingMaxSize | No | 8 | integer | Maximum number of BIG-IP instances that can be created in the Auto Scale Group. |
 | bigIpScalingMinSize | No | 1 | integer | Minimum number of BIG-IP instances you want available in the Auto Scale Group. |
diff --git a/examples/autoscale/bigiq/autoscale-existing-network.py.schema b/examples/autoscale/bigiq/autoscale-existing-network.py.schema
index aea1a330..485d86bc 100644
--- a/examples/autoscale/bigiq/autoscale-existing-network.py.schema
+++ b/examples/autoscale/bigiq/autoscale-existing-network.py.schema
@@ -62,7 +62,7 @@ properties:
     description: Supply a URL to the bigip-runtime-init configuration file in YAML or JSON format, or an escaped JSON string to use for f5-bigip-runtime-init configuration.
     type: string
   bigIpRuntimeInitPackageUrl:
-    default: https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v1.5.1/dist/f5-bigip-runtime-init-1.5.1-1.gz.run
+    default: https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.0/dist/f5-bigip-runtime-init-2.0.0-1.gz.run
     description: URL for BIG-IP Runtime Init package
     type: string
   bigIqSecretId:
diff --git a/examples/autoscale/bigiq/sample_autoscale_existing_network.yaml b/examples/autoscale/bigiq/sample_autoscale_existing_network.yaml
index f1179812..8c167fb6 100644
--- a/examples/autoscale/bigiq/sample_autoscale_existing_network.yaml
+++ b/examples/autoscale/bigiq/sample_autoscale_existing_network.yaml
@@ -48,7 +48,7 @@ resources:
         https://raw.githubusercontent.com/F5Networks/f5-google-gdm-templates-v2/v2.9.0.0/examples/autoscale/bigip-configurations/runtime-init-conf-bigiq-with-app.yaml
       ###  (OPTIONAL) Supply a URL for the bigip-runtime-init package.
       bigIpRuntimeInitPackageUrl: >-
-        https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v1.5.1/dist/f5-bigip-runtime-init-1.5.1-1.gz.run
+        https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.0/dist/f5-bigip-runtime-init-2.0.0-1.gz.run
       ###  (OPTIONAL) The name of a public F5 Marketplace image to deploy.
       #    If you would like to view all available public images, run the following gcloud command:
       #    gcloud compute images list --project f5-7626-networks-public --filter="name~f5"
diff --git a/examples/autoscale/payg/README.md b/examples/autoscale/payg/README.md
index ab2c0235..6ff45426 100644
--- a/examples/autoscale/payg/README.md
+++ b/examples/autoscale/payg/README.md
@@ -138,7 +138,7 @@ Note: These are specified in the configuration file. See sample_autoscale.yaml
 | bigIpInstanceTemplateVersion | No | 1 | integer | Version of the instance template to create. When updating deployment properties of the BIG-IP instances, you must provide a unique value for this parameter. |
 | bigIpInstanceType | No | n1-standard-8 | string | Instance type assigned to the application, for example 'n1-standard-4'. |
 | bigIpRuntimeInitConfig | No | https://raw.githubusercontent.com/F5Networks/f5-google-gdm-templates-v2/v2.9.0.0/examples/autoscale/bigip-configurations/runtime-init-conf-payg-with-app.yaml | string | Supply a URL to the bigip-runtime-init configuration file in YAML or JSON format. |
-| bigIpRuntimeInitPackageUrl | No | https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v1.5.1/dist/f5-bigip-runtime-init-1.5.1-1.gz.run | string | Supply a URL to the bigip-runtime-init package. |
+| bigIpRuntimeInitPackageUrl | No | https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.0/dist/f5-bigip-runtime-init-2.0.0-1.gz.run | string | Supply a URL to the bigip-runtime-init package. |
 | bigIpScaleOutCpuThreshold | No | 0.8 | integer | High CPU Percentage threshold to begin scaling out BIG-IP VE instances. |
 | bigIpScalingMaxSize | No | 8 | integer | Maximum number of BIG-IP instances that can be created in the Auto Scale Group. |
 | bigIpScalingMinSize | No | 1 | integer | Minimum number of BIG-IP instances you want available in the Auto Scale Group. |
@@ -172,7 +172,7 @@ Note: These are specified in the configuration file. See sample_autoscale.yaml
 | bigIpInstanceTemplateVersion | No | 1 | integer | Version of the instance template to create. When updating deployment properties of the BIG-IP instances, you must provide a unique value for this parameter. |
 | bigIpInstanceType | No | n1-standard-8 | string | Instance type assigned to the application, for example 'n1-standard-4'. |
 | bigIpRuntimeInitConfig | No | https://raw.githubusercontent.com/F5Networks/f5-google-gdm-templates-v2/v2.9.0.0/examples/autoscale/bigip-configurations/runtime-init-conf-payg-with-app.yaml | string | Supply a URL to the bigip-runtime-init configuration file in YAML or JSON format. |
-| bigIpRuntimeInitPackageUrl | No | https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v1.5.1/dist/f5-bigip-runtime-init-1.5.1-1.gz.run | string | Supply a URL to the bigip-runtime-init package. |
+| bigIpRuntimeInitPackageUrl | No | https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.0/dist/f5-bigip-runtime-init-2.0.0-1.gz.run | string | Supply a URL to the bigip-runtime-init package. |
 | bigIpScaleOutCpuThreshold | No | 0.8 | integer | High CPU Percentage threshold to begin scaling out BIG-IP VE instances. |
 | bigIpScalingMaxSize | No | 8 | integer | Maximum number of BIG-IP instances that can be created in the Auto Scale Group. |
 | bigIpScalingMinSize | No | 1 | integer | Minimum number of BIG-IP instances you want available in the Auto Scale Group. |
diff --git a/examples/autoscale/payg/autoscale-existing-network.py.schema b/examples/autoscale/payg/autoscale-existing-network.py.schema
index 73ade3cc..6d92b5b7 100644
--- a/examples/autoscale/payg/autoscale-existing-network.py.schema
+++ b/examples/autoscale/payg/autoscale-existing-network.py.schema
@@ -60,7 +60,7 @@ properties:
     description: Supply a URL to the bigip-runtime-init configuration file in YAML or JSON format, or an escaped JSON string to use for f5-bigip-runtime-init configuration.
     type: string
   bigIpRuntimeInitPackageUrl:
-    default: https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v1.5.1/dist/f5-bigip-runtime-init-1.5.1-1.gz.run
+    default: https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.0/dist/f5-bigip-runtime-init-2.0.0-1.gz.run
     description: URL for BIG-IP Runtime Init package
     type: string
   cost:
diff --git a/examples/autoscale/payg/sample_autoscale_existing_network.yaml b/examples/autoscale/payg/sample_autoscale_existing_network.yaml
index 682f6582..50324559 100644
--- a/examples/autoscale/payg/sample_autoscale_existing_network.yaml
+++ b/examples/autoscale/payg/sample_autoscale_existing_network.yaml
@@ -47,7 +47,7 @@ resources:
         https://raw.githubusercontent.com/F5Networks/f5-google-gdm-templates-v2/v2.9.0.0/examples/autoscale/bigip-configurations/runtime-init-conf-payg-with-app.yaml
       ###  (OPTIONAL) Supply a URL for the bigip-runtime-init package.
       bigIpRuntimeInitPackageUrl: >-
-        https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v1.5.1/dist/f5-bigip-runtime-init-1.5.1-1.gz.run
+        https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.0/dist/f5-bigip-runtime-init-2.0.0-1.gz.run
       ###  (OPTIONAL) The name of a public F5 Marketplace image to deploy.
       #    If you would like to view all available public images, run the following gcloud command:
       #    gcloud compute images list --project f5-7626-networks-public --filter="name~f5"
diff --git a/examples/failover/README.md b/examples/failover/README.md
index 17e83f50..a2bb29dd 100644
--- a/examples/failover/README.md
+++ b/examples/failover/README.md
@@ -181,7 +181,7 @@ Note: These are specified in the configuration file. See sample_quickstart.yaml
 | bigIpPeerAddr | No | 10.0.1.11 | string | Provide the static address of the remote peer used for clustering. In this failover solution, clustering is initiated from the second instance (02) to the first instance (01) so you would provide the first instances Self IP address. |
 | bigIpRuntimeInitConfig01 | No | https://raw.githubusercontent.com/F5Networks/f5-google-gdm-templates-v2/v2.9.0.0/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance01-with-app.yaml | string | Supply a URL to the bigip-runtime-init configuration file in YAML or JSON format, or an escaped JSON string to use for f5-bigip-runtime-init configuration. |
 | bigIpRuntimeInitConfig02 | No | https://raw.githubusercontent.com/F5Networks/f5-google-gdm-templates-v2/v2.9.0.0/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance02-with-app.yaml | string | Supply a URL to the bigip-runtime-init configuration file in YAML or JSON format, or an escaped JSON string to use for f5-bigip-runtime-init configuration. |
-| bigIpRuntimeInitPackageUrl | No | https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v1.5.1/dist/f5-bigip-runtime-init-1.5.1-1.gz.run | string | Supply a URL to the bigip-runtime-init package. |
+| bigIpRuntimeInitPackageUrl | No | https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.0/dist/f5-bigip-runtime-init-2.0.0-1.gz.run | string | Supply a URL to the bigip-runtime-init package. |
 | cfeBucket | No | cfe-storage | string | Supply a unique name for a CFE storage bucket created and used by Cloud Failover Extension. If a value is not provided, a storage bucket will be created using the value of the uniqueString input parameter. For example: **myuniqstr-cfe-storage**. |
 | bigIpSecretId | **Yes** |  | string | Supply the ID of the Google secret manager secret where the BIG-IP password used for clustering is stored. For example: **mySecretId**. |
 | bigIpServiceAccountEmail | No |  | string | Supply an email of an existing service account to be assigned to the BIG-IP instance(s). If a value is not provided, a service account will be created. Example value: `your-service-account@your-project.iam.gserviceaccount.com` |
@@ -224,7 +224,7 @@ Note: These are specified in the configuration file. See sample_failover_existin
 | bigIpPeerAddr | No | 10.0.1.11 | string | Provide the static address of the remote peer used for clustering. In this failover solution, clustering is initiated from the second instance (02) to the first instance (01) so you would provide the first instances Self IP address. |
 | bigIpRuntimeInitConfig01 | No | https://raw.githubusercontent.com/F5Networks/f5-google-gdm-templates-v2/v2.9.0.0/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance01.yaml | --- | Supply a URL to the bigip-runtime-init configuration file in YAML or JSON format, or an escaped JSON string to use for f5-bigip-runtime-init configuration. |
 | bigIpRuntimeInitConfig02 | No | https://raw.githubusercontent.com/F5Networks/f5-google-gdm-templates-v2/v2.9.0.0/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance02.yaml | string | Supply a URL to the bigip-runtime-init configuration file in YAML or JSON format, or an escaped JSON string to use for f5-bigip-runtime-init configuration. |
-| bigIpRuntimeInitPackageUrl | No | https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v1.5.1/dist/f5-bigip-runtime-init-1.5.1-1.gz.run| string | Supply a URL to the bigip-runtime-init package. |
+| bigIpRuntimeInitPackageUrl | No | https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.0/dist/f5-bigip-runtime-init-2.0.0-1.gz.run| string | Supply a URL to the bigip-runtime-init package. |
 | bigIpServiceAccountEmail | No |  | string | Supply an email of an existing service account to be assigned to the BIG-IP instance(s). If a value is not provided, a service account will be created. Example value: `your-service-account@your-project.iam.gserviceaccount.com`. |
 | bigIpSecretId | **Yes** |  | string | Supply the ID of the Google secret manager secret where the BIG-IP password used for clustering is stored. For example: **mySecretId**. |
 | cfeBucket | No | cfe-storage | string | Supply a unique name for a CFE storage bucket created and used by Cloud Failover Extension. If a value is not provided, a storage bucket will be created using the value of the uniqueString input parameter. For example: **myuniqstr-cfe-storage**. |
diff --git a/examples/failover/failover-existing-network.py.schema b/examples/failover/failover-existing-network.py.schema
index 73ab4332..a94c4024 100644
--- a/examples/failover/failover-existing-network.py.schema
+++ b/examples/failover/failover-existing-network.py.schema
@@ -73,7 +73,7 @@ properties:
     description: For BIGIP instance 2,  supply a URL to the bigip-runtime-init configuration file in YAML or JSON format, or an escaped JSON string to use for f5-bigip-runtime-init configuration.
     type: string
   bigIpRuntimeInitPackageUrl:
-    default: https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v1.5.1/dist/f5-bigip-runtime-init-1.5.1-1.gz.run
+    default: https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.0/dist/f5-bigip-runtime-init-2.0.0-1.gz.run
     description: URL for BIG-IP Runtime Init package
     type: string
   bigIpHostname01:
diff --git a/examples/failover/failover.py.schema b/examples/failover/failover.py.schema
index 50048bf4..81460fa3 100644
--- a/examples/failover/failover.py.schema
+++ b/examples/failover/failover.py.schema
@@ -79,7 +79,7 @@ properties:
     description: For BIGIP instance 2,  supply a URL to the bigip-runtime-init configuration file in YAML or JSON format, or an escaped JSON string to use for f5-bigip-runtime-init configuration.
     type: string
   bigIpRuntimeInitPackageUrl:
-    default: https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v1.5.1/dist/f5-bigip-runtime-init-1.5.1-1.gz.run
+    default: https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.0/dist/f5-bigip-runtime-init-2.0.0-1.gz.run
     description: URL for BIG-IP Runtime Init package
     type: string
   bigIpHostname01:
diff --git a/examples/failover/sample_failover.yaml b/examples/failover/sample_failover.yaml
index 876fa401..99c395a3 100644
--- a/examples/failover/sample_failover.yaml
+++ b/examples/failover/sample_failover.yaml
@@ -84,7 +84,7 @@ resources:
         https://raw.githubusercontent.com/F5Networks/f5-google-gdm-templates-v2/v2.9.0.0/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance02-with-app.yaml
       ###  (OPTIONAL) Supply a URL for the bigip-runtime-init package
       bigIpRuntimeInitPackageUrl: >-
-        https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v1.5.1/dist/f5-bigip-runtime-init-1.5.1-1.gz.run
+        https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.0/dist/f5-bigip-runtime-init-2.0.0-1.gz.run
       ###  (REQUIRED) BIG-IP secret ID.
       #    Supply the ID of the Google secret manager secret where the BIG-IP password used for
       #    clustering is stored. For example: 'mySecretId'.
diff --git a/examples/failover/sample_failover_existing_network.yaml b/examples/failover/sample_failover_existing_network.yaml
index 760e8b86..94146ce2 100644
--- a/examples/failover/sample_failover_existing_network.yaml
+++ b/examples/failover/sample_failover_existing_network.yaml
@@ -75,7 +75,7 @@ resources:
         https://raw.githubusercontent.com/F5Networks/f5-google-gdm-templates-v2/v2.9.0.0/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance02.yaml
       ###  (OPTIONAL) Supply a URL for the bigip-runtime-init package
       bigIpRuntimeInitPackageUrl: >-
-        https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v1.5.1/dist/f5-bigip-runtime-init-1.5.1-1.gz.run
+        https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.0/dist/f5-bigip-runtime-init-2.0.0-1.gz.run
       ###  (REQUIRED) BIG-IP secret ID.
       #    Supply the ID of the Google secret manager secret where the BIG-IP password used for
       #    clustering is stored. For example: 'mySecretId'.
diff --git a/examples/modules/bigip-autoscale/bigip_autoscale.py.schema b/examples/modules/bigip-autoscale/bigip_autoscale.py.schema
index 736cbb18..53bd081d 100644
--- a/examples/modules/bigip-autoscale/bigip_autoscale.py.schema
+++ b/examples/modules/bigip-autoscale/bigip_autoscale.py.schema
@@ -38,7 +38,7 @@ properties:
     type: array
   bigIpRuntimeInitPackageUrl:
     description: URL for BIG-IP Runtime Init package
-    default: https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v1.5.1/dist/f5-bigip-runtime-init-1.5.1-1.gz.run
+    default: https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.0/dist/f5-bigip-runtime-init-2.0.0-1.gz.run
     type: string
   bigIpRuntimeInitConfig:
     description: Supply a URL to the bigip-runtime-init configuration file in YAML or JSON format, or an escaped JSON string to use for f5-bigip-runtime-init configuration.
diff --git a/examples/modules/bigip-standalone/bigip_standalone.py.schema b/examples/modules/bigip-standalone/bigip_standalone.py.schema
index d9ed44d5..fb01840e 100644
--- a/examples/modules/bigip-standalone/bigip_standalone.py.schema
+++ b/examples/modules/bigip-standalone/bigip_standalone.py.schema
@@ -37,7 +37,7 @@ properties:
     type: string
   bigIpRuntimeInitPackageUrl:
     description: URL for BIG-IP Runtime Init package
-    default: https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v1.5.1/dist/f5-bigip-runtime-init-1.5.1-1.gz.run
+    default: https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.0/dist/f5-bigip-runtime-init-2.0.0-1.gz.run
     type: string
   hostname:
     default: bigip01.local
diff --git a/examples/quickstart/README.md b/examples/quickstart/README.md
index 85cc1399..b366c928 100644
--- a/examples/quickstart/README.md
+++ b/examples/quickstart/README.md
@@ -160,7 +160,7 @@ These are specified in the configuration file. See sample_quickstart.yaml
 | bigIpInstanceType | No | n1-standard-8 | string | Instance type assigned to the application, for example 'n1-standard-4'. |
 | bigIpLicenseKey | No |  | string | Supply the F5 BYOL license key for the BIG-IP instance if deploying a BYOL image. |
 | bigIpRuntimeInitConfig | No | https://raw.githubusercontent.com/F5Networks/f5-google-gdm-templates-v2/v2.9.0.0/examples/quickstart/bigip-configurations/runtime-init-conf-3nic-payg-with-app.yaml | string | Supply a URL to the bigip-runtime-init configuration file in YAML or JSON format. |
-| bigIpRuntimeInitPackageUrl | No | https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v1.5.1/dist/f5-bigip-runtime-init-1.5.1-1.gz.run | string | Supply a URL to the bigip-runtime-init package. |
+| bigIpRuntimeInitPackageUrl | No | https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.0/dist/f5-bigip-runtime-init-2.0.0-1.gz.run | string | Supply a URL to the bigip-runtime-init package. |
 | bigIpServiceAccountEmail | No |  | string | Supply an email of an existing service account to be assigned to the BIG-IP instance. If a value is not provided, a service account will not be assigned to the instance. Example value: `your-service-account@your-project.iam.gserviceaccount.com`. |
 | cost | No | f5cost | string | Cost Center Tag. |
 | environment | No | f5env | string | Environment Tag. |
@@ -189,7 +189,7 @@ These are specified in the configuration file. See sample_quickstart-existing-ne
 | bigIpInstanceType | No | n1-standard-8 | string | Instance type assigned to the application, for example 'n1-standard-4'. |
 | bigIpLicenseKey | No |  | string | Supply the F5 BYOL license key for the BIG-IP instance if deploying a BYOL image. |
 | bigIpRuntimeInitConfig | No | https://raw.githubusercontent.com/F5Networks/f5-google-gdm-templates-v2/v2.9.0.0/examples/quickstart/bigip-configurations/runtime-init-conf-3nic-payg-with-app.yaml | string | Supply a URL to the bigip-runtime-init configuration file in YAML or JSON format. |
-| bigIpRuntimeInitPackageUrl | No | https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v1.5.1/dist/f5-bigip-runtime-init-1.5.1-1.gz.run | string | Supply a URL to the bigip-runtime-init package. |
+| bigIpRuntimeInitPackageUrl | No | https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.0/dist/f5-bigip-runtime-init-2.0.0-1.gz.run | string | Supply a URL to the bigip-runtime-init package. |
 | bigIpServiceAccountEmail | No |  | string | Supply an email of an existing service account to be assigned to the BIG-IP instance. If a value is not provided, a service account will not be assigned to the instance. Example value: `your-service-account@your-project.iam.gserviceaccount.com`. |
 | cost | No | f5cost | string | Cost Center Tag. |
 | environment | No | f5env | string | Environment Tag. |
diff --git a/examples/quickstart/quickstart-existing-network.py.schema b/examples/quickstart/quickstart-existing-network.py.schema
index 42dc556b..0d5bf5f8 100644
--- a/examples/quickstart/quickstart-existing-network.py.schema
+++ b/examples/quickstart/quickstart-existing-network.py.schema
@@ -44,7 +44,7 @@ properties:
     description: Supply a URL to the bigip-runtime-init configuration file in YAML or JSON format, or an escaped JSON string to use for f5-bigip-runtime-init configuration.
     type: string
   bigIpRuntimeInitPackageUrl:
-    default: https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v1.5.1/dist/f5-bigip-runtime-init-1.5.1-1.gz.run
+    default: https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.0/dist/f5-bigip-runtime-init-2.0.0-1.gz.run
     description: URL for BIG-IP Runtime Init package
     type: string
   cost:
diff --git a/examples/quickstart/sample_quickstart_existing_network.yaml b/examples/quickstart/sample_quickstart_existing_network.yaml
index a419e715..1df8394d 100644
--- a/examples/quickstart/sample_quickstart_existing_network.yaml
+++ b/examples/quickstart/sample_quickstart_existing_network.yaml
@@ -55,7 +55,7 @@ resources:
         https://raw.githubusercontent.com/F5Networks/f5-google-gdm-templates-v2/v2.9.0.0/examples/quickstart/bigip-configurations/runtime-init-conf-3nic-payg.yaml
       ###  (OPTIONAL) Supply a URL for the bigip-runtime-init package
       bigIpRuntimeInitPackageUrl: >-
-        https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v1.5.1/dist/f5-bigip-runtime-init-1.5.1-1.gz.run
+        https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.0/dist/f5-bigip-runtime-init-2.0.0-1.gz.run
       ###  (OPTIONAL) BIG-IP service account email.
       #    Supply an email of an existing service account to be assigned to the BIG-IP instance.
       #    Uncomment the parameter below and replace 'your-service-account@yourproject' value

From 77d35f4fb589c2a9aa93d096d0acbab4d69037d4 Mon Sep 17 00:00:00 2001
From: Michael Shimkus <m.shimkus@f5.com>
Date: Wed, 20 Dec 2023 09:49:05 -0800
Subject: [PATCH 06/10] bump cfe version

---
 .../runtime-init-conf-2nic-byol-instance01-with-app.yaml      | 4 ++--
 .../runtime-init-conf-2nic-byol-instance01.yaml               | 4 ++--
 .../runtime-init-conf-2nic-byol-instance02-with-app.yaml      | 4 ++--
 .../runtime-init-conf-2nic-byol-instance02.yaml               | 4 ++--
 .../runtime-init-conf-2nic-payg-instance01-with-app.yaml      | 4 ++--
 .../runtime-init-conf-2nic-payg-instance01.yaml               | 4 ++--
 .../runtime-init-conf-2nic-payg-instance02-with-app.yaml      | 4 ++--
 .../runtime-init-conf-2nic-payg-instance02.yaml               | 4 ++--
 .../runtime-init-conf-3nic-byol-instance01-with-app.yaml      | 4 ++--
 .../runtime-init-conf-3nic-byol-instance01.yaml               | 4 ++--
 .../runtime-init-conf-3nic-byol-instance02-with-app.yaml      | 4 ++--
 .../runtime-init-conf-3nic-byol-instance02.yaml               | 4 ++--
 .../runtime-init-conf-3nic-payg-instance01-with-app.yaml      | 4 ++--
 .../runtime-init-conf-3nic-payg-instance01.yaml               | 4 ++--
 .../runtime-init-conf-3nic-payg-instance02-with-app.yaml      | 4 ++--
 .../runtime-init-conf-3nic-payg-instance02.yaml               | 4 ++--
 16 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance01-with-app.yaml b/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance01-with-app.yaml
index 016033e0..f70490af 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance01-with-app.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance01-with-app.yaml
@@ -10,8 +10,8 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 2.0.0
-      extensionHash: 57659a3acae2a60045e2aa5636d3e23530f0724d77a008f0b716309bf955de8a
+      extensionVersion: 2.0.1
+      extensionHash: f2986aeeaf0a098ce4bb7b08f42d985dfd19bb146c12c8b41b53c147f1a1749d
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance01.yaml b/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance01.yaml
index 6c2410d7..98d709a1 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance01.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance01.yaml
@@ -10,8 +10,8 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 2.0.0
-      extensionHash: 57659a3acae2a60045e2aa5636d3e23530f0724d77a008f0b716309bf955de8a
+      extensionVersion: 2.0.1
+      extensionHash: f2986aeeaf0a098ce4bb7b08f42d985dfd19bb146c12c8b41b53c147f1a1749d
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance02-with-app.yaml b/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance02-with-app.yaml
index 21fddbf4..f20ee027 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance02-with-app.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance02-with-app.yaml
@@ -10,8 +10,8 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 2.0.0
-      extensionHash: 57659a3acae2a60045e2aa5636d3e23530f0724d77a008f0b716309bf955de8a
+      extensionVersion: 2.0.1
+      extensionHash: f2986aeeaf0a098ce4bb7b08f42d985dfd19bb146c12c8b41b53c147f1a1749d
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance02.yaml b/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance02.yaml
index d304220e..cfcae564 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance02.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance02.yaml
@@ -10,8 +10,8 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 2.0.0
-      extensionHash: 57659a3acae2a60045e2aa5636d3e23530f0724d77a008f0b716309bf955de8a
+      extensionVersion: 2.0.1
+      extensionHash: f2986aeeaf0a098ce4bb7b08f42d985dfd19bb146c12c8b41b53c147f1a1749d
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance01-with-app.yaml b/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance01-with-app.yaml
index e226bc6c..402530b3 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance01-with-app.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance01-with-app.yaml
@@ -10,8 +10,8 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 2.0.0
-      extensionHash: 57659a3acae2a60045e2aa5636d3e23530f0724d77a008f0b716309bf955de8a
+      extensionVersion: 2.0.1
+      extensionHash: f2986aeeaf0a098ce4bb7b08f42d985dfd19bb146c12c8b41b53c147f1a1749d
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance01.yaml b/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance01.yaml
index bae6b9bd..12360c23 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance01.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance01.yaml
@@ -10,8 +10,8 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 2.0.0
-      extensionHash: 57659a3acae2a60045e2aa5636d3e23530f0724d77a008f0b716309bf955de8a
+      extensionVersion: 2.0.1
+      extensionHash: f2986aeeaf0a098ce4bb7b08f42d985dfd19bb146c12c8b41b53c147f1a1749d
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance02-with-app.yaml b/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance02-with-app.yaml
index 3ad631cd..5a2fc0c5 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance02-with-app.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance02-with-app.yaml
@@ -10,8 +10,8 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 2.0.0
-      extensionHash: 57659a3acae2a60045e2aa5636d3e23530f0724d77a008f0b716309bf955de8a
+      extensionVersion: 2.0.1
+      extensionHash: f2986aeeaf0a098ce4bb7b08f42d985dfd19bb146c12c8b41b53c147f1a1749d
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance02.yaml b/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance02.yaml
index 342df281..b52bbc6b 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance02.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance02.yaml
@@ -10,8 +10,8 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 2.0.0
-      extensionHash: 57659a3acae2a60045e2aa5636d3e23530f0724d77a008f0b716309bf955de8a
+      extensionVersion: 2.0.1
+      extensionHash: f2986aeeaf0a098ce4bb7b08f42d985dfd19bb146c12c8b41b53c147f1a1749d
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance01-with-app.yaml b/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance01-with-app.yaml
index ee76c04b..0464cdde 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance01-with-app.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance01-with-app.yaml
@@ -10,8 +10,8 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 2.0.0
-      extensionHash: 57659a3acae2a60045e2aa5636d3e23530f0724d77a008f0b716309bf955de8a
+      extensionVersion: 2.0.1
+      extensionHash: f2986aeeaf0a098ce4bb7b08f42d985dfd19bb146c12c8b41b53c147f1a1749d
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance01.yaml b/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance01.yaml
index 74e4e73a..42e6bd12 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance01.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance01.yaml
@@ -10,8 +10,8 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 2.0.0
-      extensionHash: 57659a3acae2a60045e2aa5636d3e23530f0724d77a008f0b716309bf955de8a
+      extensionVersion: 2.0.1
+      extensionHash: f2986aeeaf0a098ce4bb7b08f42d985dfd19bb146c12c8b41b53c147f1a1749d
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance02-with-app.yaml b/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance02-with-app.yaml
index 1b0e2c74..d922791f 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance02-with-app.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance02-with-app.yaml
@@ -10,8 +10,8 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 2.0.0
-      extensionHash: 57659a3acae2a60045e2aa5636d3e23530f0724d77a008f0b716309bf955de8a
+      extensionVersion: 2.0.1
+      extensionHash: f2986aeeaf0a098ce4bb7b08f42d985dfd19bb146c12c8b41b53c147f1a1749d
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance02.yaml b/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance02.yaml
index 3d3f925b..18a713e8 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance02.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance02.yaml
@@ -10,8 +10,8 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 2.0.0
-      extensionHash: 57659a3acae2a60045e2aa5636d3e23530f0724d77a008f0b716309bf955de8a
+      extensionVersion: 2.0.1
+      extensionHash: f2986aeeaf0a098ce4bb7b08f42d985dfd19bb146c12c8b41b53c147f1a1749d
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance01-with-app.yaml b/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance01-with-app.yaml
index 58ca4321..afff15cf 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance01-with-app.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance01-with-app.yaml
@@ -10,8 +10,8 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 2.0.0
-      extensionHash: 57659a3acae2a60045e2aa5636d3e23530f0724d77a008f0b716309bf955de8a
+      extensionVersion: 2.0.1
+      extensionHash: f2986aeeaf0a098ce4bb7b08f42d985dfd19bb146c12c8b41b53c147f1a1749d
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance01.yaml b/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance01.yaml
index 790d38a7..76519ba6 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance01.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance01.yaml
@@ -10,8 +10,8 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 2.0.0
-      extensionHash: 57659a3acae2a60045e2aa5636d3e23530f0724d77a008f0b716309bf955de8a
+      extensionVersion: 2.0.1
+      extensionHash: f2986aeeaf0a098ce4bb7b08f42d985dfd19bb146c12c8b41b53c147f1a1749d
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance02-with-app.yaml b/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance02-with-app.yaml
index 30492645..b0442e78 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance02-with-app.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance02-with-app.yaml
@@ -10,8 +10,8 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 2.0.0
-      extensionHash: 57659a3acae2a60045e2aa5636d3e23530f0724d77a008f0b716309bf955de8a
+      extensionVersion: 2.0.1
+      extensionHash: f2986aeeaf0a098ce4bb7b08f42d985dfd19bb146c12c8b41b53c147f1a1749d
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance02.yaml b/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance02.yaml
index 33a8db99..9a2b7b9a 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance02.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance02.yaml
@@ -10,8 +10,8 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 2.0.0
-      extensionHash: 57659a3acae2a60045e2aa5636d3e23530f0724d77a008f0b716309bf955de8a
+      extensionVersion: 2.0.1
+      extensionHash: f2986aeeaf0a098ce4bb7b08f42d985dfd19bb146c12c8b41b53c147f1a1749d
 extension_services:
   service_operations:
     - extensionType: do

From b56e662b68c79a3e7bdda74f0bbc2374100b9f83 Mon Sep 17 00:00:00 2001
From: Michael Shimkus <m.shimkus@f5.com>
Date: Wed, 20 Dec 2023 10:12:49 -0800
Subject: [PATCH 07/10] bump template version

---
 automated-test-scripts/data/test_policies/shimkus.yaml      | 6 +++---
 examples/autoscale/bigiq/autoscale-existing-network.py      | 2 +-
 .../autoscale/bigiq/autoscale-existing-network.py.schema    | 2 +-
 examples/autoscale/bigiq/autoscale.py                       | 2 +-
 examples/autoscale/bigiq/autoscale.py.schema                | 2 +-
 examples/autoscale/payg/autoscale-existing-network.py       | 2 +-
 .../autoscale/payg/autoscale-existing-network.py.schema     | 2 +-
 examples/autoscale/payg/autoscale.py                        | 2 +-
 examples/autoscale/payg/autoscale.py.schema                 | 2 +-
 examples/failover/failover-existing-network.py              | 2 +-
 examples/failover/failover-existing-network.py.schema       | 2 +-
 examples/failover/failover.py                               | 2 +-
 examples/failover/failover.py.schema                        | 2 +-
 examples/modules/access/access.py                           | 2 +-
 examples/modules/access/access.py.schema                    | 2 +-
 examples/modules/application/application.py                 | 2 +-
 examples/modules/application/application.py.schema          | 2 +-
 examples/modules/bastion/bastion.py                         | 2 +-
 examples/modules/bastion/bastion.py.schema                  | 2 +-
 examples/modules/bigip-autoscale/bigip_autoscale.py         | 2 +-
 examples/modules/bigip-autoscale/bigip_autoscale.py.schema  | 2 +-
 examples/modules/bigip-standalone/bigip_standalone.py       | 2 +-
 .../modules/bigip-standalone/bigip_standalone.py.schema     | 2 +-
 examples/modules/dag/dag.py                                 | 2 +-
 examples/modules/dag/dag.py.schema                          | 2 +-
 examples/modules/function/function.py.schema                | 2 +-
 examples/modules/network/network.py                         | 2 +-
 examples/modules/network/network.py.schema                  | 2 +-
 examples/quickstart/quickstart-existing-network.py          | 2 +-
 examples/quickstart/quickstart-existing-network.py.schema   | 2 +-
 examples/quickstart/quickstart.py                           | 2 +-
 examples/quickstart/quickstart.py.schema                    | 2 +-
 32 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/automated-test-scripts/data/test_policies/shimkus.yaml b/automated-test-scripts/data/test_policies/shimkus.yaml
index 8bc03e30..bd7d50ac 100644
--- a/automated-test-scripts/data/test_policies/shimkus.yaml
+++ b/automated-test-scripts/data/test_policies/shimkus.yaml
@@ -4,7 +4,7 @@
 google-autoscale-payg-example-test:
   test-url: "file://automated-test-scripts/f5-google-gdm-templates-v2/examples/autoscale/payg/daily_test.yaml"
   run: "random"
-  random-num-of-tests: 0
+  random-num-of-tests: 1
   parameters-files:
     - "automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/payg/full/demo_app.yaml"
     - "automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/payg/full/prod_app.yaml"
@@ -50,7 +50,7 @@ google-gdm-failover-example-test-byol:
 google-gdm-failover-example-test-payg:
   test-url: "file://automated-test-scripts/f5-google-gdm-templates-v2/examples/failover/daily_test_full.yaml"
   run: "random"
-  random-num-of-tests: 0
+  random-num-of-tests: 1
   parameters-files:
     - "automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/full/demo.yaml"
     - "automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/full/prod.yaml"
@@ -95,7 +95,7 @@ google-gdm-quickstart-test-byol:
 google-gdm-quickstart-test-payg:
   test-url: "file://automated-test-scripts/f5-google-gdm-templates-v2/examples/quickstart/daily_test_full.yaml"
   run: "random"
-  random-num-of-tests: 0
+  random-num-of-tests: 1
   parameters-files:
     - "automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/demo_app_1nic.yaml"
     - "automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/full/demo_app_2nic.yaml"
diff --git a/examples/autoscale/bigiq/autoscale-existing-network.py b/examples/autoscale/bigiq/autoscale-existing-network.py
index 5f2903ab..a7df3485 100644
--- a/examples/autoscale/bigiq/autoscale-existing-network.py
+++ b/examples/autoscale/bigiq/autoscale-existing-network.py
@@ -1,6 +1,6 @@
 # Copyright 2021 F5 Networks All rights reserved.
 #
-# Version 2.9.0.0
+# Version 3.0.0.0
 
 # pylint: disable=W,C,R
 
diff --git a/examples/autoscale/bigiq/autoscale-existing-network.py.schema b/examples/autoscale/bigiq/autoscale-existing-network.py.schema
index 485d86bc..79c84fc9 100644
--- a/examples/autoscale/bigiq/autoscale-existing-network.py.schema
+++ b/examples/autoscale/bigiq/autoscale-existing-network.py.schema
@@ -5,7 +5,7 @@ info:
   title: F5 Autoscale WAF BIGIQ template
   author: F5 Networks
   description: Creates an Autoscale WAF BIGIQ deployment.
-  version: 2.9.0.0
+  version: 3.0.0.0
 
 imports:
   - path: autoscale-existing-network.py
diff --git a/examples/autoscale/bigiq/autoscale.py b/examples/autoscale/bigiq/autoscale.py
index ce002c69..7a424418 100644
--- a/examples/autoscale/bigiq/autoscale.py
+++ b/examples/autoscale/bigiq/autoscale.py
@@ -1,6 +1,6 @@
 # Copyright 2021 F5 Networks All rights reserved.
 #
-# Version 2.9.0.0
+# Version 3.0.0.0
 
 # pylint: disable=W,C,R
 
diff --git a/examples/autoscale/bigiq/autoscale.py.schema b/examples/autoscale/bigiq/autoscale.py.schema
index e66d659a..01f18e06 100644
--- a/examples/autoscale/bigiq/autoscale.py.schema
+++ b/examples/autoscale/bigiq/autoscale.py.schema
@@ -5,7 +5,7 @@ info:
   title: F5 Autoscale WAF BIGIQ template
   author: F5 Networks
   description: Creates an Autoscale WAF BIGIQ deployment.
-  version: 2.9.0.0
+  version: 3.0.0.0
 
 imports:
   - path: autoscale.py
diff --git a/examples/autoscale/payg/autoscale-existing-network.py b/examples/autoscale/payg/autoscale-existing-network.py
index d6a88683..b4039201 100644
--- a/examples/autoscale/payg/autoscale-existing-network.py
+++ b/examples/autoscale/payg/autoscale-existing-network.py
@@ -1,6 +1,6 @@
 # Copyright 2021 F5 Networks All rights reserved.
 #
-# Version 2.9.0.0
+# Version 3.0.0.0
 
 # pylint: disable=W,C,R
 
diff --git a/examples/autoscale/payg/autoscale-existing-network.py.schema b/examples/autoscale/payg/autoscale-existing-network.py.schema
index 6d92b5b7..27a5be10 100644
--- a/examples/autoscale/payg/autoscale-existing-network.py.schema
+++ b/examples/autoscale/payg/autoscale-existing-network.py.schema
@@ -5,7 +5,7 @@ info:
   title: F5 Autoscale WAF PAYG template
   author: F5 Networks
   description: Creates an Autoscale WAF PAYG deployment.
-  version: 2.9.0.0
+  version: 3.0.0.0
 
 imports:
   - path: autoscale.py
diff --git a/examples/autoscale/payg/autoscale.py b/examples/autoscale/payg/autoscale.py
index e6c38d29..ca088d2e 100644
--- a/examples/autoscale/payg/autoscale.py
+++ b/examples/autoscale/payg/autoscale.py
@@ -1,6 +1,6 @@
 # Copyright 2021 F5 Networks All rights reserved.
 #
-# Version 2.9.0.0
+# Version 3.0.0.0
 
 # pylint: disable=W,C,R
 
diff --git a/examples/autoscale/payg/autoscale.py.schema b/examples/autoscale/payg/autoscale.py.schema
index 67758b8b..8ab2a883 100644
--- a/examples/autoscale/payg/autoscale.py.schema
+++ b/examples/autoscale/payg/autoscale.py.schema
@@ -5,7 +5,7 @@ info:
   title: F5 Autoscale WAF PAYG template
   author: F5 Networks
   description: Creates an Autoscale WAF PAYG deployment.
-  version: 2.9.0.0
+  version: 3.0.0.0
 
 imports:
   - path: autoscale.py
diff --git a/examples/failover/failover-existing-network.py b/examples/failover/failover-existing-network.py
index cb0d0067..de0d8f70 100644
--- a/examples/failover/failover-existing-network.py
+++ b/examples/failover/failover-existing-network.py
@@ -1,6 +1,6 @@
 # Copyright 2021 F5 Networks All rights reserved.
 #
-# Version 2.9.0.0
+# Version 3.0.0.0
 
 
 """Creates full stack for POC"""
diff --git a/examples/failover/failover-existing-network.py.schema b/examples/failover/failover-existing-network.py.schema
index a94c4024..7b1073c7 100644
--- a/examples/failover/failover-existing-network.py.schema
+++ b/examples/failover/failover-existing-network.py.schema
@@ -5,7 +5,7 @@ info:
   author: F5 Networks
   description: Creates a pair of bigip's HA deployment along with all required resources to support deployment.
   title: F5 Failover Existing Network template
-  version: 2.9.0.0
+  version: 3.0.0.0
 
 imports:
   - path: failover-existing-network.py
diff --git a/examples/failover/failover.py b/examples/failover/failover.py
index fd5e5044..3a605f64 100644
--- a/examples/failover/failover.py
+++ b/examples/failover/failover.py
@@ -1,6 +1,6 @@
 # Copyright 2021 F5 Networks All rights reserved.
 #
-# Version 2.9.0.0
+# Version 3.0.0.0
 
 
 """Creates full stack for POC"""
diff --git a/examples/failover/failover.py.schema b/examples/failover/failover.py.schema
index 81460fa3..2bf4f25a 100644
--- a/examples/failover/failover.py.schema
+++ b/examples/failover/failover.py.schema
@@ -5,7 +5,7 @@ info:
   author: F5 Networks
   description: Creates a pair of bigip's HA deployment along with all required resources to support deployment.
   title: F5 failover template
-  version: 2.9.0.0
+  version: 3.0.0.0
 
 imports:
   - path: failover.py
diff --git a/examples/modules/access/access.py b/examples/modules/access/access.py
index 7149d6fd..c3a318e8 100644
--- a/examples/modules/access/access.py
+++ b/examples/modules/access/access.py
@@ -1,6 +1,6 @@
 # Copyright 2021 F5 Networks All rights reserved.
 #
-# Version 2.9.0.0
+# Version 3.0.0.0
 
 # pylint: disable=W,C,R,duplicate-code,line-too-long
 
diff --git a/examples/modules/access/access.py.schema b/examples/modules/access/access.py.schema
index 5d6df8a2..c69fd331 100644
--- a/examples/modules/access/access.py.schema
+++ b/examples/modules/access/access.py.schema
@@ -5,7 +5,7 @@ info:
   title: F5 Sample Access
   author: F5 Networks
   description: Creates a sample access module.
-  version: 2.9.0.0
+  version: 3.0.0.0
 
 imports:
   - path: access.py
diff --git a/examples/modules/application/application.py b/examples/modules/application/application.py
index 1015f84d..e0c0d7a9 100644
--- a/examples/modules/application/application.py
+++ b/examples/modules/application/application.py
@@ -1,6 +1,6 @@
 # Copyright 2021 F5 Networks All rights reserved.
 #
-# Version 2.9.0.0
+# Version 3.0.0.0
 
 # pylint: disable=W,C,R,duplicate-code,line-too-long
 
diff --git a/examples/modules/application/application.py.schema b/examples/modules/application/application.py.schema
index 16b02329..31c9b98a 100644
--- a/examples/modules/application/application.py.schema
+++ b/examples/modules/application/application.py.schema
@@ -12,7 +12,7 @@ info:
       - https://cloud.google.com/compute/docs/reference/rest/v1/autoscalers
       - https://cloud.google.com/compute/docs/reference/rest/v1/instanceGroupManagers
       - https://cloud.google.com/compute/docs/reference/rest/v1/instanceTemplates
-  version: 2.9.0.0
+  version: 3.0.0.0
 
 imports:
   - path: application.py
diff --git a/examples/modules/bastion/bastion.py b/examples/modules/bastion/bastion.py
index 3c77007d..bb7470de 100644
--- a/examples/modules/bastion/bastion.py
+++ b/examples/modules/bastion/bastion.py
@@ -1,6 +1,6 @@
 # Copyright 2021 F5 Networks All rights reserved.
 #
-# Version 2.9.0.0
+# Version 3.0.0.0
 
 # pylint: disable=W,C,R,duplicate-code,line-too-long
 
diff --git a/examples/modules/bastion/bastion.py.schema b/examples/modules/bastion/bastion.py.schema
index 7078fc37..034941a0 100644
--- a/examples/modules/bastion/bastion.py.schema
+++ b/examples/modules/bastion/bastion.py.schema
@@ -12,7 +12,7 @@ info:
       - https://cloud.google.com/compute/docs/reference/rest/v1/autoscalers
       - https://cloud.google.com/compute/docs/reference/rest/v1/instanceGroupManagers
       - https://cloud.google.com/compute/docs/reference/rest/v1/instanceTemplates
-  version: 2.9.0.0
+  version: 3.0.0.0
 
 imports:
   - path: bastion.py
diff --git a/examples/modules/bigip-autoscale/bigip_autoscale.py b/examples/modules/bigip-autoscale/bigip_autoscale.py
index ee3f09e3..43004df1 100644
--- a/examples/modules/bigip-autoscale/bigip_autoscale.py
+++ b/examples/modules/bigip-autoscale/bigip_autoscale.py
@@ -1,6 +1,6 @@
 # Copyright 2021 F5 Networks All rights reserved.
 #
-# Version 2.9.0.0
+# Version 3.0.0.0
 
 # pylint: disable=W,C,R,duplicate-code,line-too-long
 
diff --git a/examples/modules/bigip-autoscale/bigip_autoscale.py.schema b/examples/modules/bigip-autoscale/bigip_autoscale.py.schema
index 53bd081d..8af78998 100644
--- a/examples/modules/bigip-autoscale/bigip_autoscale.py.schema
+++ b/examples/modules/bigip-autoscale/bigip_autoscale.py.schema
@@ -5,7 +5,7 @@ info:
   title: F5 BIGIP Autoscale module
   author: F5 Networks
   description: Creates a BIGIP autoscale group.
-  version: 2.9.0.0
+  version: 3.0.0.0
 
 imports:
   - path: bigip_autoscale.py
diff --git a/examples/modules/bigip-standalone/bigip_standalone.py b/examples/modules/bigip-standalone/bigip_standalone.py
index 005bedac..2056e70e 100644
--- a/examples/modules/bigip-standalone/bigip_standalone.py
+++ b/examples/modules/bigip-standalone/bigip_standalone.py
@@ -1,6 +1,6 @@
 # Copyright 2021 F5 Networks All rights reserved.
 #
-# Version 2.9.0.0
+# Version 3.0.0.0
 
 """Creates BIGIP Instance"""
 COMPUTE_URL_BASE = 'https://www.googleapis.com/compute/v1/'
diff --git a/examples/modules/bigip-standalone/bigip_standalone.py.schema b/examples/modules/bigip-standalone/bigip_standalone.py.schema
index fb01840e..5d41a162 100644
--- a/examples/modules/bigip-standalone/bigip_standalone.py.schema
+++ b/examples/modules/bigip-standalone/bigip_standalone.py.schema
@@ -10,7 +10,7 @@ info:
     For more information on this resource:
       - https://cloud.google.com/compute/docs/reference/rest/v1/instances
       - https://cloud.google.com/storage/docs/json_api/v1/buckets
-  version: 2.9.0.0
+  version: 3.0.0.0
 imports:
   - path: bigip_standalone.py
 
diff --git a/examples/modules/dag/dag.py b/examples/modules/dag/dag.py
index ba2919ef..500e3bde 100644
--- a/examples/modules/dag/dag.py
+++ b/examples/modules/dag/dag.py
@@ -1,6 +1,6 @@
 # Copyright 2021 F5 Networks All rights reserved.
 #
-# Version 2.9.0.0
+# Version 3.0.0.0
 
 # pylint: disable=W,C,R,duplicate-code,line-too-long
 
diff --git a/examples/modules/dag/dag.py.schema b/examples/modules/dag/dag.py.schema
index 48fe2740..e2d1909f 100644
--- a/examples/modules/dag/dag.py.schema
+++ b/examples/modules/dag/dag.py.schema
@@ -5,7 +5,7 @@ info:
   title: F5 Dag/Ingress
   author: F5 Networks
   description: Creates cloud resources to get traffic to BIG-IP solutions.
-  version: 2.9.0.0
+  version: 3.0.0.0
 
 
 imports:
diff --git a/examples/modules/function/function.py.schema b/examples/modules/function/function.py.schema
index aeb1c2f2..5f5d1949 100644
--- a/examples/modules/function/function.py.schema
+++ b/examples/modules/function/function.py.schema
@@ -5,7 +5,7 @@ info:
   title: F5 Sample Function
   author: F5 Networks
   description: Creates a sample function module.
-  version: 2.9.0.0
+  version: 3.0.0.0
 
 imports:
   - path: function.py
diff --git a/examples/modules/network/network.py b/examples/modules/network/network.py
index 86899983..96939e1d 100644
--- a/examples/modules/network/network.py
+++ b/examples/modules/network/network.py
@@ -1,6 +1,6 @@
 # Copyright 2021 F5 Networks All rights reserved.
 #
-# Version 2.9.0.0
+# Version 3.0.0.0
 
 # pylint: disable=W,C,R,duplicate-code,line-too-long
 
diff --git a/examples/modules/network/network.py.schema b/examples/modules/network/network.py.schema
index 5cb2cf98..a5ee9675 100644
--- a/examples/modules/network/network.py.schema
+++ b/examples/modules/network/network.py.schema
@@ -10,7 +10,7 @@ info:
     For more information on this resource:
       - https://cloud.google.com/compute/docs/reference/rest/v1/networks
       - https://cloud.google.com/compute/docs/reference/rest/v1/subnetworks
-  version: 2.9.0.0
+  version: 3.0.0.0
 imports:
   - path: network.py
 
diff --git a/examples/quickstart/quickstart-existing-network.py b/examples/quickstart/quickstart-existing-network.py
index b6a75814..1caf0b54 100644
--- a/examples/quickstart/quickstart-existing-network.py
+++ b/examples/quickstart/quickstart-existing-network.py
@@ -1,6 +1,6 @@
 # Copyright 2021 F5 Networks All rights reserved.
 #
-# Version 2.9.0.0
+# Version 3.0.0.0
 
 
 """Creates full stack for POC"""
diff --git a/examples/quickstart/quickstart-existing-network.py.schema b/examples/quickstart/quickstart-existing-network.py.schema
index 0d5bf5f8..632f4318 100644
--- a/examples/quickstart/quickstart-existing-network.py.schema
+++ b/examples/quickstart/quickstart-existing-network.py.schema
@@ -5,7 +5,7 @@ info:
   author: F5 Networks
   description: Creates a standalone bigip deployment along with all required resources to support deployment.
   title: F5 quickstart existing network template
-  version: 2.9.0.0
+  version: 3.0.0.0
 
 imports:
   - path: quickstart-existing-network.py
diff --git a/examples/quickstart/quickstart.py b/examples/quickstart/quickstart.py
index befd43cb..999dba27 100644
--- a/examples/quickstart/quickstart.py
+++ b/examples/quickstart/quickstart.py
@@ -1,6 +1,6 @@
 # Copyright 2021 F5 Networks All rights reserved.
 #
-# Version 2.9.0.0
+# Version 3.0.0.0
 
 
 """Creates full stack for POC"""
diff --git a/examples/quickstart/quickstart.py.schema b/examples/quickstart/quickstart.py.schema
index bfc69cfb..93e00c4d 100644
--- a/examples/quickstart/quickstart.py.schema
+++ b/examples/quickstart/quickstart.py.schema
@@ -5,7 +5,7 @@ info:
   author: F5 Networks
   description: Creates a standalone bigip deployment along with all required resources to support deployment.
   title: F5 quickstart template
-  version: 2.9.0.0
+  version: 3.0.0.0
 
 imports:
   - path: quickstart.py

From 0862eca80ac552f509bda0df39d7859dbb64653e Mon Sep 17 00:00:00 2001
From: Michael Shimkus <m.shimkus@f5.com>
Date: Thu, 21 Dec 2023 10:40:11 -0800
Subject: [PATCH 08/10] runtime test

---
 Makefile                                             |  2 +-
 .../quickstart/tests/verify_instance_onboarded.sh    |  5 +++--
 .../examples/quickstart/tests/verify_login.sh        |  5 ++---
 examples/autoscale/bigiq/autoscale.py.schema         |  2 +-
 examples/autoscale/bigiq/sample_autoscale.yaml       |  2 +-
 examples/autoscale/payg/autoscale.py.schema          |  2 +-
 examples/autoscale/payg/sample_autoscale.yaml        |  2 +-
 examples/quickstart/README.md                        | 12 ++++++------
 .../runtime-init-conf-1nic-byol-with-app.yaml        |  2 +-
 .../runtime-init-conf-1nic-byol.yaml                 |  2 +-
 .../runtime-init-conf-1nic-payg-with-app.yaml        |  2 +-
 .../runtime-init-conf-1nic-payg.yaml                 |  2 +-
 .../runtime-init-conf-2nic-byol-with-app.yaml        |  2 +-
 .../runtime-init-conf-2nic-byol.yaml                 |  2 +-
 .../runtime-init-conf-2nic-payg-with-app.yaml        |  2 +-
 .../runtime-init-conf-2nic-payg.yaml                 |  2 +-
 .../runtime-init-conf-3nic-byol-with-app.yaml        |  2 +-
 .../runtime-init-conf-3nic-byol.yaml                 |  2 +-
 .../runtime-init-conf-3nic-payg-with-app.yaml        |  2 +-
 .../runtime-init-conf-3nic-payg.yaml                 |  2 +-
 examples/quickstart/quickstart.py.schema             |  2 +-
 examples/quickstart/sample_quickstart.yaml           |  2 +-
 22 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/Makefile b/Makefile
index 38ba3607..82afa095 100644
--- a/Makefile
+++ b/Makefile
@@ -66,4 +66,4 @@ run_expected_outputs_diff:
 
 run_sync_at_metadata:
 	echo "Syncing AT component metadata"
-	cd ${SYNC_AT_DIR} && ./sync_at_components_metadata.sh --config-directories ../../examples/autoscale/bigip-configurations,../../examples/quickstart/bigip-configurations,../../examples/failover/bigip-configurations --template-directory ../../examples --runtime-init-package-url https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.0/dist/f5-bigip-runtime-init-2.0.0-1.gz.run --cloud gcp
+	cd ${SYNC_AT_DIR} && ./sync_at_components_metadata.sh --config-directories ../../examples/autoscale/bigip-configurations,../../examples/quickstart/bigip-configurations,../../examples/failover/bigip-configurations --template-directory ../../examples --runtime-init-package-url https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/develop/develop/dist/f5-bigip-runtime-init-2.0.1-1.gz.run --cloud gcp
diff --git a/automated-test-scripts/f5-google-gdm-templates-v2/examples/quickstart/tests/verify_instance_onboarded.sh b/automated-test-scripts/f5-google-gdm-templates-v2/examples/quickstart/tests/verify_instance_onboarded.sh
index 91063b10..053f2c9c 100644
--- a/automated-test-scripts/f5-google-gdm-templates-v2/examples/quickstart/tests/verify_instance_onboarded.sh
+++ b/automated-test-scripts/f5-google-gdm-templates-v2/examples/quickstart/tests/verify_instance_onboarded.sh
@@ -9,13 +9,14 @@ TMP_DIR=/tmp/<DEWPOINT JOB ID>
 # source test functions
 source ${TMP_DIR}/test_functions.sh
 
-instance_id=$(gcloud compute instances list --filter="name~'<UNIQUESTRING>-<INSTANCE NAME>'" --format=json | jq -r .[].id )
+instance_name=$(gcloud compute instances list --filter="name~'<UNIQUESTRING>-<INSTANCE NAME>'" --format=json | jq -r .[].name )
+echo "instance_name: ${instance_name}"
 
 if [[ <PROVISION PUBLIC IP> == True ]]; then
     IP=$(get_mgmt_ip <UNIQUESTRING>-bigip-vm-01 <AVAILABILITY ZONE> public)
     echo "IP: ${IP}"
     ssh-keygen -R $IP 2>/dev/null
-    RESPONSE=$(sshpass -p $instance_id ssh -o StrictHostKeyChecking=no admin@${IP} "bash -c 'cat /var/log/cloud/bigIpRuntimeInit.log | grep \"All operations finished successfully\"'")
+    RESPONSE=$(sshpass -p ${instance_name} ssh -o StrictHostKeyChecking=no admin@${IP} "bash -c 'cat /var/log/cloud/bigIpRuntimeInit.log | grep \"All operations finished successfully\"'")
 else
     BASTION_IP=$(get_bastion_ip <UNIQUESTRING>-bastion-vm-01 <AVAILABILITY ZONE>)
     IP=$(get_mgmt_ip <UNIQUESTRING>-bigip-vm-01 <AVAILABILITY ZONE> private)
diff --git a/automated-test-scripts/f5-google-gdm-templates-v2/examples/quickstart/tests/verify_login.sh b/automated-test-scripts/f5-google-gdm-templates-v2/examples/quickstart/tests/verify_login.sh
index a7c7a86a..2aa22240 100644
--- a/automated-test-scripts/f5-google-gdm-templates-v2/examples/quickstart/tests/verify_login.sh
+++ b/automated-test-scripts/f5-google-gdm-templates-v2/examples/quickstart/tests/verify_login.sh
@@ -16,9 +16,8 @@ else
     MGMT_PORT='8443'
 fi
 
-instance_id=$(gcloud compute instances list --filter="name~'<UNIQUESTRING>-<INSTANCE NAME>'" --format=json | jq -r .[].id )
-
-PASSWORD=$instance_id
+instance_name=$(gcloud compute instances list --filter="name~'<UNIQUESTRING>-<INSTANCE NAME>'" --format=json | jq -r .[].name )
+PASSWORD=$instance_name
 
 if [[ <PROVISION PUBLIC IP> == True ]]; then
     IP=$(get_mgmt_ip <UNIQUESTRING>-bigip-vm-01 <AVAILABILITY ZONE> public)
diff --git a/examples/autoscale/bigiq/autoscale.py.schema b/examples/autoscale/bigiq/autoscale.py.schema
index 01f18e06..9fe4fcdb 100644
--- a/examples/autoscale/bigiq/autoscale.py.schema
+++ b/examples/autoscale/bigiq/autoscale.py.schema
@@ -71,7 +71,7 @@ properties:
     description: Supply a URL to the bigip-runtime-init configuration file in YAML or JSON format, or an escaped JSON string to use for f5-bigip-runtime-init configuration.
     type: string
   bigIpRuntimeInitPackageUrl:
-    default: https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.0/dist/f5-bigip-runtime-init-2.0.0-1.gz.run
+    default: https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/develop/develop/dist/f5-bigip-runtime-init-2.0.1-1.gz.run
     description: URL for BIG-IP Runtime Init package
     type: string
   bigIqSecretId:
diff --git a/examples/autoscale/bigiq/sample_autoscale.yaml b/examples/autoscale/bigiq/sample_autoscale.yaml
index 77234fe6..96957088 100644
--- a/examples/autoscale/bigiq/sample_autoscale.yaml
+++ b/examples/autoscale/bigiq/sample_autoscale.yaml
@@ -51,7 +51,7 @@ resources:
         https://raw.githubusercontent.com/F5Networks/f5-google-gdm-templates-v2/v2.9.0.0/examples/autoscale/bigip-configurations/runtime-init-conf-bigiq-with-app.yaml
       ###  (OPTIONAL) Supply a URL for the bigip-runtime-init package.
       bigIpRuntimeInitPackageUrl: >-
-        https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.0/dist/f5-bigip-runtime-init-2.0.0-1.gz.run
+        https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/develop/develop/dist/f5-bigip-runtime-init-2.0.1-1.gz.run
       ###  (OPTIONAL) The name of a public F5 Marketplace image to deploy.
       #    If you would like to view all available public images, run the following gcloud command:
       #    gcloud compute images list --project f5-7626-networks-public --filter="name~f5"
diff --git a/examples/autoscale/payg/autoscale.py.schema b/examples/autoscale/payg/autoscale.py.schema
index 8ab2a883..cee0e2fd 100644
--- a/examples/autoscale/payg/autoscale.py.schema
+++ b/examples/autoscale/payg/autoscale.py.schema
@@ -65,7 +65,7 @@ properties:
     description: Supply a URL to the bigip-runtime-init configuration file in YAML or JSON format, or an escaped JSON string to use for f5-bigip-runtime-init configuration.
     type: string
   bigIpRuntimeInitPackageUrl:
-    default: https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.0/dist/f5-bigip-runtime-init-2.0.0-1.gz.run
+    default: https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/develop/develop/dist/f5-bigip-runtime-init-2.0.1-1.gz.run
     description: URL for BIG-IP Runtime Init package
     type: string
   cost:
diff --git a/examples/autoscale/payg/sample_autoscale.yaml b/examples/autoscale/payg/sample_autoscale.yaml
index 0e926a31..48f8fd0d 100644
--- a/examples/autoscale/payg/sample_autoscale.yaml
+++ b/examples/autoscale/payg/sample_autoscale.yaml
@@ -49,7 +49,7 @@ resources:
         https://raw.githubusercontent.com/F5Networks/f5-google-gdm-templates-v2/v2.9.0.0/examples/autoscale/bigip-configurations/runtime-init-conf-payg-with-app.yaml
       ###  (OPTIONAL) Supply a URL for the bigip-runtime-init package.
       bigIpRuntimeInitPackageUrl: >-
-        https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.0/dist/f5-bigip-runtime-init-2.0.0-1.gz.run
+        https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/develop/develop/dist/f5-bigip-runtime-init-2.0.1-1.gz.run
       ###  (OPTIONAL) The name of a public F5 Marketplace image to deploy.
       #    If you would like to view all available public images, run the following gcloud command:
       #    gcloud compute images list --project f5-7626-networks-public --filter="name~f5"
diff --git a/examples/quickstart/README.md b/examples/quickstart/README.md
index b366c928..aad26e14 100644
--- a/examples/quickstart/README.md
+++ b/examples/quickstart/README.md
@@ -456,11 +456,11 @@ OR if you are going through a bastion host (when **provisionPublicIP** = **false
     gcloud deployment-manager manifests describe --deployment=${DEPLOYMENT_NAME} --format="value(layout)" | yq '.resources[0].outputs[] | select(.name | contains("bigIpManagementPrivateIp")).finalValue'
     ```
 
-- Obtain the vmId of the BIG-IP Virtual Machine *(will be used for password later)*:
-  - **Console**: Navigate to **Deployment Manager > Deployments > *DEPLOYMENT_NAME* > Overview > Layout > Resources > Outputs > bigIpInstanceId**.
+- Obtain the name of the BIG-IP Virtual Machine *(will be used for password later)*:
+  - **Console**: Navigate to **Deployment Manager > Deployments > *DEPLOYMENT_NAME* > Overview > Layout > Resources > Outputs > bigIpInstanceName**.
   - **Google CLI**: 
     ```bash
-    gcloud deployment-manager manifests describe --deployment=${DEPLOYMENT_NAME} --format="value(layout)" | yq '.resources[0].outputs[] | select(.name | contains("bigIpInstanceId")).finalValue'
+    gcloud deployment-manager manifests describe --deployment=${DEPLOYMENT_NAME} --format="value(layout)" | yq '.resources[0].outputs[] | select(.name | contains("bigIpInstanceName")).finalValue'
     ```
 
 #### SSH
@@ -474,7 +474,7 @@ OR if you are going through a bastion host (when **provisionPublicIP** = **false
   ```bash
   ssh admin@${IP_ADDRESS_FROM_OUTPUT}
   ```
-  At prompt, enter the default password **Instance ID** of the BIG-IP VM instance.
+  At prompt, enter the default password **bigIpInstanceName** of the BIG-IP VM instance.
 
 
 - OR if you are going through a bastion host (when **provisionPublicIP** = **false**):
@@ -517,8 +517,8 @@ OR if you are going through a bastion host (when **provisionPublicIP** = **false
 - Open a browser to the Management URL:
   - NOTE: By default, the BIG-IP's WebUI starts with a self-signed cert. Follow your browsers instructions for accepting self-signed certs (for example, if using Chrome, click inside the page and type this "thisisunsafe". If using Firefox, click "Advanced" button, Click "Accept Risk and Continue").
   - Provide
-    - username: quickstart
-    - password: **Instance ID**
+    - username: admin
+    - password: **bigIpInstanceName**
 
 ### Further Exploring
 
diff --git a/examples/quickstart/bigip-configurations/runtime-init-conf-1nic-byol-with-app.yaml b/examples/quickstart/bigip-configurations/runtime-init-conf-1nic-byol-with-app.yaml
index 1de83427..09a4856b 100644
--- a/examples/quickstart/bigip-configurations/runtime-init-conf-1nic-byol-with-app.yaml
+++ b/examples/quickstart/bigip-configurations/runtime-init-conf-1nic-byol-with-app.yaml
@@ -14,7 +14,7 @@ runtime_parameters:
     value: file:///config/cloud/license_key
   - name: BIGIP_PASSWORD
     type: url
-    value: http://169.254.169.254/computeMetadata/v1/instance/id
+    value: http://169.254.169.254/computeMetadata/v1/instance/name
     headers:
       - name: Metadata-Flavor
         value: Google
diff --git a/examples/quickstart/bigip-configurations/runtime-init-conf-1nic-byol.yaml b/examples/quickstart/bigip-configurations/runtime-init-conf-1nic-byol.yaml
index 679ec6c6..ed1e2f76 100644
--- a/examples/quickstart/bigip-configurations/runtime-init-conf-1nic-byol.yaml
+++ b/examples/quickstart/bigip-configurations/runtime-init-conf-1nic-byol.yaml
@@ -14,7 +14,7 @@ runtime_parameters:
     value: file:///config/cloud/license_key
   - name: BIGIP_PASSWORD
     type: url
-    value: http://169.254.169.254/computeMetadata/v1/instance/id
+    value: http://169.254.169.254/computeMetadata/v1/instance/name
     headers:
       - name: Metadata-Flavor
         value: Google
diff --git a/examples/quickstart/bigip-configurations/runtime-init-conf-1nic-payg-with-app.yaml b/examples/quickstart/bigip-configurations/runtime-init-conf-1nic-payg-with-app.yaml
index ff199d23..5fa29196 100644
--- a/examples/quickstart/bigip-configurations/runtime-init-conf-1nic-payg-with-app.yaml
+++ b/examples/quickstart/bigip-configurations/runtime-init-conf-1nic-payg-with-app.yaml
@@ -11,7 +11,7 @@ runtime_parameters:
         value: Google
   - name: BIGIP_PASSWORD
     type: url
-    value: http://169.254.169.254/computeMetadata/v1/instance/id
+    value: http://169.254.169.254/computeMetadata/v1/instance/name
     headers:
       - name: Metadata-Flavor
         value: Google
diff --git a/examples/quickstart/bigip-configurations/runtime-init-conf-1nic-payg.yaml b/examples/quickstart/bigip-configurations/runtime-init-conf-1nic-payg.yaml
index 05486d7a..73735a4f 100644
--- a/examples/quickstart/bigip-configurations/runtime-init-conf-1nic-payg.yaml
+++ b/examples/quickstart/bigip-configurations/runtime-init-conf-1nic-payg.yaml
@@ -11,7 +11,7 @@ runtime_parameters:
         value: Google
   - name: BIGIP_PASSWORD
     type: url
-    value: http://169.254.169.254/computeMetadata/v1/instance/id
+    value: http://169.254.169.254/computeMetadata/v1/instance/name
     headers:
       - name: Metadata-Flavor
         value: Google
diff --git a/examples/quickstart/bigip-configurations/runtime-init-conf-2nic-byol-with-app.yaml b/examples/quickstart/bigip-configurations/runtime-init-conf-2nic-byol-with-app.yaml
index ab17f709..ac116130 100644
--- a/examples/quickstart/bigip-configurations/runtime-init-conf-2nic-byol-with-app.yaml
+++ b/examples/quickstart/bigip-configurations/runtime-init-conf-2nic-byol-with-app.yaml
@@ -14,7 +14,7 @@ runtime_parameters:
     value: file:///config/cloud/license_key
   - name: BIGIP_PASSWORD
     type: url
-    value: http://169.254.169.254/computeMetadata/v1/instance/id
+    value: http://169.254.169.254/computeMetadata/v1/instance/name
     headers:
       - name: Metadata-Flavor
         value: Google
diff --git a/examples/quickstart/bigip-configurations/runtime-init-conf-2nic-byol.yaml b/examples/quickstart/bigip-configurations/runtime-init-conf-2nic-byol.yaml
index 8644284a..43867309 100644
--- a/examples/quickstart/bigip-configurations/runtime-init-conf-2nic-byol.yaml
+++ b/examples/quickstart/bigip-configurations/runtime-init-conf-2nic-byol.yaml
@@ -14,7 +14,7 @@ runtime_parameters:
     value: file:///config/cloud/license_key
   - name: BIGIP_PASSWORD
     type: url
-    value: http://169.254.169.254/computeMetadata/v1/instance/id
+    value: http://169.254.169.254/computeMetadata/v1/instance/name
     headers:
       - name: Metadata-Flavor
         value: Google
diff --git a/examples/quickstart/bigip-configurations/runtime-init-conf-2nic-payg-with-app.yaml b/examples/quickstart/bigip-configurations/runtime-init-conf-2nic-payg-with-app.yaml
index 93fe96be..3f2df830 100644
--- a/examples/quickstart/bigip-configurations/runtime-init-conf-2nic-payg-with-app.yaml
+++ b/examples/quickstart/bigip-configurations/runtime-init-conf-2nic-payg-with-app.yaml
@@ -11,7 +11,7 @@ runtime_parameters:
         value: Google
   - name: BIGIP_PASSWORD
     type: url
-    value: http://169.254.169.254/computeMetadata/v1/instance/id
+    value: http://169.254.169.254/computeMetadata/v1/instance/name
     headers:
       - name: Metadata-Flavor
         value: Google
diff --git a/examples/quickstart/bigip-configurations/runtime-init-conf-2nic-payg.yaml b/examples/quickstart/bigip-configurations/runtime-init-conf-2nic-payg.yaml
index d1a375eb..bfe6d1be 100644
--- a/examples/quickstart/bigip-configurations/runtime-init-conf-2nic-payg.yaml
+++ b/examples/quickstart/bigip-configurations/runtime-init-conf-2nic-payg.yaml
@@ -11,7 +11,7 @@ runtime_parameters:
         value: Google
   - name: BIGIP_PASSWORD
     type: url
-    value: http://169.254.169.254/computeMetadata/v1/instance/id
+    value: http://169.254.169.254/computeMetadata/v1/instance/name
     headers:
       - name: Metadata-Flavor
         value: Google
diff --git a/examples/quickstart/bigip-configurations/runtime-init-conf-3nic-byol-with-app.yaml b/examples/quickstart/bigip-configurations/runtime-init-conf-3nic-byol-with-app.yaml
index 372b1374..ab758dcb 100644
--- a/examples/quickstart/bigip-configurations/runtime-init-conf-3nic-byol-with-app.yaml
+++ b/examples/quickstart/bigip-configurations/runtime-init-conf-3nic-byol-with-app.yaml
@@ -14,7 +14,7 @@ runtime_parameters:
     value: file:///config/cloud/license_key
   - name: BIGIP_PASSWORD
     type: url
-    value: http://169.254.169.254/computeMetadata/v1/instance/id
+    value: http://169.254.169.254/computeMetadata/v1/instance/name
     headers:
       - name: Metadata-Flavor
         value: Google
diff --git a/examples/quickstart/bigip-configurations/runtime-init-conf-3nic-byol.yaml b/examples/quickstart/bigip-configurations/runtime-init-conf-3nic-byol.yaml
index d9e0f291..e506398f 100644
--- a/examples/quickstart/bigip-configurations/runtime-init-conf-3nic-byol.yaml
+++ b/examples/quickstart/bigip-configurations/runtime-init-conf-3nic-byol.yaml
@@ -14,7 +14,7 @@ runtime_parameters:
     value: file:///config/cloud/license_key
   - name: BIGIP_PASSWORD
     type: url
-    value: http://169.254.169.254/computeMetadata/v1/instance/id
+    value: http://169.254.169.254/computeMetadata/v1/instance/name
     headers:
       - name: Metadata-Flavor
         value: Google
diff --git a/examples/quickstart/bigip-configurations/runtime-init-conf-3nic-payg-with-app.yaml b/examples/quickstart/bigip-configurations/runtime-init-conf-3nic-payg-with-app.yaml
index 6028ad34..47e1e815 100644
--- a/examples/quickstart/bigip-configurations/runtime-init-conf-3nic-payg-with-app.yaml
+++ b/examples/quickstart/bigip-configurations/runtime-init-conf-3nic-payg-with-app.yaml
@@ -11,7 +11,7 @@ runtime_parameters:
         value: Google
   - name: BIGIP_PASSWORD
     type: url
-    value: http://169.254.169.254/computeMetadata/v1/instance/id
+    value: http://169.254.169.254/computeMetadata/v1/instance/name
     headers:
       - name: Metadata-Flavor
         value: Google
diff --git a/examples/quickstart/bigip-configurations/runtime-init-conf-3nic-payg.yaml b/examples/quickstart/bigip-configurations/runtime-init-conf-3nic-payg.yaml
index d308f578..d64905ab 100644
--- a/examples/quickstart/bigip-configurations/runtime-init-conf-3nic-payg.yaml
+++ b/examples/quickstart/bigip-configurations/runtime-init-conf-3nic-payg.yaml
@@ -11,7 +11,7 @@ runtime_parameters:
         value: Google
   - name: BIGIP_PASSWORD
     type: url
-    value: http://169.254.169.254/computeMetadata/v1/instance/id
+    value: http://169.254.169.254/computeMetadata/v1/instance/name
     headers:
       - name: Metadata-Flavor
         value: Google
diff --git a/examples/quickstart/quickstart.py.schema b/examples/quickstart/quickstart.py.schema
index 93e00c4d..d4100058 100644
--- a/examples/quickstart/quickstart.py.schema
+++ b/examples/quickstart/quickstart.py.schema
@@ -49,7 +49,7 @@ properties:
     description: Supply a URL to the bigip-runtime-init configuration file in YAML or JSON format, or an escaped JSON string to use for f5-bigip-runtime-init configuration.
     type: string
   bigIpRuntimeInitPackageUrl:
-    default: https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.0/dist/f5-bigip-runtime-init-2.0.0-1.gz.run
+    default: https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/develop/develop/dist/f5-bigip-runtime-init-2.0.1-1.gz.run
     description: URL for BIG-IP Runtime Init package
     type: string
   cost:
diff --git a/examples/quickstart/sample_quickstart.yaml b/examples/quickstart/sample_quickstart.yaml
index 563d7448..bf84782a 100644
--- a/examples/quickstart/sample_quickstart.yaml
+++ b/examples/quickstart/sample_quickstart.yaml
@@ -59,7 +59,7 @@ resources:
         https://raw.githubusercontent.com/F5Networks/f5-google-gdm-templates-v2/v2.9.0.0/examples/quickstart/bigip-configurations/runtime-init-conf-3nic-payg-with-app.yaml
       ###  (OPTIONAL) Supply a URL for the bigip-runtime-init package
       bigIpRuntimeInitPackageUrl: >-
-        https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.0/dist/f5-bigip-runtime-init-2.0.0-1.gz.run
+        https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/develop/develop/dist/f5-bigip-runtime-init-2.0.1-1.gz.run
       ###  (OPTIONAL) BIG-IP service account email.
       #    Supply an email of an existing service account to be assigned to the BIG-IP instance.
       #    Uncomment the parameter below and replace 'your-service-account@yourproject' value

From d48222319c6839ef8480161b3ef882ce83c00dde Mon Sep 17 00:00:00 2001
From: Michael Shimkus <m.shimkus@f5.com>
Date: Thu, 21 Dec 2023 13:08:40 -0800
Subject: [PATCH 09/10] cfe update test

---
 .../runtime-init-conf-2nic-byol-instance01-with-app.yaml       | 3 +--
 .../runtime-init-conf-2nic-byol-instance01.yaml                | 3 +--
 .../runtime-init-conf-2nic-byol-instance02-with-app.yaml       | 3 +--
 .../runtime-init-conf-2nic-byol-instance02.yaml                | 3 +--
 .../runtime-init-conf-2nic-payg-instance01-with-app.yaml       | 3 +--
 .../runtime-init-conf-2nic-payg-instance01.yaml                | 3 +--
 .../runtime-init-conf-2nic-payg-instance02-with-app.yaml       | 3 +--
 .../runtime-init-conf-2nic-payg-instance02.yaml                | 3 +--
 .../runtime-init-conf-3nic-byol-instance01-with-app.yaml       | 3 +--
 .../runtime-init-conf-3nic-byol-instance01.yaml                | 3 +--
 .../runtime-init-conf-3nic-byol-instance02-with-app.yaml       | 3 +--
 .../runtime-init-conf-3nic-byol-instance02.yaml                | 3 +--
 .../runtime-init-conf-3nic-payg-instance01-with-app.yaml       | 3 +--
 .../runtime-init-conf-3nic-payg-instance01.yaml                | 3 +--
 .../runtime-init-conf-3nic-payg-instance02-with-app.yaml       | 3 +--
 .../runtime-init-conf-3nic-payg-instance02.yaml                | 3 +--
 16 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance01-with-app.yaml b/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance01-with-app.yaml
index f70490af..31f5653b 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance01-with-app.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance01-with-app.yaml
@@ -10,8 +10,7 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 2.0.1
-      extensionHash: f2986aeeaf0a098ce4bb7b08f42d985dfd19bb146c12c8b41b53c147f1a1749d
+      extensionUrl: https://cdn.f5.com/product/cloudsolutions/f5-cloud-failover-extension/develop/v2.0.1/f5-cloud-failover-2.0.1-1.noarch.rpm
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance01.yaml b/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance01.yaml
index 98d709a1..913005b5 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance01.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance01.yaml
@@ -10,8 +10,7 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 2.0.1
-      extensionHash: f2986aeeaf0a098ce4bb7b08f42d985dfd19bb146c12c8b41b53c147f1a1749d
+      extensionUrl: https://cdn.f5.com/product/cloudsolutions/f5-cloud-failover-extension/develop/v2.0.1/f5-cloud-failover-2.0.1-1.noarch.rpm
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance02-with-app.yaml b/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance02-with-app.yaml
index f20ee027..053a3810 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance02-with-app.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance02-with-app.yaml
@@ -10,8 +10,7 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 2.0.1
-      extensionHash: f2986aeeaf0a098ce4bb7b08f42d985dfd19bb146c12c8b41b53c147f1a1749d
+      extensionUrl: https://cdn.f5.com/product/cloudsolutions/f5-cloud-failover-extension/develop/v2.0.1/f5-cloud-failover-2.0.1-1.noarch.rpm
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance02.yaml b/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance02.yaml
index cfcae564..51b86011 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance02.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance02.yaml
@@ -10,8 +10,7 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 2.0.1
-      extensionHash: f2986aeeaf0a098ce4bb7b08f42d985dfd19bb146c12c8b41b53c147f1a1749d
+      extensionUrl: https://cdn.f5.com/product/cloudsolutions/f5-cloud-failover-extension/develop/v2.0.1/f5-cloud-failover-2.0.1-1.noarch.rpm
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance01-with-app.yaml b/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance01-with-app.yaml
index 402530b3..8a7d0623 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance01-with-app.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance01-with-app.yaml
@@ -10,8 +10,7 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 2.0.1
-      extensionHash: f2986aeeaf0a098ce4bb7b08f42d985dfd19bb146c12c8b41b53c147f1a1749d
+      extensionUrl: https://cdn.f5.com/product/cloudsolutions/f5-cloud-failover-extension/develop/v2.0.1/f5-cloud-failover-2.0.1-1.noarch.rpm
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance01.yaml b/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance01.yaml
index 12360c23..ed49075a 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance01.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance01.yaml
@@ -10,8 +10,7 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 2.0.1
-      extensionHash: f2986aeeaf0a098ce4bb7b08f42d985dfd19bb146c12c8b41b53c147f1a1749d
+      extensionUrl: https://cdn.f5.com/product/cloudsolutions/f5-cloud-failover-extension/develop/v2.0.1/f5-cloud-failover-2.0.1-1.noarch.rpm
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance02-with-app.yaml b/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance02-with-app.yaml
index 5a2fc0c5..f4c49eab 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance02-with-app.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance02-with-app.yaml
@@ -10,8 +10,7 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 2.0.1
-      extensionHash: f2986aeeaf0a098ce4bb7b08f42d985dfd19bb146c12c8b41b53c147f1a1749d
+      extensionUrl: https://cdn.f5.com/product/cloudsolutions/f5-cloud-failover-extension/develop/v2.0.1/f5-cloud-failover-2.0.1-1.noarch.rpm
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance02.yaml b/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance02.yaml
index b52bbc6b..7283b805 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance02.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance02.yaml
@@ -10,8 +10,7 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 2.0.1
-      extensionHash: f2986aeeaf0a098ce4bb7b08f42d985dfd19bb146c12c8b41b53c147f1a1749d
+      extensionUrl: https://cdn.f5.com/product/cloudsolutions/f5-cloud-failover-extension/develop/v2.0.1/f5-cloud-failover-2.0.1-1.noarch.rpm
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance01-with-app.yaml b/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance01-with-app.yaml
index 0464cdde..79957b88 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance01-with-app.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance01-with-app.yaml
@@ -10,8 +10,7 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 2.0.1
-      extensionHash: f2986aeeaf0a098ce4bb7b08f42d985dfd19bb146c12c8b41b53c147f1a1749d
+      extensionUrl: https://cdn.f5.com/product/cloudsolutions/f5-cloud-failover-extension/develop/v2.0.1/f5-cloud-failover-2.0.1-1.noarch.rpm
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance01.yaml b/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance01.yaml
index 42e6bd12..ed0e406c 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance01.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance01.yaml
@@ -10,8 +10,7 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 2.0.1
-      extensionHash: f2986aeeaf0a098ce4bb7b08f42d985dfd19bb146c12c8b41b53c147f1a1749d
+      extensionUrl: https://cdn.f5.com/product/cloudsolutions/f5-cloud-failover-extension/develop/v2.0.1/f5-cloud-failover-2.0.1-1.noarch.rpm
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance02-with-app.yaml b/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance02-with-app.yaml
index d922791f..92e73bde 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance02-with-app.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance02-with-app.yaml
@@ -10,8 +10,7 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 2.0.1
-      extensionHash: f2986aeeaf0a098ce4bb7b08f42d985dfd19bb146c12c8b41b53c147f1a1749d
+      extensionUrl: https://cdn.f5.com/product/cloudsolutions/f5-cloud-failover-extension/develop/v2.0.1/f5-cloud-failover-2.0.1-1.noarch.rpm
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance02.yaml b/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance02.yaml
index 18a713e8..3f7b0282 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance02.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance02.yaml
@@ -10,8 +10,7 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 2.0.1
-      extensionHash: f2986aeeaf0a098ce4bb7b08f42d985dfd19bb146c12c8b41b53c147f1a1749d
+      extensionUrl: https://cdn.f5.com/product/cloudsolutions/f5-cloud-failover-extension/develop/v2.0.1/f5-cloud-failover-2.0.1-1.noarch.rpm
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance01-with-app.yaml b/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance01-with-app.yaml
index afff15cf..8a4f6026 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance01-with-app.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance01-with-app.yaml
@@ -10,8 +10,7 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 2.0.1
-      extensionHash: f2986aeeaf0a098ce4bb7b08f42d985dfd19bb146c12c8b41b53c147f1a1749d
+      extensionUrl: https://cdn.f5.com/product/cloudsolutions/f5-cloud-failover-extension/develop/v2.0.1/f5-cloud-failover-2.0.1-1.noarch.rpm
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance01.yaml b/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance01.yaml
index 76519ba6..01d045b2 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance01.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance01.yaml
@@ -10,8 +10,7 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 2.0.1
-      extensionHash: f2986aeeaf0a098ce4bb7b08f42d985dfd19bb146c12c8b41b53c147f1a1749d
+      extensionUrl: https://cdn.f5.com/product/cloudsolutions/f5-cloud-failover-extension/develop/v2.0.1/f5-cloud-failover-2.0.1-1.noarch.rpm
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance02-with-app.yaml b/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance02-with-app.yaml
index b0442e78..505626d4 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance02-with-app.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance02-with-app.yaml
@@ -10,8 +10,7 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 2.0.1
-      extensionHash: f2986aeeaf0a098ce4bb7b08f42d985dfd19bb146c12c8b41b53c147f1a1749d
+      extensionUrl: https://cdn.f5.com/product/cloudsolutions/f5-cloud-failover-extension/develop/v2.0.1/f5-cloud-failover-2.0.1-1.noarch.rpm
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance02.yaml b/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance02.yaml
index 9a2b7b9a..58c1b042 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance02.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance02.yaml
@@ -10,8 +10,7 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionVersion: 2.0.1
-      extensionHash: f2986aeeaf0a098ce4bb7b08f42d985dfd19bb146c12c8b41b53c147f1a1749d
+      extensionUrl: https://cdn.f5.com/product/cloudsolutions/f5-cloud-failover-extension/develop/v2.0.1/f5-cloud-failover-2.0.1-1.noarch.rpm
 extension_services:
   service_operations:
     - extensionType: do

From c0e591631be2fa6394e0e05bc7d597187f7e2436 Mon Sep 17 00:00:00 2001
From: Michael Shimkus <m.shimkus@f5.com>
Date: Thu, 21 Dec 2023 15:48:22 -0800
Subject: [PATCH 10/10] update runtime a nd cfe versions

---
 Makefile                                                       | 2 +-
 cloud-tools                                                    | 2 +-
 examples/autoscale/bigiq/autoscale.py.schema                   | 2 +-
 examples/autoscale/bigiq/sample_autoscale.yaml                 | 2 +-
 examples/autoscale/payg/autoscale.py.schema                    | 2 +-
 examples/autoscale/payg/sample_autoscale.yaml                  | 2 +-
 .../runtime-init-conf-2nic-byol-instance01-with-app.yaml       | 3 ++-
 .../runtime-init-conf-2nic-byol-instance01.yaml                | 3 ++-
 .../runtime-init-conf-2nic-byol-instance02-with-app.yaml       | 3 ++-
 .../runtime-init-conf-2nic-byol-instance02.yaml                | 3 ++-
 .../runtime-init-conf-2nic-payg-instance01-with-app.yaml       | 3 ++-
 .../runtime-init-conf-2nic-payg-instance01.yaml                | 3 ++-
 .../runtime-init-conf-2nic-payg-instance02-with-app.yaml       | 3 ++-
 .../runtime-init-conf-2nic-payg-instance02.yaml                | 3 ++-
 .../runtime-init-conf-3nic-byol-instance01-with-app.yaml       | 3 ++-
 .../runtime-init-conf-3nic-byol-instance01.yaml                | 3 ++-
 .../runtime-init-conf-3nic-byol-instance02-with-app.yaml       | 3 ++-
 .../runtime-init-conf-3nic-byol-instance02.yaml                | 3 ++-
 .../runtime-init-conf-3nic-payg-instance01-with-app.yaml       | 3 ++-
 .../runtime-init-conf-3nic-payg-instance01.yaml                | 3 ++-
 .../runtime-init-conf-3nic-payg-instance02-with-app.yaml       | 3 ++-
 .../runtime-init-conf-3nic-payg-instance02.yaml                | 3 ++-
 examples/quickstart/quickstart.py.schema                       | 2 +-
 examples/quickstart/sample_quickstart.yaml                     | 2 +-
 24 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/Makefile b/Makefile
index 82afa095..942fe156 100644
--- a/Makefile
+++ b/Makefile
@@ -66,4 +66,4 @@ run_expected_outputs_diff:
 
 run_sync_at_metadata:
 	echo "Syncing AT component metadata"
-	cd ${SYNC_AT_DIR} && ./sync_at_components_metadata.sh --config-directories ../../examples/autoscale/bigip-configurations,../../examples/quickstart/bigip-configurations,../../examples/failover/bigip-configurations --template-directory ../../examples --runtime-init-package-url https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/develop/develop/dist/f5-bigip-runtime-init-2.0.1-1.gz.run --cloud gcp
+	cd ${SYNC_AT_DIR} && ./sync_at_components_metadata.sh --config-directories ../../examples/autoscale/bigip-configurations,../../examples/quickstart/bigip-configurations,../../examples/failover/bigip-configurations --template-directory ../../examples --runtime-init-package-url https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.1/dist/f5-bigip-runtime-init-2.0.1-1.gz.run --cloud gcp
diff --git a/cloud-tools b/cloud-tools
index 8aa9aa06..5dcf1dde 160000
--- a/cloud-tools
+++ b/cloud-tools
@@ -1 +1 @@
-Subproject commit 8aa9aa0652570eb884c7226366b5a13f75d9c495
+Subproject commit 5dcf1dded21aef6a52c172b396034769804a4fb2
diff --git a/examples/autoscale/bigiq/autoscale.py.schema b/examples/autoscale/bigiq/autoscale.py.schema
index 9fe4fcdb..6a278da8 100644
--- a/examples/autoscale/bigiq/autoscale.py.schema
+++ b/examples/autoscale/bigiq/autoscale.py.schema
@@ -71,7 +71,7 @@ properties:
     description: Supply a URL to the bigip-runtime-init configuration file in YAML or JSON format, or an escaped JSON string to use for f5-bigip-runtime-init configuration.
     type: string
   bigIpRuntimeInitPackageUrl:
-    default: https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/develop/develop/dist/f5-bigip-runtime-init-2.0.1-1.gz.run
+    default: https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.1/dist/f5-bigip-runtime-init-2.0.1-1.gz.run
     description: URL for BIG-IP Runtime Init package
     type: string
   bigIqSecretId:
diff --git a/examples/autoscale/bigiq/sample_autoscale.yaml b/examples/autoscale/bigiq/sample_autoscale.yaml
index 96957088..134a5cca 100644
--- a/examples/autoscale/bigiq/sample_autoscale.yaml
+++ b/examples/autoscale/bigiq/sample_autoscale.yaml
@@ -51,7 +51,7 @@ resources:
         https://raw.githubusercontent.com/F5Networks/f5-google-gdm-templates-v2/v2.9.0.0/examples/autoscale/bigip-configurations/runtime-init-conf-bigiq-with-app.yaml
       ###  (OPTIONAL) Supply a URL for the bigip-runtime-init package.
       bigIpRuntimeInitPackageUrl: >-
-        https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/develop/develop/dist/f5-bigip-runtime-init-2.0.1-1.gz.run
+        https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.1/dist/f5-bigip-runtime-init-2.0.1-1.gz.run
       ###  (OPTIONAL) The name of a public F5 Marketplace image to deploy.
       #    If you would like to view all available public images, run the following gcloud command:
       #    gcloud compute images list --project f5-7626-networks-public --filter="name~f5"
diff --git a/examples/autoscale/payg/autoscale.py.schema b/examples/autoscale/payg/autoscale.py.schema
index cee0e2fd..8327ff79 100644
--- a/examples/autoscale/payg/autoscale.py.schema
+++ b/examples/autoscale/payg/autoscale.py.schema
@@ -65,7 +65,7 @@ properties:
     description: Supply a URL to the bigip-runtime-init configuration file in YAML or JSON format, or an escaped JSON string to use for f5-bigip-runtime-init configuration.
     type: string
   bigIpRuntimeInitPackageUrl:
-    default: https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/develop/develop/dist/f5-bigip-runtime-init-2.0.1-1.gz.run
+    default: https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.1/dist/f5-bigip-runtime-init-2.0.1-1.gz.run
     description: URL for BIG-IP Runtime Init package
     type: string
   cost:
diff --git a/examples/autoscale/payg/sample_autoscale.yaml b/examples/autoscale/payg/sample_autoscale.yaml
index 48f8fd0d..f00224f0 100644
--- a/examples/autoscale/payg/sample_autoscale.yaml
+++ b/examples/autoscale/payg/sample_autoscale.yaml
@@ -49,7 +49,7 @@ resources:
         https://raw.githubusercontent.com/F5Networks/f5-google-gdm-templates-v2/v2.9.0.0/examples/autoscale/bigip-configurations/runtime-init-conf-payg-with-app.yaml
       ###  (OPTIONAL) Supply a URL for the bigip-runtime-init package.
       bigIpRuntimeInitPackageUrl: >-
-        https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/develop/develop/dist/f5-bigip-runtime-init-2.0.1-1.gz.run
+        https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.1/dist/f5-bigip-runtime-init-2.0.1-1.gz.run
       ###  (OPTIONAL) The name of a public F5 Marketplace image to deploy.
       #    If you would like to view all available public images, run the following gcloud command:
       #    gcloud compute images list --project f5-7626-networks-public --filter="name~f5"
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance01-with-app.yaml b/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance01-with-app.yaml
index 31f5653b..50240959 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance01-with-app.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance01-with-app.yaml
@@ -10,7 +10,8 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionUrl: https://cdn.f5.com/product/cloudsolutions/f5-cloud-failover-extension/develop/v2.0.1/f5-cloud-failover-2.0.1-1.noarch.rpm
+      extensionVersion: 2.0.2
+      extensionHash: 35b5ee18cc0f3d864cfbf5eeb2f830c073d9e3a7947e440a05419ffdae5c19f9
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance01.yaml b/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance01.yaml
index 913005b5..3e0af08c 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance01.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance01.yaml
@@ -10,7 +10,8 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionUrl: https://cdn.f5.com/product/cloudsolutions/f5-cloud-failover-extension/develop/v2.0.1/f5-cloud-failover-2.0.1-1.noarch.rpm
+      extensionVersion: 2.0.2
+      extensionHash: 35b5ee18cc0f3d864cfbf5eeb2f830c073d9e3a7947e440a05419ffdae5c19f9
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance02-with-app.yaml b/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance02-with-app.yaml
index 053a3810..0b3669ff 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance02-with-app.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance02-with-app.yaml
@@ -10,7 +10,8 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionUrl: https://cdn.f5.com/product/cloudsolutions/f5-cloud-failover-extension/develop/v2.0.1/f5-cloud-failover-2.0.1-1.noarch.rpm
+      extensionVersion: 2.0.2
+      extensionHash: 35b5ee18cc0f3d864cfbf5eeb2f830c073d9e3a7947e440a05419ffdae5c19f9
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance02.yaml b/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance02.yaml
index 51b86011..4c413561 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance02.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-2nic-byol-instance02.yaml
@@ -10,7 +10,8 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionUrl: https://cdn.f5.com/product/cloudsolutions/f5-cloud-failover-extension/develop/v2.0.1/f5-cloud-failover-2.0.1-1.noarch.rpm
+      extensionVersion: 2.0.2
+      extensionHash: 35b5ee18cc0f3d864cfbf5eeb2f830c073d9e3a7947e440a05419ffdae5c19f9
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance01-with-app.yaml b/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance01-with-app.yaml
index 8a7d0623..458c3475 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance01-with-app.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance01-with-app.yaml
@@ -10,7 +10,8 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionUrl: https://cdn.f5.com/product/cloudsolutions/f5-cloud-failover-extension/develop/v2.0.1/f5-cloud-failover-2.0.1-1.noarch.rpm
+      extensionVersion: 2.0.2
+      extensionHash: 35b5ee18cc0f3d864cfbf5eeb2f830c073d9e3a7947e440a05419ffdae5c19f9
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance01.yaml b/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance01.yaml
index ed49075a..c4f6157e 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance01.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance01.yaml
@@ -10,7 +10,8 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionUrl: https://cdn.f5.com/product/cloudsolutions/f5-cloud-failover-extension/develop/v2.0.1/f5-cloud-failover-2.0.1-1.noarch.rpm
+      extensionVersion: 2.0.2
+      extensionHash: 35b5ee18cc0f3d864cfbf5eeb2f830c073d9e3a7947e440a05419ffdae5c19f9
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance02-with-app.yaml b/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance02-with-app.yaml
index f4c49eab..beddd0bb 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance02-with-app.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance02-with-app.yaml
@@ -10,7 +10,8 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionUrl: https://cdn.f5.com/product/cloudsolutions/f5-cloud-failover-extension/develop/v2.0.1/f5-cloud-failover-2.0.1-1.noarch.rpm
+      extensionVersion: 2.0.2
+      extensionHash: 35b5ee18cc0f3d864cfbf5eeb2f830c073d9e3a7947e440a05419ffdae5c19f9
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance02.yaml b/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance02.yaml
index 7283b805..a716eaf0 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance02.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-2nic-payg-instance02.yaml
@@ -10,7 +10,8 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionUrl: https://cdn.f5.com/product/cloudsolutions/f5-cloud-failover-extension/develop/v2.0.1/f5-cloud-failover-2.0.1-1.noarch.rpm
+      extensionVersion: 2.0.2
+      extensionHash: 35b5ee18cc0f3d864cfbf5eeb2f830c073d9e3a7947e440a05419ffdae5c19f9
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance01-with-app.yaml b/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance01-with-app.yaml
index 79957b88..dbbeabc7 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance01-with-app.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance01-with-app.yaml
@@ -10,7 +10,8 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionUrl: https://cdn.f5.com/product/cloudsolutions/f5-cloud-failover-extension/develop/v2.0.1/f5-cloud-failover-2.0.1-1.noarch.rpm
+      extensionVersion: 2.0.2
+      extensionHash: 35b5ee18cc0f3d864cfbf5eeb2f830c073d9e3a7947e440a05419ffdae5c19f9
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance01.yaml b/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance01.yaml
index ed0e406c..d73e6a19 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance01.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance01.yaml
@@ -10,7 +10,8 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionUrl: https://cdn.f5.com/product/cloudsolutions/f5-cloud-failover-extension/develop/v2.0.1/f5-cloud-failover-2.0.1-1.noarch.rpm
+      extensionVersion: 2.0.2
+      extensionHash: 35b5ee18cc0f3d864cfbf5eeb2f830c073d9e3a7947e440a05419ffdae5c19f9
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance02-with-app.yaml b/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance02-with-app.yaml
index 92e73bde..8187ef13 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance02-with-app.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance02-with-app.yaml
@@ -10,7 +10,8 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionUrl: https://cdn.f5.com/product/cloudsolutions/f5-cloud-failover-extension/develop/v2.0.1/f5-cloud-failover-2.0.1-1.noarch.rpm
+      extensionVersion: 2.0.2
+      extensionHash: 35b5ee18cc0f3d864cfbf5eeb2f830c073d9e3a7947e440a05419ffdae5c19f9
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance02.yaml b/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance02.yaml
index 3f7b0282..c5d6fdf7 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance02.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-3nic-byol-instance02.yaml
@@ -10,7 +10,8 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionUrl: https://cdn.f5.com/product/cloudsolutions/f5-cloud-failover-extension/develop/v2.0.1/f5-cloud-failover-2.0.1-1.noarch.rpm
+      extensionVersion: 2.0.2
+      extensionHash: 35b5ee18cc0f3d864cfbf5eeb2f830c073d9e3a7947e440a05419ffdae5c19f9
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance01-with-app.yaml b/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance01-with-app.yaml
index 8a4f6026..35d3def1 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance01-with-app.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance01-with-app.yaml
@@ -10,7 +10,8 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionUrl: https://cdn.f5.com/product/cloudsolutions/f5-cloud-failover-extension/develop/v2.0.1/f5-cloud-failover-2.0.1-1.noarch.rpm
+      extensionVersion: 2.0.2
+      extensionHash: 35b5ee18cc0f3d864cfbf5eeb2f830c073d9e3a7947e440a05419ffdae5c19f9
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance01.yaml b/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance01.yaml
index 01d045b2..fb0d5a7f 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance01.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance01.yaml
@@ -10,7 +10,8 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionUrl: https://cdn.f5.com/product/cloudsolutions/f5-cloud-failover-extension/develop/v2.0.1/f5-cloud-failover-2.0.1-1.noarch.rpm
+      extensionVersion: 2.0.2
+      extensionHash: 35b5ee18cc0f3d864cfbf5eeb2f830c073d9e3a7947e440a05419ffdae5c19f9
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance02-with-app.yaml b/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance02-with-app.yaml
index 505626d4..100a1a41 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance02-with-app.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance02-with-app.yaml
@@ -10,7 +10,8 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionUrl: https://cdn.f5.com/product/cloudsolutions/f5-cloud-failover-extension/develop/v2.0.1/f5-cloud-failover-2.0.1-1.noarch.rpm
+      extensionVersion: 2.0.2
+      extensionHash: 35b5ee18cc0f3d864cfbf5eeb2f830c073d9e3a7947e440a05419ffdae5c19f9
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance02.yaml b/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance02.yaml
index 58c1b042..c5b2accd 100644
--- a/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance02.yaml
+++ b/examples/failover/bigip-configurations/runtime-init-conf-3nic-payg-instance02.yaml
@@ -10,7 +10,8 @@ extension_packages:
       extensionVersion: 3.48.0
       extensionHash: d732b0e5e462bd5a7b253022ed13dd72afcc30696f0606f4acef47ec02dc31bb
     - extensionType: cf
-      extensionUrl: https://cdn.f5.com/product/cloudsolutions/f5-cloud-failover-extension/develop/v2.0.1/f5-cloud-failover-2.0.1-1.noarch.rpm
+      extensionVersion: 2.0.2
+      extensionHash: 35b5ee18cc0f3d864cfbf5eeb2f830c073d9e3a7947e440a05419ffdae5c19f9
 extension_services:
   service_operations:
     - extensionType: do
diff --git a/examples/quickstart/quickstart.py.schema b/examples/quickstart/quickstart.py.schema
index d4100058..cd4918ce 100644
--- a/examples/quickstart/quickstart.py.schema
+++ b/examples/quickstart/quickstart.py.schema
@@ -49,7 +49,7 @@ properties:
     description: Supply a URL to the bigip-runtime-init configuration file in YAML or JSON format, or an escaped JSON string to use for f5-bigip-runtime-init configuration.
     type: string
   bigIpRuntimeInitPackageUrl:
-    default: https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/develop/develop/dist/f5-bigip-runtime-init-2.0.1-1.gz.run
+    default: https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.1/dist/f5-bigip-runtime-init-2.0.1-1.gz.run
     description: URL for BIG-IP Runtime Init package
     type: string
   cost:
diff --git a/examples/quickstart/sample_quickstart.yaml b/examples/quickstart/sample_quickstart.yaml
index bf84782a..0281e012 100644
--- a/examples/quickstart/sample_quickstart.yaml
+++ b/examples/quickstart/sample_quickstart.yaml
@@ -59,7 +59,7 @@ resources:
         https://raw.githubusercontent.com/F5Networks/f5-google-gdm-templates-v2/v2.9.0.0/examples/quickstart/bigip-configurations/runtime-init-conf-3nic-payg-with-app.yaml
       ###  (OPTIONAL) Supply a URL for the bigip-runtime-init package
       bigIpRuntimeInitPackageUrl: >-
-        https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/develop/develop/dist/f5-bigip-runtime-init-2.0.1-1.gz.run
+        https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v2.0.1/dist/f5-bigip-runtime-init-2.0.1-1.gz.run
       ###  (OPTIONAL) BIG-IP service account email.
       #    Supply an email of an existing service account to be assigned to the BIG-IP instance.
       #    Uncomment the parameter below and replace 'your-service-account@yourproject' value