diff --git a/SACAv2/3NIC_1Tier_HA/bigiq/azureDeploy.json b/SACAv2/3NIC_1Tier_HA/bigiq/azureDeploy.json
index 9c24815..784428e 100644
--- a/SACAv2/3NIC_1Tier_HA/bigiq/azureDeploy.json
+++ b/SACAv2/3NIC_1Tier_HA/bigiq/azureDeploy.json
@@ -276,7 +276,7 @@
             "type": "string"
         },
         "declarationUrl": {
-            "defaultValue": "https://raw.githubusercontent.com/Mikej81/f5-securecloud-AS3/master/dist/arm/3.16.0/sccaBaseline.json",
+            "defaultValue": "https://raw.githubusercontent.com/Mikej81/f5-bigip-hardening-AS3/master/dist/arm/3.16.0/sccaBaseline.json",
             "metadata": {
                 "description": "URL for the AS3 (https://clouddocs.f5.com/products/extensions/f5-appsvcs-extension/3.16.0/) declaration JSON file to be deployed. Leave as **NOT_SPECIFIED** to deploy without a service configuration."
             },
@@ -1627,7 +1627,7 @@
                         "https://raw.githubusercontent.com/F5Networks/f5-cloud-libs/master/dist/f5-cloud-libs.tar.gz",
                         "https://raw.githubusercontent.com/f5devcentral/f5-azure-saca/master/SACAv2/resources/Certificates_PKCS7_v5.5_DoD.zip",
                         "https://raw.githubusercontent.com/f5devcentral/f5-azure-saca/master/SACAv2/STIG/bigipstig.sh",
-                        "https://raw.githubusercontent.com/mikej81/f5-securecloud-AS3/master/asm/13.1/sccaBaselineASMPolicy.xml"
+                        "https://raw.githubusercontent.com/Mikej81/f5-bigip-hardening-AS3/master/working/asm/15.1/sccaBaselineASMPolicy.xml"
                     ]
                 },
                 "type": "CustomScript",
diff --git a/SACAv2/3NIC_1Tier_HA/byol/azureDeploy.json b/SACAv2/3NIC_1Tier_HA/byol/azureDeploy.json
index ab63aef..f95008a 100644
--- a/SACAv2/3NIC_1Tier_HA/byol/azureDeploy.json
+++ b/SACAv2/3NIC_1Tier_HA/byol/azureDeploy.json
@@ -263,7 +263,7 @@
             "type": "string"
         },
         "declarationUrl": {
-            "defaultValue": "https://raw.githubusercontent.com/Mikej81/f5-securecloud-AS3/master/dist/arm/3.16.0/byolsccaBaseline.json",
+            "defaultValue": "https://raw.githubusercontent.com/Mikej81/f5-bigip-hardening-AS3/master/dist/arm/3.16.0/byolsccaBaseline.json",
             "metadata": {
                 "description": "URL for the AS3 (https://clouddocs.f5.com/products/extensions/f5-appsvcs-extension/3.16.0/) declaration JSON file to be deployed. Leave as **NOT_SPECIFIED** to deploy without a service configuration."
             },
@@ -1620,7 +1620,7 @@
                         "https://raw.githubusercontent.com/F5Networks/f5-cloud-libs/master/dist/f5-cloud-libs.tar.gz",
                         "https://raw.githubusercontent.com/f5devcentral/f5-azure-saca/master/SACAv2/resources/Certificates_PKCS7_v5.5_DoD.zip",
                         "https://raw.githubusercontent.com/f5devcentral/f5-azure-saca/master/SACAv2/STIG/bigipstig.sh",
-                        "https://raw.githubusercontent.com/mikej81/f5-securecloud-AS3/master/asm/13.1/sccaBaselineASMPolicy.xml"
+                        "https://raw.githubusercontent.com/Mikej81/f5-bigip-hardening-AS3/master/working/asm/15.1/sccaBaselineASMPolicy.xml"
                     ]
                 },
                 "type": "CustomScript",
diff --git a/SACAv2/3NIC_1Tier_HA/payg/azureDeploy.json b/SACAv2/3NIC_1Tier_HA/payg/azureDeploy.json
index 45020c4..812a32c 100644
--- a/SACAv2/3NIC_1Tier_HA/payg/azureDeploy.json
+++ b/SACAv2/3NIC_1Tier_HA/payg/azureDeploy.json
@@ -252,7 +252,7 @@
             "type": "string"
         },
         "declarationUrl": {
-            "defaultValue": "https://raw.githubusercontent.com/Mikej81/f5-securecloud-AS3/master/dist/arm/3.16.0/paygsccaBaseline.json",
+            "defaultValue": "https://raw.githubusercontent.com/Mikej81/f5-bigip-hardening-AS3/master/dist/arm/3.16.0/paygsccaBaseline.json",
             "metadata": {
                 "description": "URL for the AS3 (https://clouddocs.f5.com/products/extensions/f5-appsvcs-extension/3.16.0/) declaration JSON file to be deployed. Leave as **NOT_SPECIFIED** to deploy without a service configuration."
             },
@@ -1654,7 +1654,7 @@
                         "https://raw.githubusercontent.com/F5Networks/f5-cloud-libs/master/dist/f5-cloud-libs.tar.gz",
                         "https://raw.githubusercontent.com/f5devcentral/f5-azure-saca/master/SACAv2/resources/Certificates_PKCS7_v5.5_DoD.zip",
                         "https://raw.githubusercontent.com/f5devcentral/f5-azure-saca/master/SACAv2/STIG/bigipstig.sh",
-                        "https://raw.githubusercontent.com/mikej81/f5-securecloud-AS3/master/asm/13.1/sccaBaselineASMPolicy.xml"
+                        "https://raw.githubusercontent.com/Mikej81/f5-bigip-hardening-AS3/master/working/asm/15.1/sccaBaselineASMPolicy.xml"
                     ]
                 },
                 "type": "CustomScript",
diff --git a/SACAv2/3NIC_3Tier_HA/bigiq/azureDeploy.json b/SACAv2/3NIC_3Tier_HA/bigiq/azureDeploy.json
index 6f78f50..961dece 100644
--- a/SACAv2/3NIC_3Tier_HA/bigiq/azureDeploy.json
+++ b/SACAv2/3NIC_3Tier_HA/bigiq/azureDeploy.json
@@ -47,7 +47,7 @@
             "type": "string"
         },
         "Tier1DeclarationUrl": {
-            "defaultValue": "https://raw.githubusercontent.com/Mikej81/f5-securecloud-AS3/master/dist/arm/3.16.0/sccaBaseline.json",
+            "defaultValue": "https://raw.githubusercontent.com/Mikej81/f5-bigip-hardening-AS3/master/dist/arm/3.16.0/sccaBaseline.json",
             "metadata": {
                 "description": "URL for the AS3 (https://clouddocs.f5.com/products/extensions/f5-appsvcs-extension/3.16.0/) declaration JSON file to be deployed. Leave as **NOT_SPECIFIED** to deploy without a service configuration."
             },
@@ -2790,7 +2790,7 @@
                         "https://raw.githubusercontent.com/F5Networks/f5-cloud-libs/master/dist/f5-cloud-libs.tar.gz",
                         "https://raw.githubusercontent.com/f5devcentral/f5-azure-saca/master/SACAv2/resources/Certificates_PKCS7_v5.5_DoD.zip",
                         "https://raw.githubusercontent.com/f5devcentral/f5-azure-saca/master/SACAv2/STIG/bigipstig.sh",
-                        "https://raw.githubusercontent.com/mikej81/f5-securecloud-AS3/master/asm/13.1/sccaBaselineASMPolicy.xml"
+                        "https://raw.githubusercontent.com/Mikej81/f5-bigip-hardening-AS3/master/working/asm/15.1/sccaBaselineASMPolicy.xml"
                     ]
                 },
                 "type": "CustomScript",
@@ -2854,7 +2854,7 @@
                         "https://raw.githubusercontent.com/F5Networks/f5-cloud-libs/master/dist/f5-cloud-libs.tar.gz",
                         "https://raw.githubusercontent.com/f5devcentral/f5-azure-saca/master/SACAv2/resources/Certificates_PKCS7_v5.5_DoD.zip",
                         "https://raw.githubusercontent.com/f5devcentral/f5-azure-saca/master/SACAv2/STIG/bigipstig.sh",
-                        "https://raw.githubusercontent.com/mikej81/f5-securecloud-AS3/master/asm/13.1/sccaBaselineASMPolicy.xml"
+                        "https://raw.githubusercontent.com/Mikej81/f5-bigip-hardening-AS3/master/working/asm/15.1/sccaBaselineASMPolicy.xml"
                     ]
                 },
                 "type": "CustomScript",
diff --git a/SACAv2/3NIC_3Tier_HA/byol/azureDeploy.json b/SACAv2/3NIC_3Tier_HA/byol/azureDeploy.json
index e30f80c..232a028 100644
--- a/SACAv2/3NIC_3Tier_HA/byol/azureDeploy.json
+++ b/SACAv2/3NIC_3Tier_HA/byol/azureDeploy.json
@@ -47,7 +47,7 @@
             "type": "string"
         },
         "Tier1DeclarationUrl": {
-            "defaultValue": "https://raw.githubusercontent.com/Mikej81/f5-securecloud-AS3/master/dist/arm/3.16.0/byolsccaBaseline.json",
+            "defaultValue": "https://raw.githubusercontent.com/Mikej81/f5-bigip-hardening-AS3/master/dist/arm/3.16.0/byolsccaBaseline.json",
             "metadata": {
                 "description": "URL for the AS3 (https://clouddocs.f5.com/products/extensions/f5-appsvcs-extension/3.16.0/) declaration JSON file to be deployed. Leave as **NOT_SPECIFIED** to deploy without a service configuration."
             },
@@ -2777,7 +2777,7 @@
                         "https://raw.githubusercontent.com/F5Networks/f5-cloud-libs/master/dist/f5-cloud-libs.tar.gz",
                         "https://raw.githubusercontent.com/f5devcentral/f5-azure-saca/master/SACAv2/resources/Certificates_PKCS7_v5.5_DoD.zip",
                         "https://raw.githubusercontent.com/f5devcentral/f5-azure-saca/master/SACAv2/STIG/bigipstig.sh",
-                        "https://raw.githubusercontent.com/mikej81/f5-securecloud-AS3/master/asm/13.1/sccaBaselineASMPolicy.xml"
+                        "https://raw.githubusercontent.com/Mikej81/f5-bigip-hardening-AS3/master/working/asm/15.1/sccaBaselineASMPolicy.xml"
                     ]
                 },
                 "type": "CustomScript",
@@ -2841,7 +2841,7 @@
                         "https://raw.githubusercontent.com/F5Networks/f5-cloud-libs/master/dist/f5-cloud-libs.tar.gz",
                         "https://raw.githubusercontent.com/f5devcentral/f5-azure-saca/master/SACAv2/resources/Certificates_PKCS7_v5.5_DoD.zip",
                         "https://raw.githubusercontent.com/f5devcentral/f5-azure-saca/master/SACAv2/STIG/bigipstig.sh",
-                        "https://raw.githubusercontent.com/mikej81/f5-securecloud-AS3/master/asm/13.1/sccaBaselineASMPolicy.xml"
+                        "https://raw.githubusercontent.com/Mikej81/f5-bigip-hardening-AS3/master/working/asm/15.1/sccaBaselineASMPolicy.xml"
                     ]
                 },
                 "type": "CustomScript",
diff --git a/SACAv2/3NIC_3Tier_HA/payg/azureDeploy.json b/SACAv2/3NIC_3Tier_HA/payg/azureDeploy.json
index d891c75..dce2357 100644
--- a/SACAv2/3NIC_3Tier_HA/payg/azureDeploy.json
+++ b/SACAv2/3NIC_3Tier_HA/payg/azureDeploy.json
@@ -47,7 +47,7 @@
             "type": "string"
         },
         "Tier1DeclarationUrl": {
-            "defaultValue": "https://raw.githubusercontent.com/Mikej81/f5-securecloud-AS3/master/dist/arm/3.16.0/paygsccaBaseline.json",
+            "defaultValue": "https://raw.githubusercontent.com/Mikej81/f5-bigip-hardening-AS3/master/working/asm/15.1/sccaBaselineASMPolicy.xml",
             "metadata": {
                 "description": "URL for the AS3 (https://clouddocs.f5.com/products/extensions/f5-appsvcs-extension/3.16.0/) declaration JSON file to be deployed. Leave as **NOT_SPECIFIED** to deploy without a service configuration."
             },
@@ -2787,7 +2787,7 @@
                         "https://raw.githubusercontent.com/F5Networks/f5-cloud-libs/master/dist/f5-cloud-libs.tar.gz",
                         "https://raw.githubusercontent.com/f5devcentral/f5-azure-saca/master/SACAv2/resources/Certificates_PKCS7_v5.5_DoD.zip",
                         "https://raw.githubusercontent.com/f5devcentral/f5-azure-saca/master/SACAv2/STIG/bigipstig.sh",
-                        "https://raw.githubusercontent.com/mikej81/f5-securecloud-AS3/master/asm/13.1/sccaBaselineASMPolicy.xml"
+                        "https://raw.githubusercontent.com/Mikej81/f5-bigip-hardening-AS3/master/working/asm/15.1/sccaBaselineASMPolicy.xml"
                     ]
                 },
                 "type": "CustomScript",
@@ -2851,7 +2851,7 @@
                         "https://raw.githubusercontent.com/F5Networks/f5-cloud-libs/master/dist/f5-cloud-libs.tar.gz",
                         "https://raw.githubusercontent.com/f5devcentral/f5-azure-saca/master/SACAv2/resources/Certificates_PKCS7_v5.5_DoD.zip",
                         "https://raw.githubusercontent.com/f5devcentral/f5-azure-saca/master/SACAv2/STIG/bigipstig.sh",
-                        "https://raw.githubusercontent.com/mikej81/f5-securecloud-AS3/master/asm/13.1/sccaBaselineASMPolicy.xml"
+                        "https://raw.githubusercontent.com/Mikej81/f5-bigip-hardening-AS3/master/working/asm/15.1/sccaBaselineASMPolicy.xml"
                     ]
                 },
                 "type": "CustomScript",