diff --git a/aws_sra_examples/modules/cloudtrail-org-module/templates/sra-cloudtrail-org-module-main.yaml b/aws_sra_examples/modules/cloudtrail-org-module/templates/sra-cloudtrail-org-module-main.yaml
index 41af6429..70e0170e 100644
--- a/aws_sra_examples/modules/cloudtrail-org-module/templates/sra-cloudtrail-org-module-main.yaml
+++ b/aws_sra_examples/modules/cloudtrail-org-module/templates/sra-cloudtrail-org-module-main.yaml
@@ -129,22 +129,17 @@ Metadata:
 
 Parameters:
   pRepoURL:
-  # TODO(liamschn): update to production URL after testing
-    # Default: https://github.com/aws-samples/aws-security-reference-architecture-examples.git
-    Default: https://github.com/liamschn/aws-security-reference-architecture-examples.git
+    Default: https://github.com/aws-samples/aws-security-reference-architecture-examples.git
     Description:
       SRA Code Library Repository URL
     Type: String
   pRepoBranch:
-  # TODO(liamschn): update to production branch/tags after testing
-    # Default: tags/v3.x.x
     Default: tags/v3.0.4
     Description:
       SRA Code Library Repository branch name.  Can be used as branch or as tags (e.g. tags/v3.0.1)
     Type: String
-  # TODO(liamschn): change to prod URL
   pTemplateURL:
-    Default: https://raw.githubusercontent.com/liamschn/aws-security-reference-architecture-examples/abi-sra/aws_sra_examples/modules/cloudtrail-org-module/templates/sra-cloudtrail-org-solution.yaml
+    Default: https://raw.githubusercontent.com/aws-samples/aws-security-reference-architecture-examples/main/aws_sra_examples/modules/cloudtrail-org-module/templates/sra-cloudtrail-org-solution.yaml
     Description:
       SRA module solution template URL
     Type: String
diff --git a/aws_sra_examples/modules/cloudtrail-org-module/templates/sra-cloudtrail-org-solution.yaml b/aws_sra_examples/modules/cloudtrail-org-module/templates/sra-cloudtrail-org-solution.yaml
index 63fc3289..a6e8d9ea 100644
--- a/aws_sra_examples/modules/cloudtrail-org-module/templates/sra-cloudtrail-org-solution.yaml
+++ b/aws_sra_examples/modules/cloudtrail-org-module/templates/sra-cloudtrail-org-solution.yaml
@@ -143,18 +143,14 @@ Metadata:
 
 Parameters:
   pRepoURL:
-  # TODO(liamschn): update to production URL after testing
-    # Default: https://github.com/aws-samples/aws-security-reference-architecture-examples.git
-    Default: https://github.com/liamschn/aws-security-reference-architecture-examples.git
+    Default: https://github.com/aws-samples/aws-security-reference-architecture-examples.git
     Description:
       SRA Code Library Repository URL
     Type: String
   pRepoBranch:
-  # TODO(liamschn): update to production branch after testing
-    # Default: main
-    Default: ct_and_org
+    Default: tags/v3.0.4
     Description:
-      SRA Code Library Repository branch name
+      SRA Code Library Repository branch name.  Can be used as branch or as tags (e.g. tags/v3.0.1)
     Type: String
 
   pCommonPrerequisitesInstalled:
diff --git a/aws_sra_examples/modules/guardduty-org-module/templates/sra-guardduty-org-module-main.yaml b/aws_sra_examples/modules/guardduty-org-module/templates/sra-guardduty-org-module-main.yaml
index f80cd507..8794af5e 100644
--- a/aws_sra_examples/modules/guardduty-org-module/templates/sra-guardduty-org-module-main.yaml
+++ b/aws_sra_examples/modules/guardduty-org-module/templates/sra-guardduty-org-module-main.yaml
@@ -147,22 +147,17 @@ Parameters:
     Description:
       SRA CodeBuild project name
     Type: String
-  # TODO(liamschn): change to prod URL
   pTemplateURL:
-    Default: https://raw.githubusercontent.com/liamschn/aws-security-reference-architecture-examples/abi-sra/aws_sra_examples/modules/guardduty-org-module/templates/sra-guardduty-org-solution.yaml
+    Default: https://raw.githubusercontent.com/aws-samples/aws-security-reference-architecture-examples/v3.0.4/aws_sra_examples/modules/guardduty-org-module/templates/sra-guardduty-org-solution.yaml
     Description:
       SRA module solution template URL
     Type: String
   pRepoURL:
-  # TODO(liamschn): update to production URL after testing
-    # Default: https://github.com/aws-samples/aws-security-reference-architecture-examples.git
-    Default: https://github.com/liamschn/aws-security-reference-architecture-examples.git
+    Default: https://github.com/aws-samples/aws-security-reference-architecture-examples.git
     Description:
       SRA Code Library Repository URL
     Type: String
   pRepoBranch:
-  # TODO(liamschn): update to production branch/tags after testing
-    # Default: tags/v3.x.x
     Default: tags/v3.0.4
     Description:
       SRA Code Library Repository branch name.  Can be used as branch or as tags (e.g. tags/v3.0.1)
diff --git a/aws_sra_examples/modules/guardduty-org-module/templates/sra-guardduty-org-solution.yaml b/aws_sra_examples/modules/guardduty-org-module/templates/sra-guardduty-org-solution.yaml
index 4286b771..ca020356 100644
--- a/aws_sra_examples/modules/guardduty-org-module/templates/sra-guardduty-org-solution.yaml
+++ b/aws_sra_examples/modules/guardduty-org-module/templates/sra-guardduty-org-solution.yaml
@@ -148,12 +148,12 @@ Parameters:
   pRepoURL:
     Default: https://github.com/aws-samples/aws-security-reference-architecture-examples.git
     Description:
-      SRA Code Library Repository URL. Default value is the AWS SRA main repo. Only change from default for testing purposes.
+      SRA Code Library Repository URL
     Type: String
   pRepoBranch:
-    Default: main
+    Default: tags/v3.0.4
     Description:
-      SRA Code Library Repository branch name.  Default is main.  Only change for testing purposes.
+      SRA Code Library Repository branch name.  Can be used as branch or as tags (e.g. tags/v3.0.1)
     Type: String
 
   pCommonPrerequisitesInstalled:
diff --git a/aws_sra_examples/modules/securityhub-org-module/templates/sra-securityhub-org-module-main.yaml b/aws_sra_examples/modules/securityhub-org-module/templates/sra-securityhub-org-module-main.yaml
index 311d3c58..9b1ef3fd 100644
--- a/aws_sra_examples/modules/securityhub-org-module/templates/sra-securityhub-org-module-main.yaml
+++ b/aws_sra_examples/modules/securityhub-org-module/templates/sra-securityhub-org-module-main.yaml
@@ -130,22 +130,17 @@ Metadata:
 
 Parameters:
   pRepoURL:
-  # TODO(liamschn): update to production URL after testing
-    # Default: https://github.com/aws-samples/aws-security-reference-architecture-examples.git
-    Default: https://github.com/liamschn/aws-security-reference-architecture-examples.git
+    Default: https://github.com/aws-samples/aws-security-reference-architecture-examples.git
     Description:
       SRA Code Library Repository URL
     Type: String
   pRepoBranch:
-  # TODO(liamschn): update to production branch/tags after testing
-    # Default: tags/v3.x.x
     Default: tags/v3.0.4
     Description:
       SRA Code Library Repository branch name.  Can be used as branch or as tags (e.g. tags/v3.0.1)
     Type: String
-  # TODO(liamschn): change to prod URL
   pTemplateURL:
-    Default: https://raw.githubusercontent.com/liamschn/aws-security-reference-architecture-examples/abi-sra/aws_sra_examples/modules/securityhub-org-module/templates/sra-securityhub-org-solution.yaml
+    Default: https://raw.githubusercontent.com/aws-samples/aws-security-reference-architecture-examples/v3.0.4/aws_sra_examples/modules/securityhub-org-module/templates/sra-securityhub-org-solution.yaml
     Description:
       SRA module solution template URL
     Type: String
diff --git a/aws_sra_examples/modules/securityhub-org-module/templates/sra-securityhub-org-solution.yaml b/aws_sra_examples/modules/securityhub-org-module/templates/sra-securityhub-org-solution.yaml
index 0a4028a6..75389a3c 100644
--- a/aws_sra_examples/modules/securityhub-org-module/templates/sra-securityhub-org-solution.yaml
+++ b/aws_sra_examples/modules/securityhub-org-module/templates/sra-securityhub-org-solution.yaml
@@ -144,18 +144,14 @@ Metadata:
 
 Parameters:
   pRepoURL:
-  # TODO(liamschn): update to production URL after testing
-    # Default: https://github.com/aws-samples/aws-security-reference-architecture-examples.git
-    Default: https://github.com/liamschn/aws-security-reference-architecture-examples.git
+    Default: https://github.com/aws-samples/aws-security-reference-architecture-examples.git
     Description:
       SRA Code Library Repository URL
     Type: String
   pRepoBranch:
-  # TODO(liamschn): update to production branch after testing
-    # Default: main
-    Default: ct_and_org
+    Default: tags/v3.0.4
     Description:
-      SRA Code Library Repository branch name
+      SRA Code Library Repository branch name.  Can be used as branch or as tags (e.g. tags/v3.0.1)
     Type: String
 
   pCommonPrerequisitesInstalled: