diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 8e94eae..2767bb6 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,10 +4,10 @@
 # this repository, with the Development group able to author and push pull requests.
 
 # In a true org structure, this line would be something like: "app-fqdn-rules.tf @<secops>"
-app-fqdn-rules.tf @<secops>
+app-fqdn-rules.tf @NidaTech
 
 # In a true org structure, these files should have the Network Operators account as the owner:
-main.tf @<netops>
-provider.tf @<netops>
-variables.tf @<netops>
-versions.tf @<netops>
+main.tf @NidaRe
+provider.tf @NidaRe
+variables.tf @NidaRe
+versions.tf @NidaRe
diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
index 7ec8ebe..47f1f82 100644
--- a/.github/workflows/terraform.yml
+++ b/.github/workflows/terraform.yml
@@ -45,31 +45,7 @@ jobs:
         run: terraform plan -no-color
         continue-on-error: true
 
-      # Add terraform plan output back into the pull request
-      - name: Update Pull Request
-        uses: actions/github-script@0.9.0
-        if: github.event_name == 'pull_request'
-        env:
-          PLAN: "terraform\n${{ steps.plan.outputs.stdout }}"
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            const output = `#### Terraform Format and Style 🖌\`${{ steps.fmt.outcome }}\`
-            #### Terraform Initialization ⚙️\`${{ steps.init.outcome }}\`
-            #### Terraform Plan 📖\`${{ steps.plan.outcome }}\`
-            <details><summary>Show Plan</summary>
-            \`\`\`
-            ${process.env.PLAN}
-            \`\`\`
-            </details>
-            *Pusher: @${{ github.actor }}, Action: \`${{ github.event_name }}\`*`;
 
-            github.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: output
-            })
 
       # Exit on Plan failure
       - name: Terraform Plan Status
diff --git a/app-fqdn-rules.tf b/app-fqdn-rules.tf
index dd8392a..3646a96 100644
--- a/app-fqdn-rules.tf
+++ b/app-fqdn-rules.tf
@@ -4,6 +4,8 @@ locals {
     tcp = {
       "*.aviatrix.com" = "443"
       "aviatrix.com"   = "80"
+      "*.ubuntu.com"   = "80"
+      "*.ubuntu.com"   = "443"
     }
     udp = {
       "dns.google.com" = "53"
diff --git a/backend.tf b/backend.tf
index 978704c..69b7086 100644
--- a/backend.tf
+++ b/backend.tf
@@ -1,7 +1,7 @@
 terraform {
   required_version = ">= 1.1.0"
   backend "remote" {
-    # organization = "<replace-with-your-Terraform-Cloud-organization-and-uncomment>"
+    organization = "Aviatrix-IaaC"
     workspaces {
       name = "ace-iac-day-two"
     }