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

[Lucas Albuquerque Medeiros de Moura]

Release 29.4 of the Pro client. This release only removes the pin files for the ESM services

[Andreas Hasenack (ahasenack)]

The diff is comprised of the reverts, and some test changes.

The package builds find, and I checked upgrades. In mantic, we get the expected conf file prompt when upgrading to the current version in mantic, and when upgrading further to this branch's version, no further prompts and things are left as they were.

The sru/release-29 directory still contains a test for the pinning that is being dropped here, but the tests in the sru directory are not part of an automated test suite, and are only run manually when the SRU verification time comes, so this particular test can be skipped this time without issues.

+1

I will hold off on the mantic upload because the cpc team still needs the 29.3 version in the archive to test their fix for LP: #2033308.

review: Approve

[Andreas Hasenack (ahasenack)]

Uploaded to lunar, jammy, focal, bionic, and xenial, with .changes file starting on version 29.

diff --git a/debian/changelog b/debian/changelog
index 308c1d7..e37337b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ubuntu-advantage-tools (29.4) mantic; urgency=medium
+
+  * esm: remove static config file that pin packages from esm-infra
+    and esm-apps
+
+ -- Lucas Moura <[e-mail]>  Wed, 06 Sep 2023 10:50:50 -0300
+
 ubuntu-advantage-tools (29.3) mantic; urgency=medium
 
   * api: fix circular import that prevents enabled_services
diff --git a/features/airgapped.feature b/features/airgapped.feature
index 2f7d806..0547b74 100644
--- a/features/airgapped.feature
+++ b/features/airgapped.feature
@@ -41,11 +41,11 @@ Feature: Performing attach using ua-airgapped
         When I run `apt-cache policy hello` with sudo
         Then stdout matches regexp:
         """
-        510 .*:9000/ubuntu jammy-apps-security/main
+        500 .*:9000/ubuntu jammy-apps-security/main
         """
         And stdout matches regexp:
         """
-        510 .*:8000/ubuntu jammy-infra-security/main
+        500 .*:8000/ubuntu jammy-infra-security/main
         """
         Then I verify that running `pro refresh` `with sudo` exits `0`
 
diff --git a/features/anbox.feature b/features/anbox.feature
index 424b575..4c4db4d 100644
--- a/features/anbox.feature
+++ b/features/anbox.feature
@@ -74,20 +74,6 @@ Feature: Enable anbox on Ubuntu
         Given a `<release>` machine with ubuntu-advantage-tools installed
         When I attach `contract_token` with sudo and options `--no-auto-enable`
         And I run `snap remove lxd` with sudo
-        And I set the machine token overlay to the following yaml
-        """
-        machineTokenInfo:
-          contractInfo:
-            resourceEntitlements:
-              - type: anbox-cloud
-                directives:
-                  requiredSnaps:
-                  - name: lxd
-                    channel: 5.0/stable
-                  - name: amc
-                  - name: anbox-cloud-appliance
-                    classicConfinementSupport: true
-        """
         And I run `pro enable anbox-cloud --access-only --assume-yes` with sudo
         Then I will see the following on stdout:
         """
diff --git a/features/api_packages.feature b/features/api_packages.feature
index daef767..3123d62 100644
--- a/features/api_packages.feature
+++ b/features/api_packages.feature
@@ -35,4 +35,4 @@ Feature: Package related API endpoints
             | bionic  | libcurl4        | 7.58.0-2ubuntu3  | standard-security |
             | focal   | libcurl4        | 7.68.0-1ubuntu2  | standard-security |
             | jammy   | libcurl4        | 7.81.0-1         | standard-security |
-            | lunar   | libcurl4        | 7.88.1-8ubuntu1  | standard-updates  |
+            | lunar   | libcurl4        | 7.88.1-8ubuntu1  | standard-security |
diff --git a/features/attach_validtoken.feature b/features/attach_validtoken.feature
index d987db0..77da4b3 100644
--- a/features/attach_validtoken.feature
+++ b/features/attach_validtoken.feature
@@ -28,6 +28,7 @@ Feature: Command behaviour when attaching a machine to an Ubuntu Pro
         esm-infra     +yes      +n/a      +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
+        landscape     +yes      +<landscape>      +Management and administration tool for Ubuntu
         livepatch     +yes      +n/a      +Canonical Livepatch service
         """
         And stdout does not match regexp:
@@ -36,9 +37,9 @@ Feature: Command behaviour when attaching a machine to an Ubuntu Pro
         """
 
         Examples: ubuntu release
-            | release |
-            | lunar   |
-            | mantic  |
+            | release | landscape |
+            | lunar   | n/a       |
+            | mantic  | yes       |
 
     @series.lts
     @uses.config.machine_type.lxd-container
diff --git a/features/attached_commands.feature b/features/attached_commands.feature
index 932ffce..6f5c45f 100644
--- a/features/attached_commands.feature
+++ b/features/attached_commands.feature
@@ -263,7 +263,7 @@ Feature: Command behaviour when attached to an Ubuntu Pro subscription
        Examples: ubuntu release
            | release | anbox | esm-apps | cc-eal | cis | fips | fips-update | ros | cis_or_usg | realtime-kernel |
            | xenial  | no    | yes      | yes    | yes | yes  | yes         | yes | cis        | no              |
-           | bionic  | yes   | yes      | yes    | yes | yes  | yes         | yes | cis        | no              |
+           | bionic  | no    | yes      | yes    | yes | yes  | yes         | yes | cis        | no              |
            | focal   | yes   | yes      | no     | yes | yes  | yes         | no  | usg        | no              |
            | jammy   | yes   | yes      | no     | yes | no   | no          | no  | usg        | yes             |
 
diff --git a/features/attached_enable.feature b/features/attached_enable.feature
index a779da4..7501b19 100644
--- a/features/attached_enable.feature
+++ b/features/attached_enable.feature
@@ -233,20 +233,16 @@ Feature: Enable command behaviour when attached to an Ubuntu Pro subscription
         See: sudo pro status
         """
         When I run `apt-cache policy` with sudo
-        Then apt-cache policy for the following url has permission `510`
+        Then apt-cache policy for the following url has permission `500`
         """
         <esm-infra-url> <release>-infra-updates/main amd64 Packages
         """
-        And apt-cache policy for the following url has permission `510`
-        """
-        <esm-infra-url> <release>-infra-security/main amd64 Packages
-        """
         And I verify that running `apt update` `with sudo` exits `0`
         When I run `apt install -y <infra-pkg>` with sudo, retrying exit [100]
         And I run `apt-cache policy <infra-pkg>` as non-root
         Then stdout matches regexp:
         """
-        \s*510 <esm-infra-url> <release>-infra-security/main amd64 Packages
+        \s*500 <esm-infra-url> <release>-infra-security/main amd64 Packages
         """
 
         Examples: ubuntu release
@@ -573,7 +569,7 @@ Feature: Enable command behaviour when attached to an Ubuntu Pro subscription
         esm-infra    +yes      +enabled  +Expanded Security Maintenance for Infrastructure
         fips         +yes      +disabled +NIST-certified core packages
         fips-updates +yes      +disabled +NIST-certified core packages with priority security updates
-        livepatch    +yes      +enabled  +Canonical Livepatch service
+        livepatch    +yes      +<livepatch_status>  +Canonical Livepatch service
         """
         When I run `pro disable livepatch` with sudo
         Then I verify that running `canonical-livepatch status` `with sudo` exits `1`
@@ -599,9 +595,9 @@ Feature: Enable command behaviour when attached to an Ubuntu Pro subscription
         """
 
         Examples: ubuntu release
-           | release |
-           | xenial  |
-           | bionic  |
+           | release | livepatch_status |
+           | xenial  | warning          |
+           | bionic  | enabled          |
 
     @series.xenial
     @series.bionic
@@ -661,7 +657,7 @@ Feature: Enable command behaviour when attached to an Ubuntu Pro subscription
         When I run `pro status` with sudo
         Then stdout matches regexp:
             """
-            livepatch +yes +enabled
+            livepatch +yes +<livepatch_status>
             """
         When I run `canonical-livepatch status` with sudo
         Then stdout matches regexp:
@@ -670,9 +666,9 @@ Feature: Enable command behaviour when attached to an Ubuntu Pro subscription
             """
 
         Examples: ubuntu release
-           | release |
-           | xenial  |
-           | bionic  |
+           | release | livepatch_status |
+           | xenial  | warning          |
+           | bionic  | enabled          |
 
     @series.xenial
     @uses.config.machine_type.lxd-vm
@@ -687,12 +683,12 @@ Feature: Enable command behaviour when attached to an Ubuntu Pro subscription
         When I run `pro status` with sudo
         Then stdout matches regexp:
         """
-        livepatch +yes +enabled
+        livepatch +yes +warning
         """
         When I run `pro api u.pro.security.status.reboot_required.v1` with sudo
         Then stdout matches regexp:
         """
-        {"_schema_version": "v1", "data": {"attributes": {"livepatch_enabled": true, "livepatch_enabled_and_kernel_patched": true, "livepatch_state": "applied", "livepatch_support": "supported", "reboot_required": "no", "reboot_required_packages": {"kernel_packages": null, "standard_packages": null}}, "meta": {"environment_vars": \[\]}, "type": "RebootRequired"}, "errors": \[\], "result": "success", "version": ".*", "warnings": \[\]}
+        {"_schema_version": "v1", "data": {"attributes": {"livepatch_enabled": true, "livepatch_enabled_and_kernel_patched": true, "livepatch_state": "applied", "livepatch_support": "kernel-upgrade-required", "reboot_required": "no", "reboot_required_packages": {"kernel_packages": null, "standard_packages": null}}, "meta": {"environment_vars": \[\]}, "type": "RebootRequired"}, "errors": \[\], "result": "success", "version": ".*", "warnings": \[\]}
         """
         When I run `pro system reboot-required` as non-root
         Then I will see the following on stdout:
@@ -703,7 +699,7 @@ Feature: Enable command behaviour when attached to an Ubuntu Pro subscription
         And I run `pro api u.pro.security.status.reboot_required.v1` as non-root
         Then stdout matches regexp:
         """
-        {"_schema_version": "v1", "data": {"attributes": {"livepatch_enabled": true, "livepatch_enabled_and_kernel_patched": true, "livepatch_state": "applied", "livepatch_support": "supported", "reboot_required": "yes", "reboot_required_packages": {"kernel_packages": \[\], "standard_packages": \["libc6"\]}}, "meta": {"environment_vars": \[\]}, "type": "RebootRequired"}, "errors": \[\], "result": "success", "version": ".*", "warnings": \[\]}
+        {"_schema_version": "v1", "data": {"attributes": {"livepatch_enabled": true, "livepatch_enabled_and_kernel_patched": true, "livepatch_state": "applied", "livepatch_support": "kernel-upgrade-required", "reboot_required": "yes", "reboot_required_packages": {"kernel_packages": \[\], "standard_packages": \["libc6"\]}}, "meta": {"environment_vars": \[\]}, "type": "RebootRequired"}, "errors": \[\], "result": "success", "version": ".*", "warnings": \[\]}
         """
         When I run `pro system reboot-required` as non-root
         Then I will see the following on stdout:
@@ -720,18 +716,18 @@ Feature: Enable command behaviour when attached to an Ubuntu Pro subscription
         And I run `pro api u.pro.security.status.reboot_required.v1` as non-root
         Then stdout matches regexp:
         """
-        {"_schema_version": "v1", "data": {"attributes": {"livepatch_enabled": true, "livepatch_enabled_and_kernel_patched": true, "livepatch_state": "applied", "livepatch_support": "supported", "reboot_required": "yes-kernel-livepatches-applied", "reboot_required_packages": {"kernel_packages": \["linux-base"\], "standard_packages": \[\]}}, "meta": {"environment_vars": \[\]}, "type": "RebootRequired"}, "errors": \[\], "result": "success", "version": ".*", "warnings": \[\]}
+        {"_schema_version": "v1", "data": {"attributes": {"livepatch_enabled": true, "livepatch_enabled_and_kernel_patched": true, "livepatch_state": "applied", "livepatch_support": "kernel-upgrade-required", "reboot_required": "yes", "reboot_required_packages": {"kernel_packages": \["linux-base"\], "standard_packages": \[\]}}, "meta": {"environment_vars": \[\]}, "type": "RebootRequired"}, "errors": \[\], "result": "success", "version": ".*", "warnings": \[\]}
         """
         When I run `pro system reboot-required` as non-root
         Then I will see the following on stdout:
         """
-        yes-kernel-livepatches-applied
+        yes
         """
         When I run `apt-get install dbus -y` with sudo
         And I run `pro api u.pro.security.status.reboot_required.v1` with sudo
         Then stdout matches regexp:
         """
-        {"_schema_version": "v1", "data": {"attributes": {"livepatch_enabled": true, "livepatch_enabled_and_kernel_patched": true, "livepatch_state": "applied", "livepatch_support": "supported", "reboot_required": "yes", "reboot_required_packages": {"kernel_packages": \["linux-base"\], "standard_packages": \["dbus"\]}}, "meta": {"environment_vars": \[\]}, "type": "RebootRequired"}, "errors": \[\], "result": "success", "version": ".*", "warnings": \[\]}
+        {"_schema_version": "v1", "data": {"attributes": {"livepatch_enabled": true, "livepatch_enabled_and_kernel_patched": true, "livepatch_state": "applied", "livepatch_support": "kernel-upgrade-required", "reboot_required": "yes", "reboot_required_packages": {"kernel_packages": \["linux-base"\], "standard_packages": \["dbus"\]}}, "meta": {"environment_vars": \[\]}, "type": "RebootRequired"}, "errors": \[\], "result": "success", "version": ".*", "warnings": \[\]}
         """
         When I run `pro system reboot-required` as non-root
         Then I will see the following on stdout:
@@ -1128,11 +1124,11 @@ Feature: Enable command behaviour when attached to an Ubuntu Pro subscription
         """
         And I verify that running `apt update` `with sudo` exits `0`
         When I run `apt-cache policy` as non-root
-        Then apt-cache policy for the following url has permission `510`
+        Then apt-cache policy for the following url has permission `500`
         """
         https://esm.ubuntu.com/apps/ubuntu <release>-apps-updates/main amd64 Packages
         """
-        And apt-cache policy for the following url has permission `510`
+        And apt-cache policy for the following url has permission `500`
         """
         https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages
         """
@@ -1142,8 +1138,8 @@ Feature: Enable command behaviour when attached to an Ubuntu Pro subscription
         Then stdout matches regexp:
         """
         Version table:
-        \s*\*\*\* .* 510
-        \s*510 https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages
+        \s*\*\*\* .* 500
+        \s*500 https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages
         """
         When I verify that running `pro enable esm-apps` `with sudo` exits `1`
         Then stdout matches regexp
diff --git a/features/attached_status.feature b/features/attached_status.feature
index b59f0bd..a6bcd07 100644
--- a/features/attached_status.feature
+++ b/features/attached_status.feature
@@ -116,6 +116,7 @@ Feature: Attached status
         esm-infra       +yes      +enabled  +Expanded Security Maintenance for Infrastructure
         fips            +yes      +disabled +NIST-certified core packages
         fips-updates    +yes      +disabled +NIST-certified core packages with priority security updates
+        landscape       +yes      +n/a      +Management and administration tool for Ubuntu
         livepatch       +yes      +n/a      +Canonical Livepatch service
         realtime-kernel +yes      +n/a      +Ubuntu kernel with PREEMPT_RT patches integrated
         ros             +yes      +disabled +Security Updates for the Robot Operating System
@@ -139,6 +140,7 @@ Feature: Attached status
         Then stdout matches regexp:
         """
         SERVICE         +ENTITLED +STATUS   +DESCRIPTION
+        anbox-cloud     +yes      +disabled +.*
         esm-apps        +yes      +enabled  +Expanded Security Maintenance for Applications
         esm-infra       +yes      +enabled  +Expanded Security Maintenance for Infrastructure
         fips            +yes      +disabled +NIST-certified core packages
@@ -153,12 +155,13 @@ Feature: Attached status
         Then stdout matches regexp:
         """
         SERVICE         +ENTITLED +STATUS   +DESCRIPTION
-        anbox-cloud     +yes      +n/a      +.*
+        anbox-cloud     +yes      +disabled +.*
         cc-eal          +yes      +n/a      +Common Criteria EAL2 Provisioning Packages
         esm-apps        +yes      +enabled  +Expanded Security Maintenance for Applications
         esm-infra       +yes      +enabled  +Expanded Security Maintenance for Infrastructure
         fips            +yes      +disabled +NIST-certified core packages
         fips-updates    +yes      +disabled +NIST-certified core packages with priority security updates
+        landscape       +yes      +n/a      +Management and administration tool for Ubuntu
         livepatch       +yes      +n/a      +Canonical Livepatch service
         realtime-kernel +yes      +n/a      +Ubuntu kernel with PREEMPT_RT patches integrated
         ros             +yes      +n/a      +Security Updates for the Robot Operating System
@@ -201,6 +204,7 @@ Feature: Attached status
         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
+        landscape       +yes      +n/a      +Management and administration tool for Ubuntu
         livepatch       +yes      +n/a      +Canonical Livepatch service
         realtime-kernel +yes      +n/a      +Ubuntu kernel with PREEMPT_RT patches integrated
         ├ generic       +yes      +n/a      +Generic version of the RT kernel \(default\)
diff --git a/features/cloud.py b/features/cloud.py
index 8f3bcb0..cef4719 100644
--- a/features/cloud.py
+++ b/features/cloud.py
@@ -327,9 +327,9 @@ class EC2(Cloud):
             An AWS cloud provider instance
         """
         if not image_name:
-            if series == "xenial" and "pro" not in machine_type:
+            if series in ("xenial", "bionic") and "pro" not in machine_type:
                 logging.debug(
-                    "defaulting to non-daily image for awsgeneric-16.04"
+                    "defaulting to non-daily image for awsgeneric-[16|18].04"
                 )
                 daily = False
             else:
diff --git a/features/enable_fips_vm.feature b/features/enable_fips_vm.feature
index f27a5e9..5724375 100644
--- a/features/enable_fips_vm.feature
+++ b/features/enable_fips_vm.feature
@@ -285,7 +285,7 @@ Feature: FIPS enablement in lxd VMs
             """
         Then stdout matches regexp:
             """
-            livepatch +yes                enabled
+            livepatch +yes +<livepatch_status>
             """
         When I run `pro enable fips-updates --assume-yes` with sudo
         Then stdout matches regexp:
@@ -302,7 +302,7 @@ Feature: FIPS enablement in lxd VMs
             """
         Then stdout matches regexp:
             """
-            livepatch +yes                enabled
+            livepatch +yes +<livepatch_status>
             """
         When I reboot the machine
         And  I run `uname -r` as non-root
@@ -322,12 +322,12 @@ Feature: FIPS enablement in lxd VMs
             """
         Then stdout matches regexp:
             """
-            livepatch +yes                enabled
+            livepatch +yes +enabled
             """
         Examples: ubuntu release
-           | release |
-           | xenial  |
-           | bionic  |
+           | release | livepatch_status |
+           | xenial  | warning          |
+           | bionic  | enabled          |
 
     @slow
     @series.focal
diff --git a/features/livepatch.feature b/features/livepatch.feature
index 4899ce0..7388ea1 100644
--- a/features/livepatch.feature
+++ b/features/livepatch.feature
@@ -8,6 +8,8 @@ Feature: Livepatch
         Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
         When I change config key `livepatch_url` to use value `<livepatch_url>`
         Then I verify that no files exist matching `/home/ubuntu/.cache/ubuntu-pro/livepatch-kernel-support-cache.json`
+        # This is needed because `apt update` creates this file before, and we need to make sure it is created correctly later
+        When I delete the file `/run/ubuntu-advantage/livepatch-kernel-support-cache.json`
         When I run `pro status` as non-root
         Then I verify that files exist matching `/home/ubuntu/.cache/ubuntu-pro/livepatch-kernel-support-cache.json`
         Then I verify that no files exist matching `/run/ubuntu-advantage/livepatch-kernel-support-cache.json`
diff --git a/features/proxy_config.feature b/features/proxy_config.feature
index 755f5dc..73f432e 100644
--- a/features/proxy_config.feature
+++ b/features/proxy_config.feature
@@ -123,6 +123,7 @@ Feature: Proxy configuration
         """
         \"http://host:port\" is not a valid url. Not setting as proxy
         """
+        When I run `apt install python3-pycurl -y` with sudo
         And I verify that running `pro config set ua_apt_https_proxy=https://localhost:12345` `with sudo` exits `1`
         Then stderr matches regexp:
         """
@@ -231,6 +232,7 @@ Feature: Proxy configuration
           "https_proxy": "invalidurls"
         }
         """
+        And I run `apt install python3-pycurl -y` with sudo
         And I verify that running `pro refresh config` `with sudo` exits `1`
         Then stderr matches regexp:
         """
@@ -509,6 +511,7 @@ Feature: Proxy configuration
           "ua_apt_https_proxy": "https://localhost:12345"
         }
         """
+        And I run `apt install python3-pycurl -y` with sudo
         And I verify that running `pro refresh config` `with sudo` exits `1`
         Then stderr matches regexp:
         """
@@ -604,6 +607,7 @@ Feature: Proxy configuration
           "ua_apt_https_proxy": "http://wronguser:wrongpassword@$behave_var{machine-ip proxy}:3128"
         }
         """
+        And I run `apt install python3-pycurl -y` with sudo
         And I verify that running `pro refresh config` `with sudo` exits `1`
         Then stderr matches regexp:
         """
@@ -745,6 +749,7 @@ Feature: Proxy configuration
         """
         \"http://host:port\" is not a valid url. Not setting as proxy
         """
+        When I run `apt install python3-pycurl -y` with sudo
         And I verify that running `pro config set global_apt_https_proxy=https://localhost:12345` `with sudo` exits `1`
         Then stderr matches regexp:
         """
@@ -1151,6 +1156,7 @@ Feature: Proxy configuration
         Acquire::http::Proxy \".*:3128\";
         Acquire::https::Proxy \".*:3128\";
         """
+        When I run `apt install python3-pycurl -y` with sudo
         And I verify that running `pro config set apt_https_proxy=https://localhost:12345` `with sudo` exits `1`
         Then stdout matches regexp:
         """
diff --git a/features/ubuntu_pro.feature b/features/ubuntu_pro.feature
index d7578d4..a5f1b98 100644
--- a/features/ubuntu_pro.feature
+++ b/features/ubuntu_pro.feature
@@ -289,19 +289,19 @@ Feature: Command behaviour when auto-attached in an ubuntu PRO image
         To use a different subscription first run: sudo pro detach.
         """
         When I run `apt-cache policy` with sudo
-        Then apt-cache policy for the following url has permission `510`
+        Then apt-cache policy for the following url has permission `500`
         """
         https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages
         """
-        And apt-cache policy for the following url has permission `510`
+        And apt-cache policy for the following url has permission `500`
         """
         https://esm.ubuntu.com/infra/ubuntu <release>-infra-security/main amd64 Packages
         """
-        And apt-cache policy for the following url has permission `510`
+        And apt-cache policy for the following url has permission `500`
         """
         https://esm.ubuntu.com/apps/ubuntu <release>-apps-updates/main amd64 Packages
         """
-        And apt-cache policy for the following url has permission `510`
+        And apt-cache policy for the following url has permission `500`
         """
         https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages
         """
@@ -310,7 +310,7 @@ Feature: Command behaviour when auto-attached in an ubuntu PRO image
         And I run `apt-cache policy <infra-pkg>` as non-root
         Then stdout matches regexp:
         """
-        \s*510 https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages
+        \s*500 https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages
         """
         And stdout matches regexp:
         """
@@ -321,8 +321,8 @@ Feature: Command behaviour when auto-attached in an ubuntu PRO image
         Then stdout matches regexp:
         """
         Version table:
-        \s*\*\*\* .* 510
-        \s*510 https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages
+        \s*\*\*\* .* 500
+        \s*500 https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages
         """
         When I create the file `/var/lib/ubuntu-advantage/marker-reboot-cmds-required` with the following:
         """
@@ -416,19 +416,19 @@ Feature: Command behaviour when auto-attached in an ubuntu PRO image
         To use a different subscription first run: sudo pro detach.
         """
         When I run `apt-cache policy` with sudo
-        Then apt-cache policy for the following url has permission `510`
+        Then apt-cache policy for the following url has permission `500`
         """
         https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages
         """
-        And apt-cache policy for the following url has permission `510`
+        And apt-cache policy for the following url has permission `500`
         """
         https://esm.ubuntu.com/infra/ubuntu <release>-infra-security/main amd64 Packages
         """
-        And apt-cache policy for the following url has permission `510`
+        And apt-cache policy for the following url has permission `500`
         """
         https://esm.ubuntu.com/apps/ubuntu <release>-apps-updates/main amd64 Packages
         """
-        And apt-cache policy for the following url has permission `510`
+        And apt-cache policy for the following url has permission `500`
         """
         https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages
         """
@@ -437,7 +437,7 @@ Feature: Command behaviour when auto-attached in an ubuntu PRO image
         And I run `apt-cache policy <infra-pkg>` as non-root
         Then stdout matches regexp:
         """
-        \s*510 https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages
+        \s*500 https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages
         """
         And stdout matches regexp:
         """
@@ -448,8 +448,8 @@ Feature: Command behaviour when auto-attached in an ubuntu PRO image
         Then stdout matches regexp:
         """
         Version table:
-        \s*\*\*\* .* 510
-        \s*510 https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages
+        \s*\*\*\* .* 500
+        \s*500 https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages
         """
         When I create the file `/var/lib/ubuntu-advantage/marker-reboot-cmds-required` with the following:
         """
@@ -542,19 +542,19 @@ Feature: Command behaviour when auto-attached in an ubuntu PRO image
         To use a different subscription first run: sudo pro detach.
         """
         When I run `apt-cache policy` with sudo
-        Then apt-cache policy for the following url has permission `510`
+        Then apt-cache policy for the following url has permission `500`
         """
         https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages
         """
-        And apt-cache policy for the following url has permission `510`
+        And apt-cache policy for the following url has permission `500`
         """
         https://esm.ubuntu.com/infra/ubuntu <release>-infra-security/main amd64 Packages
         """
-        And apt-cache policy for the following url has permission `510`
+        And apt-cache policy for the following url has permission `500`
         """
         https://esm.ubuntu.com/apps/ubuntu <release>-apps-updates/main amd64 Packages
         """
-        And apt-cache policy for the following url has permission `510`
+        And apt-cache policy for the following url has permission `500`
         """
         https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages
         """
@@ -563,7 +563,7 @@ Feature: Command behaviour when auto-attached in an ubuntu PRO image
         And I run `apt-cache policy <infra-pkg>` as non-root
         Then stdout matches regexp:
         """
-        \s*510 https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages
+        \s*500 https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages
         """
         And stdout matches regexp:
         """
@@ -574,8 +574,8 @@ Feature: Command behaviour when auto-attached in an ubuntu PRO image
         Then stdout matches regexp:
         """
         Version table:
-        \s*\*\*\* .* 510
-        \s*510 https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages
+        \s*\*\*\* .* 500
+        \s*500 https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages
         """
         When I create the file `/var/lib/ubuntu-advantage/marker-reboot-cmds-required` with the following:
         """
diff --git a/features/ubuntu_pro_fips.feature b/features/ubuntu_pro_fips.feature
index df764cf..729e5f4 100644
--- a/features/ubuntu_pro_fips.feature
+++ b/features/ubuntu_pro_fips.feature
@@ -60,19 +60,19 @@ Feature: Command behaviour when auto-attached in an ubuntu PRO fips image
         To use a different subscription first run: sudo pro detach.
         """
         When I run `apt-cache policy` with sudo
-        Then apt-cache policy for the following url has permission `510`
+        Then apt-cache policy for the following url has permission `500`
         """
         https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages
         """
-        And apt-cache policy for the following url has permission `510`
+        And apt-cache policy for the following url has permission `500`
         """
         https://esm.ubuntu.com/infra/ubuntu <release>-infra-security/main amd64 Packages
         """
-        And apt-cache policy for the following url has permission `510`
+        And apt-cache policy for the following url has permission `500`
         """
         https://esm.ubuntu.com/apps/ubuntu <release>-apps-updates/main amd64 Packages
         """
-        And apt-cache policy for the following url has permission `510`
+        And apt-cache policy for the following url has permission `500`
         """
         https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages
         """
@@ -85,11 +85,11 @@ Feature: Command behaviour when auto-attached in an ubuntu PRO fips image
         And I run `apt-cache policy <infra-pkg>` as non-root
         Then stdout matches regexp:
         """
-        \s*510 https://esm.ubuntu.com/infra/ubuntu <release>-infra-security/main amd64 Packages
+        \s*500 https://esm.ubuntu.com/infra/ubuntu <release>-infra-security/main amd64 Packages
         """
         Then stdout matches regexp:
         """
-        \s*510 https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages
+        \s*500 https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages
         """
         And stdout matches regexp:
         """
@@ -100,8 +100,8 @@ Feature: Command behaviour when auto-attached in an ubuntu PRO fips image
         Then stdout matches regexp:
         """
         Version table:
-        \s*\*\*\* .* 510
-        \s*510 https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages
+        \s*\*\*\* .* 500
+        \s*500 https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages
         """
         When I run `pro enable fips-updates --assume-yes` with sudo
         Then I will see the following on stdout:
@@ -280,19 +280,19 @@ Feature: Command behaviour when auto-attached in an ubuntu PRO fips image
         To use a different subscription first run: sudo pro detach.
         """
         When I run `apt-cache policy` with sudo
-        Then apt-cache policy for the following url has permission `510`
+        Then apt-cache policy for the following url has permission `500`
         """
         https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages
         """
-        And apt-cache policy for the following url has permission `510`
+        And apt-cache policy for the following url has permission `500`
         """
         https://esm.ubuntu.com/infra/ubuntu <release>-infra-security/main amd64 Packages
         """
-        And apt-cache policy for the following url has permission `510`
+        And apt-cache policy for the following url has permission `500`
         """
         https://esm.ubuntu.com/apps/ubuntu <release>-apps-updates/main amd64 Packages
         """
-        And apt-cache policy for the following url has permission `510`
+        And apt-cache policy for the following url has permission `500`
         """
         https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages
         """
@@ -305,11 +305,11 @@ Feature: Command behaviour when auto-attached in an ubuntu PRO fips image
         And I run `apt-cache policy <infra-pkg>` as non-root
         Then stdout matches regexp:
         """
-        \s*510 https://esm.ubuntu.com/infra/ubuntu <release>-infra-security/main amd64 Packages
+        \s*500 https://esm.ubuntu.com/infra/ubuntu <release>-infra-security/main amd64 Packages
         """
         Then stdout matches regexp:
         """
-        \s*510 https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages
+        \s*500 https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages
         """
         And stdout matches regexp:
         """
@@ -320,8 +320,8 @@ Feature: Command behaviour when auto-attached in an ubuntu PRO fips image
         Then stdout matches regexp:
         """
         Version table:
-        \s*\*\*\* .* 510
-        \s*510 https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages
+        \s*\*\*\* .* 500
+        \s*500 https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages
         """
         When I run `pro enable fips-updates --assume-yes` with sudo
         Then I will see the following on stdout:
@@ -553,19 +553,19 @@ Feature: Command behaviour when auto-attached in an ubuntu PRO fips image
         To use a different subscription first run: sudo pro detach.
         """
         When I run `apt-cache policy` with sudo
-        Then apt-cache policy for the following url has permission `510`
+        Then apt-cache policy for the following url has permission `500`
         """
         https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages
         """
-        And apt-cache policy for the following url has permission `510`
+        And apt-cache policy for the following url has permission `500`
         """
         https://esm.ubuntu.com/infra/ubuntu <release>-infra-security/main amd64 Packages
         """
-        And apt-cache policy for the following url has permission `510`
+        And apt-cache policy for the following url has permission `500`
         """
         https://esm.ubuntu.com/apps/ubuntu <release>-apps-updates/main amd64 Packages
         """
-        And apt-cache policy for the following url has permission `510`
+        And apt-cache policy for the following url has permission `500`
         """
         https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages
         """
@@ -578,11 +578,11 @@ Feature: Command behaviour when auto-attached in an ubuntu PRO fips image
         And I run `apt-cache policy <infra-pkg>` as non-root
         Then stdout matches regexp:
         """
-        \s*510 https://esm.ubuntu.com/infra/ubuntu <release>-infra-security/main amd64 Packages
+        \s*500 https://esm.ubuntu.com/infra/ubuntu <release>-infra-security/main amd64 Packages
         """
         Then stdout matches regexp:
         """
-        \s*510 https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages
+        \s*500 https://esm.ubuntu.com/infra/ubuntu <release>-infra-updates/main amd64 Packages
         """
         And stdout matches regexp:
         """
@@ -593,8 +593,8 @@ Feature: Command behaviour when auto-attached in an ubuntu PRO fips image
         Then stdout matches regexp:
         """
         Version table:
-        \s*\*\*\* .* 510
-        \s*510 https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages
+        \s*\*\*\* .* 500
+        \s*500 https://esm.ubuntu.com/apps/ubuntu <release>-apps-security/main amd64 Packages
         """
         When I run `pro enable fips-updates --assume-yes` with sudo
         Then I will see the following on stdout:
diff --git a/features/unattached_status.feature b/features/unattached_status.feature
index 6eea754..80a35e9 100644
--- a/features/unattached_status.feature
+++ b/features/unattached_status.feature
@@ -58,7 +58,6 @@ Feature: Unattached status
         esm-infra       +yes       +Expanded Security Maintenance for Infrastructure
         fips            +yes       +NIST-certified core packages
         fips-updates    +yes       +NIST-certified core packages with priority security updates
-        landscape       +yes       +Management and administration tool for Ubuntu
         livepatch       +yes      +(Canonical Livepatch service|Current kernel is not supported)
         ros             +yes       +Security Updates for the Robot Operating System
         ros-updates     +yes       +All Updates for the Robot Operating System
@@ -80,7 +79,7 @@ Feature: Unattached status
         esm-infra       +yes       +Expanded Security Maintenance for Infrastructure
         fips            +yes       +NIST-certified core packages
         fips-updates    +yes       +NIST-certified core packages with priority security updates
-        landscape       +yes       +Management and administration tool for Ubuntu
+        landscape       +no        +Management and administration tool for Ubuntu
         livepatch       +yes      +(Canonical Livepatch service|Current kernel is not supported)
         realtime-kernel +no        +Ubuntu kernel with PREEMPT_RT patches integrated
         ros             +yes       +Security Updates for the Robot Operating System
@@ -106,7 +105,6 @@ Feature: Unattached status
         esm-infra       +yes       +Expanded Security Maintenance for Infrastructure
         fips            +yes       +NIST-certified core packages
         fips-updates    +yes       +NIST-certified core packages with priority security updates
-        landscape       +yes       +Management and administration tool for Ubuntu
         livepatch       +yes      +(Canonical Livepatch service|Current kernel is not supported)
         ros             +yes       +Security Updates for the Robot Operating System
         ros-updates     +yes       +All Updates for the Robot Operating System
@@ -139,7 +137,6 @@ Feature: Unattached status
         esm-infra       +yes       +Expanded Security Maintenance for Infrastructure
         fips            +yes       +NIST-certified core packages
         fips-updates    +yes       +NIST-certified core packages with priority security updates
-        landscape       +yes       +Management and administration tool for Ubuntu
         livepatch       +yes       +Canonical Livepatch service
         usg             +yes       +Security compliance and audit tools
 
@@ -159,7 +156,7 @@ Feature: Unattached status
         esm-infra       +yes       +Expanded Security Maintenance for Infrastructure
         fips            +yes       +NIST-certified core packages
         fips-updates    +yes       +NIST-certified core packages with priority security updates
-        landscape       +yes       +Management and administration tool for Ubuntu
+        landscape       +no        +Management and administration tool for Ubuntu
         livepatch       +yes       +Canonical Livepatch service
         realtime-kernel +no        +Ubuntu kernel with PREEMPT_RT patches integrated
         ros             +no        +Security Updates for the Robot Operating System
@@ -184,7 +181,6 @@ Feature: Unattached status
         esm-infra       +yes       +Expanded Security Maintenance for Infrastructure
         fips            +yes       +NIST-certified core packages
         fips-updates    +yes       +NIST-certified core packages with priority security updates
-        landscape       +yes       +Management and administration tool for Ubuntu
         livepatch       +yes       +Canonical Livepatch service
         usg             +yes       +Security compliance and audit tools
 
@@ -213,7 +209,6 @@ Feature: Unattached status
         anbox-cloud     +yes       +.*
         esm-apps        +yes       +Expanded Security Maintenance for Applications
         esm-infra       +yes       +Expanded Security Maintenance for Infrastructure
-        landscape       +yes       +Management and administration tool for Ubuntu
         livepatch       +yes       +Canonical Livepatch service
         realtime-kernel +yes       +Ubuntu kernel with PREEMPT_RT patches integrated
         usg             +yes       +Security compliance and audit tools
@@ -234,7 +229,7 @@ Feature: Unattached status
         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
-        landscape       +yes       +Management and administration tool for Ubuntu
+        landscape       +no        +Management and administration tool for Ubuntu
         livepatch       +yes       +Canonical Livepatch service
         realtime-kernel +yes       +Ubuntu kernel with PREEMPT_RT patches integrated
         ros             +no        +Security Updates for the Robot Operating System
@@ -257,7 +252,6 @@ Feature: Unattached status
         anbox-cloud     +yes       +.*
         esm-apps        +yes       +Expanded Security Maintenance for Applications
         esm-infra       +yes       +Expanded Security Maintenance for Infrastructure
-        landscape       +yes       +Management and administration tool for Ubuntu
         livepatch       +yes       +Canonical Livepatch service
         realtime-kernel +yes       +Ubuntu kernel with PREEMPT_RT patches integrated
         usg             +yes       +Security compliance and audit tools
@@ -292,7 +286,6 @@ Feature: Unattached status
         esm-infra       +yes       +yes       +yes          +Expanded Security Maintenance for Infrastructure
         fips            +yes       +yes       +no           +NIST-certified core packages
         fips-updates    +yes       +yes       +no           +NIST-certified core packages with priority security updates
-        landscape       +yes       +yes       +no           +Management and administration tool for Ubuntu
         livepatch       +yes       +yes       +yes          +Canonical Livepatch service
         """
         When I do a preflight check for `contract_token` with the all flag
@@ -306,7 +299,7 @@ Feature: Unattached status
         esm-infra       +yes       +yes       +yes          +Expanded Security Maintenance for Infrastructure
         fips            +yes       +yes       +no           +NIST-certified core packages
         fips-updates    +yes       +yes       +no           +NIST-certified core packages with priority security updates
-        landscape       +yes       +yes       +no           +Management and administration tool for Ubuntu
+        landscape       +no        +yes       +no           +Management and administration tool for Ubuntu
         livepatch       +yes       +yes       +yes          +Canonical Livepatch service
         realtime-kernel +no        +yes       +no           +Ubuntu kernel with PREEMPT_RT patches integrated
         ros             +yes       +yes       +no           +Security Updates for the Robot Operating System
@@ -355,7 +348,6 @@ Feature: Unattached status
         esm-infra       +yes       +yes       +yes          +Expanded Security Maintenance for Infrastructure
         fips            +yes       +yes       +no           +NIST-certified core packages
         fips-updates    +yes       +yes       +no           +NIST-certified core packages with priority security updates
-        landscape       +yes       +yes       +no           +Management and administration tool for Ubuntu
         livepatch       +yes       +yes       +yes          +Canonical Livepatch service
         usg             +yes       +yes       +no           +Security compliance and audit tools
         """
@@ -369,7 +361,7 @@ Feature: Unattached status
         esm-infra       +yes       +yes       +yes          +Expanded Security Maintenance for Infrastructure
         fips            +yes       +yes       +no           +NIST-certified core packages
         fips-updates    +yes       +yes       +no           +NIST-certified core packages with priority security updates
-        landscape       +yes       +yes       +no           +Management and administration tool for Ubuntu
+        landscape       +no        +yes       +no           +Management and administration tool for Ubuntu
         livepatch       +yes       +yes       +yes          +Canonical Livepatch service
         realtime-kernel +no        +yes       +no           +Ubuntu kernel with PREEMPT_RT patches integrated
         ros             +no        +yes       +no           +Security Updates for the Robot Operating System
@@ -417,7 +409,6 @@ Feature: Unattached status
         anbox-cloud     +yes       +.*
         esm-apps        +yes       +yes       +yes          +Expanded Security Maintenance for Applications
         esm-infra       +yes       +yes       +yes          +Expanded Security Maintenance for Infrastructure
-        landscape       +yes       +yes       +no           +Management and administration tool for Ubuntu
         livepatch       +yes       +yes       +yes          +Canonical Livepatch service
         realtime-kernel +yes       +yes       +no           +Ubuntu kernel with PREEMPT_RT patches integrated
         usg             +yes       +yes       +no           +Security compliance and audit tools
@@ -432,7 +423,7 @@ Feature: Unattached status
         esm-infra       +yes       +yes       +yes          +Expanded Security Maintenance for Infrastructure
         fips            +no        +yes       +no           +NIST-certified core packages
         fips-updates    +no        +yes       +no           +NIST-certified core packages with priority security updates
-        landscape       +yes       +yes       +no           +Management and administration tool for Ubuntu
+        landscape       +no        +yes       +no           +Management and administration tool for Ubuntu
         livepatch       +yes       +yes       +yes          +Canonical Livepatch service
         realtime-kernel +yes       +yes       +no           +Ubuntu kernel with PREEMPT_RT patches integrated
         ros             +no        +yes       +no           +Security Updates for the Robot Operating System
@@ -507,8 +498,7 @@ Feature: Unattached status
         esm-infra       +yes       +yes       +yes          +Expanded Security Maintenance for Infrastructure
         fips            +yes       +yes       +no           +NIST-certified core packages
         fips-updates    +yes       +yes       +no           +NIST-certified core packages with priority security updates
-        (landscape       +(yes|no)       +yes       +no           +Management and administration tool for Ubuntu)?
-        ?livepatch       +yes       +yes       +yes          +Canonical Livepatch service
+        livepatch       +yes       +yes       +yes          +Canonical Livepatch service
         ros             +yes       +no        +no           +Security Updates for the Robot Operating System
         ros-updates     +yes       +no        +no           +All Updates for the Robot Operating System
         """
@@ -553,8 +543,7 @@ Feature: Unattached status
         esm-infra       +yes       +yes       +yes          +Expanded Security Maintenance for Infrastructure
         fips            +yes       +yes       +no           +NIST-certified core packages
         fips-updates    +yes       +yes       +no           +NIST-certified core packages with priority security updates
-        (landscape       +(yes|no)       +yes       +no           +Management and administration tool for Ubuntu)?
-        ?livepatch       +yes       +yes       +yes          +Canonical Livepatch service
+        livepatch       +yes       +yes       +yes          +Canonical Livepatch service
         usg             +yes       +yes       +no           +Security compliance and audit tools
         """
 
@@ -596,8 +585,7 @@ Feature: Unattached status
         esm-apps        +yes       +no        +no           +Expanded Security Maintenance for Applications
         esm-infra       +yes       +yes       +yes          +Expanded Security Maintenance for Infrastructure
         fips            +yes       +yes       +no           +NIST-certified core packages
-        (landscape       +(yes|no)       +yes       +no           +Management and administration tool for Ubuntu)?
-        ?livepatch       +yes       +yes       +yes          +Canonical Livepatch service
+        livepatch       +yes       +yes       +yes          +Canonical Livepatch service
         """
 
         Examples: ubuntu release
diff --git a/preferences.d/ubuntu-pro-esm-apps b/preferences.d/ubuntu-pro-esm-apps
deleted file mode 100644
index 5ded6f8..0000000
--- a/preferences.d/ubuntu-pro-esm-apps
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file is used by Ubuntu Pro and supplied by the ubuntu-advantage-tools
-# package. It has no effect if Ubuntu Pro services are not in use since no
-# other apt repositories are expected to match o=UbuntuESMApps.
-#
-# Pin esm-apps packages to a slightly higher value than the default,
-# so those are preferred over a non-ESM package from the archive when the
-# service is enabled.
-
-Package: *
-Pin: release o=UbuntuESMApps
-Pin-Priority: 510
diff --git a/preferences.d/ubuntu-pro-esm-infra b/preferences.d/ubuntu-pro-esm-infra
deleted file mode 100644
index e956e0a..0000000
--- a/preferences.d/ubuntu-pro-esm-infra
+++ /dev/null
@@ -1,10 +0,0 @@
-# This file is used by Ubuntu Pro and supplied by the ubuntu-advantage-tools
-# package. It has no effect if Ubuntu Pro services are not in use since no
-# other apt repositories are expected to match o=UbuntuESM.
-#
-# Pin esm-infra packages to a slightly higher value than the default,
-# so those are preferred over a non-ESM package from the archive when the
-# service is enabled.
-Package: *
-Pin: release o=UbuntuESM
-Pin-Priority: 510
diff --git a/setup.py b/setup.py
index bccdfed..a1105f2 100644
--- a/setup.py
+++ b/setup.py
@@ -40,7 +40,6 @@ def _get_data_files():
             "/etc/update-manager/release-upgrades.d/",
             ["release-upgrades.d/ubuntu-advantage-upgrades.cfg"],
         ),
-        ("/etc/apt/preferences.d", glob.glob("preferences.d/*")),
         (defaults.CONFIG_DEFAULTS["data_dir"], []),
         ("/lib/systemd/system", glob.glob("systemd/*")),
         (
diff --git a/tools/run-integration-tests.py b/tools/run-integration-tests.py
index ed16645..cc373ce 100644
--- a/tools/run-integration-tests.py
+++ b/tools/run-integration-tests.py
@@ -24,7 +24,7 @@ TOKEN_TO_ENVVAR = {
 }
 
 PLATFORM_SERIES_TESTS = {
-    "azuregeneric": ["xenial", "bionic", "focal", "jammy"],
+    "azuregeneric": ["xenial", "bionic", "focal", "jammy", "lunar"],
     "azurepro": ["xenial", "bionic", "focal", "jammy"],
     "azurepro-fips": ["xenial", "bionic", "focal"],
     "awsgeneric": ["xenial", "bionic", "focal", "jammy"],
diff --git a/uaclient/version.py b/uaclient/version.py
index 4d61635..fc599da 100644
--- a/uaclient/version.py
+++ b/uaclient/version.py
@@ -15,7 +15,7 @@ from uaclient.defaults import CANDIDATE_CACHE_PATH, UAC_RUN_PATH
 from uaclient.exceptions import ProcessExecutionError
 from uaclient.system import subp
 
-__VERSION__ = "29.3"
+__VERSION__ = "29.4"
 PACKAGED_VERSION = "@@PACKAGED_VERSION@@"
 
 CANDIDATE_REGEX = r"Candidate: (?P<candidate>.*?)\n"