Merge ~lamoura/ubuntu/+source/ubuntu-advantage-tools:upload-29-mantic into ubuntu/+source/ubuntu-advantage-tools:ubuntu/devel

[Lucas Albuquerque Medeiros de Moura]

Release version 29 for ubuntu-advantage-tools package.
More information can be found on the following SRU bug:
https://bugs.launchpad.net/ubuntu/+source/ubuntu-advantage-tools/+bug/2029144

See the CHANGELOG and related bugs for more information.

[Lucas Albuquerque Medeiros de Moura (lamoura)]

Xenial tests:
  - Source ubuntu-advantage-tools/29~16.04~rc1: Published
    + amd64: https://autopkgtest.ubuntu.com/request.cgi?release=xenial&package=ubuntu-advantage-tools&arch=amd64&trigger=ubuntu-advantage-tools%2F29~16.04~rc1&ppa=ua-client%2Fstaging♻️
    + arm64: https://autopkgtest.ubuntu.com/request.cgi?release=xenial&package=ubuntu-advantage-tools&arch=arm64&trigger=ubuntu-advantage-tools%2F29~16.04~rc1&ppa=ua-client%2Fstaging♻️
    + armhf: https://autopkgtest.ubuntu.com/request.cgi?release=xenial&package=ubuntu-advantage-tools&arch=armhf&trigger=ubuntu-advantage-tools%2F29~16.04~rc1&ppa=ua-client%2Fstaging♻️
    + ppcel64: https://autopkgtest.ubuntu.com/request.cgi?release=xenial&package=ubuntu-advantage-tools&arch=ppcel64&trigger=ubuntu-advantage-tools%2F29~16.04~rc1&ppa=ua-client%2Fstaging♻️
    + riscv64: https://autopkgtest.ubuntu.com/request.cgi?release=xenial&package=ubuntu-advantage-tools&arch=riscv64&trigger=ubuntu-advantage-tools%2F29~16.04~rc1&ppa=ua-client%2Fstaging♻️
    + s390x: https://autopkgtest.ubuntu.com/request.cgi?release=xenial&package=ubuntu-advantage-tools&arch=s390x&trigger=ubuntu-advantage-tools%2F29~16.04~rc1&ppa=ua-client%2Fstaging♻️
    + amd64: https://autopkgtest.ubuntu.com/request.cgi?release=xenial&package=ubuntu-advantage-tools&arch=amd64&trigger=ubuntu-advantage-tools%2F29~16.04~rc1&ppa=ua-client%2Fstaging💍
    + arm64: https://autopkgtest.ubuntu.com/request.cgi?release=xenial&package=ubuntu-advantage-tools&arch=arm64&trigger=ubuntu-advantage-tools%2F29~16.04~rc1&ppa=ua-client%2Fstaging💍
    + armhf: https://autopkgtest.ubuntu.com/request.cgi?release=xenial&package=ubuntu-advantage-tools&arch=armhf&trigger=ubuntu-advantage-tools%2F29~16.04~rc1&ppa=ua-client%2Fstaging💍
    + ppcel64: https://autopkgtest.ubuntu.com/request.cgi?release=xenial&package=ubuntu-advantage-tools&arch=ppcel64&trigger=ubuntu-advantage-tools%2F29~16.04~rc1&ppa=ua-client%2Fstaging💍
    + riscv64: https://autopkgtest.ubuntu.com/request.cgi?release=xenial&package=ubuntu-advantage-tools&arch=riscv64&trigger=ubuntu-advantage-tools%2F29~16.04~rc1&ppa=ua-client%2Fstaging💍
    + s390x: https://autopkgtest.ubuntu.com/request.cgi?release=xenial&package=ubuntu-advantage-tools&arch=s390x&trigger=ubuntu-advantage-tools%2F29~16.04~rc1&ppa=ua-client%2Fstaging💍

Bionic tests:

  - Source ubuntu-advantage-tools/29~18.04~rc1: Published
    + amd64: https://autopkgtest.ubuntu.com/request.cgi?release=bionic&package=ubuntu-advantage-tools&arch=amd64&trigger=ubuntu-advantage-tools%2F29~18.04~rc1&ppa=ua-client%2Fstaging♻️
    + arm64: https://autopkgtest.ubuntu.com/request.cgi?release=bionic&package=ubuntu-advantage-tools&arch=arm64&trigger=ubuntu-advantage-tools%2F29~18.04~rc1&ppa=ua-client%2Fstaging♻️
    + armhf: https://autopkgtest.ubuntu.com/request.cgi?release=bionic&package=ubuntu-advantage-tools&arch=armhf&trigger=ubuntu-advantage-tools%2F29~18.04~rc1&ppa=ua-client%2Fstaging♻️
    + ppcel64: https://a...

[Sergio Durigan Junior (sergiodj)]

Thank you, Lucas.

Here's my review. I focused on the Debian packaging stuff, but also tried to review the overall changes to the source code. Also, some of the points I raise below can be considered nitpicky/wishlist.

## dep8 tests

Before I forget: I triggered the dep8 tests for Mantic. Here's the result:

Results: (from http://autopkgtest.ubuntu.com/results/autopkgtest-mantic-ua-client-staging/?format=plain)
  ubuntu-advantage-tools @ amd64:
    02.08.23 19:27:59 Log 🗒️ ✅ Triggers: ubuntu-advantage-tools/29~rc1
  ubuntu-advantage-tools @ arm64:
    02.08.23 19:48:24 Log 🗒️ ✅ Triggers: ubuntu-advantage-tools/29~rc1
  ubuntu-advantage-tools @ armhf:
    02.08.23 19:23:09 Log 🗒️ ✅ Triggers: ubuntu-advantage-tools/29~rc1
  ubuntu-advantage-tools @ ppc64el:
    02.08.23 20:17:12 Log 🗒️ ✅ Triggers: ubuntu-advantage-tools/29~rc1
  ubuntu-advantage-tools @ s390x:
    02.08.23 19:36:43 Log 🗒️ ✅ Triggers: ubuntu-advantage-tools/29~rc1

## lintian messages

I noticed that you do read the lintian messages (good!) and take care to handle them when needed, so I decided to comment on some of the existing messages that I believe could be addressed as well.

- maintainer-script-calls-systemctl: you should be able to use "deb-systemd-invoke" instead of invoking "systemctl" directly in the postinst script, because "deb-systemd-invoke" will simply execute "systemctl" with whatever arguments you pass to it.

- possible-bashism-in-maintainer-script: you can safely override this one.

- command-with-path-in-maintainer-script: I see that this has been done this way because of LP #1930121, so it's OK to override this (and leave a comment referencing the bug).

- package-supports-alternative-init-but-no-init.d-script: you can safely override this one (Ubuntu doesn't support sysv init.d).

- systemd-service-file-missing-documentation-key: I'd recommend adding the Documentation directive in the systemd service files.

There are two override flags that can probably be dropped (invalid-arch-string-in-source-relation and missing-build-dependency-for-dh_-command) because lintian is saying that they're unused.

## d/changelog

- The new README file is called d/README.source (you missed the ".source" suffix).

- Typo: subsctiption

- The text after "- proxy:" starts with a capital "A". It should follow the convention and start with lowercase "a".

- Nitpick: you might also mention the d/copyright update here, just for completeness sake. No need to rebase the branch just for that, though.

I still have to look deeper into the contents of d/changelog vs. the commits.

## d/README.source

LGTM, but I have a question:

- According to the discussion on https://github.com/canonical/ubuntu-pro-client/issues/2463, you had decided to keep the documentation bits as part of the tarball but mention that they're not actually used to generate the binary package. However, df505d4643a20a7210a9c9ae972678549adc0801 seems to indicate that you decided to move the documentation out of the tarball. Is that correct? Is this why I don't see a mention to the documentation part in the "Particularities" section here?

## d/*postinst

- Nitpick: you co...

review: Needs Information

ac83297... by Renan Rodrigo on 2023-08-04

d/changelog: fix typos and add missing d/copyright entry

Signed-off-by: Renan Rodrigo <email address hidden>

097d33b... by Renan Rodrigo on 2023-08-04

chore: tweak messages in the preferences files

Following release review suggestions

Signed-off-by: Renan Rodrigo <email address hidden>

[Renan Rodrigo (renanrodrigo)]

Hello, sergiodj, thanks much for this first round of feedback - appreciated.

So,

> - According to the discussion on https://github.com/canonical/ubuntu-pro-client/issues/2463, you had decided to keep the documentation bits as part of the tarball but mention that they're not actually used to generate the binary package. However, df505d4643a20a7210a9c9ae972678549adc0801 seems to indicate that you decided to move the documentation out of the tarball. Is that correct? Is this why I don't see a mention to the documentation part in the "Particularities" section here?

Sorry, this is on me - I updated the Jira ticket, but not the (public and available) GH issue :/
We have decided to completely remove the documentation bits from the tarball, so anyone packaging/sponsoring u-a-t would not need to care about docs in the process. We would include it in the readme if we had decided to keep those around, but given we removed it, we also don't mention it in the readme.

8137d60... by Lucas Albuquerque Medeiros de Moura on 2023-08-04

lintian: add overrides to some known warnings

3b619ce... by Lucas Albuquerque Medeiros de Moura on 2023-08-04

postinst: change systemctl to deb-systemd-invoke

Calling systemctl on the postinst script generates a lintian warning.
We are replacing it for deb-systemd-invoke to silence it

8380832... by Lucas Albuquerque Medeiros de Moura on 2023-08-04

postinst: use for loop to rename gpg keys

[Sergio Durigan Junior (sergiodj)]

> Hello, sergiodj, thanks much for this first round of feedback - appreciated.
>
> So,
>
> > - According to the discussion on https://github.com/canonical/ubuntu-pro-
> client/issues/2463, you had decided to keep the documentation bits as part of
> the tarball but mention that they're not actually used to generate the binary
> package. However, df505d4643a20a7210a9c9ae972678549adc0801 seems to indicate
> that you decided to move the documentation out of the tarball. Is that
> correct? Is this why I don't see a mention to the documentation part in the
> "Particularities" section here?
>
> Sorry, this is on me - I updated the Jira ticket, but not the (public and
> available) GH issue :/
> We have decided to completely remove the documentation bits from the tarball,
> so anyone packaging/sponsoring u-a-t would not need to care about docs in the
> process. We would include it in the readme if we had decided to keep those
> around, but given we removed it, we also don't mention it in the readme.

Thanks for the reply and for clarifying this part, Renan.

[Lucas Albuquerque Medeiros de Moura (lamoura)]

Hi Sergio,

Thanks for the review. I have updated the MR addressing all of the suggested changes.
Regarding b33fb5e3, this is an issue generated by a previous release. What I did was at least to remove the duplicated code generated by it.

But please let me know if you identify anything else that needs improvement/changes.

[Sergio Durigan Junior (sergiodj)]

Thank you, Lucas et al.

I did a second pass to verify the points that I raised, and confirmed that they've been properly addressed.

Everything else LGTM, so I'm approving this MP and uploading the package. Thank you again!

$ dput ubuntu-advantage-tools_29_source.changes
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/work/ubuntu-advantage-tools/ubuntu-advantage-tools_29_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/ubuntu-advantage-tools/ubuntu-advantage-tools_29.dsc: Valid signature from 106DA1C8C3CBBF14
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading ubuntu-advantage-tools_29.dsc: done.
  Uploading ubuntu-advantage-tools_29.tar.xz: done.
  Uploading ubuntu-advantage-tools_29_source.buildinfo: done.
  Uploading ubuntu-advantage-tools_29_source.changes: done.
Successfully uploaded packages.

review: Approve

[Robie Basak (racb)]

> b33fb5e3 lock: alert the user about corrupted lock

[Comment only] This seems to have no relation to the change, and the referenced bug is already fixed?

> 31572946 refactor: implementation-agnostic interface to readurl

[Comment only] On what you describe in the commit message: in Python, I'm dubious about failures being presented by return codes instead of via exceptions. It's not the normal pattern, and thus seems error-prone in that a caller is more likely to fail to check and for that to be missed in future reviews.

> 296edca3 chore: rename repo GPG keys from -advantage to -pro
> 83808325 postinst: use for loop to rename gpg keys

[Comment only] I'm not sure why this is labelled as "chore". I don't subscribe to "semantic commit messages" but even then this is absolutely a user-visible change!

[Needs Information] Why are we renaming these keys at all? We're not renaming the package name, and the prefix /etc/apt/trusted.gpg.d/ubuntu-advantage- arguably makes it clear the these file belong to this package. And there are further complications: these are in /etc, so could be modified or removed by users, so we have to consider that type of case - at least to review to ensure that the maintainer scripts cannot explode. Further, even though mv_conffile is not appropriate in this case, it demonstrates the error rollbacks that are not implemented here, so a failure somewhere else in the postinst could lead to a user's system ending up in a broken state due to this part not being rolled back correctly, and that requires further thought, review and possible implementation. Is this worth the regression risk and review effort?

> 7c2f481b http: use pycurl for tls-in-tls requests

[Comment only]

Note that you are depending on ca-certificates (due to /etc/ssl/certs/ca-certificates.crt) but cannot Depend on it. The instruction "apt install python3-pycurl" will probably pull it in as a Recommends, but not necessarily if users have Recommends installation disabled (this is not uncommon in "minimal" server deployments). So it might be worth stating it explicitly.

IIRC this is also an issue for plain Python SSL. I remember it coming up but don't remember how we handled it. It might be worth verifying that there are tests to ensure that behaviour is reasonable when ca-certificates is not installed - both for the Python and pycurl cases.

> fead7d19 contract: support requiredPackages directive

[Needs Information] Under what circumstances are these directives provided? Just when a service is being enabled, or is it wider than this?

> c2a7f7ab landscape: support enabling and disabling landscape-client

[Comment only] I asked why is help_data.yaml in /etc, and understand that you are planning to move it out.

> 1162f56f esm: pin repositories to a higher priority using static files
> 21c28f36 esm: add comment to preference files
> 097d33bf chore: tweak messages in the preferences files

[Needs Fixing]

1. Could you please add a test to ensure that a regular archive package not from ESM remains *not* pinned (ie. priority 500)? Unless I'm missing something, I looked at features/attached_enable.feature and at sru/release-29/test-esm-pinning.sh and didn't se...

review: Needs Fixing

[Sergio Durigan Junior (sergiodj)]

On Thursday, August 17 2023, Robie Basak wrote:

>> 3b619ce9 postinst: change systemctl to deb-systemd-invoke
>
> [Needs Information]
>
> Did you do this because lintian told you to? deb-systemd-invoke is
> documented as only supporting start|stop|restart and I'm not sure
> policy-rc.d makes sense for daemon-reload or reset-failed anyway. But
> I tested this on Mantic and it seems to work. I'm OK with the change,
> but as it's in a less common upgrade path, do we have an ongoing test
> that validates that it will work into the future please? Alternatively
> this seems like a lintian bug that should allow "--system
> daemon-reload" and "reset-failed" and might be worth a bug report (and
> additionally a blanket "use deb-systemd-invoke" claim contradicts the
> command's own usage notice that only permits it for
> start|stop|restart). I see code to allow daemon-reload upstream
> already[1]. See also the scoped overrides I mentioned above.
>
> Please either: 1) defer the change; or 2) ensure an ongoing test exists for the purposes of exercising this code path (this might already exist; I didn't check; if you say there is one then that's good enough for me).
>
> I suggest also specific lintian overrides and a bug to lintian upstream.
>
> [1] https://salsa.debian.org/lintian/lintian/-/blob/ea05801918ed0e87824d89bf16a6ee166450b977/lib/Lintian/Check/MaintainerScripts/Systemctl.pm

Hey Robie,

Thanks for the extra review. This change was done because of a request
I made after building the package noticing the lintian warning.

My rationale here is that even though "deb-systemd-invoke" does not
explicitly document support actions other than start|stop|restart, there
is code in place to support deferring any other command to "systemctl"
directly:

  https://salsa.debian.org/debian/init-system-helpers/-/blob/master/script/deb-systemd-invoke#L157

This code (or other versions of it) has been there since the start, so
we should be covered when dealing with Xenial.

It is indeed arguable whether "deb-systemd-invoke" should be used only
for the actions mentioned above; the manpage's SYNOPSIS indicates that,
but the DESCRIPTION is more generic and doesn't impose the same limits.

Anyway, this is a really small change and I'm absolutely fine if Lucas
decides to revert it, although he also told me that they do have tests
to cover this code path, but I will let him elaborate more on that.

Thanks,

--
Sergio
GPG key ID: E92F D0B3 6B14 F1F4 D8E0 EB2F 106D A1C8 C3CB BF14

[Lucas Albuquerque Medeiros de Moura (lamoura)]

Hi Robie, thanks for the review.

Let me address all of the comments here:

> b33fb5e3 lock: alert the user about corrupted lock

This commit is just trying to fix a rebase issue we had in the past. It just deletes duplicated lines on the messages module. It is not ideal, but I think this can be ignored for the release.

> 31572946 refactor: implementation-agnostic interface to readurl

Yes, since the libraries we support now have those differences between how they raise the exception, we have tried to follow a pattern similar to what request does:
https://requests.readthedocs.io/en/latest/user/quickstart/#response-status-codes
But we understand that we need to be careful on the review regarding new code that perform any type of requests

> 296edca3 chore: rename repo GPG keys from -advantage to -pro
> 83808325 postinst: use for loop to rename gpg keys
> Why are we renaming these keys at all?

we plan to rename the package before 24.04 and we are already addressing some parts of the code earlier, to make this change more incremental.

> And there are further complications: these are in /etc, so could be modified or removed by users, so we have to consider that type of case - at least to review to ensure that the maintainer scripts cannot explode. Further, even though mv_conffile is not appropriate in this case, it demonstrates the error rollbacks that are not implemented here, so a failure somewhere else in the postinst could lead to a user's system ending up in a broken state due to this part not being rolled back correctly, and that requires further thought, review and possible implementation. Is this worth the regression risk and review effort?

Regarding user modifications, I believe we shouldn't worry. Those files are only created once the service is enabled and the key there isn unique for each service. Therefore, modifications are definitely unsupported.

Regarding failures, the only impact is that we will end up with a key that was not renamed. In that situation, the service will still work as expected and the only side-effect is that during disable, we will
not remove the old key. But I will of course create a test script that demonstrate that

> 7c2f481b http: use pycurl for tls-in-tls requests

Great catch, we need to better alert the user about ca-certificates. I will add a commit addressing this.

> fead7d19 contract: support requiredPackages directive

[Needs Information] Under what circumstances are these directives provided? Just when a service is being enabled, or is it wider than this?

We will only read and act upon this directive when a service is enabled. Also this directive is currently only present for the Landscape service

[Needs Fixing]

Yes, I will update the test and update the comment on the pin file too

[Andreas Hasenack (ahasenack)]

Some version of this eventually landed in mantic-proposed[1], but was superseeded by multiple follow-up uploads.

I'll mark this MP as merged due to that.

1. https://launchpad.net/ubuntu/+source/ubuntu-advantage-tools/29

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 7faa407..a652232 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -45,7 +45,7 @@ sudo pro new-sub-command --new-flag
 that apply. -->
  - [ ] I have updated or added any unit tests accordingly
  - [ ] I have updated or added any integration tests accordingly
- - [ ] I have updated or added any documentation accordingly
+ - [ ] Changes here need to be documented, and this was done in: <!-- Insert PR number here if the box is checked (ex. #1234) -->
 
 ## Does this PR require extra reviews?
 <!-- Should people outside of the team see and approve these changes before the
diff --git a/.github/actions/bug-refs/index.js b/.github/actions/bug-refs/index.js
index b603793..c873aca 100644
--- a/.github/actions/bug-refs/index.js
+++ b/.github/actions/bug-refs/index.js
@@ -3,7 +3,7 @@ const github = require('@actions/github');
 
 const commentHeader = "<!-- ubuntu-pro-client-bug-refs -->";
 
-function createCommentBody(commits, title) {
+function createCommentBody(commits, title, body) {
     let newComment = "";
     newComment += commentHeader;
     newComment += "\n";
@@ -49,6 +49,19 @@ function createCommentBody(commits, title) {
     }
     newComment += "\n";
 
+    newComment += "Documentation:";
+    if (!body.includes('[x] Changes here need to be documented')){
+        newComment += " The changes in this PR do not require documentation changes.";
+    } else {
+        docsPullMatch = body.match(/and this was done in: (#\d+)/)
+        if (docsPullMatch){
+            newComment += ` Documentation changes addressed in ${docsPullMatch[1]}`;
+        } else {
+            newComment += " The changes in this PR do require documentation changes, but those were not addressed yet.";
+        }
+    }
+    newComment += "\n\n";
+
     newComment += "👍 this comment to confirm that this is correct.";
 
     return newComment;
@@ -80,7 +93,11 @@ async function run() {
     if (theComment) {
         // comment already exists, update it appropriately
         const existingBody = theComment.body;
-        const newBody = createCommentBody(commits.data, context.payload.pull_request.title);
+        const newBody = createCommentBody(
+            commits.data,
+            context.payload.pull_request.title,
+            context.payload.pull_request.body
+        );
         if (existingBody !== newBody) {
             client.rest.issues.updateComment({
                 owner: context.issue.owner,
@@ -91,13 +108,23 @@ async function run() {
         }
     } else {
         // first run, comment doesn't exist yet
-        const newBody = createCommentBody(commits.data, context.payload.pull_request.title);
+        const newBody = createCommentBody(
+            commits.data,
+            context.payload.pull_request.title,
+            context.payload.pull_request.body
+        );
         client.rest.issues.createComment({
             owner: context.issue.owner,
             repo: context.issue.repo,
             issue_number: context.issue.number,
             body: newBody,
         });
+        client.rest.reactions.createForIssue({
+            owner: context.issue.owner,
+            repo: context.issue.repo,
+            issue_number: context.issue.number,
+            content: "eyes"
+        });
     }
 }
 
diff --git a/.github/actions/release-changelog-bug-refs/action.yml b/.github/actions/release-changelog-bug-refs/action.yml
 new file mode 100644
index 0000000..edd4ca1
--- /dev/null
+++ b/.github/actions/release-changelog-bug-refs/action.yml
@@ -0,0 +1,9 @@
+name: 'Ensure Release Changelog has Bug References'
+description: "Block releases if bug references in commits aren't in the proposed changelog entry"
+inputs:
+  repo-token:
+    description: 'Token for the repository. Can be passed in using {{ secrets.GITHUB_TOKEN }}'
+    required: true
+runs:
+  using: 'node16'
+  main: 'index.js'
diff --git a/.github/actions/release-changelog-bug-refs/index.js b/.github/actions/release-changelog-bug-refs/index.js
 new file mode 100644
index 0000000..5c8a494
--- /dev/null
+++ b/.github/actions/release-changelog-bug-refs/index.js
@@ -0,0 +1,44 @@
+const fs = require('fs/promises');
+const core = require('@actions/core');
+const github = require('@actions/github');
+
+async function run() {
+    const context = github.context;
+    if (context.eventName !== "pull_request") {
+      console.log(
+        'The event that triggered this action was not a pull request, skipping.'
+      );
+      return;
+    }
+
+    const client = github.getOctokit(
+        core.getInput('repo-token', {required: true})
+    );
+    const commits = await client.rest.pulls.listCommits({
+        owner: context.issue.owner,
+        repo: context.issue.repo,
+        pull_number: context.issue.number,
+    });
+    let lpBugs = [];
+    let ghIssues = [];
+    commits.data.forEach(commit => {
+        const message = commit.commit.message.toLocaleUpperCase();
+        lpBugs = lpBugs.concat(Array.from(message.matchAll(/LP: #(\d+)/g)).map(m => m[1]));
+        ghIssues = ghIssues.concat(Array.from(message.matchAll(/FIXES: #(\d+)/g)).map(m => m[1]));
+        ghIssues = ghIssues.concat(Array.from(message.matchAll(/CLOSES: #(\d+)/g)).map(m => m[1]));
+    });
+    const changelog = await fs.readFile("./debian/changelog", { encoding: "utf8" });
+    const changelogEntries = changelog.split("ubuntu-advantage-tools");
+    const newEntry = changelogEntries[1];
+    const missingLpBugs = lpBugs.filter(bug => !newEntry.includes(`LP: #${bug}`));
+    const missingGhIssues = ghIssues.filter(issue => !newEntry.includes(`GH: #${issue}`));
+
+    if (missingLpBugs.length > 0 || missingGhIssues.length > 0) {
+        core.setFailed({ missingLpBugs, missingGhIssues });
+    }
+}
+
+run().catch(error => {
+    console.error(error);
+    core.setFailed(error.message);
+})
diff --git a/.github/actions/release-changelog-bug-refs/package-lock.json b/.github/actions/release-changelog-bug-refs/package-lock.json
 new file mode 100644
index 0000000..f9ad26b
--- /dev/null
+++ b/.github/actions/release-changelog-bug-refs/package-lock.json
@@ -0,0 +1,430 @@
+{
+  "name": "bug-refs",
+  "version": "1.0.0",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "bug-refs",
+      "version": "1.0.0",
+      "dependencies": {
+        "@actions/core": "^1.10.0",
+        "@actions/github": "^5.1.1"
+      }
+    },
+    "node_modules/@actions/core": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.0.tgz",
+      "integrity": "sha512-2aZDDa3zrrZbP5ZYg159sNoLRb61nQ7awl5pSvIq5Qpj81vwDzdMRKzkWJGJuwVvWpvZKx7vspJALyvaaIQyug==",
+      "dependencies": {
+        "@actions/http-client": "^2.0.1",
+        "uuid": "^8.3.2"
+      }
+    },
+    "node_modules/@actions/github": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@actions/github/-/github-5.1.1.tgz",
+      "integrity": "sha512-Nk59rMDoJaV+mHCOJPXuvB1zIbomlKS0dmSIqPGxd0enAXBnOfn4VWF+CGtRCwXZG9Epa54tZA7VIRlJDS8A6g==",
+      "dependencies": {
+        "@actions/http-client": "^2.0.1",
+        "@octokit/core": "^3.6.0",
+        "@octokit/plugin-paginate-rest": "^2.17.0",
+        "@octokit/plugin-rest-endpoint-methods": "^5.13.0"
+      }
+    },
+    "node_modules/@actions/http-client": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.1.0.tgz",
+      "integrity": "sha512-BonhODnXr3amchh4qkmjPMUO8mFi/zLaaCeCAJZqch8iQqyDnVIkySjB38VHAC8IJ+bnlgfOqlhpyCUZHlQsqw==",
+      "dependencies": {
+        "tunnel": "^0.0.6"
+      }
+    },
+    "node_modules/@octokit/auth-token": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.5.0.tgz",
+      "integrity": "sha512-r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g==",
+      "dependencies": {
+        "@octokit/types": "^6.0.3"
+      }
+    },
+    "node_modules/@octokit/core": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-3.6.0.tgz",
+      "integrity": "sha512-7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q==",
+      "dependencies": {
+        "@octokit/auth-token": "^2.4.4",
+        "@octokit/graphql": "^4.5.8",
+        "@octokit/request": "^5.6.3",
+        "@octokit/request-error": "^2.0.5",
+        "@octokit/types": "^6.0.3",
+        "before-after-hook": "^2.2.0",
+        "universal-user-agent": "^6.0.0"
+      }
+    },
+    "node_modules/@octokit/endpoint": {
+      "version": "6.0.12",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.12.tgz",
+      "integrity": "sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA==",
+      "dependencies": {
+        "@octokit/types": "^6.0.3",
+        "is-plain-object": "^5.0.0",
+        "universal-user-agent": "^6.0.0"
+      }
+    },
+    "node_modules/@octokit/graphql": {
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.8.0.tgz",
+      "integrity": "sha512-0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg==",
+      "dependencies": {
+        "@octokit/request": "^5.6.0",
+        "@octokit/types": "^6.0.3",
+        "universal-user-agent": "^6.0.0"
+      }
+    },
+    "node_modules/@octokit/openapi-types": {
+      "version": "12.11.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-12.11.0.tgz",
+      "integrity": "sha512-VsXyi8peyRq9PqIz/tpqiL2w3w80OgVMwBHltTml3LmVvXiphgeqmY9mvBw9Wu7e0QWk/fqD37ux8yP5uVekyQ=="
+    },
+    "node_modules/@octokit/plugin-paginate-rest": {
+      "version": "2.21.3",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.21.3.tgz",
+      "integrity": "sha512-aCZTEf0y2h3OLbrgKkrfFdjRL6eSOo8komneVQJnYecAxIej7Bafor2xhuDJOIFau4pk0i/P28/XgtbyPF0ZHw==",
+      "dependencies": {
+        "@octokit/types": "^6.40.0"
+      },
+      "peerDependencies": {
+        "@octokit/core": ">=2"
+      }
+    },
+    "node_modules/@octokit/plugin-rest-endpoint-methods": {
+      "version": "5.16.2",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.16.2.tgz",
+      "integrity": "sha512-8QFz29Fg5jDuTPXVtey05BLm7OB+M8fnvE64RNegzX7U+5NUXcOcnpTIK0YfSHBg8gYd0oxIq3IZTe9SfPZiRw==",
+      "dependencies": {
+        "@octokit/types": "^6.39.0",
+        "deprecation": "^2.3.1"
+      },
+      "peerDependencies": {
+        "@octokit/core": ">=3"
+      }
+    },
+    "node_modules/@octokit/request": {
+      "version": "5.6.3",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.6.3.tgz",
+      "integrity": "sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A==",
+      "dependencies": {
+        "@octokit/endpoint": "^6.0.1",
+        "@octokit/request-error": "^2.1.0",
+        "@octokit/types": "^6.16.1",
+        "is-plain-object": "^5.0.0",
+        "node-fetch": "^2.6.7",
+        "universal-user-agent": "^6.0.0"
+      }
+    },
+    "node_modules/@octokit/request-error": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.1.0.tgz",
+      "integrity": "sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==",
+      "dependencies": {
+        "@octokit/types": "^6.0.3",
+        "deprecation": "^2.0.0",
+        "once": "^1.4.0"
+      }
+    },
+    "node_modules/@octokit/types": {
+      "version": "6.41.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.41.0.tgz",
+      "integrity": "sha512-eJ2jbzjdijiL3B4PrSQaSjuF2sPEQPVCPzBvTHJD9Nz+9dw2SGH4K4xeQJ77YfTq5bRQ+bD8wT11JbeDPmxmGg==",
+      "dependencies": {
+        "@octokit/openapi-types": "^12.11.0"
+      }
+    },
+    "node_modules/before-after-hook": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.3.tgz",
+      "integrity": "sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ=="
+    },
+    "node_modules/deprecation": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz",
+      "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ=="
+    },
+    "node_modules/is-plain-object": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/node-fetch": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz",
+      "integrity": "sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==",
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+    },
+    "node_modules/tunnel": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
+      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
+      "engines": {
+        "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
+      }
+    },
+    "node_modules/universal-user-agent": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
+      "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w=="
+    },
+    "node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+    },
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+    }
+  },
+  "dependencies": {
+    "@actions/core": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.0.tgz",
+      "integrity": "sha512-2aZDDa3zrrZbP5ZYg159sNoLRb61nQ7awl5pSvIq5Qpj81vwDzdMRKzkWJGJuwVvWpvZKx7vspJALyvaaIQyug==",
+      "requires": {
+        "@actions/http-client": "^2.0.1",
+        "uuid": "^8.3.2"
+      }
+    },
+    "@actions/github": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@actions/github/-/github-5.1.1.tgz",
+      "integrity": "sha512-Nk59rMDoJaV+mHCOJPXuvB1zIbomlKS0dmSIqPGxd0enAXBnOfn4VWF+CGtRCwXZG9Epa54tZA7VIRlJDS8A6g==",
+      "requires": {
+        "@actions/http-client": "^2.0.1",
+        "@octokit/core": "^3.6.0",
+        "@octokit/plugin-paginate-rest": "^2.17.0",
+        "@octokit/plugin-rest-endpoint-methods": "^5.13.0"
+      }
+    },
+    "@actions/http-client": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.1.0.tgz",
+      "integrity": "sha512-BonhODnXr3amchh4qkmjPMUO8mFi/zLaaCeCAJZqch8iQqyDnVIkySjB38VHAC8IJ+bnlgfOqlhpyCUZHlQsqw==",
+      "requires": {
+        "tunnel": "^0.0.6"
+      }
+    },
+    "@octokit/auth-token": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.5.0.tgz",
+      "integrity": "sha512-r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g==",
+      "requires": {
+        "@octokit/types": "^6.0.3"
+      }
+    },
+    "@octokit/core": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-3.6.0.tgz",
+      "integrity": "sha512-7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q==",
+      "requires": {
+        "@octokit/auth-token": "^2.4.4",
+        "@octokit/graphql": "^4.5.8",
+        "@octokit/request": "^5.6.3",
+        "@octokit/request-error": "^2.0.5",
+        "@octokit/types": "^6.0.3",
+        "before-after-hook": "^2.2.0",
+        "universal-user-agent": "^6.0.0"
+      }
+    },
+    "@octokit/endpoint": {
+      "version": "6.0.12",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.12.tgz",
+      "integrity": "sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA==",
+      "requires": {
+        "@octokit/types": "^6.0.3",
+        "is-plain-object": "^5.0.0",
+        "universal-user-agent": "^6.0.0"
+      }
+    },
+    "@octokit/graphql": {
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.8.0.tgz",
+      "integrity": "sha512-0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg==",
+      "requires": {
+        "@octokit/request": "^5.6.0",
+        "@octokit/types": "^6.0.3",
+        "universal-user-agent": "^6.0.0"
+      }
+    },
+    "@octokit/openapi-types": {
+      "version": "12.11.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-12.11.0.tgz",
+      "integrity": "sha512-VsXyi8peyRq9PqIz/tpqiL2w3w80OgVMwBHltTml3LmVvXiphgeqmY9mvBw9Wu7e0QWk/fqD37ux8yP5uVekyQ=="
+    },
+    "@octokit/plugin-paginate-rest": {
+      "version": "2.21.3",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.21.3.tgz",
+      "integrity": "sha512-aCZTEf0y2h3OLbrgKkrfFdjRL6eSOo8komneVQJnYecAxIej7Bafor2xhuDJOIFau4pk0i/P28/XgtbyPF0ZHw==",
+      "requires": {
+        "@octokit/types": "^6.40.0"
+      }
+    },
+    "@octokit/plugin-rest-endpoint-methods": {
+      "version": "5.16.2",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.16.2.tgz",
+      "integrity": "sha512-8QFz29Fg5jDuTPXVtey05BLm7OB+M8fnvE64RNegzX7U+5NUXcOcnpTIK0YfSHBg8gYd0oxIq3IZTe9SfPZiRw==",
+      "requires": {
+        "@octokit/types": "^6.39.0",
+        "deprecation": "^2.3.1"
+      }
+    },
+    "@octokit/request": {
+      "version": "5.6.3",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.6.3.tgz",
+      "integrity": "sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A==",
+      "requires": {
+        "@octokit/endpoint": "^6.0.1",
+        "@octokit/request-error": "^2.1.0",
+        "@octokit/types": "^6.16.1",
+        "is-plain-object": "^5.0.0",
+        "node-fetch": "^2.6.7",
+        "universal-user-agent": "^6.0.0"
+      }
+    },
+    "@octokit/request-error": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.1.0.tgz",
+      "integrity": "sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==",
+      "requires": {
+        "@octokit/types": "^6.0.3",
+        "deprecation": "^2.0.0",
+        "once": "^1.4.0"
+      }
+    },
+    "@octokit/types": {
+      "version": "6.41.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.41.0.tgz",
+      "integrity": "sha512-eJ2jbzjdijiL3B4PrSQaSjuF2sPEQPVCPzBvTHJD9Nz+9dw2SGH4K4xeQJ77YfTq5bRQ+bD8wT11JbeDPmxmGg==",
+      "requires": {
+        "@octokit/openapi-types": "^12.11.0"
+      }
+    },
+    "before-after-hook": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.3.tgz",
+      "integrity": "sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ=="
+    },
+    "deprecation": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz",
+      "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ=="
+    },
+    "is-plain-object": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="
+    },
+    "node-fetch": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz",
+      "integrity": "sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==",
+      "requires": {
+        "whatwg-url": "^5.0.0"
+      }
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+    },
+    "tunnel": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
+      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg=="
+    },
+    "universal-user-agent": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
+      "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w=="
+    },
+    "uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
+    },
+    "webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+    },
+    "whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "requires": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+    }
+  }
+}
diff --git a/.github/actions/release-changelog-bug-refs/package.json b/.github/actions/release-changelog-bug-refs/package.json
 new file mode 100644
index 0000000..62509b1
--- /dev/null
+++ b/.github/actions/release-changelog-bug-refs/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "release-changelog-bug-refs",
+  "version": "1.0.0",
+  "description": "Block releases if bug references in commits aren't in the proposed changelog entry",
+  "main": "index.js",
+  "dependencies": {
+    "@actions/core": "^1.10.0",
+    "@actions/github": "^5.1.1"
+  }
+}
diff --git a/.github/workflows/ci-base.yaml b/.github/workflows/ci-base.yaml
index dab17d3..59174bf 100644
--- a/.github/workflows/ci-base.yaml
+++ b/.github/workflows/ci-base.yaml
@@ -29,8 +29,6 @@ jobs:
         run: tox -e mypy
       - name: Version Consistency
         run: python3 ./tools/check-versions-are-consistent.py
-      - name: Docs
-        run: tox -e docs
   unit-tests:
     name: Unit Tests
     runs-on: ubuntu-22.04
diff --git a/.github/workflows/ci-integration.yaml b/.github/workflows/ci-integration.yaml
index 937de39..be05d93 100644
--- a/.github/workflows/ci-integration.yaml
+++ b/.github/workflows/ci-integration.yaml
@@ -27,7 +27,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        release: ['xenial', 'bionic', 'focal', 'jammy', 'kinetic', 'lunar']
+        release: ['xenial', 'bionic', 'focal', 'jammy', 'lunar', 'mantic']
     steps:
       - name: Prepare build tools
         env:
@@ -65,7 +65,7 @@ jobs:
       # as much information as possible from them.
       fail-fast: false
       matrix:
-        release: ['bionic', 'focal', 'jammy', 'kinetic']
+        release: ['bionic', 'focal', 'jammy', 'lunar']
         platform: ['lxd']
         host_os: ['ubuntu-22.04']
         include:
@@ -123,6 +123,9 @@ jobs:
           UACLIENT_BEHAVE_CONTRACT_TOKEN: '${{ secrets.UACLIENT_BEHAVE_CONTRACT_TOKEN }}'
           UACLIENT_BEHAVE_CONTRACT_TOKEN_STAGING: '${{ secrets.UACLIENT_BEHAVE_CONTRACT_TOKEN_STAGING }}'
           UACLIENT_BEHAVE_CONTRACT_TOKEN_STAGING_EXPIRED: '${{ secrets.UACLIENT_BEHAVE_CONTRACT_TOKEN_STAGING_EXPIRED }}'
+          UACLIENT_BEHAVE_LANDSCAPE_REGISTRATION_KEY: '${{ secrets.UACLIENT_BEHAVE_LANDSCAPE_REGISTRATION_KEY }}'
+          UACLIENT_BEHAVE_LANDSCAPE_API_ACCESS_KEY: '${{ secrets.UACLIENT_BEHAVE_LANDSCAPE_API_ACCESS_KEY }}'
+          UACLIENT_BEHAVE_LANDSCAPE_API_SECRET_KEY: '${{ secrets.UACLIENT_BEHAVE_LANDSCAPE_API_SECRET_KEY }}'
         run: |
           PYCLOUDLIB_CONFIG="$(mktemp --tmpdir="${{ runner.temp }}" pycloudlib.toml.XXXXXXXXXX)"
           GCE_CREDENTIALS_PATH="$(mktemp --tmpdir="${{ runner.temp }}" gcloud.json.XXXXXXXXXX)"
diff --git a/.github/workflows/release-checks.yaml b/.github/workflows/release-checks.yaml
 new file mode 100644
index 0000000..a5e0c83
--- /dev/null
+++ b/.github/workflows/release-checks.yaml
@@ -0,0 +1,22 @@
+---
+
+name: Release Checks
+
+on:
+  pull_request:
+    branches:
+      - release
+
+jobs:
+  release-changelog-bug-refs:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Git checkout
+        uses: actions/checkout@v3
+      - name: Install dependencies
+        run: cd ./.github/actions/release-changelog-bug-refs && npm install
+      - name: Check for bug references
+        uses: ./.github/actions/release-changelog-bug-refs
+        id: release-changelog-bug-refs
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
 new file mode 100644
index 0000000..def4de5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,51 @@
+artifacts/*
+*debhelper*
+debian/ubuntu-advantage-tools/
+debian/ubuntu-advantage-tools.substvars
+dev/entitlement-creds.json.*
+*.pyc
+*.pyo
+__pycache__
+.tox
+.pybuild
+.coverage
+.cache
+*.egg-info/
+.mypy_cache/
+.python-version
+
+# Ignore artifacts generated by bddeb
+*-1~bddeb*
+ubuntu-advantage-tools_*.orig.tar.gz
+ubuntu-advantage-tools_all.deb
+ubuntu_advantage_tools.dsc
+
+# test/jenkins artifacts
+pytest_results.xml
+reports/
+
+# integration test artifacts
+azure-priv-*.pem
+azure-pub-*.txt
+ec2-*.pem
+gcp-pub-*
+gcp-priv-*
+lxd-*-uaclient-ci-*
+build-from-source.sh
+test-results*
+
+# credentials - don't commit credentials
+tools/ua-test-credentials.yaml
+
+# apt-hook build artifacts
+apt-hook/hook
+apt-hook/ubuntu-advantage.pot
+apt-hook/json-hook
+apt-hook/json-hook-test
+
+# custom github actions use node
+node_modules
+
+# docs
+docs/build/
+.sphinx
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index 5090ca0..5840eeb 100644
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -1,14 +1,12 @@
 version: 2
 
-sphinx:
-   configuration: docs/conf.py
-
 build:
   os: ubuntu-22.04
   tools:
     python: "3.10"
+  jobs:
+    post_checkout:
+      # Always skip on main branch.
+      # Docs are kept in separate docs and docs-devel branches.
+      - exit 183
 
-python:
-   install:
-   - requirements: docs-requirements.txt
-   - requirements: requirements.txt
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 03568a6..3529de0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -7,29 +7,29 @@ from the architecture of the project to how you should test any code changes.
 
 ### How to Guides
 
-* [How to build](./dev-docs/howtoguides/building.md)
-* [How to run the code formatting tools](./dev-docs/howtoguides/code_formatting.md)
-* [How to run the tests](./dev-docs/howtoguides/testing.md)
-* [How to release a new version](./dev-docs/howtoguides/how_to_release_a_new_version_of_ua.md)
-* [How to use the contract staging environment](./dev-docs/howtoguides/use_staging_environment.md)
-* [How to use the magic attach endpoints](./dev-docs/howtoguides/how_to_use_magic_attach_endpoints.md)
+* [How to build](https://github.com/canonical/ubuntu-pro-client/blob/docs/dev-docs/howtoguides/building.md)
+* [How to run the code formatting tools](https://github.com/canonical/ubuntu-pro-client/blob/docs/dev-docs/howtoguides/code_formatting.md)
+* [How to run the tests](https://github.com/canonical/ubuntu-pro-client/blob/docs/dev-docs/howtoguides/testing.md)
+* [How to release a new version](https://github.com/canonical/ubuntu-pro-client/blob/docs/dev-docs/howtoguides/how_to_release_a_new_version_of_ua.md)
+* [How to use the contract staging environment](https://github.com/canonical/ubuntu-pro-client/blob/docs/dev-docs/howtoguides/use_staging_environment.md)
+* [How to use the magic attach endpoints](https://github.com/canonical/ubuntu-pro-client/blob/docs/dev-docs/howtoguides/how_to_use_magic_attach_endpoints.md)
 
 ### Reference
 
-* [Terminology](./dev-docs/references/terminology.md)
-* [Architecture](./dev-docs/references/architecture.md)
-* [Early review sign-off](./dev-docs/references/early_review_signoff.md)
-* [What happens during attach](./dev-docs/references/what_happens_during_attach.md)
-* [Enabling a service](./dev-docs/references/enabling_a_service.md)
-* [Directory layout](./dev-docs/references/directory_layout.md)
-* [Daily Builds](./dev-docs/references/daily_builds.md)
-* [Version String Formatting](./dev-docs/references/version_string_formatting.md)
-* [PR review policy](./dev-docs/references/pr_review_policy.md)
+* [Terminology](https://github.com/canonical/ubuntu-pro-client/blob/docs/dev-docs/references/terminology.md)
+* [Architecture](https://github.com/canonical/ubuntu-pro-client/blob/docs/dev-docs/references/architecture.md)
+* [Early review sign-off](https://github.com/canonical/ubuntu-pro-client/blob/docs/dev-docs/references/early_review_signoff.md)
+* [What happens during attach](https://github.com/canonical/ubuntu-pro-client/blob/docs/dev-docs/references/what_happens_during_attach.md)
+* [Enabling a service](https://github.com/canonical/ubuntu-pro-client/blob/docs/dev-docs/references/enabling_a_service.md)
+* [Directory layout](https://github.com/canonical/ubuntu-pro-client/blob/docs/dev-docs/references/directory_layout.md)
+* [Daily Builds](https://github.com/canonical/ubuntu-pro-client/blob/docs/dev-docs/references/daily_builds.md)
+* [Version String Formatting](https://github.com/canonical/ubuntu-pro-client/blob/docs/dev-docs/references/version_string_formatting.md)
+* [PR review policy](https://github.com/canonical/ubuntu-pro-client/blob/docs/dev-docs/references/pr_review_policy.md)
 
 ### Explanation
 
-* [How auto-attach works](./dev-docs/explanations/how_auto_attach_works.md)
+* [How auto-attach works](https://github.com/canonical/ubuntu-pro-client/blob/docs/dev-docs/explanations/how_auto_attach_works.md)
 
 ### Documentation
 
-* [Documentation guide](./dev-docs/devdocs_styleguide.md)
+* [Documentation guide](https://github.com/canonical/ubuntu-pro-client/blob/docs/dev-docs/devdocs_styleguide.md)
diff --git a/README.md b/README.md
index 4e7a493..54295c9 100644
--- a/README.md
+++ b/README.md
@@ -1,22 +1,22 @@
 <h1>
   <a href="https://ubuntu.com/pro" target="_blank">
-    <img src="./docs/_static/circle_of_friends.png" width="33"/>
+    <img src="https://raw.githubusercontent.com/canonical/ubuntu-pro-client/docs/docs/_static/circle_of_friends.png" width="33"/>
   </a>
   <br>
   Ubuntu Pro Client
 </h1>
 
 ###### Clean and Consistent CLI for your Ubuntu Pro Systems
-[![Latest Upstream Version](https://img.shields.io/github/v/tag/canonical/ubuntu-advantage-client.svg?label=Latest%20Upstream%20Version&logo=github&logoColor=white&color=33ce57)](https://github.com/canonical/ubuntu-pro-client/tags)
-[![CI](https://github.com/canonical/ubuntu-advantage-client/actions/workflows/ci-base.yaml/badge.svg?branch=main)](https://github.com/canonical/ubuntu-pro-client/actions)
+[![Latest Upstream Version](https://img.shields.io/github/v/tag/canonical/ubuntu-pro-client.svg?label=Latest%20Upstream%20Version&logo=github&logoColor=white&color=33ce57)](https://github.com/canonical/ubuntu-pro-client/tags)
+[![CI](https://github.com/canonical/ubuntu-pro-client/actions/workflows/ci-base.yaml/badge.svg?branch=main)](https://github.com/canonical/ubuntu-pro-client/actions)
 [![Documentation Status](https://readthedocs.com/projects/canonical-ubuntu-pro-client/badge/?version=latest)](https://canonical-ubuntu-pro-client.readthedocs-hosted.com/en/latest/?badge=latest)
 <br/>
 [![Released Xenial Version](https://img.shields.io/ubuntu/v/ubuntu-advantage-tools/xenial?label=Xenial&logo=ubuntu&logoColor=white)](https://launchpad.net/ubuntu/xenial/+source/ubuntu-advantage-tools)
 [![Released Bionic Version](https://img.shields.io/ubuntu/v/ubuntu-advantage-tools/bionic?label=Bionic&logo=ubuntu&logoColor=white)](https://launchpad.net/ubuntu/bionic/+source/ubuntu-advantage-tools)
 [![Released Focal Version](https://img.shields.io/ubuntu/v/ubuntu-advantage-tools/focal?label=Focal&logo=ubuntu&logoColor=white)](https://launchpad.net/ubuntu/focal/+source/ubuntu-advantage-tools)
 [![Released Jammy Version](https://img.shields.io/ubuntu/v/ubuntu-advantage-tools/jammy?label=Jammy&logo=ubuntu&logoColor=white)](https://launchpad.net/ubuntu/jammy/+source/ubuntu-advantage-tools)
-[![Released Kinetic Version](https://img.shields.io/ubuntu/v/ubuntu-advantage-tools/kinetic?label=Kinetic&logo=ubuntu&logoColor=white)](https://launchpad.net/ubuntu/kinetic/+source/ubuntu-advantage-tools)
 [![Released Lunar Version](https://img.shields.io/ubuntu/v/ubuntu-advantage-tools/lunar?label=Lunar&logo=ubuntu&logoColor=white)](https://launchpad.net/ubuntu/lunar/+source/ubuntu-advantage-tools)
+[![Released Mantic Version](https://img.shields.io/ubuntu/v/ubuntu-advantage-tools/mantic?label=Mantic&logo=ubuntu&logoColor=white)](https://launchpad.net/ubuntu/mantic/+source/ubuntu-advantage-tools)
 
 The Ubuntu Pro Client (`pro`) is the official tool to enable Canonical offerings on your
 system.
diff --git a/debian/README.source b/debian/README.source
 new file mode 100644
index 0000000..44b96b9
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,38 @@
+===================================
+Packaging of ubuntu-advantage-tools
+===================================
+
+Development code
+===================================
+
+The development branches of ubuntu-advantage-tools are hosted in GitHub, at:
+https://github.com/canonical/ubuntu-pro-client
+
+New pull requests with contributions either to the codebase itself or to the
+documentation branches should always be opened in GitHub.
+
+Package source code
+===================================
+
+The source code used to build the package is hosted in Launchpad, at:
+https://git.launchpad.net/ubuntu/+source/ubuntu-advantage-tools
+
+The development branch in Launchpad is equivalent to the release branch in
+GitHub. Everytime a new version is released, the content of the GitHub release
+branch is brought in a Merge Request to the Launchpad development branch.
+
+Particularities
+===================================
+
+- ubuntu-advantage-tools ships the same features and bugfixes to all
+  supported Ubuntu releases. This means the package is practically the
+  same across all LTS releases, including the ones in ESM period, and in
+  the interim releases. (The only differences are the specific dependencies,
+  dealt with in the debian/ files when building the package).
+
+- Some test-related files and folders are present in the source package, but
+  are ignored when building the binary packages. debian/rules specifies
+  'pybuild' as the build system, and unit tests / integration tests are
+  excluded in 'setup.py'. As a consequence, changes to the tests are less
+  relevant in SRU reviews: they stil reflect what is being tested in each
+  release, but they do not cause any impact to the stable releases.
diff --git a/debian/changelog b/debian/changelog
index 85d1272..26f78a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,38 @@
+ubuntu-advantage-tools (29) mantic; urgency=medium
+
+  * d/control:
+    - update links for the project github page
+  * d/copyright:
+    - bump date to 2023
+    - update upstream-name and source
+  * d/ubuntu-advantage-tools.{postinst,postrm}:
+    - rename repo GPG keys from -advantage to -pro (GH: #1539)
+    - replace calls to systemctl for deb-systemd-invoke
+  * d/README.source:
+    - add file with basic explanation on the source code (GH: #2463)
+  * New upstream release 29 (LP: #2029144)
+    - anbox-cloud: add support for service
+    - api
+      + new endpoint: u.pro.security.fix.plan.cve.v1
+      + new endpoint: u.pro.security.fix.plan.usn.v1
+      + new endpoint: u.apt_news.current_news.v1
+      + add more data explaining the decision made for
+        u.pro.security.status.reboot_required.v1 endpoint
+    - contract:
+      + send activityInfo after cli attach, enable and disable
+      + start recording when the machine has attached to a Pro subscription
+      + more reliable detection when running on a docker container
+    - esm: create static files to pin packages from esm-infra and esm-apps with
+      higher priority (GH: #2580)
+    - fix: ignore non-USN items on related usns
+    - landscape: add support for the service
+    - logging: update to ubuntupro logging namespace
+    - proxy: add support for TLS-in-TLS proxy (LP: #1999909)
+    - snapd: look for the snapd package instead of the snap command
+    - system: try/except logic to remove files and folders (LP: #2025731)
+
+ -- Lucas Moura <[e-mail]>  Mon, 31 Jul 2023 15:46:23 +0000
+
 ubuntu-advantage-tools (28.1) mantic; urgency=medium
 
   * New upstream release 28.1 (LP: #2017949)
diff --git a/debian/control b/debian/control
index 1f78a18..51f0549 100644
--- a/debian/control
+++ b/debian/control
@@ -26,8 +26,8 @@ Build-Depends: bash-completion,
                python3-yaml
 Standards-Version: 4.5.1
 Homepage: https://ubuntu.com/advantage
-Vcs-Git: https://github.com/canonical/ubuntu-advantage-client.git
-Vcs-Browser: https://github.com/canonical/ubuntu-advantage-client
+Vcs-Git: https://github.com/canonical/ubuntu-pro-client.git
+Vcs-Browser: https://github.com/canonical/ubuntu-pro-client
 Rules-Requires-Root: no
 
 Package: ubuntu-advantage-tools
diff --git a/debian/copyright b/debian/copyright
index 7eb8c9e..e965469 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: ubuntu-advantage-script
-Source: https://github.com/CanonicalLtd/ubuntu-advantage-script
+Upstream-Name: ubuntu-pro-client
+Source: https://github.com/canonical/ubuntu-pro-client
 
 Files: *
-Copyright: 2017, Canonical Ltd
+Copyright: 2023, Canonical Ltd
 License: GPL-3.0
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index b1ce79a..0697833 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -3,6 +3,3 @@ ubuntu-advantage-tools: missing-build-dependency-for-dh_-command dh_systemd_star
 
 # Lintian can't handle the multiline debhelper/dh-systemd dependencies explained in debian/control
 ubuntu-advantage-tools: missing-build-dependency-for-dh-addon *systemd*
-
-# Lintian doesn't like mentioning riscv64 for older go package
-ubuntu-advantage-tools: invalid-arch-string-in-source-relation riscv64 [build-depends: golang-1.10-go [!powerpc !riscv64]]
diff --git a/debian/ubuntu-advantage-tools.lintian-overrides b/debian/ubuntu-advantage-tools.lintian-overrides
 new file mode 100644
index 0000000..0b09bcb
--- /dev/null
+++ b/debian/ubuntu-advantage-tools.lintian-overrides
@@ -0,0 +1,10 @@
+# We are silencing this issue because of this LP: #1930121
+ubuntu-advantage-tools: command-with-path-in-maintainer-script
+
+# Ubuntu doesn't support sysv init.d
+ubuntu-advantage-tools: package-supports-alternative-init-but-no-init.d-script
+
+# We have made the decision of delivering those files
+ubuntu-advantage-tools: package-installs-apt-preferences
+
+ubuntu-advantage-tools: possible-bashism-in-maintainer-script
diff --git a/debian/ubuntu-advantage-tools.postinst b/debian/ubuntu-advantage-tools.postinst
index 31d93ae..b332333 100644
--- a/debian/ubuntu-advantage-tools.postinst
+++ b/debian/ubuntu-advantage-tools.postinst
@@ -16,8 +16,11 @@ fi
 
 APT_TRUSTED_KEY_DIR="/etc/apt/trusted.gpg.d"
 
-ESM_INFRA_KEY_TRUSTY="ubuntu-advantage-esm-infra-trusty.gpg"
-ESM_APPS_KEY="ubuntu-advantage-esm-apps.gpg"
+# ubuntu-advantage-* GPG keys renamed to ubuntu-pro-* in version 29
+OLD_ESM_INFRA_KEY_TRUSTY="ubuntu-advantage-esm-infra-trusty.gpg"
+OLD_ESM_APPS_KEY="ubuntu-advantage-esm-apps.gpg"
+ESM_INFRA_KEY="ubuntu-pro-esm-infra.gpg"
+ESM_APPS_KEY="ubuntu-pro-esm-apps.gpg"
 
 APT_SRC_DIR="/etc/apt/sources.list.d"
 APT_PREFERENCES_DIR="/etc/apt/preferences.d"
@@ -132,7 +135,8 @@ if status:
 esm_infra_cleanup() {
     if ! check_service_is_enabled esm-infra; then
         rm -f "$APT_TRUSTED_KEY_DIR/ubuntu-esm*gpg"  # Remove previous esm keys
-        rm -f "$APT_TRUSTED_KEY_DIR/$ESM_INFRA_KEY_TRUSTY"
+        rm -f "$APT_TRUSTED_KEY_DIR/$OLD_ESM_INFRA_KEY_TRUSTY"
+        rm -f "$APT_TRUSTED_KEY_DIR/$ESM_INFRA_KEY"
         rm -f "$ESM_INFRA_APT_SOURCE_FILE"
         rm -f "$ESM_INFRA_OLD_APT_SOURCE_FILE_TRUSTY"
         rm -f "$ESM_APT_PREF_FILE_TRUSTY" "$ESM_INFRA_OLD_APT_PREF_FILE_TRUSTY"
@@ -143,6 +147,7 @@ esm_infra_cleanup() {
 
 esm_apps_cleanup() {
     if ! check_service_is_enabled esm-apps; then
+        rm -f "$APT_TRUSTED_KEY_DIR/$OLD_ESM_APPS_KEY"
         rm -f "$APT_TRUSTED_KEY_DIR/$ESM_APPS_KEY"
         rm -f "$ESM_APPS_APT_SOURCE_FILE"
         rm -f "$ESM_APPS_APT_PREF_FILE"
@@ -251,11 +256,11 @@ remove_old_systemd_units() {
             # The failed state is ephemeral and only needs to be cleared if
             # it is there so that the system doesn't say it is degraded.
             # If the old timer was not running, then this is a noop.
-            systemctl --system daemon-reload > /dev/null || true
-            systemctl reset-failed ua-license-check.timer > /dev/null 2>&1 || true
+            deb-systemd-invoke --system daemon-reload > /dev/null || true
+            deb-systemd-invoke reset-failed ua-license-check.timer > /dev/null 2>&1 || true
             # In rare race-condition scenarios, the service can also get into
             # the same failed state.
-            systemctl reset-failed ua-license-check.service > /dev/null 2>&1 || true
+            deb-systemd-invoke reset-failed ua-license-check.service > /dev/null 2>&1 || true
         fi
         deb-systemd-helper purge ua-license-check.path > /dev/null || true
         deb-systemd-helper unmask ua-license-check.path > /dev/null || true
@@ -359,6 +364,19 @@ migrate_user_config_post() {
     fi
 }
 
+rename_gpg_keys() {
+    # esm-infra doesn't follow the name pattern
+    if [ -f "$APT_TRUSTED_KEY_DIR/$OLD_ESM_INFRA_KEY_TRUSTY" ]; then
+        mv "$APT_TRUSTED_KEY_DIR/$OLD_ESM_INFRA_KEY_TRUSTY" "$APT_TRUSTED_KEY_DIR/$ESM_INFRA_KEY"
+    fi
+    SERVICES="cc-eal cis esm-apps fips ros realtime-kernel"
+    for service in $SERVICES; do
+        if [ -f "$APT_TRUSTED_KEY_DIR/ubuntu-advantage-$service.gpg" ]; then
+            mv "$APT_TRUSTED_KEY_DIR/ubuntu-advantage-$service.gpg" "$APT_TRUSTED_KEY_DIR/ubuntu-pro-$service.gpg"
+        fi
+    done
+}
+
 case "$1" in
     configure)
       PREVIOUS_PKG_VER=$2
@@ -452,6 +470,11 @@ case "$1" in
           migrate_user_config_post
       fi
 
+      # Rename the gpg keys to -pro-
+      if dpkg --compare-versions "$PREVIOUS_PKG_VER" lt "29~"; then
+          rename_gpg_keys
+      fi
+
       if grep -q "^ua_config:" /etc/ubuntu-advantage/uaclient.conf; then
           echo "Warning: uaclient.conf contains old ua_config field." >&2
           echo "         Please do the following:" >&2
diff --git a/debian/ubuntu-advantage-tools.postrm b/debian/ubuntu-advantage-tools.postrm
index c1bcdf5..e0e930d 100644
--- a/debian/ubuntu-advantage-tools.postrm
+++ b/debian/ubuntu-advantage-tools.postrm
@@ -20,7 +20,7 @@ remove_logs(){
 }
 
 remove_gpg_files(){
-    rm -f /etc/apt/trusted.gpg.d/ubuntu-advantage-*.gpg
+    rm -f /etc/apt/trusted.gpg.d/ubuntu-pro-*.gpg
 }
 
 case "$1" in
diff --git a/dev-docs/devdocs_styleguide.md b/dev-docs/devdocs_styleguide.md
 deleted file mode 100644
index 818a189..0000000
--- a/dev-docs/devdocs_styleguide.md
+++ /dev/null
@@ -1,152 +0,0 @@
-# Documentation
-
-Our docs are hosted on [Read the Docs](https://readthedocs.com/). This page
-will explain how to contribute to the docs and build them locally.
-
-The documentation is *primarily* written in standard Markdown, but pages can
-be written in reStructuredText if you prefer.
-
-We also use the
-[MyST-Parser Sphinx extension](https://myst-parser.readthedocs.io/en/latest/intro.html).
-This causes all Markdown (.md) files to be parsed as MyST, and
-[enables the use of directives](https://myst-parser.readthedocs.io/en/latest/syntax/roles-and-directives.html),
-which can be awkward to achieve in standard Markdown.
-
-## Building the docs
-
-To build the docs for Ubuntu Pro Client, you can use a `tox` command. You can
-install `tox` on your machine by running the `make test` command. Once tox is
-installed, just run the command:
-
-```
-$ tox -e docs
-```
-
-The command will generate the HTML pages inside `docs/build`. The makefile
-target will build the documentation for you using Sphinx.
-
-Once built, the HTML files will be viewable in `docs/build/html/`. Use your web
-browser to open `index.html` to preview the site.
-
-## Style guide
-
-We use the [Canonical style guide](https://docs.ubuntu.com/styleguide/en) in
-our documentation, which is summarised below -- with a few additions relevant
-to our docs.
-
-### Language
-
-Where possible, text should be written in UK English. However, discretion and
-common sense can both be applied. For example, where text refers to code
-elements that exist in US English, the spelling of these elements should not
-be changed to UK English.
-
-### Voice
-
-Try to use active voice where possible, rather than the passive voice. The
-active voice is generally more concise and easier to read. As an example, you
-could say "we recommend" (active) rather than "it is recommended that"
-(passive). 
-
-### Headings
-
-Headings should be written in sentence case. This means that only the first
-letter is capitalised (unless the header text refers to e.g., a product name
-that would normally be capitalised, such as "Ubuntu Pro Client").
-
-Ensure that you do not skip header levels when creating your document
-structure, i.e., that a section is followed by a subsection, and not a
-sub-subsection. Skipping header levels can lead to de-ranking of pages in
-search engines.
-
-Try to craft your headings to be descriptive, but as short as possible, to help
-readers understand what content to expect if they click on it.
-
-### Line length
-
-Please keep the line lengths to a maximum of **79** characters. This ensures
-that the pages and tables do not get so wide that side scrolling is required.
-
-### Links
-
-Where possible, use contextual text in your links to aid users with screen
-readers and other accessibility tools. For example, "check out our
-[documentation style guide](#links) is preferable to "click
-[here](#links) for more".
-
-### Code blocks
-
-Our documentation uses the
-[Sphinx extension "sphinx-copybutton"](https://sphinx-copybutton.readthedocs.io/en/latest/),
-which creates a small button on the right-hand side of code blocks for users to
-copy the code snippets we provide.
-
-The copied code will strip out any prompt symbols so that users can
-paste commands directly into their terminal. For user convenience, please
-ensure that if you show any code output, it is presented in a separate code
-block to the commands.
-
-Please also specify the language used in your code block, to make sure it
-renders with the correct syntax highlighting.
-
-### Vertical whitespace
-
-One newline between each section helps ensure readability of the documentation
-source code. Keeping paragraphs relatively short (up to ~5-6 sentences) aids in
-keeping the text readable when rendered to a web page. Some rST elements also
-require an empty newline before and after, so for consistency, ensure that all
-elements (tables, images, headers, etc) have a newline before and after.
-
-### Acronyms and jargon
-
-Acronyms are always capitalised (e.g., JSON, YAML, QEMU, LXD) in text.
-
-The first time an acronym is used on a page, it is best practice to introduce
-it by showing the expanded name followed by the acronym in parentheses. E.g.,
-Quick EMUlator (QEMU). If the acronym is *very* common (e.g., URL, HTTP), or
-you provide a link to a documentation page with these details, you do not need
-to include them.
-
-Avoid using jargon unless absolutely necessary, to keep our documentation
-accessible to as wide a range of users as possible. If jargon is unavoidable,
-consider including brief explanations to help the user keep up with the
-material.
-
-### Admonitions and callouts
-
-Notes, warnings, or other information you wish to draw the reader's attention
-to can be called out in an admonition block. If you are writing your code in
-Markdown, this is where the MyST extension comes in handy. Here is an example:
-
-````
-  ```{note}
-  The options are: note, important, hint, seealso, tip, attention, caution,
-  warning, danger, and error.
-  ```{warning}
-  Although it's possible to nest admonitions inside each other, it's better to
-  avoid doing that unless it's strictly necessary!
-  ```
-````
-
-```{note}
-The options are: note, important, hint, seealso, tip, attention, caution,
-warning, danger, and error.
-```{warning}
-Although it's possible to nest admonitions inside each other, it's better to
-avoid doing that unless it's strictly necessary!
-```
-
-## Organisation
-
-We follow the [principles of Diataxis](https://diataxis.fr/) in our
-documentation. When writing new docs, try to consider the purpose of the
-document and how the reader will probably use it. This will help you to decide
-which section it belongs in.
-
-### Getting advice
-
-If you are in any doubt, please contact our team's
-[Technical Author (Sally)](https://github.com/s-makin) for guidance. If you
-would like her to review any documentation, she would be very happy to help!
-Please also tag her as a reviewer on any PR that contains documentation
-elements.
diff --git a/dev-docs/explanations/how_auto_attach_works.md b/dev-docs/explanations/how_auto_attach_works.md
 deleted file mode 100644
index c1734f7..0000000
--- a/dev-docs/explanations/how_auto_attach_works.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# How auto-attach works
-
-The `pro auto-attach` command follows a specific flow on every **Public Cloud Ubuntu Pro** image:
-
-1. Identify which cloud the command is running on. This is achieved by running
-   the `cloud-id` command provided by the [cloud-init](https://cloudinit.readthedocs.io/en/latest/)
-   package. Currently, we only support the following clouds when
-   running the command: AWS, Azure and GCP. The command will fail if performed on other
-   cloud types.
-
-2. Fetch the cloud metadata. This metadata is a cryptographically signed json blob
-   that provides the necessary information for the contract server to validate
-   the machine and return a valid pro token. To fetch that metadata, every cloud
-   provide a different endpoint to reach it:
-
-   * **AWS**: http://169.254.169.254/latest/dynamic/instance-identity/pkcs7
-   * **Azure**: http://169.254.169.254/metadata/attested/document?api-version=2020-09-01
-   * **GCP**: http://metadata/computeMetadata/v1/instance/service-accounts/default/identity
-
-> **Note**
-> On AWS, the client will also try the IPv6 address (`[fd00:ec2::254]`) to fetch the metadata if the IPv4 address doesn't work.
-
-3. Send this metadata json blob to the contract server at:
-
-   * https://contracts.canonical.com/v1/clouds/CLOUD-TYPE/token
-
-   Where CLOUD-TYPE is the cloud name we identified on step 1.
-
-   The contract server will verify if the metadata is signed correctly based on the cloud
-   it is stored. Additionally, some other checks are performed to see if the metadata is valid.
-   For example, the contract server checks the product id provided in the metadata is a
-   valid product. If any problems is found on the metadata, the contract server will produce
-   an error response.
-
-4. After the contract server validates the metadata, it returns a token that will be used
-   to attach the machine to a pro subscription. To attach the machine we will reach the
-   following contract server endpoint:
-
-   * https://contracts.canonical.com/v1/context/machines/token
-
-   We will pass the token provided on step 3 as header bearer token for this request
-
-5. The contract returns a json specification based on the provided token. This json
-   contains all the directives the pro client needs to setup the machine and enable
-   the necessary services the token is associated with.
-
-6. Disable the `ubuntu-advantage.service` [daemon](../../docs/explanations/what_is_the_daemon.md), if running.
-   If the machine is detached, this daemon will be started again.
-
-Additionally, you can disable the `pro auto-attach` command by adding
-the following lines on your `uaclient.conf` configuration file, (by default located at
-`/etc/ubuntu-advantage/uaclient.conf`):
-
-```bash
-features:
-  disable_auto_attach: true
-```
diff --git a/dev-docs/explanations/systemd_units.md b/dev-docs/explanations/systemd_units.md
 deleted file mode 100644
index 577960a..0000000
--- a/dev-docs/explanations/systemd_units.md
+++ /dev/null
@@ -1,89 +0,0 @@
-# Mechanisms for auto-attaching Ubuntu Pro Cloud instances
-
-> **Note**
-> This document explains the systemd units that attempt to auto-attach in various scenarios. If you're interested in how auto-attach itself works, see [How auto-attach works](./how_auto_attach_works.md).
-
-There are three methods by which a cloud instance may auto-attach to become Ubuntu Pro.
-
-1. On boot auto-attach for known Pro cloud instances.
-2. Upgrade-in-place for non-Pro instances that get modified via the Cloud platform to entitle them to become Ubuntu Pro (only on Azure and GCP for now).
-3. Retry auto-attach in case of failures.
-
-(1) is handled by a systemd unit (`ua-auto-attach.service`) delivered by a separate package called `ubuntu-advantage-pro`. This package is only installed on Ubuntu Pro Cloud images. In this way, an instance launched from an Ubuntu Pro Cloud image knows that it needs to auto-attach.
-
-(2) and (3) are both handled in a systemd unit (`ubuntu-advantage.service`) that is present on all Ubuntu machines (including non-Pro).
-
-Below is a flow chart intended to describe how all of these methods and systemd units interact.
-
-```mermaid
-graph TD;
-    %% nodes
-    %%%% decisions
-    is_pro{Is -pro installed?}
-    auto_outcome{Success?}
-    is_attached{Attached?}
-    should_run_daemon{on Azure? or GCP? or retry flag set?}
-    is_gcp{Azure or GCP?}
-    is_retry{retry flag set?}
-    is_gcp_pro{Pro license detected?}
-    daemon_attach_outcome{Success?}
-    daemon_attach_outcome2{Success?}
-
-    %%%% actions
-    auto_attach[/Try to Attach/]
-    trigger_retry[/Create Retry Flag File/]
-    trigger_retry2[/Create Retry Flag File/]
-    poll_gcp[/Poll for cloud Pro license/]
-    daemon_attach[/Try to Attach/]
-    daemon_attach2[/Try to Attach/]
-    wait[/Wait a while/]
-
-    %%%% systemd units
-    auto(ua-auto-attach.service)
-    daemon(ubuntu-advantage.service)
-
-    %%%% states
-    done([End])
-
-
-    %% arrows
-    is_pro--Yes-->auto
-    auto-->auto_attach
-    subgraph ua-auto-attach.service blocks boot
-        auto_attach-->auto_outcome
-        auto_outcome--No-->trigger_retry
-    end
-
-    is_pro--No-->is_attached
-    trigger_retry-->is_attached
-    auto_outcome--Yes-->is_attached
-    is_attached--No-->should_run_daemon
-    is_attached--Yes-->done
-    should_run_daemon--No-->done
-    should_run_daemon--Yes-->daemon
-
-    daemon-->is_gcp
-    subgraph ubuntu-advantage.service
-        is_gcp--Yes-->poll_gcp
-        subgraph poll for pro license
-            poll_gcp-->is_gcp_pro
-            is_gcp_pro--No-->poll_gcp
-            is_gcp_pro--Yes-->daemon_attach
-            daemon_attach-->daemon_attach_outcome
-            daemon_attach_outcome--No-->trigger_retry2
-        end
-        trigger_retry2-->is_retry
-        is_gcp--No-->is_retry
-        is_retry--Yes-->daemon_attach2
-        subgraph retry auto-attach
-            daemon_attach2-->daemon_attach_outcome2
-            daemon_attach_outcome2--No-->wait
-        end
-        wait-->daemon_attach2
-    end
-
-    daemon_attach_outcome--Yes-->done
-    is_retry--No-->done
-    daemon_attach_outcome2--Yes-->done
-    daemon_attach_outcome2--Failed for a month-->done
-```
diff --git a/dev-docs/howtoguides/build-docs.md b/dev-docs/howtoguides/build-docs.md
 deleted file mode 100644
index f2a2606..0000000
--- a/dev-docs/howtoguides/build-docs.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# How to generate Ubuntu Pro Client user documentation
-
-To build the docs for Ubuntu Pro Client, you can use a dedicated `tox` command for it.
-You can install `tox` on your machine by running the `make test` command. Once tox is
-installed just run the command:
-
-```console
-$ tox -e docs
-```
-
-The command will generate the html pages inside `docs/build`
diff --git a/dev-docs/howtoguides/building.md b/dev-docs/howtoguides/building.md
 deleted file mode 100644
index 40b4d70..0000000
--- a/dev-docs/howtoguides/building.md
+++ /dev/null
@@ -1,43 +0,0 @@
-# Building
-
-Packages ubuntu-advantage-tools and ubuntu-advantage-pro are created from the
-debian/control file in this repository. You can build the
-packages the way you would normally build a Debian package:
-
-
-```shell
-dpkg-buildpackage -us -uc
-```
-
-> **Note**
-> It will build the packages with dependencies for the Ubuntu release on
-> which you are building, so it's best to build in a container or kvm for the
-> release you are targeting.
-
-OR, if you want to build for a target release other than the release
-you're on:
-
-## using sbuild
-[configure sbuild](https://wiki.ubuntu.com/SimpleSbuild) and
-use that for the build:
-
-Setup some chroots for sbuild with this script
-```shell
-bash ./tools/setup_sbuild.sh
-```
-
-```shell
-debuild -S
-sbuild --dist=<target> ../ubuntu-advantage-tools_*.dsc
-# emulating different architectures in sbuild-launchpad-chroot
-sbuild-launchpad-chroot create --architecture="riscv64" "--name=focal-riscv64" "--series=focal"
-```
-
-> **Note**
-> Every so often, it is recommended to update your chroots.
-> ```bash
-> # to update a single chroot
-> sudo sbuild-launchpad-chroot update -n ua-xenial-amd64
-> # this script can be used to update all chroots
-> sudo PATTERN=\* sh /usr/share/doc/sbuild/examples/sbuild-debian-developer-setup-update-all
-> ```
diff --git a/dev-docs/howtoguides/code_formatting.md b/dev-docs/howtoguides/code_formatting.md
 deleted file mode 100644
index 153b134..0000000
--- a/dev-docs/howtoguides/code_formatting.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# Code Formatting
-
-The `ubuntu-advantage-client` code base is formatted using
-[black](https://github.com/psf/black), and imports are sorted with
-[isort](https://github.com/PyCQA/isort).  When making changes, you
-should ensure that your code is blackened and isorted, or it will
-be rejected by CI.
-Formatting the whole codebase is as simple as running:
-
-```shell
-black uaclient/
-isort uaclient/
-```
-
-To make it easier to avoid committing incorrectly formatted code, this
-repo includes configuration for [pre-commit](https://pre-commit.com/)
-which will stop you from committing any code that isn't blackened.  To
-install the project's pre-commit hook, install `pre-commit` and run:
-
-```shell
-pre-commit install
-```
-
-(To install `black` and `pre-commit` at the appropriate versions for
-the project, you should install them via `dev-requirements.txt`.)
diff --git a/dev-docs/howtoguides/detach_pro_instances.md b/dev-docs/howtoguides/detach_pro_instances.md
 deleted file mode 100644
index 5bbf541..0000000
--- a/dev-docs/howtoguides/detach_pro_instances.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# How to permanently detach Pro instances
-
-## TL;DR
-
-1. Modify the client configuration file, normally `/etc/ubuntu-advantage/uaclient.conf`,
-to contain:
-
-    ```yaml
-    features:
-      disable_auto_attach: true
-    ```
-
-2. Perform a `sudo pro detach --assume-yes`.
-
-## Explanation
-
-On Pro instances, a `pro detach` won't permanently detach them as,
-the instance will be reauto-attached on the next boot (on non GCE instances)
-or immediately (on GCE instances due to the daemon).
-
-The config in step 1 will prevent the [daemon](../../systemd/ubuntu-advantage.service)
-and the a [service](../../systemd/ua-auto-attach.service) at next boot to auto-reattach.
-
-If you want to allow the instance to reauto attach by itself, then remove or set to false
-`disable_auto_attach` in the configuration file.
diff --git a/dev-docs/howtoguides/how_to_use_magic_attach_endpoints.md b/dev-docs/howtoguides/how_to_use_magic_attach_endpoints.md
 deleted file mode 100644
index c06c32b..0000000
--- a/dev-docs/howtoguides/how_to_use_magic_attach_endpoints.md
+++ /dev/null
@@ -1,168 +0,0 @@
-# How to use magic attach API endpoints
-
-> **Note**
-> Minimum version: 27.11
-
-Th Ubuntu Pro Client provides three distinct endpoints to make it easier to perform
-the magic attach flow. They are:
-
-* u.pro.attach.magic.initiate.v1
-* u.pro.attach.magic.wait.v1
-* u.pro.attach.magic.revoke.v1
-
-We will explain how to use each endpoint and what is the expected output for each of them.
-
-## Initiate endpoint
-
-To start the magic attach flow, we need to create a token for it. The initiate endpoint
-will perform exactly that. When you run:
-
-```console
-$ pro api u.pro.attach.magic.initiate.v1
-```
-
-It is expected for you to see the following json response:
-
-```json
-{
-  "_schema_version": "v1",
-  "data": {
-    "meta": {
-       "environment_vars": []
-    },
-    "attributes": {
-      "expires": "EXPIRE_DATE",
-      "expires_in": 10000,
-      "token": "MAGIC_ATTACH_TOKEN",
-      "user_code": "USER_CODE"
-    },
-    "type": "MagicAttachInitiate"
-  },
-  "errors": [],
-  "result": "success",
-  "version": "UBUNTU PRO CLIENT VERSION",
-  "warnings": []
-}
-```
-
-It is noteworthy here that the `attributes` contain both the `user_code` and `token`. The `user_code`
-is the information that will be presented to the user, which it will make possible for the user
-to validate the magic attach on the Ubuntu Pro portal. Additionally, the `token` information is required
-for the other two API endpoints which will be described next.
-
-
-## Wait endpoint
-
-After we initiate the magic attach procedure, the user must go to the Ubuntu Pro portal and validate
-the `user_code` it received. Once that is done, a contract token will be generated for the user, allowing
-the attach procedure to begin. The wait endpoint will wait for the user to perform all of those
-steps on the Ubuntu Pro portal. To call it, use:
-
-```console
-$ pro api u.pro.attach.magic.wait.v1 --args magic_token=MAGIC_ATTACH_TOKEN
-```
-
-Note here that the command requires the `token` that was generated in the initiate step. This command
-will block and poll the server until there are any updates for that token. If the
-user successfully performed the necessary steps on the Ubuntu Pro portal, we should see the following
-response:
-
-```json
-{
-  "_schema_version": "v1",
-  "data": {
-    "attributes": {
-      "contract_id": "CONTRACT_ID",
-      "contract_token": "CONTRACT_TOKEN",
-      "expires": "EXPIRE_DATE",
-      "expires_in": 10000,
-      "token": "MAGIC_ATTACH_TOKEN",
-      "user_code": "USER_CODE"
-    }
-    "type": "MagicAttachInitiate"
-  },
-  "errors": [],
-  "result": "success",
-  "version": "UBUNTU PRO CLIENT VERSION",
-  "warnings": []
-}
-```
-
-The `contract_token` is the token that can be used to perform an attach operation.
-
-If the provided token is invalid or has expired, we will see the following response:
-
-```json
-{
-  "_schema_version": "v1",
-  "data": {
-    "meta": {
-      "environment_vars": []
-    }
-  },
-  "errors": [
-    {
-      "code": "magic-attach-token-error",
-      "meta": {},
-      "title": "The magic attach token is invalid, has expired or never existed"
-    }
-  ],
-  "result": "failure",
-  "version": "UBUNTU PRO CLIENT VERSION",
-  "warnings": []
-}
-```
-
-It is expected that the token will be valid for about 10 minutes. Therefore, we expect the wait
-command to keep polling for about that amount of time.
-
-
-## Revoke
-
-If we want to revoke the token created during the initiate call, we can use the revoke command:
-
-```console
-$ pro api u.pro.attach.magic.revoke.v1 --args magic_token=MAGIC_ATTACH_TOKEN
-```
-
-If the token is valid, we should see the following output:
-
-```json
-{
-  "_schema_version": "v1",
-  "data": {
-    "attributes": {},
-    "meta": {
-      "environment_vars": []
-    },
-    "type": "MagicAttachRevoke"
-  },
-  "errors": [],
-  "result": "success",
-  "version": "PRO CLIENT VERSION",
-  "warnings": []
-}
-```
-
-However, if the token is already expired or even invalid, we will see the following output:
-
-```json
-{
-  "_schema_version": "v1",
-  "data": {
-    "meta": {
-      "environment_vars": []
-    }
-  },
-  "errors": [
-    {
-      "code": "magic-attach-token-error",
-      "meta": {},
-      "title": "The magic attach token is invalid, has expired or never existed"
-    }
-  ],
-  "result": "failure",
-  "version": "PRO CLIENT VERSION",
-  "warnings": []
-}
-```
diff --git a/dev-docs/howtoguides/release_a_new_version.md b/dev-docs/howtoguides/release_a_new_version.md
 deleted file mode 100644
index 44ebd48..0000000
--- a/dev-docs/howtoguides/release_a_new_version.md
+++ /dev/null
@@ -1,227 +0,0 @@
-# Ubuntu Pro Client releases
-
-## Background
-
-The release process for ubuntu-advantage-tools has three overarching steps/goals.
-
-1. Release to our team infrastructure. This includes GitHub and the `ua-client` PPAs.
-2. Release to the latest Ubuntu devel release.
-3. Release to the supported Ubuntu past releases via [SRU](https://wiki.ubuntu.com/StableReleaseUpdates) using the [ubuntu-advantage-tools specific SRU process](https://wiki.ubuntu.com/UbuntuAdvantageToolsUpdates).
-
-Generally speaking, these steps happen in order, but there is some overlap. Also we may backtrack if issues are found part way through the process.
-
-An average release should take somewhere between 10 and 14 calendar days if things go smoothly, starting at the decision to release and ending at the new version being available in all supported Ubuntu releases. Note that it is not 2 weeks of full time work. Most of the time is spent waiting for review or sitting in proposed.
-
-> **Warning**
-> If the release contains any change listed in the [Early Review Sign-Off list](../references/early_review_signoff.md), make sure it was properly reviewed *before* starting the release process. Ideally they would be reviewed even before implementation, but if some feature is in the list and didn't get a proper review, now is the time to do so.
-
-## Prerequisites
-
-If this is your first time releasing ubuntu-advantage-tools, you'll need to do the following before getting started:
-
-* Add the team helper scripts to your PATH: [uss-tableflip](https://github.com/canonical/uss-tableflip).
-* If you don't yet have a gpg key set up, follow the instructions
-  [here](https://help.launchpad.net/YourAccount/ImportingYourPGPKey) to create a key,
-  publish it to `hkp://keyserver.ubuntu.com`, and import it into Launchpad.
-* Before you run `sbuild-it` for the first time, you'll need to set up a chroot for each Ubuntu release.
-  Run the following to set up chroots with dependencies pre-installed for each release:
-  ```bash
-  apt-get install sbuild-launchpad-chroot
-  bash ./tools/setup_sbuild.sh # This will give you usage information on how to call it with the correct parameters
-  ```
-* You must have Launchpad already properly configured in your system in order to upload packages to the PPAs. Follow [this guide](https://help.launchpad.net/Packaging/PPA/Uploading) to get set up.
-
-* In order to run the `ppa` command, install `ppa-dev-tools` from `bryce`'s PPA:
-  ```bash
-  sudo add-apt-repository ppa:bryce/ppa-dev-tools
-  sudo apt update
-  sudo apt install ppa-dev-tools
-  ```
-  When running `ppa` for the first time, there will be another round of launchpad authorization to be performed.
-
-## I. Preliminary/staging release to team infrastructure
-1. Create a release PR:
-
-    a. Move the desired commits from our `main` branch onto the desired release branch.
-
-      * This step is currently not well defined. We currently are using `release-27` for all `27.X` releases and have been cherry-picking/rebasing all commits from `main` into this branch for a release.
-
-    b. Create a new entry in the `debian/changelog` file:
-
-      * You can do that by running `dch --newversion <version-name>`.
-      * Remember to update the release from `UNRELEASED` to the ubuntu/devel release. Edit the version to look like: `27.2`, with the appropriate pro-client version number.
-      * Populate `debian/changelog` with the commits you have cherry-picked.
-      * You can do that by running `git log <first-cherry-pick-commit>..<last-cherry-pick-commit> | log2dch`
-        * This will generate a list of commits that could be included in the changelog.
-      * You don't need to include all of the commits generated. Remember that the changelog should
-        be read by the user to understand the new features/modifications in the package. If you
-        think a commit will not add that much to the user experience, you can drop it from the
-        changelog.
-      * To structure the changelog you can use the other entries as example. But we basically try to
-        keep this order: debian changes, new features/modifications, testing. Within each section, bullet points should be alphabetized.
-
-    c. Create a PR on GitHub into the release branch. Ask in the ~UA channel on Mattermost for review.
-
-    d. When reviewing the release PR, please use the following guidelines when reviewing the new changelog entry:
-
-      * Is the version correctly updated? We must ensure that the new version in the changelog is
-        correct and it also targets the latest Ubuntu release at the moment.
-      * Is the entry useful for the user? The changelog entries should be user focused, meaning
-        that we should only add entries that we think users will care about (i.e. we don't need
-        entries when fixing a test, as this doesn't provide meaningful information to the user).
-      * Is this entry redundant? Sometimes we may have changes that affect separate modules of the
-        code. We should have an entry only for the module that was most affected by it.
-      * Is the changelog entry unique? We need to verify that the changelog entry is not already
-        reflected in an earlier version of the changelog. If it is, we need not only to remove but double
-        check the process we are using to cherry-pick the commits.
-      * Is this entry actually reflected in the code? Sometimes, we can have changelog entries
-        that are not reflected in the code anymore. This can happen during development when we are
-        still unsure about the behaviour of a feature or when we fix a bug that removes the code
-        that was added. We must verify each changelog entry that is added to be sure of their
-        presence in the product.
-
-2. After the release PR is merged, tag the head of the release branch with the version number, e.g., `27.1`. Push this tag to GitHub.
-
-3. Build the package for all Ubuntu releases and upload to `ppa:ua-client/staging`:
-
-    a. Clone the repository into a clean directory and switch to the release branch.
-      * *WARNING* Build the package in a clean environment. The reason is that the package
-        will contain everything that is present in the folder. If you are storing credentials or
-        other sensible development information in your folder, they will be uploaded too when we send
-        the package to the ppa. A clean environment is the safest way to perform this.
-
-    b. Edit the changelog
-      * List yourself as the author of this release.
-      * Edit the version number to look like: `27.2~rc1` (`<version>~rc<release-candidate-number>`)
-      * Edit the Ubuntu release name. Start with the ubuntu/devel release.
-      * `git add debian/changelog && git commit -m "throwaway"` - Do **not** push this commit!
-
-    c. `build-package`
-      * This script will generate all the package artefacts in the parent directory as `../out`.
-
-    d. `sbuild-it ../out/<package_name>.dsc`
-      * If this succeeds move on. If this fails, debug and fix before continuing.
-
-    e. Repeat 3.b through 3.d for all supported Ubuntu Releases
-      * The version for series other than devel should be in the form `<version>~<ubuntu-release-number>~rc<release-candidate-number>`
-        This means you must add the release number in the changelog. For example, suppose
-        the devel version is `1.1~rc1`. If you want to build for jammy now, change it to
-        `1.1~22.04~rc1`.
-
-    f. For each release, dput to the staging PPA:
-      * `dput ppa:ua-client/staging ../out/<package_name>_source.changes`
-      * After each `dput` wait for the "Accepted" email from Launchpad before moving on.
-
-## II. Release to Ubuntu (devel and SRU)
-
-> **Note**
-> `kinetic` is used throughout as a reference to the current devel release. This will change.
-
-1. Prepare SRU Launchpad bugs.
-
-    a. We do this even before a successful merge into ubuntu/devel because the context added to these bugs is useful for the Server Team reviewer.
-
-    b. Create a new bug on Launchpad for ubuntu-advantage-tools and use the format defined [here](https://wiki.ubuntu.com/UbuntuAdvantageToolsUpdates#SRU_Template) for the description.
-      * The title should be in the format `[SRU] ubuntu-advantage-tools (27.1 -> 27.2) Xenial, Bionic, Focal, Jammy`, substituting version numbers and release names as necessary.
-      * If any of the changes for the SRU is in the [Early Review Sign-off list](../references/early_review_signoff.md), include a pointer in the `[Discussion]` section to where the discussion/approval of that feature took place (if possible).
-
-    c. For each Launchpad bug fixed by this release (which should all be referenced in our changelog), add the SRU template to the description and fill out each section.
-      * Leave the original description in the bug at the bottom under the header `[Original Description]`.
-      * For the testing steps, include steps to reproduce the bug. Then include instructions for adding `ppa:ua-client/staging`, and steps to verify the bug is no longer present.
-
-2. Set up the Merge Proposal (MP) for ubuntu/devel:
-
-    a. `git-ubuntu clone ubuntu-advantage-tools; cd ubuntu-advantage-tools`
-
-    b. `git remote add upstream [e-mail]:canonical/ubuntu-advantage-client.git`
-
-    c. `git fetch upstream`
-
-    d. `git rebase --onto pkg/ubuntu/devel <last-version-tag> <this-version-tag>`
-      * e.g. `git rebase --onto pkg/ubuntu/devel 27.0.2 27.1`
-      * You may need to resolve conflicts, but hopefully these will be minimal.
-      * You'll end up in a detached state.
-
-    e. `git checkout -B upload-<this-version>-kinetic`
-      * This creates a new local branch name based on your detached branch.
-
-    f. `git push <your_launchpad_user> upload-<this-version>-kinetic`
-
-    g. On Launchpad, create a merge proposal for this version which targets `ubuntu/devel`
-      * For an example, see the [27.14.1 merge proposal](https://code.launchpad.net/~renanrodrigo/ubuntu/+source/ubuntu-advantage-tools/+git/ubuntu-advantage-tools/+merge/439507).
-      * Add 2 review slots for `canonical-server-reporter` and `canonical-server-core-reviewers`.
-
-    h. With the packages published to `ppa:ua-client/staging`, add links to the autopkgtest triggers to the Merge Proposal. The reviewer will have permission to trigger those tests. The links can be obtained by running `ppa tests -r <release> -a <arch1,arch2> ua-client/staging -L`
-      * Make sure to post links to all the architectures built for a given release.
-      * The riscv64 autopkgtests are not avaialble and don't need to be included.
-      * The `ppa test` command will have two variations of tests: the regular one, and one with `all-proposed=1`; only the regular test need to be there.
-
-3. Server Team Review and Pre-SRU Review
-
-    a. Ask the assigned ubuntu-advantage-tools reviewer/sponsor from Server team for a review of your MPs. If you don't know who that is, ask in ~Server. Include a link to the ubuntu/devel MP and to the SRU bug.
-
-    b. If they request changes, create a PR into the release branch on GitHub and ask Pro Client team for review. After that is merged, cherry-pick the commit into your `upload-<this-version>-<devel-release>` branch and push to launchpad. Then notify the Server Team member that you have addressed their requests.
-      * Some issues may just be filed for addressing in the future if they are not urgent or pertinent to this release.
-      * Unless the changes are very minor, or only testing related, you should upload a new release candidate version to `ppa:ua-client/staging` as described in I.3.
-      * After the release is finished, any commits that were merged directly into the release branch in this way should be brought back into `main` via a single PR.
-
-    c. Once review is complete and approved, the Server Team member should **not** upload the version to the devel release.
-      * If they do, then any changes to the code after this point will require a bump in the patch version of the release.
-
-    d. Now ask the SRU team for a pre-SRU review of the same MP. Mention that the exact same code will be released to all stable Ubuntu releases.
-      * Follow instructions in `II.4.b` if they request any changes.
-
-    e. Once the SRU team member gives a pre-SRU approval, create the branches for each stable release. They should be named `upload-<this-version>-<codename>`.
-      * The versions for the stable releases must include `~<release-number>`
-      * If you've followed the instructions precisely so far, you can just run `bash tools/create-lp-release-branches.sh`.
-        - When using the `create-lp-release-branches.sh` script, an important parameter is `SRU_BUG`:
-        - In the vast majority of cases, this should be set to the overall SRU bug written in step II.1.b.
-        - In the case where an existing SRU never got released, and a new patch version was uploaded on top of it to fix a new bug discovered during review, then the bug should still be the overall SRU bug.
-        - If the release is exclusively a bugfix release and the previous version has already been successfully released all the way through the SRU process, then the bug should instead be the specific bugfix number.
-
-    f. Ask Server team member sponsor to upload to devel, and then the SRU proposed queue using the stable release branches you just created.
-      * Ask them to tag the PR with the appropriate `upload/<version>` tag so git-ubuntu will import rich commit history.
-      * If they do not have upload rights to the proposed queue, ask in ~Server channel for a Ubuntu Server team member with upload rights for an upload review of the MP for the proposed queue.
-
-    g. Check the [-proposed release queue](https://launchpad.net/ubuntu/xenial/+queue?queue_state=1&queue_text=ubuntu-advantage-tools) for presence of ubuntu-advantage-tools in unapproved state for each supported release. Note: libera chat #ubuntu-release IRC channel has a bot that reports queued uploads of any package in a message like "Unapproved: ubuntu-advantage-tools .. version".
-
-    h. Tell the SRU team member who performed the pre-SRU review that the packages are in the -proposed release queue. They will need to actually approve the package to move into -proposed.
-
-4. -proposed verification and release to -updates
-
-    a. As soon as the SRU vanguard approves the packages, a bot in #ubuntu-release will announce that ubuntu-advantage-tools is accepted into the applicable -proposed pockets, or the [Xenial -proposed release rejection queue](https://launchpad.net/ubuntu/xenial/+queue?queue_state=4&queue_text=ubuntu-advantage-tools) will contain a reason for rejections. Double check the SRU process bug for any actionable review feedback.
-      * Once accepted into `-proposed` by an SRU vanguard [ubuntu-advantage-tools shows up in the pending_sru page](https://people.canonical.com/~ubuntu-archive/pending-sru.html), check `rmadison ubuntu-advantage-tools | grep -proposed` to see if the upload exists in -proposed yet.
-      * Also actually check that the packages are accessible in a container by [enabling proposed](https://wiki.ubuntu.com/Testing/EnableProposed) and updating the package.
-
-    b. With the package in proposed, perform the steps from `I.3` above but use a `~stableppaX` suffix instead of `~rcX` in the version name, and upload to `ppa:ua-client/stable` instead of staging.
-
-    c. Perform the [Ubuntu-advantage-client SRU verification steps](https://wiki.ubuntu.com/UbuntuAdvantageToolsUpdates). This typically involves running all behave targets with `UACLIENT_BEHAVE_ENABLE_PROPOSED=1 UACLIENT_BEHAVE_CHECK_VERSION=<this-version>` and saving the output.
-      * There may also be one-time test scripts added in the `sru/` directory for this release.
-
-    d. After all tests have passed, tarball all of the output files and upload them to the SRU bug with a message that looks like this:
-
-    ```
-    We have run the full ubuntu-advantage-tools integration test suite against the version in -proposed. The results are attached. All tests passed.
-
-    You can verify the correct version was used by checking the output of the first test in each file, which prints the version number.
-
-    I am marking the verification done for this SRU.
-    ```
-
-    Change the tags on the bug from `verification-needed` to `verification-done` (including the verification tags for each Ubuntu release).
-
-    e. For any other related Launchpad bugs that are fixed in this release, perform the verification steps necessary for those bugs and mark them `verification-done` as needed. This will likely involve following the test steps, but instead of adding the staging PPA, enabling -proposed.
-
-    f. Once all SRU bugs are tagged as `verification*-done`, all SRU-bugs should be listed as green in [the pending_sru page](https://people.canonical.com/~ubuntu-archive/pending-sru.html).
-
-    g. After the pending SRU page says that ubuntu-advantage-tools has been in proposed for 7 days, it is now time to ping the [current SRU vanguard](https://wiki.ubuntu.com/StableReleaseUpdates#Publishing) for acceptance of ubuntu-advantage-tools into -updates.
-
-    h. Check `rmadison ubuntu-advantage-tools` for updated version in -updates.
-      * Also actually check that the packages are accessible in a container and updating the package.
-
-## III. Post-release updates
-
-1. Ensure the version tag is correct on GitHub. The `version` git tag should point to the commit that was released as that version to ubuntu -updates. If changes were made in response to feedback during the release process, the tag may have to be moved.
-2. Bring in any changes that were made to the release branch into `main` via PR (e.g., changelog edits).
-3. Move any scripts added in `sru/` to a new folder in `sru/_archive` for the release.
-4. Tell CPC that there is a new version of `ubuntu-advantage-tools` in -updates for all series.
diff --git a/dev-docs/howtoguides/testing.md b/dev-docs/howtoguides/testing.md
 deleted file mode 100644
index 24706d4..0000000
--- a/dev-docs/howtoguides/testing.md
+++ /dev/null
@@ -1,247 +0,0 @@
-# Testing
-All unit and lint tests are run using `tox`, with different versions of Python with specific constraints. We also use `tox-setuptools-version` to specify the correct setuptools version based on what is present in each release, and `tox-pyenv` to recognize the different local [pyenv interpreters](https://github.com/pyenv/pyenv).
-
-First, run the script to install and configure `pyenv`, and the `tox` dependencies:
-
-```shell
-./tools/setup_pyenv.sh
-```
-
-After that you need to [set up your shell environment](https://github.com/pyenv/pyenv#set-up-your-shell-environment-for-pyenv), according to the pyenv documentation.
-The guide has quick snippets to configure `bash`, `zsh` and `fish` shells.
-
-Refresh your terminal to make sure pyenv is working. Then you can run the unit and lint tests:
-
-```shell
-tox
-```
-
-> **Note**
-> There are a number of `autouse` mocks in our unit tests. These are intended to prevent accidental side effects on the host system from running the unit tests, as well as prevent leaks of the system environment into the unit tests.
-> One such `autouse` mock tells the unit tests that they are run as root (unless the mock is overriden for a particular test).
-> These `autouse` mocks have helped, but may not be preventing all side effects or environment leakage.
-
-The client also includes built-in dep8 tests. These are run as follows:
-
-```shell
-autopkgtest -U --shell-fail . -- lxd ubuntu:xenial
-```
-
-## Integration Tests
-
-Ubuntu Pro Client uses [behave](https://behave.readthedocs.io)
-for its integration testing.
-
-The integration test definitions are stored in the `features/`
-directory and consist of two parts: `.feature` files that define the
-tests we want to run, and `.py` files which implement the underlying
-logic for those tests.
-
-By default, integration tests will do the following on a given cloud platform:
- * Launch an instance running latest daily image of the target Ubuntu release
- * Add the Ubuntu Pro client daily build PPA: [ppa:ua-client/daily](https://code.launchpad.net/~ua-client/+archive/ubuntu/daily)
- * Install the appropriate ubuntu-advantage-tools and ubuntu-advantage-pro deb
- * Run the integration tests on that instance.
-
-The testing can be overridden to install ubuntu-advantage-tools from other sources instead of the daily PPA by providing `UACLIENT_BEHAVE_INSTALL_FROM` to the behave test runner. The default is `UACLIENT_BEHAVE_INSTALL_FROM=daily`, and the other available options are:
-
-- `staging`: install from the [staging PPA](https://code.launchpad.net/~ua-client/+archive/ubuntu/staging)
-- `stable`: install from the [stable PPA](https://code.launchpad.net/~ua-client/+archive/ubuntu/stable)
-- `archive`: install the latest version available in the archive, not adding any PPA
-- `proposed`: install the package from the -proposed pocket - specially useful for SRU testing (see [the release guide](how_to_release_a_new_version_of_ua.md))
-- `custom`: install from a custom provided PPA. If set, then two other variables need to be set: `UACLIENT_BEHAVE_CUSTOM_PPA=<PPA URL>` and `UACLIENT_BEHAVE_CUSTOM_PPA_KEYID=<signing key for the PPA>`.
-- `local`: install from a local copy of the ubuntu-advantage-client source code
-
-`local` is particularly useful, as it runs the suite against the local code, thus including and validating the latest changes made. It is advised to run any related integration tests against local code changes before pushing them to be reviewed.
-
-> **Note**
-> Note that we cache the source when running with `UACLIENT_BEHAVE_INSTALL_FROM=local` based on a hash, calculated from the repository state. If you change the python code locally and run the behave tests against your new version, there will be new debs in the cache source with the new repo state hash.
-
-To run the tests, you can use `tox`:
-
-```shell
-tox -e behave-lxd-20.04
-```
-
-or, if you just want to run a specific file, or a test within a file:
-
-```shell
-tox -e behave-lxd-20.04 features/unattached_commands.feature
-tox -e behave-lxd-20.04 features/unattached_commands.feature:28
-```
-
-As can be seen, this will run behave tests only for release 20.04 (Focal Fossa). We are currently
-supporting 5 distinct releases:
-
-* 21.10 (Kinetic Kudu)
-* 22.04 (Jammy Jellyfish)
-* 20.04 (Focal Fossa)
-* 18.04 (Bionic Beaver)
-* 16.04 (Xenial Xerus)
-
-Therefore, to change which release to run the behave tests against, just change the release version
-on the behave command.
-
-Furthermore, when developing/debugging a new scenario:
-
- 1. Add a `@wip` tag decorator on the scenario
- 2. To only run @wip scenarios run: `tox -e behave-lxd-20.04 -- -w`
- 3. If you want to use a debugger:
-    1. Add ipdb to integration-requirements.txt
-    2. Add ipdb.set_trace() in the code block you wish to debug
-
-(If you're getting started with behave, we recommend at least reading
-through [the behave
-tutorial](https://behave.readthedocs.io/en/latest/tutorial.html) to get
-an idea of how it works, and how tests are written.)
-
-## Iterating Locally
-
-To make running the tests repeatedly less time-intensive, our behave
-testing setup has support for reusing images between runs via two
-configuration options (provided in environment variables),
-`UACLIENT_BEHAVE_IMAGE_CLEAN` and `UACLIENT_BEHAVE_REUSE_IMAGE`.
-
-To avoid the test framework cleaning up the image it creates, you can
-run it like this:
-
-```sh
-UACLIENT_BEHAVE_IMAGE_CLEAN=0 tox -e behave
-```
-
-which will emit a line like this above the test summary:
-
-```
-Image cleanup disabled, not deleting: behave-image-1572443113978755
-```
-
-You can then reuse that image by plugging its name into your next test
-run, like so:
-
-```sh
-UACLIENT_BEHAVE_REUSE_IMAGE=behave-image-1572443113978755 tox -e behave
-```
-
-If you've done this correctly, you should see something like
-`reuse_image = behave-image-1572443113978755` in the "Config options"
-output, and test execution should start immediately (without the usual
-image build step).
-
-(Note that this handling is specific to our behave tests as it's
-performed in `features/environment.py`, so don't expect to find
-documentation about it outside of this codebase.)
-
-## Optimizing total run time of integration tests with snapshots
-When `UACLIENT_BEHAVE_SNAPSHOT_STRATEGY=1` we create a snapshot of an instance
-with ubuntu-advantage-tools installed and restore from that snapshot for all tests.
-This adds an upfront cost that is amortized across several test scenarios.
-
-Based on some rough testing in July 2021, these are the situations
-when you should set UACLIENT_BEHAVE_SNAPSHOT_STRATEGY=1
-
-> At time of writing, starting a lxd-vm instance from a local snapshot takes
-> longer than starting a fresh lxd-vm instance and installing ua.
-
-| machine_type  | condition          |
-| ------------- | ------------------ |
-| lxd-container | num_scenarios > 7  |
-| lxd-vm        | never              |
-| gcp           | num_scenarios > 5  |
-| azure         | num_scenarios > 14 |
-| aws           | num_scenarios > 11 |
-
-## Integration testing on EC2
-The following tox environments allow for testing focal on EC2:
-
-```
-  # To test ubuntu-pro-images
-  tox -e behave-awspro-20.04
-  # To test Canonical cloud images (non-ubuntu-pro)
-  tox -e behave-awsgeneric-20.04
-```
-
-To run the test for a different release, just update the release version string. For example,
-to run AWS pro xenial tests, you can run:
-
-```
-tox -e behave-awspro-16.04
-```
-
-In order to run EC2 tests, please set up the [pycloudlib toml
-file](https://github.com/canonical/pycloudlib/blob/main/pycloudlib.toml.template) with
-the required EC2 credentials.
-
-To specifically run non-ubuntu pro tests using canonical cloud-images an
-additional token obtained from https://ubuntu.com/pro needs to be set:
-  - UACLIENT_BEHAVE_CONTRACT_TOKEN=<your_token>
-
-* To manually run EC2 integration tests with a specific AMI Id provide the
-following environment variable to launch your specific  AMI instead of building
-a daily ubuntu-advantage-tools image.
-```sh
-UACLIENT_BEHAVE_REUSE_IMAGE=your-custom-ami tox -e behave-awspro-20.04
-```
-
-## Integration testing on Azure
-The following tox environments allow for testing focal on Azure:
-
-```
-  # To test ubuntu-pro-images
-  tox -e behave-azurepro-20.04
-  # To test Canonical cloud images (non-ubuntu-pro)
-  tox -e behave-azuregeneric-20.04
-```
-
-To run the test for a different release, just update the release version string. For example,
-to run Azure pro xenial tests, you can run:
-
-```
-tox -e behave-azurepro-16.04
-```
-
-In order to run Azure tests, please set up the [pycloudlib toml
-file](https://github.com/canonical/pycloudlib/blob/main/pycloudlib.toml.template) with
-the required Azure credentials.
-
-To specifically run non-ubuntu pro tests using canonical cloud-images an
-additional token obtained from https://ubuntu.com/pro needs to be set:
-  - UACLIENT_BEHAVE_CONTRACT_TOKEN=<your_token>
-
-* To manually run Azure integration tests with a specific Image Id provide the
-following environment variable to launch your specific Image Id instead of building
-a daily ubuntu-advantage-tools image.
-```sh
-UACLIENT_BEHAVE_REUSE_IMAGE=your-custom-image-id tox -e behave-azurepro-20.04
-```
-
-## Integration testing on GCP
-The following tox environments allow for testing focal on GCP:
-
-```
-  # To test ubuntu-pro-images
-  tox -e behave-gcppro-20.04
-  # To test Canonical cloud images (non-ubuntu-pro)
-  tox -e behave-gcpgeneric-20.04
-```
-
-To run the test for a different release, just update the release version string. For example,
-to run GCP pro xenial tests, you can run:
-
-```
-tox -e behave-gcppro-16.04
-```
-
-In order to run GCP tests, please set up the [pycloudlib toml
-file](https://github.com/canonical/pycloudlib/blob/main/pycloudlib.toml.template) with
-the required GCP credentials.
-
-To specifically run non-ubuntu pro tests using canonical cloud-images an
-additional token obtained from https://ubuntu.com/pro needs to be set:
-  - UACLIENT_BEHAVE_CONTRACT_TOKEN=<your_token>
-
-* To manually run GCP integration tests with a specific Image Id provide the
-following environment variable to launch your specific Image Id instead of building
-a daily ubuntu-advantage-tools image.
-```sh
-UACLIENT_BEHAVE_REUSE_IMAGE=your-custom-image-id tox -e behave-gcppro-20.04
-```
diff --git a/dev-docs/howtoguides/use_staging_environment.md b/dev-docs/howtoguides/use_staging_environment.md
 deleted file mode 100644
index b616fce..0000000
--- a/dev-docs/howtoguides/use_staging_environment.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Use the contracts staging environment
-
-You can change the contract server that the Pro Client will use by setting the
-following option in your `uaclient.conf` configuration file, (by default located at
-`/etc/ubuntu-advantage/uaclient.conf`).
-
-```yaml
-contract_url: https://contracts.staging.canonical.com
-```
-
-> **Note**
-> You might be using a local `uaclient.conf` file when running the pro client.
-> If that is the case, remember to change that file instead.
diff --git a/dev-docs/references/architecture.md b/dev-docs/references/architecture.md
 deleted file mode 100644
index a4efbdd..0000000
--- a/dev-docs/references/architecture.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# Architecture
-
-Ubuntu Pro Client is a python3-based command line
-utility. It provides a CLI to attach, detach, enable,
-disable and check status of support related services.
-
-The package `ubuntu-advantage-tools` also provides a C++ APT hook which helps
-advertise ESM service and available packages in MOTD and during various apt
-commands.
-
-The `ubuntu-advantage-pro` package delivers auto-attach functionality via a
-systemd service for various cloud platforms.
-
-By default, Ubuntu machines are deployed in an unattached state. A machine can
-get manually or automatically attached to a specific contract by interacting
-with the Contract Server REST API. Any change in state of services or machine
-attach results in additional interactions with the Contract Server API to
-validate such operations.
diff --git a/dev-docs/references/daily_builds.md b/dev-docs/references/daily_builds.md
 deleted file mode 100644
index ea52c39..0000000
--- a/dev-docs/references/daily_builds.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Daily Builds
-
-On Launchpad, there is a [daily build recipe](https://code.launchpad.net/~canonical-server/+recipe/ua-client-daily),
-which will build the client and place it in the [ua-client-daily PPA](https://code.launchpad.net/~ua-client/+archive/ubuntu/daily).
diff --git a/dev-docs/references/directory_layout.md b/dev-docs/references/directory_layout.md
 deleted file mode 100644
index 1fc1f77..0000000
--- a/dev-docs/references/directory_layout.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# Directory layout
-
-The following describes the intent of Ubuntu Pro Client related directories:
-
-| File/Directory | Intent |
-| -------- | -------- |
-| ./tools | Helpful scripts used to publish, release or test various aspects of Ubuntu Pro Client |
-| ./features/ | Behave BDD integration tests for Ubuntu Pro Client
-| ./uaclient/ | collection of python modules which will be packaged into ubuntu-advantage-tools package to deliver the Ubuntu Pro Client CLI |
-| uaclient.entitlements | Service-specific \*Entitlement class definitions which perform enable, disable, status, and entitlement operations etc. All classes derive from base.py:UAEntitlement and many derive from repo.py:RepoEntitlement |
-| ./uaclient/cli.py | The entry-point for the command-line client
-| ./uaclient/clouds/ | Cloud-platform detection logic used in Ubuntu Pro to determine if a given instance should be auto-attached to a contract |
-| uaclient.contract | Module for interacting with the Contract Server API |
-| uaclient.messages | Module that contains the messages delivered by `pro` to the user |
-| uaclient.security | Module that hold the logic used to run `pro fix` commands |
-| ./apt-hook/ | the C++ apt-hook delivering MOTD and apt command notifications about Ubuntu Pro support services |
-| /etc/ubuntu-advantage/uaclient.conf | Configuration file for the Ubuntu Pro Client.|
-| /var/lib/ubuntu-advantage/private | `root` read-only directory containing Contract API responses, machine-tokens and service credentials |
-| /var/lib/ubuntu-advantage/machine-token.json | `world` readable file containing redacted Contract API responses, machine-tokens and service credentials |
-| /var/log/ubuntu-advantage.log | `root` read-only log of ubuntu-advantage operations |
-
-## Note
-
-We have two `machine-token.json` files, located at:
-
-- /var/lib/ubuntu-advantage/private/machine-token.json
-- /var/lib/ubuntu-advantage/machine-token.json
-
-The first file, located in the `private` directory, is root read-only. We have another world readable file in the `/var/lib/ubuntu-advantage` directory.
-
-The latter is currently being used when calling the `pro status` command as a non-root user. This file is redacted to remove any sensitive user data.
diff --git a/dev-docs/references/early_review_signoff.md b/dev-docs/references/early_review_signoff.md
 deleted file mode 100644
index f5d99d8..0000000
--- a/dev-docs/references/early_review_signoff.md
+++ /dev/null
@@ -1,36 +0,0 @@
-# Early review sign-off
-As the Client has a very broad exception for SRUs, there are some features which
-need pre-evaluation from people outside the team.
-
-This pre-evaluation should be performed at specification time, even before any
-implementation, to prevent frustration from any side when trying to SRU and to
-avoid possible blockers for the process.
-
-The review for such special features must be performed by:
-1. A SRU team member, and
-2. Someone from the Ubuntu Core Development team with appropriate expertise on
-   the topic being changed.
-
-There may be the case where a single person matches both of the descriptions
-above - that is acceptable from the review perspective.
-
-## Features which need special attention
-
-The team should request the aforementioned pre-evaluation of any feature which
-involves:
-
-- How the Client interacts with APT
-- How the Client interacts with systemd
-- Anything that changes network traffic patterns, including anything
-that might "phone home"
-- Anything that changes the use of persistent processes or scheduled
-jobs
-- Changes that affect what part of the namespace in PATH we consume
-- Actions that take place without an explicit user opt-in*
-
-New items may be eventually added to this list
-(preferrably before any problem happens!).
-
-
-\* executing a CLI command to perform a specific task counts a
-   opt-in for that task.
diff --git a/dev-docs/references/enabling_a_service.md b/dev-docs/references/enabling_a_service.md
 deleted file mode 100644
index d799972..0000000
--- a/dev-docs/references/enabling_a_service.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# Enabling a service
-
-Each service controlled by Ubuntu Pro Client will have a python module in
-uaclient/entitlements/\*.py which handles setup and teardown of services when
-enabled or disabled.
-
-If a contract entitles a machine to a service, `root` user can enable the
-service with `pro enable <service>`.  If a service can be disabled
-`pro disable <service>` will be permitted.
-
-The goal of the Ubuntu Pro Client is to remain simple and flexible and let the
-contracts backend drive dynamic changes in contract offerings and constraints.
-In pursuit of that goal, the Ubuntu Pro Client obtains most of it's service constraints
-from a machine token that it obtains from the Contract Server API.
-
-The Ubuntu Pro Client is simple in that it relies on the machine token on the attached
-machine to describe whether a service is applicable for an environment and what
-configuration is required to properly enable that service.
-
-Any interactions with the Contract Server API are defined as UAContractClient
-class methods in [uaclient/contract.py](../../uaclient/contract.py).
diff --git a/dev-docs/references/pr_review_policy.md b/dev-docs/references/pr_review_policy.md
 deleted file mode 100644
index ce9a35e..0000000
--- a/dev-docs/references/pr_review_policy.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# PR review policy
-
-The team follows this policy for PR reviews:
-
-* Simple PRs: PRs that fix typos or perform one line changes require **one** approval from a team
-  member and can be merged immediately by the reviewer.
-* Low complexity PRs: For short PRs we require **one** approval to merge. However, after approving the
-  PR we will wait for **one** day before merging it. This will allow other team members to review
-  the PR if they want. When one day has passed after the approval and there are no new requested
-  changes, any team member can merge.
-* Complex PRs: Minimum of **two** approvals from team members. After there are two team-member approvals
-  and there are no remaining requested changes, any team member can merge.
-* SRU blocker PRs: Some PRs may also require review from members that are not on the team, like SRU
-  reviewers. This is the case, for example, when adding/creating new systemd units. For those PRs, we
-  will directly ask for feedback from members outside the team that have a more suitable background to review
-  the change we are proposing. Therefore, we not only require at least **two** approvals from team members,
-  but also approvals from every external reviewer we assigned. After the required approvals have been given,
-  the additional review feedback has been taken into account, and there are no requested changes remaining,
-  any team member can merge.
diff --git a/dev-docs/references/terminology.md b/dev-docs/references/terminology.md
 deleted file mode 100644
index 0459eb7..0000000
--- a/dev-docs/references/terminology.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Terminology
-
-The following vocabulary is used to describe different aspects of the work
-Ubuntu Pro Client performs:
-
-| Term     | Meaning |
-| -------- | -------- |
-| Ubuntu Pro Client | The python command line client represented in this ubuntu-pro-client repository. It is installed on each Ubuntu machine and is the entry-point to enable any Ubuntu Pro commercial service on an Ubuntu machine |
-| Contract Server | The backend service exposing a REST API to which Ubuntu Pro Client authenticates in order to obtain contract and commercial service information and manage which support services are active on a machine |
-| Entitlement/Service | An Ubuntu Pro commercial support service such as FIPS, ESM, Livepatch, CIS-Audit to which a contract may be entitled |
-| Affordance | Service-specific list of applicable architectures and Ubuntu series on which a service can run |
-| Directives | Service-specific configuration values which are applied to a service when enabling that service |
-| Obligations | Service-specific policies that must be instrumented for support of a service. Example: `enableByDefault: true` means that any attached machine **MUST** enable a service on attach |
diff --git a/dev-docs/references/version_string_formatting.md b/dev-docs/references/version_string_formatting.md
 deleted file mode 100644
index 59f163c..0000000
--- a/dev-docs/references/version_string_formatting.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# Version string formatting
-
-Below are the versioning schemes used for publishing debs:
-
-| Build target                                                                      | Version Format                             |
-| --------------------------------------------------------------------------------- | ------------------------------------------ |
-| [Daily PPA](https://code.launchpad.net/~canonical-server/+recipe/ua-client-daily) | `XX.YY-<revno>~g<commitish>~ubuntu22.04.1` |
-| Staging PPA                                                                       | `XX.YY~22.04~rc1`                        |
-| Stable PPA                                                                        | `XX.YY~22.04~stableppa1`                 |
-| Archive release                                                                   | `XX.YY~22.04`                            |
-| Archive bugfix release                                                            | `XX.YY.Z~22.04`                          |
-
-## Supported upgrade paths on same upstream version
-
-Regardless of source, the latest available "upstream version" (e.g. 27.4) will always be installed, because the upstream version comes first followed by a tilde in all version formats.
-
-This table demonstrates upgrade paths between sources for one particular upstream version.
-
-| Upgrade path                    | Version diff example                                                    |
-| ------------------------------- | ----------------------------------------------------------------------- |
-| Staging to Next Staging rev     | `31.4~22.04~rc1` ➜ `31.4~22.04~rc2`                                 |
-| Staging to Stable               | `31.4~22.04~rc2` ➜ `31.4~22.04~stableppa1`                          |
-| Stable to Next Stable rev       | `31.4~22.04~stableppa1` ➜ `31.4~22.04~stableppa2`                   |
-| Stable to Archive               | `31.4~22.04~stableppa2` ➜ `31.4~22.04`                              |
-| LTS Archive to Next LTS Archive | `31.4~22.04` ➜ `31.4~24.04`                                         |
-| Archive to Daily                | `31.4~24.04` ➜ `31.4-1500~g75fa134~ubuntu24.04.1`                     |
-| Daily to Next Daily             | `31.4-1500~g75fa134~ubuntu24.04.1` ➜ `31.4-1501~g3836375~ubuntu24.04.1` |
diff --git a/dev-docs/references/what_happens_during_attach.md b/dev-docs/references/what_happens_during_attach.md
 deleted file mode 100644
index 05854e1..0000000
--- a/dev-docs/references/what_happens_during_attach.md
+++ /dev/null
@@ -1,15 +0,0 @@
-### What happens during attach
-After running the command `pro attach TOKEN`, Ubuntu Pro Client will perform the following steps:
-
-* Read the config from /etc/ubuntu-advantage/uaclient.conf to obtain
-  the contract\_url (default: https://contracts.canonical.com)
-* POSTs to the Contract Server API @
-  <contract_url>/api/v1/context/machines/token providing the \<contractToken\>
-* The Contract Server responds with a JSON blob containing an unique machine
-  token, service credentials, affordances, directives and obligations to allow
-  enabling and disabling Ubuntu Pro services
-* Ubuntu Pro Client writes the machine token API response to the root-readonly
-  /var/lib/ubuntu-advantage/private/machine-token.json and a version with secrets redacted to the world-readable
-  file /var/lib/ubuntu-advantage/machine-token.json.
-* Ubuntu Pro Client auto-enables any services defined with
-  `obligations:{enableByDefault: true}`
diff --git a/docs-requirements.txt b/docs-requirements.txt
 deleted file mode 100644
index a2de834..0000000
--- a/docs-requirements.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-furo
-m2r2
-myst-parser
-sphinx==5.1.1
-sphinx_autobuild
-sphinx_copybutton
-sphinx_design
diff --git a/docs/_static/circle_of_friends.png b/docs/_static/circle_of_friends.png
 deleted file mode 100644
index 4178914..0000000
 Binary files a/docs/_static/circle_of_friends.png and /dev/null differ
diff --git a/docs/_static/css/custom.css b/docs/_static/css/custom.css
 deleted file mode 100644
index 49efd28..0000000
--- a/docs/_static/css/custom.css
+++ /dev/null
@@ -1,240 +0,0 @@
-/** Fix the font weight (300 for normal, 400 for slightly bold) **/
-/** Should be 100 for all headers, 400 for normal text  **/
-
-h1, h2, h3, h4, h5, h6, .sidebar-tree .current-page>.reference, button, input, optgroup, select, textarea, th.head {
-    font-weight: 200;
-}
-
-.toc-title {
-    font-weight: 400;
-}
-
-div.page, li.scroll-current>.reference, dl.glossary dt, dl.simple dt, dl:not([class]) dt {
-    font-weight: 300;
-    line-height: 1.5;
-    font-size: var(--font-size--normal);
-}
-
-
-/** Side bars (side-bar tree = left, toc-tree = right) **/
-div.sidebar-tree {
-    font-weight: 200;
-    line-height: 1.5;
-    font-size: var(--font-size--normal);
-}
-
-div.toc-tree {
-    font-weight: 200;
-    font-size: var(--font-size--medium);
-    line-height: 1.5;
-}
-
-.sidebar-tree .toctree-l1>.reference, .toc-tree li.scroll-current>.reference {
-    font-weight: 400;
-}
-
-/** List styling   **/
-ol, ul {
-    margin-bottom: 1.5rem;
-    margin-left: 1rem;
-    margin-top: 0;
-    padding-left: 1rem;
-}
-
-/** Table styling **/
-
-th.head {
-    text-transform: uppercase;
-    font-size: var(--font-size--small);
-}
-
-table.docutils {
-    border: 0;
-    box-shadow: none;
-    width:100%;
-}
-
-table.docutils td, table.docutils th, table.docutils td:last-child, table.docutils th:last-child, table.docutils td:first-child, table.docutils th:first-child {
-    border-right: none;
-    border-left: none;
-}
-
-/* center align table cells with ":-:" */
-td.text-center {
-    text-align: center;
-}
-
-/** No rounded corners **/
-
-.admonition, code.literal, .sphinx-tabs-tab, .sphinx-tabs-panel, .highlight {
-    border-radius: 0;
-}
-
-/** code blocks and literals **/
-code.docutils.literal.notranslate, .highlight pre, pre.literal-block {
-    font-size: var(--font-size--medium);
-}
-
-
-/** Admonition styling **/
-
-.admonition {
-    font-size: var(--font-size--medium);
-    box-shadow: none;
-}
-
-/** Styling for links **/
-/* unvisited link */
-a:link {
-    color: #06c;
-    text-decoration: none;
-}
-
-/* visited link */
-a:visited {
-    color: #7d42b8;
-    text-decoration: none;
-}
-
-/* mouse over link */
-a:hover {
-    text-decoration: underline;
-}
-
-/* selected link */
-a:active {
-    text-decoration: underline;
-}
-
-a.sidebar-brand.centered {
-    text-decoration: none;
-}
-
-/** Color for the "copy link" symbol next to headings **/
-
-a.headerlink {
-    color: var(--color-brand-primary);
-}
-
-/** Line to the left of the current navigation entry **/
-
-.sidebar-tree li.current-page {
-    border-left: 2px solid var(--color-brand-primary);
-}
-
-/** Some tweaks for issue #16 **/
-
-[role="tablist"] {
-    border-bottom: 1px solid var(--color-sidebar-item-background--hover);
-}
-
-.sphinx-tabs-tab[aria-selected="true"] {
-    border: 0;
-    border-bottom: 2px solid var(--color-brand-primary);
-    background-color: var(--color-sidebar-item-background--current);
-    font-weight:300;
-}
-
-.sphinx-tabs-tab{
-    color: var(--color-brand-primary);
-    font-weight:300;
-}
-
-.sphinx-tabs-panel {
-    border: 0;
-    border-bottom: 1px solid var(--color-sidebar-item-background--hover);
-    background: var(--color-background-primary);
-}
-
-button.sphinx-tabs-tab:hover {
-    background-color: var(--color-sidebar-item-background--hover);
-}
-
-/** Custom classes to fix scrolling in tables by decreasing the
-    font size or breaking certain columns.
-    Specify the classes in the Markdown file with, for example:
-    ```{rst-class} break-col-4 min-width-4-8
-    ```
-**/
-
-table.dec-font-size {
-    font-size: smaller;
-}
-table.break-col-1 td.text-left:first-child {
-    word-break: break-word;
-}
-table.break-col-4 td.text-left:nth-child(4) {
-    word-break: break-word;
-}
-table.min-width-1-15 td.text-left:first-child {
-    min-width: 15em;
-}
-table.min-width-4-8 td.text-left:nth-child(4) {
-    min-width: 8em;
-}
-
-/** Underline for abbreviations **/
-
-abbr[title] {
-    text-decoration: underline solid #cdcdcd;
-}
-
-/** Use the same style for right-details as for left-details **/
-.bottom-of-page .right-details {
-    font-size: var(--font-size--small);
-    display: block;
-}
-
-/** Version switcher */
-button.version_select {
-  color: var(--color-foreground-primary);
-  background-color: var(--color-toc-background);
-  padding: 5px 10px;
-  border: none;
-}
-
-.version_select:hover, .version_select:focus {
-    background-color: var(--color-sidebar-item-background--hover);
-}
-
-.version_dropdown {
-  position: relative;
-  display: inline-block;
-  text-align: right;
-  font-size: var(--sidebar-item-font-size);
-}
-
-.available_versions {
-  display: none;
-  position: absolute;
-  right: 0px;
-  background-color: var(--color-toc-background);
-  box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
-  z-index: 11;
-}
-
-.available_versions a {
-  color: var(--color-foreground-primary);
-  padding: 12px 16px;
-  text-decoration: none;
-  display: block;
-}
-
-.available_versions a:hover {background-color: var(--color-sidebar-item-background--current)}
-
-.show {display:block;}
-
-/** Fix for nested numbered list - the nested list is lettered **/
-ol.arabic ol.arabic {
-  list-style: lower-alpha;
-}
-
-/** Make expandable sections look like links **/
-details summary {
-    color: var(--color-link);
-}
-
-/** Context links at the bottom of the page **/
-footer {
-    font-size: var(--font-size--medium);
-}
diff --git a/docs/_static/css/github_issue_links.css b/docs/_static/css/github_issue_links.css
 deleted file mode 100644
index af4be86..0000000
--- a/docs/_static/css/github_issue_links.css
+++ /dev/null
@@ -1,24 +0,0 @@
-.github-issue-link-container {
-    padding-right: 0.5rem;
-}
-.github-issue-link {
-    font-size: var(--font-size--small);
-    font-weight: bold;
-    background-color: #DD4814;
-    padding: 13px 23px;
-    text-decoration: none;
-}
-.github-issue-link:link {
-    color: #FFFFFF;
-}
-.github-issue-link:visited {
-    color: #FFFFFF
-}
-.muted-link.github-issue-link:hover {
-    color: #FFFFFF;
-    text-decoration: underline;
-}
-.github-issue-link:active {
-    color: #FFFFFF;
-    text-decoration: underline;
-}
diff --git a/docs/_static/css/logo.css b/docs/_static/css/logo.css
 deleted file mode 100644
index 98d7cef..0000000
--- a/docs/_static/css/logo.css
+++ /dev/null
@@ -1,7 +0,0 @@
-.sidebar-brand.centered {
-    text-align: start;
-}
-.sidebar-logo {
-    max-width: 44px;
-    margin: initial;
-}
diff --git a/docs/_static/js/github_issue_links.js b/docs/_static/js/github_issue_links.js
 deleted file mode 100644
index d339060..0000000
--- a/docs/_static/js/github_issue_links.js
+++ /dev/null
@@ -1,25 +0,0 @@
-window.onload = function() {
-    const link = document.createElement("a");
-    link.classList.add("muted-link");
-    link.classList.add("github-issue-link");
-    link.text = "Give feedback";
-    link.href = (
-        "https://github.com/canonical/ubuntu-pro-client/issues/new?"
-        + "title=docs%3A+TYPE+YOUR+QUESTION+HERE"
-        + "&body=*Please describe the question or issue you're facing with "
-        + `"${document.title}"`
-        + ".*"
-        + "%0A%0A%0A%0A%0A"
-        + "---"
-        + "%0A"
-        + `*Reported+from%3A+${location.href}*`
-    );
-    link.target = "_blank";
-
-    const div = document.createElement("div");
-    div.classList.add("github-issue-link-container");
-    div.append(link)
-
-    const container = document.querySelector(".article-container > .content-icon-container");
-    container.prepend(div);
-};
diff --git a/docs/conf.py b/docs/conf.py
 deleted file mode 100644
index 33da04c..0000000
--- a/docs/conf.py
+++ /dev/null
@@ -1,109 +0,0 @@
-# Configuration file for the Sphinx documentation builder.
-#
-# This file only contains a selection of the most common options. For a full
-# list see the documentation:
-# https://www.sphinx-doc.org/en/master/usage/configuration.html
-
-# -- Path setup --------------------------------------------------------------
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#
-# import os
-# import sys
-# sys.path.insert(0, os.path.abspath('.'))
-
-import datetime
-
-# -- Project information -----------------------------------------------------
-
-project = "Ubuntu Pro Client"
-author = "Canonical Group Ltd"
-copyright = "%s, %s" % (datetime.date.today().year, author)
-
-# -- General configuration ---------------------------------------------------
-
-# Add any Sphinx extension module names here, as strings. They can be
-# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
-# ones.
-
-extensions = [
-    "myst_parser",
-    "sphinx_copybutton",
-    "sphinx_design",
-]
-
-# Add any paths that contain templates here, relative to this directory.
-
-templates_path = ["_templates"]
-
-html_extra_path = ["googleaf254801a5285c31.html", "sitemap-index.xml"]
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-# This pattern also affects html_static_path and html_extra_path.
-
-exclude_patterns = []
-
-# It seems we need to request creation of automatic anchors for our headings.
-# Setting to 2 because that's what we need now.
-# If referencing any heading of lesser importance, adjust here.
-
-myst_heading_anchors = 3
-
-
-# -- Options for HTML output -------------------------------------------------
-
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes:
-# https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output
-
-html_theme = "furo"
-html_logo = "_static/circle_of_friends.png"
-html_theme_options = {
-    "light_css_variables": {
-        "color-sidebar-background-border": "none",
-        "font-stack": "Ubuntu, -apple-system, Segoe UI, Roboto, Oxygen, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif",
-        "font-stack--monospace": "Ubuntu Mono variable, Ubuntu Mono, Consolas, Monaco, Courier, monospace",
-        "color-foreground-primary": "#111",
-        "color-foreground-secondary": "var(--color-foreground-primary)",
-        "color-foreground-muted": "#333",
-        "color-background-secondary": "#FFF",
-        "color-background-hover": "#f2f2f2",
-        "color-brand-primary": "#111",
-        "color-brand-content": "#06C",
-        "color-inline-code-background": "rgba(0,0,0,.03)",
-        "color-sidebar-link-text": "#111",
-        "color-sidebar-item-background--current": "#ebebeb",
-        "color-sidebar-item-background--hover": "#f2f2f2",
-        "sidebar-item-line-height": "1.3rem",
-        "color-link-underline": "var(--color-background-primary)",
-        "color-link-underline--hover": "var(--color-background-primary)",
-    },
-    "dark_css_variables": {
-        "color-foreground-secondary": "var(--color-foreground-primary)",
-        "color-foreground-muted": "#CDCDCD",
-        "color-background-secondary": "var(--color-background-primary)",
-        "color-background-hover": "#666",
-        "color-brand-primary": "#fff",
-        "color-brand-content": "#06C",
-        "color-sidebar-link-text": "#f7f7f7",
-        "color-sidebar-item-background--current": "#666",
-        "color-sidebar-item-background--hover": "#333",
-    },
-}
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ["_static"]
-
-html_css_files = [
-    "css/logo.css",
-    "css/github_issue_links.css",
-    "css/custom.css",
-]
-html_js_files = [
-    "js/github_issue_links.js",
-]
diff --git a/docs/explanations.rst b/docs/explanations.rst
 deleted file mode 100644
index 78adb85..0000000
--- a/docs/explanations.rst
+++ /dev/null
@@ -1,56 +0,0 @@
-Ubuntu Pro Client explanation
-*****************************
-
-Our explanatory and conceptual guides are written to provide a better
-understanding of how the Ubuntu Pro Client (``pro``) works. They enable you
-to expand your knowledge and become better at using and configuring ``pro``.
-
-Messaging
-=========
-
-Here you'll find details about Ubuntu Pro Client-related APT and MOTD messages
--- what they are, when they are used and how they work.
-
-..  toctree::
-    :maxdepth: 1
-
-    Pro-related APT messages <explanations/apt_messages.md>
-    Pro-related MOTD messages <explanations/motd_messages.md>
-
-Commands
-========
-
-Some of the commands in ``pro`` do more than you think. Here we'll show you a
-selection of some of the commands -- what they do, and how they work.
-
-..  toctree::
-    :maxdepth: 1
-
-    explanations/how_to_interpret_the_security_status_command.md
-    explanations/how_to_interpret_output_of_unattended_upgrades.md
-    explanations/status_columns.md
-    explanations/what_refresh_does.md
-
-Public Cloud Ubuntu Pro
-=======================
-
-Here we talk about Ubuntu Pro images for AWS, Azure and GCP, and the related
-tooling: the ``ubuntu-advantage-pro`` package.
-
-..  toctree::
-    :maxdepth: 1
-
-    explanations/what_are_ubuntu_pro_cloud_instances.md
-    explanations/what_is_the_ubuntu_advantage_pro_package.md
-
-Other Pro features explained
-============================
-
-..  toctree::
-    :maxdepth: 1
-    
-    explanations/cves_and_usns_explained.md
-    explanations/what_are_the_timer_jobs.md
-    explanations/what_is_the_daemon.md
-    explanations/why_trusty_is_no_longer_supported.md
-    explanations/errors_explained.md
diff --git a/docs/explanations/apt_messages.md b/docs/explanations/apt_messages.md
 deleted file mode 100644
index edd50d2..0000000
--- a/docs/explanations/apt_messages.md
+++ /dev/null
@@ -1,156 +0,0 @@
-# Ubuntu Pro-related APT messages
-
-When running some APT commands, you might see Ubuntu Pro-related messages in
-the output of those commands. Currently, we deliver those messages when
-running either `apt upgrade` or `apt dist-upgrade`. The scenarios
-where we deliver those messages are:
-
-## ESM series with esm-infra service disabled
-
-When you run `apt upgrade` on an ESM release, like Xenial, we advertise
-the `esm-infra` service if packages could be upgraded by enabling the service:
-
-```
-Reading package lists... Done
-Building dependency tree
-Reading state information... Done
-Calculating upgrade... Done
-The following package was automatically installed and is no longer required:
-  libfreetype6
-  Use 'apt autoremove' to remove it.
-The following security updates require Ubuntu Pro with 'esm-infra' enabled:
-  libpam0g libpam-modules openssl ntfs-3g git-man libsystemd0 squashfs-tools git openssh-sftp-server udev libpam-runtime isc-dhcp-common libx11-6 libudev1 apport python3-apport systemd-sysv liblz4-1 libpam-systemd systemd libpam-modules-bin openssh-server libx11-data openssh-client libxml2 curl isc-dhcp-client python3-problem-report libcurl3-gnutls libssl1.0.0
-Learn more about Ubuntu Pro for 16.04 at https://ubuntu.com/16-04
-```
-
-## LTS series with esm-apps service disabled
-
-When you are running `apt upgrade` on a LTS release, like Focal, we advertise
-the `esm-apps` service if packages could be upgraded by enabling the service:
-
-```
-Reading package lists... Done
-Building dependency tree
-Reading state information... Done
-Calculating upgrade... Done
-The following package was automatically installed and is no longer required:
-  libfreetype6
-Use 'apt autoremove' to remove it.
-Get more security updates through Ubuntu Pro with 'esm-apps' enabled:
-  adminer editorconfig ansible
-Learn more about Ubuntu Pro at https://ubuntu.com/pro
-0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
-```
-
-## ESM package count
-
-If both ESM services are enabled on the system, we deliver a package count
-related to each service near the end of the `apt` command:
-
-```
-1 standard LTS security update, 29 esm-infra security updates and 8 esm-apps security updates
-```
-
-We only deliver this message if the service is enabled *and* we upgraded
-packages related to it. For example, if we had no `esm-infra` package upgrades,
-the message would be:
-
-```
-1 standard LTS security update and 8 esm-apps security updates
-```
-
-## Expired contract
-
-If we detect that your contract is expired, we will deliver the following
-message advertising `esm-infra` in the middle of the `apt upgrade` command:
-
-```
-#
-# *Your Ubuntu Pro subscription has EXPIRED*
-# 10 additional security update(s) require Ubuntu Pro with '{service}' enabled.
-# Renew your service at https://ubuntu.com/pro
-#
-```
- 
-If we don't have any `esm-infra`-related packages to upgrade, we would show the
-following message instead:
-
-```
-#
-# *Your Ubuntu Pro subscription has EXPIRED*
-# Renew your service at https://ubuntu.com/pro
-#
-```
-
-## Contract is about to expire
-
-Similarly, if we detect that your contract is about to expire, we deliver the
-following message in the middle of the `apt` command:
-
-```
-#
-# CAUTION: Your Ubuntu Pro subscription will expire in 2 days.
-# Renew your subscription at https://ubuntu.com/pro to ensure continued
-# security coverage for your applications.
-#
-```
-
-## Contract has expired, but still in grace period
-
-Additionally, if we detect that the contract has expired, but is still in the
-grace period, the following message will be seen in the middle of the `apt`
-command output:
-
-```
-#
-# CAUTION: Your Ubuntu Pro subscription expired on 10 Sep 2021.
-# Renew your subscription at https://ubuntu.com/pro to ensure continued
-# security coverage for your applications.
-# Your grace period will expire in 11 days.
-#
-```
-
-## How are the APT messages generated?
-
-We have two distinct `apt` hooks that allow us to deliver these messages when
-you run `apt upgrade` or `apt dist-upgrade`. They are:
-
-### `apt-esm-hook`
-
-Responsible for populating templates with accurate package counts (i.e. the package
-count we see on the Expired contract messages).
-However, the messaging here is created by two distinct steps:
-
-1. Our [update_messages](what_are_the_timer_jobs.md) timer job creates
-   templates for the APT messages this hook will deliver. We cannot create the
-   full message on the timer job, because we need the accurate package names
-   and count. This information can only be obtained when running the `apt`
-   command.
-
-   ```{note}
-   These templates will only be produced if certain conditions are met. For
-   example, we only produce "expired contract" templates if the contracts are
-   indeed expired.
-   ```
-
-2. When you run either `apt upgrade` or `apt dist-upgrade`, the hook
-   searches for these templates and if they exist, they are populated with the
-   correct `apt` content and delivered to the user.
-
-### `apt-esm-json-hook`
-
-The JSON hook is responsible for delivering the rest of the message we have presented here.
-This hook is used to inject the message in the exact place we want, so we need to use a specific `apt`
-[JSON hook](https://salsa.debian.org/apt-team/apt/-/blob/main/doc/json-hooks-protocol.md)
-to communicate with it.
-
-```{note}
-Those hooks are only delivered on LTS releases. This is because the hooks will
-not deliver useful messages on non-LTS due to lack of support for ESM services.
-```
-
-## How are APT configured to deliver those messages?
-
-We currently ship the package the `20apt-esm-hook.conf` configuration that
-configures both the basic apt hooks to call our `apt-esm-hook` binary, and also
-the `json` API of `apt` to call our `apt-esm-json-hook` binary.
diff --git a/docs/explanations/cves_and_usns_explained.md b/docs/explanations/cves_and_usns_explained.md
 deleted file mode 100644
index 272c1d8..0000000
--- a/docs/explanations/cves_and_usns_explained.md
+++ /dev/null
@@ -1,44 +0,0 @@
-# CVEs and USNs explained
-
-## What is a CVE
-
-Common Vulnerabilities and Exposures (CVEs) are a way to catalogue and track public security
-vulnerabilities for a given software. Every CVE is identified through a unique identifier,
-for example [CVE-2023-0465](https://www.cve.org/CVERecord?id=CVE-2023-0465).
-
-CVEs are maintained by the [MITRE Corporation](https://cve.mitre.org/) and the goal of the project
-is to provide naming conventions for the public known security issues while also maintaining a
-centralised repository for all of the security issues. This makes it easier for an organization to
-submit a new security flaw though the CVE convention while also analysing any other existing CVEs
-in the database.
-
-You can search for any existing CVE related to Ubuntu using
-[the Ubuntu CVE page](https://ubuntu.com/security/cves).
-
-## What is a USN?
-
-An Ubuntu Security Notice (USN) is the way that Canonical publicly catalogues and displays security
-vulneratibilities for Ubuntu packages. Usually, a USN is composed of one or more
-[CVEs](#what-is-a-cve) and it also contains update instructions to fix the issue, if a fix is
-already available.
-
-USNs follow a naming convention of the format: [USN-5963-1](https://ubuntu.com/security/notices/USN-5963-1)
-
-You can search for any existing USN using
-[the Ubuntu Security Notices page](https://ubuntu.com/security/notices).
-
-## What are related USNs?
-
-A USN is composed of different CVEs. If the same CVE appears on multiple USNs, we say that those USNs are related.
-In the following image, we can see a visual representation of that concept, where USN-789 and USN-321
-are related USNs because both are affected by CVE-2:
-
-![Related USN example](../images/usn-related.png)
-
-
-A real example can be seen in [USN-5573-1](https://ubuntu.com/security/notices/USN-5573-1).
-In the section **Related notices**, it shows that both **USN-5570-1**
-and **USN-5570-2** are related to **USN-5573-1**.
-
-This information is useful for users that want to tackle
-all related USNs at once, making sure that a CVE is fully fixed on their Ubuntu machine.
diff --git a/docs/explanations/errors_explained.md b/docs/explanations/errors_explained.md
 deleted file mode 100644
index 6739e8b..0000000
--- a/docs/explanations/errors_explained.md
+++ /dev/null
@@ -1,101 +0,0 @@
-# Errors you may encounter and their meaning
-
-If you encounter an error or warning message from Pro Client that you don't understand and cannot find it in this document, please click "Have a question?" at the top of the page and let us know so that we can add it.
-
-## User Configuration Migration in version 27.14
-
-Version 27.14 of Ubuntu Pro Client changed how some user configuration settings are stored on disk. It moved several settings out of `/etc/ubuntu-advantage/uaclient.conf` and into a file managed solely by the `pro config {set,unset,show}` subcommands.
-
-Most settings should've gotten automatically migrated to the new file when Pro Client upgraded. If something failed you may see one of the following messages:
-
-### Migration error 1
-**Error message:**
-```
-Warning: Failed to load /etc/ubuntu-advantage/uaclient.conf
-         No automatic migration will occur.
-         You may need to use "pro config set" to re-set your settings.
-```
-
-**Where you'll see it:**
-
-During an `apt upgrade` or `apt install ubuntu-advantage-tools`
-
-**What does it mean:**
-
-This means that `/etc/ubuntu-advantage/uaclient.conf` was unable to be read or unable to be parsed as yaml during the migration.
-
-**What you can do about it:**
-
-Check the contents of `/etc/ubuntu-advantage/uaclient.conf`.
-1. Ensure it is valid yaml
-2. For any setting that is nested under `ua_config`:
-  - If you modified the value in the past: run `pro config set field_name=your_custom_value`
-  - delete the setting from `/etc/ubuntu-advantage/uaclient.conf`
-  - delete the `ua_config:` line from `/etc/ubuntu-advantage/uaclient.conf`
-
-### Migration error 2
-**Error message:**
-```
-Warning: Failed to migrate user_config from /etc/ubuntu-advantage/uaclient.conf
-         Please run the following to keep your custom settings:
-           pro config set example=example
-```
-
-**Where you'll see it:**
-
-During an `apt upgrade` or `apt install ubuntu-advantage-tools`
-
-**What does it mean:**
-
-This means that `/var/lib/ubuntu-advantage/user-config.json` was unable to be written or a json serialization error occurred.
-
-**What you can do about it:**
-
-Run each of the `pro config set` commands recommended in the warning message.
-
-### Migration error 3
-**Error message:**
-```
-Warning: Failed to migrate /etc/ubuntu-advantage/uaclient.conf
-         Please add following to uaclient.conf to keep your config:
-           example: example
-```
-
-**Where you'll see it:**
-
-During an `apt upgrade` or `apt install ubuntu-advantage-tools`
-
-**What does it mean:**
-
-This means that `/etc/ubuntu-advantage/uaclient.conf` was unable to be written or a yaml serialization error occurred.
-
-**What you can do about it:**
-
-Ensure that the settings listed in the warning output make it into your new uaclient.conf.
-
-### Warnings in versions >=27.14~
-
-**Error message:**
-```
-legacy "ua_config" found in uaclient.conf
-```
-or
-```
-Warning: uaclient.conf contains old ua_config field.
-```
-
-**Where you'll see it:**
-
-In `/var/log/ubuntu-advantage.log` after using the `pro` cli or during an `apt upgrade` to a newer version of ubuntu-advantage-tools.
-
-**What does it mean:**
-
-This means that there are still settings nested under `ua_config` in `/etc/ubuntu-advantage/uaclient.conf`. These will still be honored, but support may be removed in the future.
-
-**What you can do about it:**
-
-Check the contents of `/etc/ubuntu-advantage/uaclient.conf`.
-For any setting that is nested under `ua_config`:
-- If you modified the value in the past: run `pro config set field_name=your_custom_value`
-- delete the setting from `/etc/ubuntu-advantage/uaclient.conf`
-- delete the `ua_config:` line from `/etc/ubuntu-advantage/uaclient.conf`
diff --git a/docs/explanations/how_to_interpret_output_of_unattended_upgrades.md b/docs/explanations/how_to_interpret_output_of_unattended_upgrades.md
 deleted file mode 100644
index 714c14a..0000000
--- a/docs/explanations/how_to_interpret_output_of_unattended_upgrades.md
+++ /dev/null
@@ -1,82 +0,0 @@
-# How to interpret the output of unattended-upgrades
-
-On Pro Client version 27.14~, we introduced the `u.pro.unattended_upgrades.status.v1` endpoint.
-This endpoint is designed to provide users with an overview of the configuration and setup for
-unattended-upgrades on the machine. The expected output follows this JSON example:
-
-```json
-{
-  "_schema_version": "v1",
-  "data": {
-    "attributes": {
-      "apt_periodic_job_enabled": true,
-      "package_lists_refresh_frequency_days": 1,
-      "systemd_apt_timer_enabled": true,
-      "unattended_upgrades_allowed_origins": [
-        "${distro_id}:${distro_codename}",
-        "${distro_id}:${distro_codename}-security",
-        "${distro_id}ESMApps:${distro_codename}-apps-security",
-        "${distro_id}ESM:${distro_codename}-infra-security"
-      ],
-      "unattended_upgrades_disabled_reason": null,
-      "unattended_upgrades_frequency_days": 1,
-      "unattended_upgrades_last_run": null,
-      "unattended_upgrades_running": true
-    },
-    "meta": {
-      "environment_vars": [],
-      "raw_config": {
-        "APT::Periodic::Enable": "1",
-        "APT::Periodic::Unattended-Upgrade": "1",
-        "APT::Periodic::Update-Package-Lists": "1",
-        "Unattended-Upgrade::Allowed-Origins": [
-          "${distro_id}:${distro_codename}",
-          "${distro_id}:${distro_codename}-security",
-          "${distro_id}ESMApps:${distro_codename}-apps-security",
-          "${distro_id}ESM:${distro_codename}-infra-security"
-        ]
-      }
-    },
-    "type": "UnattendedUpgradesStatus"
-  },
-  "errors": [],
-  "result": "success",
-  "version": "27.14~16.04.1",
-  "warnings": []
-}
-```
-
-As we can see from this output, we have a variable named `unattended_upgrades_running`. That variable
-indicates if unattended-upgrades is properly configured and running on the machine.
-The value of this field will only be `true` if *ALL*  of the following prerequisites are also true:
-
-* *`apt_periodic_job_enable` is true*: That variable indicates if the APT::Periodic::Enable configuration variable
-  is turned on. If it is turned off, unattended-upgrades will not automatically run on the machine.
-* *`package_lists_refresh_frequency_days` is non-zero*: That variable shows the value of APT::Periodic::Package-List-Frequency.
-  This configuration defines the daily frequency for updating package sources in the background. If it has a zero value, this step will never
-  happen and unattended-upgrades might not be able to install new versions of the packages.
-* *`systemd_apt_timer_enabled` is true*: This variable is true if both `apt-daily.timer` and `apt-daily-upgrade.timer` are running
-  on the machine. These timers are the ones that control when unattended-upgrades run. The first job, `apt-daily.timer` is responsible
-  for triggering the code that downloads the lastest package information on the system. The second job, `apt-daily-upgrade.timer` is
-  responsible for running unattended-upgrades to download the latest version of the packages. If one of these jobs is disabled,
-  unattended-upgrades might not work as expected.
-* *`unattended_upgrades_allowed_origins` is not empty*: This variable defines the origins that
-  unattended-upgrades can use to install a package. If that list is empty, no packages can be
-  installed and unattended-upgrades will not work as expected.
-* *`unattended_upgrades_frequency_days` is non-zero*: That variable shows the value of
-  APT::Periodic::Unattended-Upgrade. This configuration defines the daily frequency for running
-  unattended-upgrades in the background. Therefore, if it has a zero value, the command will never
-  run.
-
-
-If any of those conditions are not met, the variable
-*unattended_upgrades_disabled_reason* will contain an object explaining why unattended-upgrades is
-not running. For example, if `package_lists_refresh_frequency_days` has a zero value, we will see
-the following value for *unattended_upgrades_disabled_reason*:
-
-```json
-{
-    "msg": "APT::Periodic::Update-Package-Lists is turned off",
-    "code": "unattended-upgrades-cfg-value-turned-off"
-}
-```
diff --git a/docs/explanations/how_to_interpret_the_security_status_command.md b/docs/explanations/how_to_interpret_the_security_status_command.md
 deleted file mode 100644
index b0a56e9..0000000
--- a/docs/explanations/how_to_interpret_the_security_status_command.md
+++ /dev/null
@@ -1,323 +0,0 @@
-# What does `security-status` do?
-
-The `security-status` command provides an overview of all the packages
-installed on your machine, and the security coverage that applies to those
-packages.
-
-The output of the `security-status` command varies, depending on the configuration of the machine you run it on. In this article, we'll take a look at the different outputs of `security-status` and the situations in which you might see them.
-
-## Command output
-
-If you run the `pro security-status` command, the first blocks of information
-you see look like:
-
-```
-2871 packages installed:
-     2337 packages from Ubuntu Main/Restricted repository
-     504 packages from Ubuntu Universe/Multiverse repository
-     8 packages from third parties
-     22 packages no longer available for download
-
-To get more information about the packages, run
-    pro security-status --help
-for a list of available options.
-```
-
-Those are counts for the `apt` packages installed in the system, sorted
-between the packages in main, universe, third party packages, and packages
-that are no longer available. You will also see a hint to run
-`pro security-status --help` to get more information.
-
-### `apt update` hint
-
-To get accurate package information, the `apt` caches must be up to date. If
-your cache was not updated recently, you may see a message in the output with
-a hint to update.
-
-```
-The system apt cache may be outdated. Make sure to run
-    sudo apt-get update
-to get the latest package information from apt.
-```
-
-### LTS coverage
-
-If `esm-infra` is disabled in your system, main/restricted packages will be
-covered during the LTS period - this information is presented right after the
-hints. A covered system will present this message:
-
-```
-This machine is receiving security patching for Ubuntu Main/Restricted
-repository until <year>.
-```
-
-On a system where the LTS period ended, you'll see:
-
-```
-This machine is NOT receiving security patches because the LTS period has ended
-and esm-infra is not enabled.
-```
-
-### Ubuntu Pro coverage
-
-An Ubuntu Pro subscription provides more security coverage than a standard LTS.
-The next blocks of information are related to Ubuntu Pro itself:
-
-```
-This machine is attached to an Ubuntu Pro subscription.
-
-Main/Restricted packages are receiving security updates from
-Ubuntu Pro with 'esm-infra' enabled until 2032.
-
-Universe/Multiverse packages are receiving security updates from
-Ubuntu Pro with 'esm-apps' enabled until 2032. You have received 21 security
-updates.
-```
-
-This system is already attached to Pro! It is a Jammy machine, which has
-installed some updates from `esm-apps`. Running the same command on a Xenial
-system without Pro enabled, the output looks like:
-
-```
-This machine is NOT attached to an Ubuntu Pro subscription.
-
-Ubuntu Pro with 'esm-infra' enabled provides security updates for
-Main/Restricted packages until 2026. There are 170 pending security updates.
-
-Ubuntu Pro with 'esm-apps' enabled provides security updates for
-Universe/Multiverse packages until 2026. There is 1 pending security update.
-
-Try Ubuntu Pro with a free personal subscription on up to 5 machines.
-Learn more at https://ubuntu.com/pro
-```
-
-There are lots of `esm-infra` updates for this machine, and even an `esm-apps`
-update. The hint in the end of the output has a link to the main Pro website,
-so the user can learn more about Pro and get their subscription.
-
-### Interim releases
-
-If you are running an interim release, the output is slightly different because
-there are no Ubuntu Pro services available. You will still see the package
-counts and support period though - your main/restricted packages are supported
-for 9 months from the release date.
-
-```
-613 packages installed:
-    601 packages from Ubuntu Main/Restricted repository
-    12 packages from Ubuntu Universe/Multiverse repository
-
-To get more information about the packages, run
-    pro security-status --help
-for a list of available options.
-
-Main/Restricted packages receive updates until 1/2024.
-
-Ubuntu Pro is not available for non-LTS releases.
-```
-
-### Optional flags for specific package sets
-
-Some flags can be passed to `security-status` to get information about coverage
-of specific package sets. As an example, let's look at the output of
-`pro security-status --esm-infra`:
-
-```
-442 packages installed:
-    441 packages from Ubuntu Main/Restricted repository
-
-Main/Restricted packages are receiving security updates from
-Ubuntu Pro with 'esm-infra' enabled until 2026. You have received 3 security
-updates. There are 160 pending security updates.
-
-Run 'pro help esm-infra' to learn more
-
-Installed packages with an available esm-infra update:
-( ... list of packages ... )
-
-Installed packages with an esm-infra update applied:
-( ... list of packages ... )
-
-Further installed packages covered by esm-infra:
-( ... list of packages ... )
-
-For example, run:
-    apt-cache show tcpdump
-to learn more about that package.
-```
-
-Besides the support information of main/restricted (which Ubuntu Pro with
-`esm-infra` extends) there are lists of:
-- packages which have some updated version available in esm-infra repositories
-- packages which have an installed version from the esm-infra repositories
-- packages which are covered by esm-infra
-
-You will see a similar output when running `pro security-status --esm-apps`,
-but with information regarding universe/multiverse packages.
-
-You can also get a list of the third-party packages installed in the system:
-
-```
-$ pro security-status --thirdparty
-2871 packages installed:
-     8 packages from third parties
-
-Packages from third parties are not provided by the official Ubuntu
-archive, for example packages from Personal Package Archives in Launchpad.
-
-Packages:
-( ... list of packages ... )
-
-For example, run:
-    apt-cache show <package_name>
-to learn more about that package.
-```
-
-And also a list of unavailable packages (which no longer have any installation
-source):
-
-```
-$ pro security-status --unavailable
-2871 packages installed:
-     22 packages no longer available for download
-
-Packages that are not available for download may be left over from a
-previous release of Ubuntu, may have been installed directly from a
-.deb file, or are from a source which has been disabled.
-
-Packages:
-( ... list of packages ... )
-
-
-For example, run:
-    apt-cache show <package_name>
-to learn more about that package.
-```
-
-## Machine-readable output
-
-If you run the `pro security-status --format yaml` command on your machine, you
-should expect to see an output that follows this structure:
-
-```
-_schema_version: '0.1'
-summary:
-  num_esm_apps_packages: 0
-  num_esm_apps_updates: 0
-  num_esm_infra_packages: 1
-  num_esm_infra_updates: 1
-  num_main_packages: 70
-  num_multiverse_packages: 10
-  num_restricted_packages: 10
-  num_third_party_packages: 0
-  num_universe_packages: 9
-  num_installed_packages: 100
-  num_standard_security_updates: 0
-  ua:
-    attached: true
-    enabled_services:
-    - esm-apps
-    - esm-infra
-    entitled_services:
-    - esm-apps
-    - esm-infra
-packages:
-- origin: esm.ubuntu.com
-  package: zlib1g
-  service_name: esm-infra
-  status: upgrade_available
-  version: 1:1.2.8.dfsg-2ubuntu4.3+esm1
-  download_size: 123456
-livepatch:
-  fixed_cves:
-    - Name: cve-2013-1798
-      Patched: true
-```
-
-Let's understand what each key means in the output of the
-`pro security-status --format yaml` command:
-
-### `summary`
-
-This provides a summary of the system related to Ubuntu Pro and the different
-package sources in the system:
-
-* **`num_installed_packages`**: The total number of installed packages on the
-  system.
-* **`num_esm_apps_packages`**: The number of packages installed from `esm-apps`.
-* **`num_esm_apps_updates`**: The number of `esm-apps` package updates available
-  to the system.
-* **`num_esm_infra_packages`**: The number of packages installed from
-  `esm-infra`.
-* **`num_esm_infra_updates`**: The number of `esm-infra` package updates
-  available to the system.
-* **`num_main_packages`**: The number of packages installed from the `main`
-  archive component.
-* **`num_multiverse_packages`**: The number of packages installed from the
-  `multiverse` archive component.
-* **`num_restricted_packages`**: The number of packages installed from the
-  `restricted` archive component.
-* **`num_third_party_packages`** : The number of packages installed from
-  `third party` sources.
-* **`num_universe_packages`**: The number of packages installed from the
-  `universe` archive component.
-* **`num_unknown_packages`**: The number of packages installed from sources not
-  known to `apt` (e.g., those installed locally through `dpkg` or packages
-  without a remote reference).
-* **`num_standard_security_updates`**: The number of standard security updates
-  available to the system.
-
-```{note}
-  It is worth mentioning here that the `_updates` fields are presenting the
-  number of **security** updates for **installed** packages. For example, let's
-  assume your machine has a universe package that has a security update from
-  `esm-infra`. The count will be displayed as:
-
-  ```
-  num_esm_infra_packages: 0
-  num_esm_infra_updates: 1
-  num_universe_packages: 1
-  ```
-
-  After upgrading the system, the count will turn to:
-
-  ```
-  num_esm_infra_packages: 1
-  num_esm_infra_updates: 0
-  num_universe_packages: 0
-  ```
-```
-
-* **`ua`**: An object representing the state of Ubuntu Pro on the system:
-  * **`attached`**: If the system is attached to an Ubuntu Pro subscription.
-  * **`enabled_services`**: A list of services that are enabled on the system.
-    If unattached, this will always be an empty list.
-  * **`entitled_services`**: A list of services that are entitled on your
-    Ubuntu Pro subscription. If unattached, this will always be an empty list.
-
-### `packages`
-
-This provides a list of security updates for packages installed on the system.
-Every entry on the list will follow this structure:
-
-* **`origin`**: The host where the update comes from.
-* **`package`**: The name of the package.
-* **`service_name`**: The service that provides the package update. It can be
-  one of: `esm-infra`, `esm-apps` or `standard-security`.
-* **`status`**: The status for this update. It will be one of:
-  * **"upgrade_available"**: The package can be upgraded right now.
-  * **"pending_attach"**: The package needs an Ubuntu Pro subscription attached
-    to be upgraded.
-  * **"pending_enable"**: The machine is attached to an Ubuntu Pro subscription,
-    but the service required to provide the upgrade is not enabled.
-  * **"upgrade_unavailable"**: The machine is attached, but the contract is not
-    entitled to the service which provides the upgrade.
-* **`version`**: The update version.
-* **`download_size`**: The number of bytes that would be downloaded in order to
-  install the update.
-
-### `livepatch`
-
-This displays Livepatch-related information. Currently, the only information
-presented is **`fixed_cves`**. This represents a list of CVEs that were fixed
-by Livepatches applied to the kernel.
diff --git a/docs/explanations/motd_messages.md b/docs/explanations/motd_messages.md
 deleted file mode 100644
index 6a8f22b..0000000
--- a/docs/explanations/motd_messages.md
+++ /dev/null
@@ -1,212 +0,0 @@
-# Ubuntu Pro-related MOTD messages
-
-When the Ubuntu Pro Client (`pro`) is installed on the system, it delivers
-custom messages on ["Message of the Day" (MOTD)](https://wiki.debian.org/motd).
-Those messages are generated directly by three different sources.
-
-* MOTD about available updates
-* MOTD about important subscription conditions
-* MOTD about ESM being available
-
-## MOTD about available updates
-
-The [update-notifier](https://wiki.ubuntu.com/UpdateNotifier) delivers a script
-via the `update-notifier-common` package called
-`/usr/lib/update-notifier/apt_check.py.
-With regards to Ubuntu Pro, this script is responsible for:
-
-* Informing the user about the status of one of the ESM services; `esm-apps` if
-  the machine is an LTS series, or `esm-infra` if the series is in ESM mode.
-* Showing the number of `esm-infra` or `esm-apps` packages that can be upgraded
-  on the machine.
-
-`update-notifier` has always added information about potential updates to
-MOTD to raise user awareness. With the advent of Ubuntu Pro they are
-just more differentiated.
-
-Note that if you run `apt_check.py` directly it might give you rather
-unreadable output as it is meant for program use. You can add `--human-readable`
-to see the information as it would be presented in MOTD.
-
-### Machine is unattached
-
-On a machine that runs an Ubuntu release for which the `esm-apps` service
-is available, but not yet attached to an Ubuntu Pro subscription, there will
-be a message notifying the user that there may be more security updates
-available through ESM Apps.
-
-```
-Expanded Security Maintenance for Applications is not enabled.
-
-0 updates can be applied immediately.
-
-Enable ESM Apps to receive additional future security updates.
-See https://ubuntu.com/esm or run: sudo pro status
-```
-
-### Machine is fully attached
-
-In the opposite situation, if an LTS machine has the `esm-infra` and `esm-apps` services enabled then users will see the following output in MOTD:
-
-```
-Expanded Security Maintenance for Applications is enabled.
-
-11 updates can be applied immediately.
-5 of these updates are ESM Apps security updates.
-1 of these updates is a ESM Infra security update.
-5 of these updates are standard security updates.
-To see these additional updates run: apt list --upgradable
-```
-
-### Machine is fully attached, on an older release
-
-Above you have seen examples of recent (as in "still in their first 5
-years of support") Ubuntu releases, where the hint is about ESM Apps
-extending the coverage to the universe repositories.
-
-However, if running on an Ubuntu release that has is already past the initial
-5 years of support and has thereby entered Expanded Security Maintenance
-(["ESM"](https://ubuntu.com/security/esm)), we would instead see
-`esm-infra` (which provides coverage for another 5 years) being shown:
-
-```
-Expanded Security Maintenance Infrastructure is enabled.
-
-11 updates can be applied immediately.
-5 of these updates are ESM Apps security updates.
-1 of these updates is a ESM Infra security update.
-5 of these updates are standard security updates.
-To see these additional updates run: apt list --upgradable
-```
-
-### Partial service enablement
-
-Now let's consider a scenario where one of these services is not enabled. For
-example, if `esm-apps` was disabled, the output will be:
-
-```
-Expanded Security Maintenance for Applications is not enabled.
-
-6 updates can be applied immediately.
-1 of these updates is a ESM Infra security update.
-5 of these updates are standard security updates.
-To see these additional updates run: apt list --upgradable
-
-5 additional security updates can be applied with ESM Apps
-Learn more about enabling ESM Apps for Ubuntu 16.04 at
-https://ubuntu.com/16-04
-```
-
-At the end of the output we can see the number of packages that *could* be
-upgraded if that service was enabled. Note that we would deliver the same
-information for `esm-infra` if the service was disabled and the series running
-on the machine is in ESM state.
-
-## MOTD about important subscription conditions
-
-One of the [timer jobs](https://canonical-ubuntu-pro-client.readthedocs-hosted.com/en/latest/explanations/what_are_the_timer_jobs.html)
-Ubuntu Pro uses can insert additional messages into MOTD.
-These messages will be always delivered next to the content created by
-`update-notifier`. These additional messages are generated when `pro`
-detects that certain conditions on the machine have been met. They are:
-
-### Subscription expired
-
-When the Ubuntu Pro subscription is expired, `pro` will deliver the following
-message after the `update-notifier` message:
-
-```
-*Your Ubuntu Pro subscription has EXPIRED*
-2 additional security update(s) require Ubuntu Pro with 'esm-infra' enabled.
-Renew your service at https://ubuntu.com/pro
-```
-
-### Subscription about to expire
-
-When the Ubuntu Pro subscription is about to expire, we deliver the following
-message after the `update-notifier` message:
-
-```
-CAUTION: Your Ubuntu Pro subscription will expire in 2 days.
-Renew your subscription at https://ubuntu.com/pro to ensure continued security
-coverage for your applications.
-```
-
-### Subscription expired but within grace period
-
-When the Ubuntu Pro subscription has expired, but is still within the grace
-period, we deliver the following message after the `update-notifier` script:
-
-```
-CAUTION: Your Ubuntu Pro subscription expired on 10 Sep 2021.
-Renew your subscription at https://ubuntu.com/pro to ensure continued security
-coverage for your applications.
-Your grace period will expire in 9 days.
-```
-
-## MOTD about ESM being available
-
-When Ubuntu Pro became generally available, a temporary announcement was made
-through MOTD. This was intended to raise awareness of Pro now being available
-and free for personal use, and was shown on systems that could be covered
-by `esm-apps`.
-It looked like:
-
-```
- * Introducing Expanded Security Maintenance for Applications.
-   Receive updates to over 25,000 software packages with your
-   Ubuntu Pro subscription. Free for personal use.
-
-     https://ubuntu.com/pro
-```
-
-Since this message was intended as a limited-time announcement to coincide
-with the release of Ubuntu Pro into general availability, it was removed in
-27.14.
-
-## How are these messages inserted into MOTD and how can I disable them?
-
-Just as there are different purposes to the messages outlined above,
-there are different sources producing these MOTD elements that one
-sees at login.
-
-Those messages are considered important to ensure user awareness about
-the free additional security coverage provided by Ubuntu Pro and about
-not-yet-applied potential updates in general. Therefore it is generally not
-recommended to disable them. But still, you can selectively disable them
-by removing the config files that add them, as outlined below.
-
-Removing those files is considered a conffile change to customize a program
-and they will stay removed even on future upgrades or re-installations of the
-related packages.
-
-If you realize that you actually need them back you need
-to reinstall the related packages and tell apt/dpkg to offer you to restore
-those files via:
-
-```
-sudo apt install --reinstall -o Dpkg::Options::="--force-confask" ubuntu-advantage-tools update-notifier-common
-```
-
-## Source: MOTD about available updates
-
-1. `update-notifier-common` has a hook `/etc/apt/apt.conf.d/99update-notifier` that runs after `apt update`.
-2. That hook will update the information in `/var/lib/update-notifier/updates-available` matching the new package information that was just fetched by using `/usr/lib/update-notifier/apt-check --human-readable`.
-3. At MOTD generation time, the script located at `/etc/update-motd.d/90-updates-available` checks if `/var/lib/update-notifier/updates-available` exists and if it does, inserts the message into the full MOTD.
-
-If you want to disable any message of update-notifier (not just related to Ubuntu Pro and ESM) about potentially available updates remove `/etc/update-motd.d/90-updates-available`.
-
-## Source: MOTD about important subscription conditions
-
-1. The subscription status is checked periodically in the background when the machine is attached to an Ubuntu Pro subscription.
-2. If one of the above conditions applies to the subscription that the machine is attached to (there are no messages generated by this for unattached machines), then the message is stored in `/var/lib/ubuntu-advantage/messages/motd-contract-status`.
-3. At MOTD generation time, the script located at `/etc/update-motd.d/91-contract-ua-esm-status` checks if `/var/lib/ubuntu-advantage/messages/motd-contract-status` exists and if it does, inserts the message into the full MOTD.
-
-If you want to disable any message about important conditions of your attached subscription remove `/etc/update-motd.d/91-contract-ua-esm-status`.
-
-## Source: MOTD about ESM being available
-
-1. `pro` checks regularly if a system would have `esm-apps` available to it and if so places a message in `/var/lib/ubuntu-advantage/messages/motd-esm-announce`.
-2. At MOTD generation time, the script located at `/etc/update-motd.d/88-esm-announce` checks if `/var/lib/ubuntu-advantage/messages/motd-esm-announce` exists and if it does, inserts the message into the full MOTD.
-
-If you want to disable the ESM announcement remove `/etc/update-motd.d/88-esm-announce` (or upgrade to 27.14 or later which will remove it for you).
diff --git a/docs/explanations/status_columns.md b/docs/explanations/status_columns.md
 deleted file mode 100644
index 6e79449..0000000
--- a/docs/explanations/status_columns.md
+++ /dev/null
@@ -1,205 +0,0 @@
-# The `pro status` output explained
-
-When running `pro status` we can observe two different types of outputs, which
-depend on whether the Ubuntu Pro subscription is attached or unattached.
-
-## Pro subscription unattached
-When unattached, users will see the following status table containing only
-three columns:
-
-```
-SERVICE          AVAILABLE  DESCRIPTION
-cc-eal           no         Common Criteria EAL2 Provisioning Packages
-cis              no         Security compliance and audit tools
-esm-infra        yes        Expanded Security Maintenance for Infrastructure
-fips             no         NIST-certified core packages
-fips-updates     no         NIST-certified core packages with priority security updates
-livepatch        yes        Canonical Livepatch service
-```
-
-Where:
-
-* **SERVICE**: Is the name of service being offered
-* **AVAILABLE**: Shows if that service is available on that machine. To verify
-  if a service is available, we check the machine kernel version, architecture,
-  Ubuntu release being used and the machine type (i.e lxd for LXD containers)
-* **DESCRIPTION**: A short description of the service.
-
-## With Pro subscription attached
-
-However, if we run the same command when attached, we have an output with 4
-columns:
-
-```
-SERVICE       ENTITLED  STATUS    DESCRIPTION
-cis           yes       disabled  Center for Internet Security Audit Tools
-esm-infra     yes       enabled   Expanded Security Maintenance for Infrastructure
-fips          yes       n/a       NIST-certified core packages
-fips-updates  yes       n/a       NIST-certified core packages with priority security updates
-livepatch     yes       n/a       Canonical Livepatch service
-```
-
-You may notice that the column **AVAILABLE** is no longer shown, and instead we
-see the following new columns:
-
-* **ENTITLED**: Shows if the user subscription allows that service to be
-  enabled.
-* **STATUS**: Reports the state of that service on the machine.
-
-It is possible that a service could appear as "available" when the Pro status is
-unattached, but then shows as "not entitled" if the subscription is later
-attached. This happens because even if the service is available, if your Ubuntu
-Pro subscription doesn't allow you access to a service, `pro` cannot enable it.
-
-The **STATUS** column allows for three possible states:
-
-* **enabled**: The service is enabled on the machine.
-* **disabled**: The service is not currently running.
-* **n/a**: This means "not applicable". This will show if the service cannot be
-  enabled on the machine due to a non-contract restriction. For example, we
-  cannot enable `livepatch` on a container.
-
-## Notices
-
-"Notices" are information regarding the Ubuntu Pro status which either require
-some kind of action from the user, or may impact the experience with Ubuntu Pro.
-
-For example, let's say FIPS was just enabled, but the system wasn't rebooted
-yet (which is required for booting into the FIPS Kernel). The output of
-`pro status` in this case will contain:
-
-```
-NOTICES
-FIPS support requires system reboot to complete configuration.
-```
-
-After the system is rebooted, the notice will go away.
-
-Notices can always be resolved, and the instructions on how to resolve it will
-be explicitly stated in the notice itself.
-
-## Features
-
-"Features" are extra configuration values that can be set and unset in
-`uaclient.conf`. Most of these are meant for development/testing purposes, but
-some can be used in application flows. For example, to always have beta services
-with the same flow as the non-beta (for `enable`, `status`, etc.),
-`uaclient.conf` may have:
-
-```
-features:
-  allow_beta: true
-```
-
-In this case, the output of `pro status` will contain:
-
-```
-FEATURES
-allow_beta: True
-```
-
-It's important to keep in mind that any feature defined like this will be
-listed, even if it is invalid or typed the wrong way. Those appear in `status`
-output for informational and debugging purposes.
-
-## Machine-readable output
-
-The `pro status` command supports a `--format` flag with options including `json` and `yaml`. These result in a machine-readable form of the information presented by the `pro status` command.
-
-```{note}
-`pro status` should return the same results whether using `sudo` or not, but earlier versions did not always do this. We recommend using `sudo` whenever possible.
-```
-
-For example, running `sudo pro status --format=json` on an attached machine may give you something like this:
-```javascript
-{
-  "_doc": "Content provided in json response is currently considered Experimental and may change",
-  "_schema_version": "0.1",
-  "account": {
-    "created_at": "2000-01-02T03:04:05+06:00",
-    "id": "account_id",
-    "name": "Test"
-  },
-  "attached": true,
-  "config": { ...effectiveConfiguration },
-  "config_path": "/etc/ubuntu-advantage/uaclient.conf",
-  "contract": {
-    "created_at": "2000-01-02T03:04:05+06:00",
-    "id": "contract_id",
-    "name": "contract_name",
-    "products": [ "uaa-essential" ],
-    "tech_support_level": "essential"
-  },
-  "effective": null,
-  "environment_vars": [...proClientEnvironmentVariables],
-  "errors": [],
-  "execution_details": "No Ubuntu Pro operations are running",
-  "execution_status": "inactive",
-  "expires": "9999-12-31T00:00:00+00:00",
-  "features": {},
-  "machine_id": "machine_id",
-  "notices": [],
-  "result": "success",
-  "services": [
-    {
-      "available": "yes",
-      "blocked_by": [],
-      "description": "Expanded Security Maintenance for Applications",
-      "description_override": null,
-      "entitled": "yes",
-      "name": "esm-apps",
-      "status": "enabled",
-      "status_details": "Ubuntu Pro: ESM Apps is active",
-      "warning": null
-    },
-    {
-      "available": "yes",
-      "blocked_by": [],
-      "description": "Expanded Security Maintenance for Infrastructure",
-      "description_override": null,
-      "entitled": "yes",
-      "name": "esm-infra",
-      "status": "enabled",
-      "status_details": "Ubuntu Pro: ESM Infra is active",
-      "warning": null
-    },
-    {
-      "available": "yes",
-      "blocked_by": [],
-      "description": "Canonical Livepatch service",
-      "description_override": null,
-      "entitled": "yes",
-      "name": "livepatch",
-      "status": "enabled",
-      "status_details": "",
-      "warning": null
-    },
-    ...otherServiceStatusObjects
-  ],
-  "simulated": false,
-  "version": "27.13.6~18.04.1",
-  "warnings": []
-}
-```
-
-Some particularly important attributes in the output include:
-* `attached`: This boolean value indicates whether this machine is attached to an Ubuntu Pro account. This does not tell you if any particular service (e.g. `esm-infra`) is enabled. You must check the individual service item in the `services` list for that status (described below).
-* `expires`: This is the date that the Ubuntu Pro subscription is valid until (in RFC3339 format). After this date has passed the machine should be treated as if not attached and no services are enabled. `attached` may still say `true` and services may still say they are `entitled` and `enabled`, but if the `expires` date has passed, you should assume the services are not functioning.
-* `services`: This is a list of Ubuntu Pro services. Each item has its own attributes. Widely applicable services include those with `name` equal to `esm-infra`, `esm-apps`, and `livepatch`. Some important fields in each service object are:
-  * `name`: The name of the service.
-  * `entitled`: A boolean indicating whether the attached Ubuntu Pro account is allowed to enable this service.
-  * `status`: A string indicating the service's current status on the machine. Any value other than `enabled` should be treated as if the service is not enabled and not working properly on the machine. Possible values are:
-    * `enabled`: The service is enabled and working.
-    * `disabled`: The service can be enabled but is not currently.
-    * `n/a`: The service cannot be enabled on this machine.
-    * `warning`: The service is supposed to be enabled but something is wrong. Check the `warning` field in the service item for additional information.
-
-For example, if you want to programatically find the status of esm-infra on a particular machine, you can use the following command:
-```shell
-sudo pro status --format=json | jq '.services[] | select(.name == "esm-infra").status'
-```
-That command will print one of the `status` values defined above.
-
-```{attention}
-In an future version of Ubuntu Pro Client, there will be an [API](../references/api.md) function to access this information. For now, though, `pro status --format=json` is the recommended machine-readable interface to this data.
-```
diff --git a/docs/explanations/what_are_the_timer_jobs.md b/docs/explanations/what_are_the_timer_jobs.md
 deleted file mode 100644
index fa84b36..0000000
--- a/docs/explanations/what_are_the_timer_jobs.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# Timer jobs explained
-
-Ubuntu Pro Client (`pro`) sets up a `systemd` timer to run jobs that need to be
-carried out periodically. Every time the timer runs, it decides which jobs need
-to be performed based on their intervals. When a job runs successfully, its next
-run is determined by the interval defined for that job.
-
-## Current jobs
-
-The jobs that `pro` runs periodically are `metering` and `update_messaging`.
-
-### The `update_messaging` job
-
-`update_messaging` updates the MOTD and APT messages every 6 hours. It ensures
-that the MOTD and APT messages displayed on the system match those that are
-available/enabled. It finds updated information about available packages or
-security updates and shows these to the user. 
-
-### The `metering` job
-
-`metering` pings the Canonical servers for contract metering every 4 hours. It
-informs Canonical which services are enabled on the machine. 
-
-```{note}
-The `metering` job only runs when attached to an Ubuntu Pro subscription.
-```
diff --git a/docs/explanations/what_are_ubuntu_pro_cloud_instances.md b/docs/explanations/what_are_ubuntu_pro_cloud_instances.md
 deleted file mode 100644
index 4e84d7e..0000000
--- a/docs/explanations/what_are_ubuntu_pro_cloud_instances.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# About Public Cloud Ubuntu Pro images
-
-Ubuntu Pro images are published to [AWS](https://ubuntu.com/aws/pro),
-[Azure](https://ubuntu.com/azure/pro) and [GCP](https://ubuntu.com/gcp/pro). 
-All of these come with Ubuntu Pro support and services built in.
-
-On first boot, Ubuntu Pro images will automatically attach to an Ubuntu Pro
-support contract and enable all necessary Ubuntu Pro services so that no extra
-setup is required to ensure a secure and supported Ubuntu machine.
-
-There are two primary flavors of Ubuntu Pro images in clouds: *Ubuntu Pro*, and
-*Ubuntu Pro FIPS*.
-
-## Ubuntu Pro
-
-These Ubuntu LTS images are provided already attached to Ubuntu Pro support,
-with kernel Livepatch and ESM security access enabled. Ubuntu Pro images are
-entitled to enable any additional Ubuntu Pro services (like
-[`fips`](../howtoguides/enable_fips.md) or
-[`usg`](../howtoguides/enable_cis.md)).
-
-## Ubuntu Pro FIPS
-
-These specialized Ubuntu Pro images for 16.04, 18.04 and 20.04 come pre-enabled
-with the cloud-optimized FIPS-certified kernel, as well as all additional SSL
-and security hardening enabled. These images are available as
-[AWS Ubuntu Pro FIPS](https://ubuntu.com/aws/fips),
-[Azure Ubuntu Pro FIPS](https://ubuntu.com/azure/fips) and GCP Ubuntu Pro FIPS.
diff --git a/docs/explanations/what_is_the_daemon.md b/docs/explanations/what_is_the_daemon.md
 deleted file mode 100644
index 0ad510f..0000000
--- a/docs/explanations/what_is_the_daemon.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# What is the Pro upgrade daemon?
-
-Ubuntu Pro Client sets up a daemon on supported platforms (currently GCP
-only) to detect if an Ubuntu Pro license has been purchased for the machine.
-If a Pro license is detected, then the machine is automatically attached.
-
-If you are not interested in Ubuntu Pro services and don't want your machine to
-be automatically attached to your subscription, you can safely stop and disable
-the daemon using `systemctl`:
-
-```
-sudo systemctl stop ubuntu-advantage.service
-sudo systemctl disable ubuntu-advantage.service
-```
diff --git a/docs/explanations/what_is_the_ubuntu_advantage_pro_package.md b/docs/explanations/what_is_the_ubuntu_advantage_pro_package.md
 deleted file mode 100644
index 337e97c..0000000
--- a/docs/explanations/what_is_the_ubuntu_advantage_pro_package.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# What is the `ubuntu-advantage-pro` package?
-
-The `ubuntu-advantage-pro` package is used by
-[Public Cloud Ubuntu Pro](what_are_ubuntu_pro_cloud_instances.md) machines to
-automate the process of attaching a machine on boot.
-
-Therefore, the only thing that `ubuntu-advantage-pro` does is ship a `systemd`
-unit that runs an auto-attach command on first boot.
diff --git a/docs/explanations/what_refresh_does.md b/docs/explanations/what_refresh_does.md
 deleted file mode 100644
index 5312962..0000000
--- a/docs/explanations/what_refresh_does.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# What `pro refresh` does
-
-When you run the `pro refresh` command on your machine, three distinct stages
-are performed.
-
-## Contract
-
-The contract information on the machine is refreshed. If we find any deltas
-between the old contract and the new one, we process that delta and apply the
-changes to the machine.
-
-If you need *only* this stage during refresh, run `pro refresh contract`.
-
-## Configuration
-
-If there is any config change made to `/etc/ubuntu-advantage/uaclient.conf`,
-those changes will now be applied to the machine.
-
-If you need *only* this stage during refresh, run `pro refresh config`.
-
-## MOTD and APT messages
-
-Processes new MOTD and APT messages, and refreshes the machine to use them.
-
-If you need *only* this stage during refresh, run `pro refresh messages`.
diff --git a/docs/explanations/why_trusty_is_no_longer_supported.md b/docs/explanations/why_trusty_is_no_longer_supported.md
 deleted file mode 100644
index 3d37ee6..0000000
--- a/docs/explanations/why_trusty_is_no_longer_supported.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Why is 14.04 (Trusty) no longer supported?
-
-On 14.04 (Trusty), the Ubuntu Pro Client package is not receiving upstream
-updates beyond version 19.6, plus any critical CVE maintenance related to this
-version.
-
-Version 19.6 already has full-featured support of the applicable Ubuntu Pro
-service offerings `esm-infra` and `livepatch`. In the event that a CVE is
-discovered that affects the Ubuntu Pro Client version on Trusty, a fix and
-backport will be provided for those specific issues.
diff --git a/docs/googleaf254801a5285c31.html b/docs/googleaf254801a5285c31.html
 deleted file mode 100644
index b603071..0000000
--- a/docs/googleaf254801a5285c31.html
+++ /dev/null
@@ -1 +0,0 @@
-google-site-verification: googleaf254801a5285c31.html
 \ No newline at end of file
diff --git a/docs/howtoguides.rst b/docs/howtoguides.rst
 deleted file mode 100644
index 5b93de6..0000000
--- a/docs/howtoguides.rst
+++ /dev/null
@@ -1,102 +0,0 @@
-Ubuntu Pro Client how-to guides
-*******************************
-
-If you have a specific goal and are already familiar with the Ubuntu Pro Client
-(``pro``), our how-to guides have more in-depth detail than our tutorials and
-can be applied to a wider range of situations.
-
-They will help you to achieve a particular end result, but may require you to
-understand and adapt the steps to fit your specific requirements.
-
-How to use ``pro`` commands
-===========================
-
-``attach``
-----------
-
-..  toctree::
-    :maxdepth: 1
-
-    Get an Ubuntu Pro token and attach to a subscription <howtoguides/get_token_and_attach.md>
-    Attach with a configuration file <howtoguides/how_to_attach_with_config_file.md>
-
-``collect-logs``
-----------------
-
-..  toctree::
-    :maxdepth: 1
-
-    Collect data logs for bug reporting <howtoguides/how_to_collect_logs.md>
-
-``config``
-----------
-
-..  toctree::
-    :maxdepth: 1
-
-    Disable or re-enable APT News <howtoguides/disable_enable_apt_news.md>
-    Configure a proxy <howtoguides/configure_proxies.md>
-    Configure a timer job <howtoguides/configuring_timer_jobs.md>
-
-``enable``
-----------
-
-..  toctree::
-    :maxdepth: 1
-
-    Enable Pro Services in a Dockerfile <howtoguides/enable_in_dockerfile.md>
-    Enable CC EAL <howtoguides/enable_cc.md>
-    Enable CIS <howtoguides/enable_cis.md>
-    Enable Expanded Security Maintenance for Infrastructure <howtoguides/enable_esm_infra.md>
-    Enable FIPS <howtoguides/enable_fips.md>
-    Enable Livepatch <howtoguides/enable_livepatch.md>
-    Enable Real-Time Kernel <howtoguides/enable_realtime_kernel.md>
-
-``fix``
--------
-
-..  toctree::
-    :maxdepth: 1
-
-    Run `fix` in "dry run" mode <howtoguides/how_to_run_fix_in_dry_run_mode.md>
-    Skip fixing related USNs <howtoguides/how_to_not_fix_related_usns.md>
-
-``refresh``
------------
-
-..  toctree::
-    :maxdepth: 1
-
-    Update MOTD and APT messages <howtoguides/update_motd_messages.md>
-
-``status``
-----------
-
-..  toctree::
-    :maxdepth: 1
-
-    Simulate the `attach` operation <howtoguides/how_to_simulate_attach.md>
-
-``version``
------------
-
-..  toctree::
-    :maxdepth: 1
-
-    Check Ubuntu Pro Client version <howtoguides/check_pro_version>
-
-``lock``
------------
-
-..  toctree::
-    :maxdepth: 1
-
-    Get rid of corrupted locks <howtoguides/get_rid_of_corrupt_lock.md>
-    
-Create a ``pro`` Golden Image
-=============================
-
-..  toctree::
-    :maxdepth: 1
-
-    Create a customised Cloud Ubuntu Pro image <howtoguides/create_pro_golden_image.md>
diff --git a/docs/howtoguides/check_pro_version.md b/docs/howtoguides/check_pro_version.md
 deleted file mode 100644
index faeaf6b..0000000
--- a/docs/howtoguides/check_pro_version.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# How to check your Ubuntu Pro Client version
-
-There are two ways to check the current version of the Ubuntu Pro Client you
-are running. You can use the command:
-
-```bash
-pro version
-```
-
-Or the alternative:
-
-```bash
-pro --version
-```
diff --git a/docs/howtoguides/configure_proxies.md b/docs/howtoguides/configure_proxies.md
 deleted file mode 100644
index 4fa5081..0000000
--- a/docs/howtoguides/configure_proxies.md
+++ /dev/null
@@ -1,120 +0,0 @@
-# How to configure a proxy
-
-The Ubuntu Pro Client can be configured to use an HTTP/HTTPS proxy as needed
-for network requests. It will also honor the `no_proxy` environment variable
-(if set) to avoid using local proxies for certain outbound traffic. In
-addition, the Ubuntu Pro Client will automatically set up proxies for all
-programs required for enabling Ubuntu Pro services. This includes APT, Snaps,
-and Livepatch.
-
-## HTTP/HTTPS proxies
-
-To configure standard HTTP and/or HTTPS proxies, run the following commands:
-
-```console
-$ sudo pro config set http_proxy=http://host:port
-$ sudo pro config set https_proxy=https://host:port
-```
-
-After running the above commands, Ubuntu Pro Client will:
-
-1. Verify that the proxy is working by using it to reach `api.snapcraft.io`
-2. Configure itself to use the given proxy for all future network requests
-3. Configure `snapd` (if `snapd` is installed) to use the given proxy
-4. Configure Livepatch (if Livepatch has already been enabled) to use the given
-   proxy
-   1. If Livepatch is enabled after the `config` command, Ubuntu Pro Client
-      will configure Livepatch to use the given proxy at that time.
-
-To remove HTTP/HTTPS proxy configuration, run the following:
-
-```console
-$ sudo pro config unset http_proxy
-$ sudo pro config unset https_proxy
-```
-
-After running the above commands, Ubuntu Pro Client will also remove proxy
-configuration from `snapd` (if installed) and Livepatch (if enabled).
-
-## APT proxies
-
-APT proxy settings are configured separately. To have Ubuntu Pro Client manage
-your global APT proxy configuration, run the following commands:
-
-```console
-$ sudo pro config set global_apt_http_proxy=http://host:port
-$ sudo pro config set global_apt_https_proxy=https://host:port
-```
-
-After running the above commands, Ubuntu Pro Client will:
-
-1. Verify that the proxy works by using it to reach `archive.ubuntu.com` or
-   `esm.ubuntu.com`.
-2. Configure APT to use the given proxy by writing an apt configuration file to
-   `/etc/apt/apt.conf.d/90ubuntu-advantage-aptproxy`.
-
-```{caution}
-Any configuration file that comes later in the `apt.conf.d`
-directory could override the proxy configured by the Ubuntu Pro Client.
-```
-
-To remove the APT proxy configuration, run the following:
-
-```
-$ sudo pro config unset global_apt_http_proxy
-$ sudo pro config unset global_apt_https_proxy
-```
-
-```{attention}
-Starting in version 27.9, APT proxy config options changed.
-The old settings: `apt_http_proxy` and `apt_https_proxy` will still work and
-will be treated the same as `global_apt_http_proxy` and
-`global_apt_https_proxy`, respectively.
-```
-
-### Pro-service-only APT proxies
-
-To set an APT proxy that will only be used for Ubuntu Pro services, use the
-following commands instead:
-
-```console
-$ sudo pro config set ua_apt_http_proxy=http://host:port
-$ sudo pro config set ua_apt_https_proxy=https://host:port
-```
-
-## Authenticate your proxy server
-
-If your proxy server requires authentication, you can pass the credentials
-directly in the URL when setting the configuration, as in:
-
-```
-$ sudo pro config set https_proxy=https://username:password@host:port
-```
-
-## Check the configuration
-
-To see which proxies Ubuntu Pro Client is currently configured to use, you can
-use the `show` command.
-
-```console
-$ sudo pro config show
-```
-
-The above will output something that looks like the following if there are
-proxies set:
-
-```
-http_proxy             http://proxy
-https_proxy            https://proxy
-global_apt_http_proxy  http://aptproxy
-global_apt_https_proxy https://aptproxy
-```
-
-Or it may look like this if there aren’t any proxies set:
-
-```
-http_proxy             None
-https_proxy            None
-global_apt_http_proxy  None
-global_apt_https_proxy None
-```
diff --git a/docs/howtoguides/configuring_timer_jobs.md b/docs/howtoguides/configuring_timer_jobs.md
 deleted file mode 100644
index 05059df..0000000
--- a/docs/howtoguides/configuring_timer_jobs.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# How to configure a timer job
-
-All timer jobs can be configured through the `pro config set` command.
-We will show how you can properly use this command to interact with timer jobs.
-
-## Check a timer job's configuration
-
-To see each job’s running interval, use the `show` command:
-
-```console
-$ sudo pro config show
-```
-
-You should see output which includes the timer jobs:
-
-```
-update_messaging_timer  21600
-metering_timer          14400
-```
-
-## Change a timer job interval
-
-Each job has a configuration option of the form `<job_name>_timer`,
-which can be set with `pro config`. The expected value is a positive
-integer for the number of seconds in the interval. For example, to
-change the `update_messaging job` timer interval to run every 24 hours, run:
-
-```console
-$ sudo pro config set update_messaging_timer=86400
-```
-
-## Disable a timer job
-
-To disable a job, set its interval to zero. For instance, to disable
-the `update_messaging`  job, run:
-
-```console
-$ sudo pro config set update_messaging_timer=0
-```
diff --git a/docs/howtoguides/create_pro_golden_image.md b/docs/howtoguides/create_pro_golden_image.md
 deleted file mode 100644
index 99e4265..0000000
--- a/docs/howtoguides/create_pro_golden_image.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# How to create a customised Cloud Ubuntu Pro image
-
-* Launch an Ubuntu Pro instance on your cloud of choice
-* Customize the instance as you see fit
-* Run the command: `sudo rm /etc/machine-id`
-* Use your cloud platform to clone or snapshot this VM as a golden image
-
-```{tip}
-Prior to version 27.11 - when launching instances based on this instance,
-you will need to re-enable any non-standard Ubuntu Pro services that you
-enabled on the image. This will be faster on the new instance because it was
-already enabled on the image. You will not need to reboot for e.g. `fips` or
-`fips-updates`.
-```
diff --git a/docs/howtoguides/disable_enable_apt_news.md b/docs/howtoguides/disable_enable_apt_news.md
 deleted file mode 100644
index c9ffd59..0000000
--- a/docs/howtoguides/disable_enable_apt_news.md
+++ /dev/null
@@ -1,45 +0,0 @@
-# How to disable or re-enable APT News
-
-APT News is a feature that allows for timely package-related news to be displayed during an `apt upgrade`. It is distinct from [Ubuntu Pro 'available update' messages](../explanations/apt_messages.md) that are also displayed during an `apt upgrade`. APT News messages are fetched from [https://motd.ubuntu.com/aptnews.json](https://motd.ubuntu.com/aptnews.json) at most once per day.
-
-By default, APT News is turned on. In this How-to-guide, we show how to turn off and on the APT News feature for a particular machine.
-
-## Step 1: Check the current configuration of APT News
-
-```
-pro config show apt_news
-```
-
-The default value is `True`, so if you haven't yet modified this setting, you will see:
-```
-apt_news True
-```
-
-## Step 2: Disable APT News
-
-```
-pro config set apt_news=false
-```
-
-This should also clear any current APT News you may be seeing on your system during `apt upgrade`.
-
-You can double-check that the setting was successful by running the following again:
-
-```
-pro config show apt_news
-```
-
-You should now see:
-```
-apt_news False
-```
-
-## Step 3: (Optional) Re-enable APT News
-
-If you change your mind and want APT News to start appearing again in `apt upgrade`, run the following:
-
-```
-pro config set apt_news=true
-```
-
-And verify the setting worked with `pro config show apt_news`.
diff --git a/docs/howtoguides/enable_cc.md b/docs/howtoguides/enable_cc.md
 deleted file mode 100644
index 45e9435..0000000
--- a/docs/howtoguides/enable_cc.md
+++ /dev/null
@@ -1,56 +0,0 @@
-# How to enable CC EAL
-
-```{note}
-CC EAL can be enabled on both Xenial and Bionic, but the installed scripts
-that configure CC EAL on those machines will only run on Xenial 16.04.4 and
-Bionic 18.04.4 point releases.
-
-Common Criteria is supported only on 16.04 and 18.04. For more information,
-please see https://ubuntu.com/security/cc
-```
-
-## Enable and auto-install
-
-To enable CC EAL using the Ubuntu Pro Client, please run:
-
-```console
-$ sudo pro enable cc-eal
-```
-
-You should see output like the following, indicating that the CC EAL package
-has been installed.
-
-```
-(This will download more than 500MB of packages, so may take some time.)
-Installing CC EAL2 packages
-CC EAL2 enabled
-Please follow instructions in /usr/share/doc/ubuntu-commoncriteria/README to configure EAL2
-```
-
-## Enable and manually install
-
-```{important}
-The --access-only flag is introduced in version 27.11
-```
-
-If you would like to enable access to the CC EAL apt repository but not install
-the packages right away, use the `--access-only` flag while enabling.
-
-```console
-$ sudo pro enable cc-eal --access-only
-```
-
-With that extra flag you'll see output like the following:
-
-```
-One moment, checking your subscription first
-Updating package lists
-Skipping installing packages: ubuntu-commoncriteria
-CC EAL2 access enabled
-```
-
-To install the packages you can then run:
-
-```console
-$ sudo apt install ubuntu-commoncriteria
-```
diff --git a/docs/howtoguides/enable_cis.md b/docs/howtoguides/enable_cis.md
 deleted file mode 100644
index 380075b..0000000
--- a/docs/howtoguides/enable_cis.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# How to enable CIS
-
-```{note}
-On Focal (and later releases), CIS was
-[replaced by USG](https://ubuntu.com/security/certifications/docs/usg),
-therefore, just change `cis` to `usg` when running the enable command on those
-releases.
-```
-
-To access the CIS tooling, first enable the software repository as follows:
-
-```console
-$ sudo pro enable cis
-```
-
-You should see output like the following, indicating that the CIS package has
-been installed:
-
-```
-Installing CIS Audit packages
-CIS Audit enabled
-Visit https://security-certs.docs.ubuntu.com/en/cis to learn how to use CIS
-```
-
-Once the feature is enabled please
-[follow the documentation](https://ubuntu.com/security/certifications/docs/cis)
-for the CIS tooling, to run the provided hardening audit scripts.
diff --git a/docs/howtoguides/enable_esm_infra.md b/docs/howtoguides/enable_esm_infra.md
 deleted file mode 100644
index efdaf55..0000000
--- a/docs/howtoguides/enable_esm_infra.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# How to enable Expanded Security Maintenance for Infrastructure (`esm-infra`)
-
-For Ubuntu LTS releases, `esm-infra` will be automatically enabled after
-attaching the Ubuntu Pro Client to your account. After `ubuntu-advantage-tools`
-is installed and your machine is attached, `esm-infra` should be enabled. If
-`esm-infra` is not enabled, you can enable it with the following command:
-
-```console
-$ sudo pro enable esm-infra
-```
-
-With the `esm-infra` repository enabled, especially on Ubuntu 14.04 and 16.04,
-you may see a number of additional package updates available that were not
-available previously.
-
-Even if your system had indicated that it was up to date before installing the
-`ubuntu-advantage-tools` and attaching, make sure to check for new package
-updates after `esm-infra` is enabled using `apt upgrade`. If you have cron jobs
-set to install updates, or other unattended upgrades configured, be aware that
-this will likely result in a number of package updates with the `esm-infra`
-content.
-
-Running `apt upgrade` will now apply all available package updates, including
-the ones in `esm-infra`.
-
-```console
-$ sudo apt upgrade
-```
-
-```{seealso}
-For more information, see https://ubuntu.com/security/esm
-```
diff --git a/docs/howtoguides/enable_fips.md b/docs/howtoguides/enable_fips.md
 deleted file mode 100644
index 4fe8b8a..0000000
--- a/docs/howtoguides/enable_fips.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# How to enable FIPS
-
-```{important}
-[FIPS is supported on 16.04, 18.04 and 20.04 releases](https://ubuntu.com/security/certifications/docs/fips).
-```
-
-To use FIPS, one can either launch existing Ubuntu premium support images which
-already have FIPS kernel and security pre-enabled on first boot at
-[AWS Ubuntu Pro FIPS images](https://ubuntu.com/aws/fips),
-[Azure Pro FIPS images](https://ubuntu.com/azure/fips) and GCP Pro FIPS Images.
-
-Alternatively, you can enable FIPS using the Ubuntu Pro Client, which will
-install a FIPS-certified kernel and core security-related packages such as
-`openssh-server/client` and `libssl`. 
-
-```{danger}
-Disabling FIPS is not currently supported: only use it on machines intended
-expressly for this purpose.
-```
-
-```{danger}
-Enabling FIPS should be performed during a system maintenance window because
-this operation makes changes to underlying SSL-related libraries and requires a
-reboot into the FIPS-certified kernel.
-```
-
-To enable FIPS, run:
-
-```console
-$ sudo pro enable fips
-```
-
-You should see output like the following, indicating that the FIPS packages has
-been installed:
-
-```
-Installing FIPS packages
-FIPS enabled
-A reboot is required to complete install.
-```
diff --git a/docs/howtoguides/enable_in_dockerfile.md b/docs/howtoguides/enable_in_dockerfile.md
 deleted file mode 100644
index 5501a92..0000000
--- a/docs/howtoguides/enable_in_dockerfile.md
+++ /dev/null
@@ -1,156 +0,0 @@
-# How to enable Ubuntu Pro Services in a Dockerfile
-
-```{important}
-This requires at least Ubuntu Pro Client version 27.7
-```
-
-Ubuntu Pro comes with several services, some of which can be useful in Docker.
-For example, Expanded Security Maintenance (ESM) of packages and FIPS-certified
-packages may be desirable in a Docker image. In this how-to guide, we show how
-you can use the `pro` tool to take advantage of these services in your
-Dockerfile.
-
-## Create an Ubuntu Pro Attach Config file
-
-```{attention}
-The Ubuntu Pro Attach Config file will contain your Ubuntu Pro Contract token
-and should be treated as a secret file.
-```
-
-An Attach Config file for `pro` is a YAML file that specifies some options when
-running `pro attach`. The file has two fields, `token` and `enable_services`
-and looks something like this:
-
-```yaml
-token: TOKEN
-enable_services:
-  - service1
-  - service2
-  - service3
-```
-
-The `token` field is required and must be set to your Ubuntu Pro token that you
-can get from signing into [ubuntu.com/pro](https://ubuntu.com/pro).
-
-The `enable_services` field value is a list of Ubuntu Pro service names. When
-it is set, then the services specified will be automatically enabled after
-attaching with your Ubuntu Pro token.
-
-Service names that you may be interested in enabling in your Docker builds
-include:
-
-- `esm-infra`
-- `esm-apps`
-- `fips`
-- `fips-updates`
-
-You can find out more about these services by running `pro help service-name`
-on any Ubuntu machine.
-
-## Create a Dockerfile to use `pro` and your Attach Config file
-
-Your Dockerfile is going to look something like the following -- there are
-inline comments explaining each line:
-
-```dockerfile
-# Base off of the LTS of your choice
-FROM ubuntu:focal
-
-# We mount a BuildKit secret here to access the attach config file which should
-# be kept separate from the Dockerfile and managed in a secure fashion since it
-# needs to contain your Ubuntu Pro token.
-# In the next step, we demonstrate how to pass the file as a secret when
-# running docker build.
-RUN --mount=type=secret,id=pro-attach-config \
-    #
-    # First we update apt so we install the correct versions of packages in
-    # the next step
-    apt-get update \
-    #
-    # Here we install `pro` (ubuntu-advantage-tools) as well as ca-certificates,
-    # which is required to talk to the Ubuntu Pro authentication server securely.
-    && apt-get install --no-install-recommends -y ubuntu-advantage-tools ca-certificates \
-    #
-    # With pro installed, we attach using our attach config file from the
-    # previous step
-    && pro attach --attach-config /run/secrets/pro-attach-config \
-    #
-    ###########################################################################
-    # At this point, the container has access to all Ubuntu Pro services
-    # specified in the attach config file.
-    ###########################################################################
-    #
-    # Always upgrade all packages to the latest available version with the Ubuntu Pro
-    # services enabled.
-    && apt-get upgrade -y \
-    #
-    # Then, you can install any specific packages you need for your docker
-    # container.
-    # Install them here, while Ubuntu Pro is enabled, so that you get the appropriate
-    # versions.
-    # Any `apt-get install ...` commands you have in an existing Dockerfile
-    # that you may be migrating to use Ubuntu Pro should probably be moved here.
-    && apt-get install -y openssl \
-    #
-    ###########################################################################
-    # Now that we have upgraded and installed any packages from the Ubuntu Pro
-    # services, we can clean up.
-    ###########################################################################
-    #
-    # This purges ubuntu-advantage-tools, including all Ubuntu Pro related
-    # secrets from the system.
-    ###########################################################################
-    # IMPORTANT: As written here, this command assumes your container does not
-    # need ca-certificates so it is purged as well.
-    # If your container needs ca-certificates, then do not purge it from the
-    # system here.
-    ###########################################################################
-    && apt-get purge --auto-remove -y ubuntu-advantage-tools ca-certificates \
-    #
-    # Finally, we clean up the apt lists which should not be needed anymore
-    # because any `apt-get install`s should have happened above. Cleaning these
-    # lists keeps your image smaller.
-    && rm -rf /var/lib/apt/lists/*
-
-
-# Now, with all of your ubuntu apt packages installed, including all those
-# from Ubuntu Pro services, you can continue the rest of your app-specific Dockerfile.
-```
-
-An important point to note about the above Dockerfile is that all of the `apt`
-and `pro` commands happen inside one Dockerfile `RUN` instruction. This is
-critical and must not be changed. Keeping everything as written inside of
-one `RUN` instruction has two key benefits:
-
-1. It prevents any Ubuntu Pro Subscription-related tokens and secrets from
-   being leaked in an image layer.
-2. It keeps the image as small as possible by cleaning up extra packages and
-   files before the layer is finished.
-
-```{note}
-These benefits could also be attained by squashing the image.
-```
-
-## Build the Docker image
-
-Now, with our Attach Config file and Dockerfile created, we can build the image
-with a command like the following:
-
-```bash
-DOCKER_BUILDKIT=1 docker build . --secret id=pro-attach-config,src=pro-attach-config.yaml -t ubuntu-focal-pro
-```
-
-There are two important pieces to this command.
-
-1. We enable BuildKit with `DOCKER_BUILDKIT=1`. This is necessary to support
-   the secret mount feature.
-2. We use the secret mount feature of BuildKit with
-   `--secret id=pro-attach-config,src=pro-attach-config.yaml`. This is what
-   passes our Attach Config file in to be securely used by the
-   `RUN --mount=type=secret,id=pro-attach-config` command in the Dockerfile.
-
-## Success
-
-Congratulations! At this point, you should have a docker image that has been
-built with Ubuntu Pro packages installed from whichever Ubuntu Pro service you
-required.
diff --git a/docs/howtoguides/enable_livepatch.md b/docs/howtoguides/enable_livepatch.md
 deleted file mode 100644
index d220553..0000000
--- a/docs/howtoguides/enable_livepatch.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# How to enable Livepatch
-
-```{important}
-Check if your kernel is supported by Livepatch here: 
-https://ubuntu.com/security/livepatch/docs/kernels
-```
-
-To enable Livepatch, run:
-