Repository: chef/automate
Pull request #6943 (2022-04-21 10:50:58)

announcement and release notes changes
Signed-off-by: Vivek Yadav <vivek.yadav@progress.com>

### :nut_and_bolt: Description: What code changed, and why?

<!-- /!\ Please ensure that you are NOT disclosing any customer information without their consent /!\ -->

### :chains: Related Resources

### :+1: Definition of Done

### :athletic_shoe: How to Build and Test the Change

### :white_check_mark: Checklist

**All PRs** must tick these:

- [ ] I have read the [CONTRIBUTING document](https://github.com/chef/automate/blob/master/CONTRIBUTING.md).
- [ ] All commits signed-off for the [Developer Certification of Origin](https://github.com/chef/chef/blob/master/CONTRIBUTING.md#developer-certification-of-origin-dco).

With occasional exceptions, all PRs **from Progress employees** must tick these:

- [ ] Is the code clear? *(complicated code or lots of comments--subdivide and use well-named methods, meaningful variable names, etc.)*
- [ ] Consistency checked? *(user notifications, user prompts, visual patterns, code patterns, variable names)*
- [ ] Repeated code blocks eliminated? *(adapt and reuse existing components, blocks, functions, etc.)*
- [ ] Spelling, grammar, typos checked? *(at a minimum use `make spell` in any component directory)*
- [ ] Code well-formatted? *(indents, line breaks, etc. improve rather than hinder readability)*

All PRs **from Progress employees** should tick these if appropriate:

- [ ] Tests added/updated? (all new code needs new tests)
- [ ] Docs added/updated? (all customer-facing changes)

*Please add a note next to any checkbox above if you are NOT ticking it.*

### :camera: Screenshots, if applicable


netlify[bot]: ### <span aria-hidden="true">👷</span> Deploy Preview for *chef-automate* processing.


|  Name | Link |
|---------------------------------|------------------------|
|<span aria-hidden="true">🔨</span> Latest commit | 6435ea1ab4d6b896b2d6582056856c2251cd8ade |
|<span aria-hidden="true">🔍</span> Latest deploy log | https://app.netlify.com/sites/chef-automate/deploys/6261371442c8050009ea97bc |
sonarcloud[bot]: Kudos, SonarCloud Quality Gate passed!&nbsp; &nbsp; [![Quality Gate passed](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/QualityGateBadge/passed-16px.png 'Quality Gate passed')](https://sonarcloud.io/dashboard?id=chef_automate&pullRequest=6943)

[![Bug](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/common/bug-16px.png 'Bug')](https://sonarcloud.io/project/issues?id=chef_automate&pullRequest=6943&resolved=false&types=BUG) [![A](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/RatingBadge/A-16px.png 'A')](https://sonarcloud.io/project/issues?id=chef_automate&pullRequest=6943&resolved=false&types=BUG) [0 Bugs](https://sonarcloud.io/project/issues?id=chef_automate&pullRequest=6943&resolved=false&types=BUG)  
[![Vulnerability](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/common/vulnerability-16px.png 'Vulnerability')](https://sonarcloud.io/project/issues?id=chef_automate&pullRequest=6943&resolved=false&types=VULNERABILITY) [![A](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/RatingBadge/A-16px.png 'A')](https://sonarcloud.io/project/issues?id=chef_automate&pullRequest=6943&resolved=false&types=VULNERABILITY) [0 Vulnerabilities](https://sonarcloud.io/project/issues?id=chef_automate&pullRequest=6943&resolved=false&types=VULNERABILITY)  
[![Security Hotspot](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/common/security_hotspot-16px.png 'Security Hotspot')](https://sonarcloud.io/project/security_hotspots?id=chef_automate&pullRequest=6943&resolved=false&types=SECURITY_HOTSPOT) [![A](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/RatingBadge/A-16px.png 'A')](https://sonarcloud.io/project/security_hotspots?id=chef_automate&pullRequest=6943&resolved=false&types=SECURITY_HOTSPOT) [0 Security Hotspots](https://sonarcloud.io/project/security_hotspots?id=chef_automate&pullRequest=6943&resolved=false&types=SECURITY_HOTSPOT)  
[![Code Smell](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/common/code_smell-16px.png 'Code Smell')](https://sonarcloud.io/project/issues?id=chef_automate&pullRequest=6943&resolved=false&types=CODE_SMELL) [![A](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/RatingBadge/A-16px.png 'A')](https://sonarcloud.io/project/issues?id=chef_automate&pullRequest=6943&resolved=false&types=CODE_SMELL) [0 Code Smells](https://sonarcloud.io/project/issues?id=chef_automate&pullRequest=6943&resolved=false&types=CODE_SMELL)

[![No Coverage information](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/CoverageChart/NoCoverageInfo-16px.png 'No Coverage information')](https://sonarcloud.io/component_measures?id=chef_automate&pullRequest=6943&metric=coverage&view=list) No Coverage information  
[![No Duplication information](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/Duplications/NoDuplicationInfo-16px.png 'No Duplication information')](https://sonarcloud.io/component_measures?id=chef_automate&pullRequest=6943&metric=duplicated_lines_density&view=list) No Duplication information


sonarcloud[bot]: Kudos, SonarCloud Quality Gate passed!&nbsp; &nbsp; [![Quality Gate passed](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/QualityGateBadge/passed-16px.png 'Quality Gate passed')](https://sonarcloud.io/dashboard?id=chef_automate&pullRequest=6943)

[![Bug](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/common/bug-16px.png 'Bug')](https://sonarcloud.io/project/issues?id=chef_automate&pullRequest=6943&resolved=false&types=BUG) [![A](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/RatingBadge/A-16px.png 'A')](https://sonarcloud.io/project/issues?id=chef_automate&pullRequest=6943&resolved=false&types=BUG) [0 Bugs](https://sonarcloud.io/project/issues?id=chef_automate&pullRequest=6943&resolved=false&types=BUG)  
[![Vulnerability](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/common/vulnerability-16px.png 'Vulnerability')](https://sonarcloud.io/project/issues?id=chef_automate&pullRequest=6943&resolved=false&types=VULNERABILITY) [![A](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/RatingBadge/A-16px.png 'A')](https://sonarcloud.io/project/issues?id=chef_automate&pullRequest=6943&resolved=false&types=VULNERABILITY) [0 Vulnerabilities](https://sonarcloud.io/project/issues?id=chef_automate&pullRequest=6943&resolved=false&types=VULNERABILITY)  
[![Security Hotspot](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/common/security_hotspot-16px.png 'Security Hotspot')](https://sonarcloud.io/project/security_hotspots?id=chef_automate&pullRequest=6943&resolved=false&types=SECURITY_HOTSPOT) [![A](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/RatingBadge/A-16px.png 'A')](https://sonarcloud.io/project/security_hotspots?id=chef_automate&pullRequest=6943&resolved=false&types=SECURITY_HOTSPOT) [0 Security Hotspots](https://sonarcloud.io/project/security_hotspots?id=chef_automate&pullRequest=6943&resolved=false&types=SECURITY_HOTSPOT)  
[![Code Smell](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/common/code_smell-16px.png 'Code Smell')](https://sonarcloud.io/project/issues?id=chef_automate&pullRequest=6943&resolved=false&types=CODE_SMELL) [![A](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/RatingBadge/A-16px.png 'A')](https://sonarcloud.io/project/issues?id=chef_automate&pullRequest=6943&resolved=false&types=CODE_SMELL) [0 Code Smells](https://sonarcloud.io/project/issues?id=chef_automate&pullRequest=6943&resolved=false&types=CODE_SMELL)

[![No Coverage information](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/CoverageChart/NoCoverageInfo-16px.png 'No Coverage information')](https://sonarcloud.io/component_measures?id=chef_automate&pullRequest=6943&metric=coverage&view=list) No Coverage information  
[![0.0%](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/Duplications/3-16px.png '0.0%')](https://sonarcloud.io/component_measures?id=chef_automate&pullRequest=6943&metric=new_duplicated_lines_density&view=list) [0.0% Duplication](https://sonarcloud.io/component_measures?id=chef_automate&pullRequest=6943&metric=new_duplicated_lines_density&view=list)


sonarcloud[bot]: Kudos, SonarCloud Quality Gate passed!&nbsp; &nbsp; [![Quality Gate passed](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/QualityGateBadge/passed-16px.png 'Quality Gate passed')](https://sonarcloud.io/dashboard?id=chef_automate&pullRequest=6943)

[![Bug](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/common/bug-16px.png 'Bug')](https://sonarcloud.io/project/issues?id=chef_automate&pullRequest=6943&resolved=false&types=BUG) [![A](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/RatingBadge/A-16px.png 'A')](https://sonarcloud.io/project/issues?id=chef_automate&pullRequest=6943&resolved=false&types=BUG) [0 Bugs](https://sonarcloud.io/project/issues?id=chef_automate&pullRequest=6943&resolved=false&types=BUG)  
[![Vulnerability](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/common/vulnerability-16px.png 'Vulnerability')](https://sonarcloud.io/project/issues?id=chef_automate&pullRequest=6943&resolved=false&types=VULNERABILITY) [![A](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/RatingBadge/A-16px.png 'A')](https://sonarcloud.io/project/issues?id=chef_automate&pullRequest=6943&resolved=false&types=VULNERABILITY) [0 Vulnerabilities](https://sonarcloud.io/project/issues?id=chef_automate&pullRequest=6943&resolved=false&types=VULNERABILITY)  
[![Security Hotspot](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/common/security_hotspot-16px.png 'Security Hotspot')](https://sonarcloud.io/project/security_hotspots?id=chef_automate&pullRequest=6943&resolved=false&types=SECURITY_HOTSPOT) [![A](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/RatingBadge/A-16px.png 'A')](https://sonarcloud.io/project/security_hotspots?id=chef_automate&pullRequest=6943&resolved=false&types=SECURITY_HOTSPOT) [0 Security Hotspots](https://sonarcloud.io/project/security_hotspots?id=chef_automate&pullRequest=6943&resolved=false&types=SECURITY_HOTSPOT)  
[![Code Smell](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/common/code_smell-16px.png 'Code Smell')](https://sonarcloud.io/project/issues?id=chef_automate&pullRequest=6943&resolved=false&types=CODE_SMELL) [![A](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/RatingBadge/A-16px.png 'A')](https://sonarcloud.io/project/issues?id=chef_automate&pullRequest=6943&resolved=false&types=CODE_SMELL) [0 Code Smells](https://sonarcloud.io/project/issues?id=chef_automate&pullRequest=6943&resolved=false&types=CODE_SMELL)

[![No Coverage information](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/CoverageChart/NoCoverageInfo-16px.png 'No Coverage information')](https://sonarcloud.io/component_measures?id=chef_automate&pullRequest=6943&metric=coverage&view=list) No Coverage information  
[![0.0%](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/Duplications/3-16px.png '0.0%')](https://sonarcloud.io/component_measures?id=chef_automate&pullRequest=6943&metric=new_duplicated_lines_density&view=list) [0.0% Duplication](https://sonarcloud.io/component_measures?id=chef_automate&pullRequest=6943&metric=new_duplicated_lines_density&view=list)


sonarcloud[bot]: Kudos, SonarCloud Quality Gate passed!&nbsp; &nbsp; [![Quality Gate passed](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/QualityGateBadge/passed-16px.png 'Quality Gate passed')](https://sonarcloud.io/dashboard?id=chef_automate&pullRequest=6943)

[![Bug](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/common/bug-16px.png 'Bug')](https://sonarcloud.io/project/issues?id=chef_automate&pullRequest=6943&resolved=false&types=BUG) [![A](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/RatingBadge/A-16px.png 'A')](https://sonarcloud.io/project/issues?id=chef_automate&pullRequest=6943&resolved=false&types=BUG) [0 Bugs](https://sonarcloud.io/project/issues?id=chef_automate&pullRequest=6943&resolved=false&types=BUG)  
[![Vulnerability](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/common/vulnerability-16px.png 'Vulnerability')](https://sonarcloud.io/project/issues?id=chef_automate&pullRequest=6943&resolved=false&types=VULNERABILITY) [![A](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/RatingBadge/A-16px.png 'A')](https://sonarcloud.io/project/issues?id=chef_automate&pullRequest=6943&resolved=false&types=VULNERABILITY) [0 Vulnerabilities](https://sonarcloud.io/project/issues?id=chef_automate&pullRequest=6943&resolved=false&types=VULNERABILITY)  
[![Security Hotspot](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/common/security_hotspot-16px.png 'Security Hotspot')](https://sonarcloud.io/project/security_hotspots?id=chef_automate&pullRequest=6943&resolved=false&types=SECURITY_HOTSPOT) [![A](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/RatingBadge/A-16px.png 'A')](https://sonarcloud.io/project/security_hotspots?id=chef_automate&pullRequest=6943&resolved=false&types=SECURITY_HOTSPOT) [0 Security Hotspots](https://sonarcloud.io/project/security_hotspots?id=chef_automate&pullRequest=6943&resolved=false&types=SECURITY_HOTSPOT)  
[![Code Smell](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/common/code_smell-16px.png 'Code Smell')](https://sonarcloud.io/project/issues?id=chef_automate&pullRequest=6943&resolved=false&types=CODE_SMELL) [![A](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/RatingBadge/A-16px.png 'A')](https://sonarcloud.io/project/issues?id=chef_automate&pullRequest=6943&resolved=false&types=CODE_SMELL) [0 Code Smells](https://sonarcloud.io/project/issues?id=chef_automate&pullRequest=6943&resolved=false&types=CODE_SMELL)

[![0.0%](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/CoverageChart/0-16px.png '0.0%')](https://sonarcloud.io/component_measures?id=chef_automate&pullRequest=6943&metric=new_coverage&view=list) [0.0% Coverage](https://sonarcloud.io/component_measures?id=chef_automate&pullRequest=6943&metric=new_coverage&view=list)  
[![0.0%](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/Duplications/3-16px.png '0.0%')](https://sonarcloud.io/component_measures?id=chef_automate&pullRequest=6943&metric=new_duplicated_lines_density&view=list) [0.0% Duplication](https://sonarcloud.io/component_measures?id=chef_automate&pullRequest=6943&metric=new_duplicated_lines_density&view=list)



Patch:
diff --git a/.expeditor/announce-acceptance.sh b/.expeditor/announce-acceptance.sh
index 36ab488b9..cedf48ec1 100755
--- a/.expeditor/announce-acceptance.sh
+++ b/.expeditor/announce-acceptance.sh
@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 
 # Get current sha, then find the one right after that via the ancestry-path; that is where we start.
-current_sha=$(curl https://packages.chef.io/manifests/current/automate/latest.json 2>/dev/null | jq -r '.git_sha');
+current_sha=$(curl https://packages.chef.io/manifests/current/automate/latest_semver.json 2>/dev/null | jq -r '.git_sha');
 # date renders as e.g. "2021-01-27T10:16:58+00:00" so we need to urlencode the plus sign
 current_date=$(git log -1 --pretty=%cI "$(git rev-list --ancestry-path "$current_sha"..HEAD | tail -1)" | sed -e s/\+/%2B/)
 
 # Get the date of the latest acceptance sha and add one second to it, otherwise it does not appear in the list!
-acceptance_sha=$(curl https://packages.chef.io/manifests/acceptance/automate/latest.json 2>/dev/null | jq -r '.git_sha');
+acceptance_sha=$(curl https://packages.chef.io/manifests/acceptance/automate/latest_semver.json 2>/dev/null | jq -r '.git_sha');
 acceptance_date_tmp=$(git log -1 --pretty=%cI "$acceptance_sha")
 acceptance_date=$(date -d "$acceptance_date_tmp + 1 second" '+%Y-%m-%dT%H:%M:%S%z' | sed -e s/\+/%2B/)
 
diff --git a/.expeditor/announce-release.sh b/.expeditor/announce-release.sh
index 72cb4f141..f82faad5e 100755
--- a/.expeditor/announce-release.sh
+++ b/.expeditor/announce-release.sh
@@ -9,22 +9,15 @@ build_version=$(jq -r -c ".version"  manifest.json)
 # Download the release-notes for our specific build
 curl -o release-notes.md "https://packages.chef.io/release-notes/automate/${build_version}.md"
 
-topic_title="Automate 2 version $build_version Released!"
+topic_title="Automate version $build_version Released!"
 topic_body=$(cat <<EOH
-We are delighted to announce the availability of version $build_version of Chef Automate 2.
+We are delighted to announce the availability of version $build_version of Chef Automate.
 
 $(cat release-notes.md)
 
 ---
-## How to Upgrade
 
-By default Chef Automate 2 will [automatically upgrade](https://automate.chef.io/docs/install/#upgrades) to this new version. If you have disabled automatic upgrades you can manually initiate an upgrade by running:
-
-\`\`\`
-chef-automate upgrade run
-\`\`\`
-
-As always, we welcome your feedback and invite you to contact us directly or share your [feedback online](https://www.chef.io/feedback/). Thanks for using Chef Automate 2!
+As always, we welcome your feedback and invite you to contact us directly or share your [feedback online](https://www.chef.io/feedback/). Thanks for using Chef Automate!
 EOH
 )
 
diff --git a/.expeditor/publish-release-notes.sh b/.expeditor/publish-release-notes.sh
index e5e73a659..783647161 100755
--- a/.expeditor/publish-release-notes.sh
+++ b/.expeditor/publish-release-notes.sh
@@ -27,7 +27,7 @@ Chef lets you choose your **upgrade journey** based on your current version of C
 | Any version before 20220329091442| 20220329091442|
 | 20220329091442| 3.0.x|
 
-Click [here](/automate/major_upgrade/) to know more.
+Click [here](https://docs.chef.io/automate/major_upgrade/) to know more.
 
 ## Maintenance
 - 
diff --git a/.studio/deployment-service b/.studio/deployment-service
index 5388f9fbd..f26022414 100644
--- a/.studio/deployment-service
+++ b/.studio/deployment-service
@@ -160,7 +160,7 @@ function pkg_from_manifest {
   install_if_missing core/curl curl
   manifest=$(find_local_manifest)
   if [[ "$manifest" = "" ]]; then
-      manifest_content=$(curl -sS "https://packages.chef.io/manifests/dev/automate/latest.json")
+      manifest_content=$(curl -sS "https://packages.chef.io/manifests/dev/automate/latest_semver.json")
   else
       manifest_content=$(cat "$manifest")
   fi
diff --git a/.studio/tooling b/.studio/tooling
index c8073ddd5..75ecdc469 100644
--- a/.studio/tooling
+++ b/.studio/tooling
@@ -41,7 +41,7 @@ function manifest_for_channel() {
     fi
 
     install_if_missing core/curl curl
-    curl -sS "https://packages.chef.io/manifests/$channel/automate/latest.json"
+    curl -sS "https://packages.chef.io/manifests/$channel/automate/latest_semver.json"
 }
 
 document "versions_for_channel"<<DOC
diff --git a/HOW_THE_PIPELINE_WORKS.md b/HOW_THE_PIPELINE_WORKS.md
index 12c5ec332..616b108ff 100644
--- a/HOW_THE_PIPELINE_WORKS.md
+++ b/HOW_THE_PIPELINE_WORKS.md
@@ -1,4 +1,4 @@
-# Automate 2 Build and Test Pipeline
+# Automate Build and Test Pipeline
 
 This document describes the testing and build infrastructure for the
 Automate repository. The goal of this document is to provide a useful
diff --git a/README.md b/README.md
index 5ef301d4e..1e6395264 100644
--- a/README.md
+++ b/README.md
@@ -79,9 +79,9 @@ document](./dev-docs/DEV_ENVIRONMENT.md).
 
 ## Architecture
 
-The following picture illustrates the Automate 2.0 architecture
+The following picture illustrates the Automate architecture
 
-![Automate 2 Architecture](dev-docs/diagrams/a2-architecture.png)
+![Automate Architecture](dev-docs/diagrams/a2-architecture.png)
 
 ## API Compatibility
 
diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md
index 92921cc22..1aedcb4f9 100644
--- a/RELEASE_PROCESS.md
+++ b/RELEASE_PROCESS.md
@@ -1,4 +1,4 @@
-# Automate 2.0 Release Philosophy and Process
+# Automate Release Philosophy and Process
 
 Automate's pipeline and release process adhere to the [patterns of continuous delivery](https://continuousdelivery.com/implementing/patterns/). Each time a PR/change is merged to master we produce a build which is a candidate for release to our end-users. Although it feels counterintuitive, we are actually lowering our risk by incrementally releasing small batches of change. It also creates a separation between the _technical_ decision to ship our software (by way of channel promotions) from the _business_ decision to fully release a new feature to our end-users. [Feature flags/toggles](https://martinfowler.com/bliki/FeatureToggle.html) allow us to continue merging partially implemented features to master, yet control when our end-users begin using these features.
 
@@ -28,7 +28,7 @@ The Release Engineering team executes this promotion Mondays at **7:30 PST/10:30
 
 We don't revert, we roll forward! We also transform and roll out.
 
-To be more specific we don't support/encourage customers rolling back to a previously promoted version of Automate 2.0. Instead, we should get a fix merged, promoted and into our end-users hands ASAP. This might be as simple as `git revert`-ing the bug while we we consider the proper long-term fix.
+To be more specific we don't support/encourage customers rolling back to a previously promoted version of Automate. Instead, we should get a fix merged, promoted and into our end-users hands ASAP. This might be as simple as `git revert`-ing the bug while we we consider the proper long-term fix.
 
 ## Release Notes
 
@@ -49,8 +49,8 @@ https://packages.chef.io/release-notes/automate/<BUILD_VERSION>.md
 
 These published release notes are used to communicate update availability across a number of distribution channels including:
 
-- The Automate 2.0 download/landing page.
-- Update notification prompts we'll be adding to the Automate 2.0 user interface.
+- The Automate download/landing page.
+- Update notification prompts we'll be adding to the Automate user interface.
 - Discourse, blog and Slack posts
 
 ## Change Flow
diff --git a/VERSION b/VERSION
index 21c498934..3a460e657 100644
--- a/VERSION
+++ b/VERSION
@@ -1,1 +1,1 @@
-3.0.39
\ No newline at end of file
+3.0.40
\ No newline at end of file
diff --git a/Vagrantfile b/Vagrantfile
index c918a8007..63a3a5a22 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -24,7 +24,7 @@ EOF
 SCRIPT
 
 def hab_version_from_manifest
-  manifest = JSON.parse(open("https://packages.chef.io/manifests/dev/automate/latest.json").read)
+  manifest = JSON.parse(open("https://packages.chef.io/manifests/dev/automate/latest_semver.json").read)
   hab = manifest["hab"]
   hab.find {|x| x.start_with?("core/hab/") }.split("/")[2]
 end
diff --git a/components/authn-service/DESIGN.md b/components/authn-service/DESIGN.md
index 6980b97c2..c5fa713fb 100644
--- a/components/authn-service/DESIGN.md
+++ b/components/authn-service/DESIGN.md
@@ -75,7 +75,7 @@ location / {
 
 ### Why proxying?
 
-While looking for ways to reconcile our initial plan (see [Request flow issue](docs/Request_flow_issue.md)) with the planned deployment model of Automate 2.0, which puts an emphasis on a fairly limited, little-complexity frontend service, [Træfik](https://traefik.io/), the issue came up that we might **just do the proxying ourselves**.
+While looking for ways to reconcile our initial plan (see [Request flow issue](docs/Request_flow_issue.md)) with the planned deployment model of Automate, which puts an emphasis on a fairly limited, little-complexity frontend service, [Træfik](https://traefik.io/), the issue came up that we might **just do the proxying ourselves**.
 
 Since it was both fairly easy to get up and running in the service, and results in a deployment with low complexity (no nginx, no upstreams, location lines with regexp matches, lua handlers...), it was decided that it's at least worth trying.
 From the perspective of authn-service's code, it doesn't matter much, so keep both interfaces alive for now -- with the intention to kill the one we don't end up using later on.
diff --git a/components/authz-service/README.md b/components/authz-service/README.md
index 96c39b71e..b62b71c0e 100644
--- a/components/authz-service/README.md
+++ b/components/authz-service/README.md
@@ -90,13 +90,13 @@ Figure 11 is analogous to Figure 1, but now includes projects.
 The major thing to note here is that now downstream services need to be an active participant
 by typically filtering results by the allowable projects (extreme right in the figure) .
 
-![Automate 2 Authorization With Projects](../../dev-docs/diagrams/authz-projects-sequence.png)
+![Automate Authorization With Projects](../../dev-docs/diagrams/authz-projects-sequence.png)
 
 FIGURE 11 -- AUTHZ SEQUENCE DIAGRAM *WITH* PROJECTS
 
 The next figure sheds light on how a request for "all projects" is handled.
 
-![Automate 2 Authorization With Projects](../../dev-docs/diagrams/authz-all-or-no-projects.png)
+![Automate Authorization With Projects](../../dev-docs/diagrams/authz-all-or-no-projects.png)
 
 FIGURE 12 -- HANDLING OF "ALL PROJECTS" REQUESTED
 
@@ -107,7 +107,7 @@ There is a lot more to say about projects, but this at least serves as a place h
 There are a lot of moving parts in Authz service.
 To aid in visualizing the various pieces here is an entity-relationship diagram detailing the data layer.
 
-![Automate 2 AuthZ Entity Relationship Diagram](../../dev-docs/diagrams/authz-entity-relationships.png)
+![Automate AuthZ Entity Relationship Diagram](../../dev-docs/diagrams/authz-entity-relationships.png)
 
 FIGURE 13 -- ENTITY RELATIONSHIP DIAGRAM
 
diff --git a/components/automate-backend-deployment/README.md b/components/automate-backend-deployment/README.md
index a7d85a748..06046e398 100644
--- a/components/automate-backend-deployment/README.md
+++ b/components/automate-backend-deployment/README.md
@@ -4,4 +4,5 @@ This provides the `automate-backend-deployment` package.
 
 This package will build a package using terraform/a2ha-terraform, inspecs, test, certs and Makefile.
 
+
 This is the heart of the a2ha because this component will set up a workspace for a2ha and all the a2ha command will get avilable after installing this package.
diff --git a/components/automate-backend-deployment/habitat/.terraform/modules/modules.json b/components/automate-backend-deployment/habitat/.terraform/modules/modules.json
index efee908cc..1966bbf5d 100644
--- a/components/automate-backend-deployment/habitat/.terraform/modules/modules.json
+++ b/components/automate-backend-deployment/habitat/.terraform/modules/modules.json
@@ -1,1 +1,1 @@
-{"Modules":[{"Key":"","Source":"","Dir":"."},{"Key":"chef_server","Source":"./modules/automate","Dir":"modules/automate"},{"Key":"habitat-automate","Source":"./modules/habitat","Dir":"modules/habitat"},{"Key":"postgresql","Source":"./modules/postgresql","Dir":"modules/postgresql"},{"Key":"system-tuning-automate","Source":"./modules/system","Dir":"modules/system"},{"Key":"system-tuning-chef_server","Source":"./modules/system","Dir":"modules/system"},{"Key":"elasticsearch.metricbeat","Source":"../metricbeat","Dir":"modules/metricbeat"},{"Key":"habitat-elasticsearch","Source":"./modules/habitat","Dir":"modules/habitat"},{"Key":"system-tuning-elasticsearch","Source":"./modules/system","Dir":"modules/system"},{"Key":"automate","Source":"./modules/automate","Dir":"modules/automate"},{"Key":"bootstrap_automate","Source":"./modules/automate","Dir":"modules/automate"},{"Key":"elasticsearch","Source":"./modules/elasticsearch","Dir":"modules/elasticsearch"},{"Key":"postgresql.metricbeat","Source":"../metricbeat","Dir":"modules/metricbeat"},{"Key":"system-tuning-postgresql","Source":"./modules/system","Dir":"modules/system"},{"Key":"habitat-chef_server","Source":"./modules/habitat","Dir":"modules/habitat"},{"Key":"airgap_bundle-automate","Source":"./modules/airgap_bundle","Dir":"modules/airgap_bundle"},{"Key":"airgap_bundle-chef_server","Source":"./modules/airgap_bundle","Dir":"modules/airgap_bundle"},{"Key":"airgap_bundle-elasticsearch","Source":"./modules/airgap_bundle","Dir":"modules/airgap_bundle"},{"Key":"airgap_bundle-postgresql","Source":"./modules/airgap_bundle","Dir":"modules/airgap_bundle"},{"Key":"elasticsearch.curator","Source":"../curator","Dir":"modules/curator"},{"Key":"elasticsearch.journalbeat","Source":"../journalbeat","Dir":"modules/journalbeat"},{"Key":"elasticsearch.kibana","Source":"../kibana","Dir":"modules/kibana"},{"Key":"habitat-postgresql","Source":"./modules/habitat","Dir":"modules/habitat"},{"Key":"postgresql.journalbeat","Source":"../journalbeat","Dir":"modules/journalbeat"}]}
\ No newline at end of file
+{"Modules":[{"Key":"","Source":"","Dir":"."},{"Key":"chef_server","Source":"./modules/automate","Dir":"modules/automate"},{"Key":"habitat-automate","Source":"./modules/habitat","Dir":"modules/habitat"},{"Key":"postgresql","Source":"./modules/postgresql","Dir":"modules/postgresql"},{"Key":"system-tuning-automate","Source":"./modules/system","Dir":"modules/system"},{"Key":"system-tuning-chef_server","Source":"./modules/system","Dir":"modules/system"},{"Key":"habitat-elasticsearch","Source":"./modules/habitat","Dir":"modules/habitat"},{"Key":"system-tuning-elasticsearch","Source":"./modules/system","Dir":"modules/system"},{"Key":"automate","Source":"./modules/automate","Dir":"modules/automate"},{"Key":"bootstrap_automate","Source":"./modules/automate","Dir":"modules/automate"},{"Key":"elasticsearch","Source":"./modules/elasticsearch","Dir":"modules/elasticsearch"},{"Key":"system-tuning-postgresql","Source":"./modules/system","Dir":"modules/system"},{"Key":"habitat-chef_server","Source":"./modules/habitat","Dir":"modules/habitat"},{"Key":"airgap_bundle-automate","Source":"./modules/airgap_bundle","Dir":"modules/airgap_bundle"},{"Key":"airgap_bundle-chef_server","Source":"./modules/airgap_bundle","Dir":"modules/airgap_bundle"},{"Key":"airgap_bundle-elasticsearch","Source":"./modules/airgap_bundle","Dir":"modules/airgap_bundle"},{"Key":"airgap_bundle-postgresql","Source":"./modules/airgap_bundle","Dir":"modules/airgap_bundle"},{"Key":"habitat-postgresql","Source":"./modules/habitat","Dir":"modules/habitat"}]}
\ No newline at end of file
diff --git a/components/automate-cluster-ctl/readme b/components/automate-cluster-ctl/readme
index 723837302..7e9089487 100644
--- a/components/automate-cluster-ctl/readme
+++ b/components/automate-cluster-ctl/readme
@@ -1,2 +1,1 @@
-Add Readme 
-bump the pkg version
+Automate-cluster-ctl
diff --git a/components/automate-deployment/docs/backup_plan.md b/components/automate-deployment/docs/backup_plan.md
index 893a072b7..b9b37ca93 100644
--- a/components/automate-deployment/docs/backup_plan.md
+++ b/components/automate-deployment/docs/backup_plan.md
@@ -3,7 +3,7 @@
 ## Desired State
 
 #### Backups
-This document outlines how we plan to implement backup and restore operations for Automate 2. It's describes a three phase plan that we'll use to incrementally deliver value until we realize our eventual goal of distributed backups orchestrated by the `deployment-service`.
+This document outlines how we plan to implement backup and restore operations for Automate. It's describes a three phase plan that we'll use to incrementally deliver value until we realize our eventual goal of distributed backups orchestrated by the `deployment-service`.
 
 Each service in A2 will be responsible and require a gRPC endpoint for:
   * creating a backup of its data
diff --git a/components/automate-deployment/docs/how-to-add-a-service.md b/components/automate-deployment/docs/how-to-add-a-service.md
index 1e508f7db..d3f946d58 100644
--- a/components/automate-deployment/docs/how-to-add-a-service.md
+++ b/components/automate-deployment/docs/how-to-add-a-service.md
@@ -1,6 +1,6 @@
-# How To Add a New Service to Automate 2
+# How To Add a New Service to Automate
 
-Adding a new service to Automate 2 is not currently as easy as we would like. This document will guide you through it. There are two general chunks of work required when adding a new service:
+Adding a new service to Automate is not currently as easy as we would like. This document will guide you through it. There are two general chunks of work required when adding a new service:
 * You need to setup your service to fulfil the platform contract
 * You need to teach deployment service how to deploy your service
 
@@ -155,4 +155,4 @@ to wire up your new service to other services this will be needed.
 
 ### The product.meta File
 
-The list of services and other mandatory packages that comprise Automate 2 and other Chef products is maintained in `product.meta`. This file is also used to generate the manifest file that represents a Chef Automate 2 release as described above. Edit this file and add your service. Services may also define extra metadata for their service in a `package.meta` for their component. See https://godoc.org/github.com/chef/automate/lib/product for more information.
+The list of services and other mandatory packages that comprise Automate and other Chef products is maintained in `product.meta`. This file is also used to generate the manifest file that represents a Chef Automate release as described above. Edit this file and add your service. Services may also define extra metadata for their service in a `package.meta` for their component. See https://godoc.org/github.com/chef/automate/lib/product for more information.
diff --git a/components/automate-deployment/scripts/generate_owca_manifest.rb b/components/automate-deployment/scripts/generate_owca_manifest.rb
index ced8c3f75..38c376f63 100755
--- a/components/automate-deployment/scripts/generate_owca_manifest.rb
+++ b/components/automate-deployment/scripts/generate_owca_manifest.rb
@@ -43,7 +43,7 @@ def get_latest_manifest(channel)
   http = Net::HTTP.new(PACKAGES_HOST, 443)
   http.use_ssl = true
   http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-  req = Net::HTTP::Get.new("/manifests/#{channel}/automate/latest.json",
+  req = Net::HTTP::Get.new("/manifests/#{channel}/automate/latest_semver.json",
                            {'User-Agent' => HTTP_USER_AGENT})
   resp = http.request(req)
   JSON.parse(resp.body)
diff --git a/components/docs-chef-io/content/automate/data_collection.md b/components/docs-chef-io/content/automate/data_collection.md
index 27a3d416e..2fb760bb8 100644
--- a/components/docs-chef-io/content/automate/data_collection.md
+++ b/components/docs-chef-io/content/automate/data_collection.md
@@ -12,9 +12,9 @@ gh_repo = "automate"
     weight = 20
 +++
 
-# Audit Cookbook + InSpec + Automate 2 Versions Support Matrix
+# Audit Cookbook + InSpec + Automate Versions Support Matrix
 
-Refer to the [following Supported Versions list](https://github.com/chef-cookbooks/audit#chef-automate) to confirm a full set of working versions for your chef-client, Audit cookbook, InSpec, and Automate 2. When these do not match up, ingestion problems can occur because the messages will not show up in the expected format.
+Refer to the [following Supported Versions list](https://github.com/chef-cookbooks/audit#chef-automate) to confirm a full set of working versions for your chef-client, Audit cookbook, InSpec, and Automate. When these do not match up, ingestion problems can occur because the messages will not show up in the expected format.
 
 # Node Run and Audit Data Collection
 
diff --git a/components/docs-chef-io/content/automate/log_management.md b/components/docs-chef-io/content/automate/log_management.md
index 37c2dbd94..90b4f4d1d 100644
--- a/components/docs-chef-io/content/automate/log_management.md
+++ b/components/docs-chef-io/content/automate/log_management.md
@@ -13,7 +13,7 @@ gh_repo = "automate"
     weight = 40
 +++
 
-Chef Automate 2.0 uses `systemd`. Log management is performed according to the configuration defined for the system service `journald`.
+Chef Automate uses `systemd`. Log management is performed according to the configuration defined for the system service `journald`.
 
 ### Viewing Logs
 
diff --git a/components/release-mgmt-dashboard/src/app/app.component.ts b/components/release-mgmt-dashboard/src/app/app.component.ts
index 4df4e4306..b8acb634b 100644
--- a/components/release-mgmt-dashboard/src/app/app.component.ts
+++ b/components/release-mgmt-dashboard/src/app/app.component.ts
@@ -64,7 +64,7 @@ export class AppComponent implements OnInit {
 
     this
       .http
-      .get <RespManifest> (`https://packages.chef.io/manifests/${this.channel}/automate/latest.json`)
+      .get <RespManifest> (`https://packages.chef.io/manifests/${this.channel}/automate/latest_semver.json`)
       .subscribe(data => {
         this.build_version = data.build;
         this.packages = data.packages;
diff --git a/dev-docs/a2-manifest-urls.md b/dev-docs/a2-manifest-urls.md
index 77b114560..d86c3364d 100644
--- a/dev-docs/a2-manifest-urls.md
+++ b/dev-docs/a2-manifest-urls.md
@@ -5,7 +5,7 @@ and the automate-cli command line tools. These can be found at the
 following URLs
 
 - `https://packages.chef.io/manifests/CHANNEL/automate/versions.json` all versions released to a particular channel
-- `https://packages.chef.io/manifests/CHANNEL/automate/latest.json`: the latest manifest for a particular channel
+- `https://packages.chef.io/manifests/CHANNEL/automate/latest_semver.json`: the latest manifest for a particular channel
 - `https://packages.chef.io/manifests/automate/VERSION.json`: the manifest for a particular version
 - `https://packages.chef.io/files/CHANNEL/latest/chef-automate-cli/chef-automate_linux_amd64.zip`:the latest version of the automate-cli command line tool for a particular channel
 - `https://packages.chef.io/files/automate/VERSION/chef-automate_linux_amd64.zip`: the version of automate-cli that shipped with the given Chef Automate version
diff --git a/ec2/README.md b/ec2/README.md
index d74deeb73..b765a75f1 100644
--- a/ec2/README.md
+++ b/ec2/README.md
@@ -160,9 +160,9 @@ tail -f /hab/studios/home--*/hab/sup/default/sup.log
 Let's say you specified `acceptance` channel for the automate VERSION and you want to upgrade to a new version to test data migration. Run this command in the hab studio to overwrite the original manifest and trigger an upgrade to the latest build from the dev channel:
 
 ```
-wget -O /src/results/build.json "https://packages.chef.io/manifests/dev/automate/latest.json"
+wget -O /src/results/build.json "https://packages.chef.io/manifests/dev/automate/latest_semver.json"
 ```
-If you want a specific build, replace `latest` in the URL above with the build timestamp(Ex: 20190329033403). Find all `dev` build timestamps in `versions.json`
+If you want a specific build, replace `latest_semver` in the URL above with the build version(Ex: 3.0.23). Find all `dev` build versions in `versions.json`
 
 Wait 30 seconds or so for the auto-upgrade to kick in. You can verify the progress of the upgrade with:
 ```
diff --git a/scripts/git_difference_expression.rb b/scripts/git_difference_expression.rb
index 65a76af93..16559b603 100755
--- a/scripts/git_difference_expression.rb
+++ b/scripts/git_difference_expression.rb
@@ -6,7 +6,7 @@ require "openssl"
 require "yaml"
 
 MANIFEST_HOST = "packages.chef.io".freeze
-MANIFEST_URL = "/manifests/dev/automate/latest.json".freeze
+MANIFEST_URL = "/manifests/dev/automate/latest_semver.json".freeze
 
 def get_dev_manifest_sha
   http = Net::HTTP.new(MANIFEST_HOST, 443)
diff --git a/scripts/verify_build.sh b/scripts/verify_build.sh
index ee37e633c..00a3df49d 100755
--- a/scripts/verify_build.sh
+++ b/scripts/verify_build.sh
@@ -30,9 +30,9 @@ log_section_start "generate ephemeral origin key"
 HAB_CACHE_KEY_PATH=$RESOLVED_RESULTS_DIR hab origin key generate chef
 
 log_section_start "download manifests"
-curl "https://packages.chef.io/manifests/dev/automate/latest.json" > results/dev.json
-curl "https://packages.chef.io/manifests/current/automate/latest.json" > results/current.json
-curl "https://packages.chef.io/manifests/acceptance/automate/latest.json" > results/acceptance.json
+curl "https://packages.chef.io/manifests/dev/automate/latest_semver.json" > results/dev.json
+curl "https://packages.chef.io/manifests/current/automate/latest_semver.json" > results/current.json
+curl "https://packages.chef.io/manifests/acceptance/automate/latest_semver.json" > results/acceptance.json
 
 log_section_start "determine changed components"
 mapfile -t changed_components < <(./scripts/changed_components.rb 2>/dev/null)
diff --git a/terraform/a2ha-terraform/modules/automate/inputs.tf b/terraform/a2ha-terraform/modules/automate/inputs.tf
index b110713d6..b9768cea0 100644
--- a/terraform/a2ha-terraform/modules/automate/inputs.tf
+++ b/terraform/a2ha-terraform/modules/automate/inputs.tf
@@ -42,14 +42,6 @@ variable "backup_config_efs" {
   default = "false"
 }
 
-variable "backup_config_efs" {
-  default = "false"
-}
-
-variable "backup_config_s3" {
-  default = "false"
-}
-
 variable "backup_config_s3" {
   default = "false"
 }
@@ -58,10 +50,6 @@ variable "bucket_name" {
   default = "chef-automate-ha"
 }
 
-variable "bucket_name" {
-  default = "chef-automate-ha"
-}
-
 variable "cluster_id" {
   default = ""
 }
@@ -144,15 +132,12 @@ variable "public_ips" {
   default = []
 }
 
-variable "setup_managed_services" {
-  default = false
-}
 variable "s3_endpoint" {
   default = "https://s3.amazonaws.com"
 }
 
-variable "s3_endpoint" {
-  default = "https://s3.amazonaws.com"
+variable "setup_managed_services" {
+  default = false
 }
 
 variable "ssh_key_file" {
diff --git a/terraform/a2ha-terraform/modules/elasticsearch/main.tf b/terraform/a2ha-terraform/modules/elasticsearch/main.tf
index 80d430bca..d2cfbbea9 100644
--- a/terraform/a2ha-terraform/modules/elasticsearch/main.tf
+++ b/terraform/a2ha-terraform/modules/elasticsearch/main.tf
@@ -23,78 +23,6 @@ locals {
   })
 }
 
-module "journalbeat" {
-  count                     = 0
-  airgap_info               = var.airgap_info
-  backend_aib_dest_file     = var.backend_aib_dest_file
-  elasticsearch_listen_port = var.elasticsearch_listen_port
-  habitat_info              = var.habitat_info
-  instance_count            = var.elasticsearch_instance_count
-  journalbeat_pkg_ident     = var.journalbeat_pkg_ident
-  journalbeat_svc_binds     = "--bind elasticsearch:automate-ha-elasticsearch.default"
-  journalbeat_tags          = ["elasticsearch"]
-  elasticsearch_private_ips = var.private_ips
-  private_ips               = var.private_ips
-  source                    = "../journalbeat"
-  ssh_key_file              = var.ssh_key_file
-  ssh_user                  = var.ssh_user
-  ssh_user_sudo_password    = var.ssh_user_sudo_password
-  sudo_cmd                  = var.sudo_cmd
-}
-
-module "metricbeat" {
-  count                     = 0
-  airgap_info               = var.airgap_info
-  backend_aib_dest_file     = var.backend_aib_dest_file
-  elasticsearch_listen_port = var.elasticsearch_listen_port
-  habitat_info              = var.habitat_info
-  instance_count            = var.elasticsearch_instance_count
-  metricbeat_pkg_ident      = var.metricbeat_pkg_ident
-  metricbeat_svc_binds      = "--bind elasticsearch:automate-ha-elasticsearch.default"
-  metricbeat_tags           = ["elasticsearch"]
-  elasticsearch_private_ips = var.private_ips
-  private_ips               = var.private_ips
-  source                    = "../metricbeat"
-  ssh_key_file              = var.ssh_key_file
-  ssh_user                  = var.ssh_user
-  ssh_user_sudo_password    = var.ssh_user_sudo_password
-  sudo_cmd                  = var.sudo_cmd
-}
-
-module "kibana" {
-  count                     = 0
-  airgap_info               = var.airgap_info
-  backend_aib_dest_file     = var.backend_aib_dest_file
-  elasticsearch_listen_port = var.elasticsearch_listen_port
-  habitat_info              = var.habitat_info
-  instance_count            = var.elasticsearch_instance_count
-  kibana_pkg_ident          = var.kibana_pkg_ident
-  kibana_svc_binds          = "--bind elasticsearch:automate-ha-elasticsearch.default"
-  private_ips               = var.private_ips
-  source                    = "../kibana"
-  ssh_key_file              = var.ssh_key_file
-  ssh_user                  = var.ssh_user
-  ssh_user_sudo_password    = var.ssh_user_sudo_password
-  sudo_cmd                  = var.sudo_cmd
-}
-
-module "curator" {
-  count                     = 0
-  airgap_info               = var.airgap_info
-  backend_aib_dest_file     = var.backend_aib_dest_file
-  elasticsearch_listen_port = var.elasticsearch_listen_port
-  habitat_info              = var.habitat_info
-  instance_count            = var.elasticsearch_instance_count
-  curator_pkg_ident         = var.curator_pkg_ident
-  curator_svc_binds         = "--bind elasticsearch:automate-ha-elasticsearch.default"
-  private_ips               = var.private_ips
-  source                    = "../curator"
-  ssh_key_file              = var.ssh_key_file
-  ssh_user                  = var.ssh_user
-  ssh_user_sudo_password    = var.ssh_user_sudo_password
-  sudo_cmd                  = var.sudo_cmd
-}
-
 resource "null_resource" "elasticsearch" {
   count = var.elasticsearch_instance_count
 
diff --git a/terraform/a2ha-terraform/modules/postgresql/main.tf b/terraform/a2ha-terraform/modules/postgresql/main.tf
index 267779c0f..c793ba7f7 100644
--- a/terraform/a2ha-terraform/modules/postgresql/main.tf
+++ b/terraform/a2ha-terraform/modules/postgresql/main.tf
@@ -30,44 +30,6 @@ locals {
   })
 }
 
-module "journalbeat" {
-  count                     = 0
-  airgap_info               = var.airgap_info
-  backend_aib_dest_file     = var.backend_aib_dest_file
-  elasticsearch_listen_port = var.elasticsearch_listen_port
-  habitat_info              = var.habitat_info
-  instance_count            = var.postgresql_instance_count
-  journalbeat_pkg_ident     = var.journalbeat_pkg_ident
-  journalbeat_svc_binds     = "--bind elasticsearch:automate-ha-elasticsearch.default"
-  journalbeat_tags          = ["postgresql"]
-  elasticsearch_private_ips = var.elasticsearch_private_ips
-  private_ips               = var.private_ips
-  source                    = "../journalbeat"
-  ssh_key_file              = var.ssh_key_file
-  ssh_user                  = var.ssh_user
-  ssh_user_sudo_password    = var.ssh_user_sudo_password
-  sudo_cmd                  = var.sudo_cmd
-}
-
-module "metricbeat" {
-  count                     = 0
-  airgap_info               = var.airgap_info
-  backend_aib_dest_file     = var.backend_aib_dest_file
-  elasticsearch_listen_port = var.elasticsearch_listen_port
-  habitat_info              = var.habitat_info
-  instance_count            = var.postgresql_instance_count
-  metricbeat_pkg_ident      = var.metricbeat_pkg_ident
-  metricbeat_svc_binds      = "--bind database:automate-ha-postgresql.default --bind elasticsearch:automate-ha-elasticsearch.default"
-  metricbeat_tags           = ["postgresql"]
-  elasticsearch_private_ips = var.elasticsearch_private_ips
-  private_ips               = var.private_ips
-  source                    = "../metricbeat"
-  ssh_key_file              = var.ssh_key_file
-  ssh_user                  = var.ssh_user
-  ssh_user_sudo_password    = var.ssh_user_sudo_password
-  sudo_cmd                  = var.sudo_cmd
-}
-
 resource "null_resource" "postgresql" {
   count = var.postgresql_instance_count
 
diff --git a/tools/hab-dep-graph/main.go b/tools/hab-dep-graph/main.go
index b2fec7640..a6ee49a81 100644
--- a/tools/hab-dep-graph/main.go
+++ b/tools/hab-dep-graph/main.go
@@ -68,7 +68,7 @@ You can generate the graph for a particular package by passing it as an argument
 
 Or combine this with other tools to create the dep graph for a particular release:
 
-    pkg_list="$(curl https://packages.chef.io/manifests/dev/automate/latest.json 2>/dev/null | jq -r '.packages | .[]')"
+    pkg_list="$(curl https://packages.chef.io/manifests/dev/automate/latest_semver.json 2>/dev/null | jq -r '.packages | .[]')"
     go run ./tools/hab-dep-graph $pkg_list
 `,
 


Test patch:
diff --git a/components/automate-deployment/tools/upgrade-test-scaffold/upgrade-test-scaffold.go b/components/automate-deployment/tools/upgrade-test-scaffold/upgrade-test-scaffold.go
index 3ebe3a499..31254d9cf 100644
--- a/components/automate-deployment/tools/upgrade-test-scaffold/upgrade-test-scaffold.go
+++ b/components/automate-deployment/tools/upgrade-test-scaffold/upgrade-test-scaffold.go
@@ -191,6 +191,8 @@ func serve(cmd *cobra.Command, args []string) {
 
 	http.HandleFunc("/manifests/current/automate/latest.json", ServeLatestManifest(manifestPath, manifestMap))
 	http.HandleFunc("/manifests/dev/automate/latest.json", ServeLatestManifest(manifestPath, manifestMap))
+	http.HandleFunc("/manifests/current/automate/latest_semver.json", ServeLatestManifest(manifestPath, manifestMap))
+	http.HandleFunc("/manifests/dev/automate/latest_semver.json", ServeLatestManifest(manifestPath, manifestMap))
 	http.HandleFunc("/manifests/current/automate/versions.json", ServeVersions(versionPath, manifestMap))
 	http.HandleFunc("/manifests/dev/automate/versions.json", ServeVersions(versionPath, manifestMap))
 	http.HandleFunc("/manifests/automate/", ServeManifest("/manifests/automate/", manifestMap))