diff --git a/.github/workflows/pkg.yml b/.github/workflows/pkg.yml
index a0866ab..bd650c3 100644
--- a/.github/workflows/pkg.yml
+++ b/.github/workflows/pkg.yml
@@ -26,7 +26,7 @@ on:
 jobs:
   full:
     if: ${{ inputs.single_job == '' || inputs.single_job == 'full' }}
-    uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v7
+    uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@checkout-fix
     secrets: inherit
     with:
       artifact_prefix: full_
@@ -43,6 +43,7 @@ jobs:
         image:
           - "ubuntu:bionic"
           - "ubuntu:jammy" # ubuntu/22.04
+          - "ubuntu:noble" # ubuntu/24.04
           - "debian:stretch"
           - "debian:buster"
           - "debian:bullseye"
@@ -88,6 +89,9 @@ jobs:
           - image: "ubuntu:jammy"
             deb_extra_lintian_args: "--suppress-tags no-manual-page,changelog-not-compressed-with-max-compression"
 
+          - image: "ubuntu:noble"
+            deb_extra_lintian_args: "--suppress-tags no-manual-page,changelog-not-compressed-with-max-compression"
+
           - image: "debian:stretch"
             deb_extra_lintian_args: "--suppress-tags binary-without-manpage,changelog-not-compressed-with-max-compression"
 
@@ -136,11 +140,11 @@ jobs:
 
   minimal:
     if: ${{ inputs.single_job == '' || inputs.single_job == 'minimal' }}
-    uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v7
+    uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@checkout-fix
 
   no_test_scripts:
     if: ${{ inputs.single_job == '' || inputs.single_job == 'no_test_scripts' }}
-    uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v7
+    uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@checkout-fix
     secrets: inherit
     with:
       artifact_prefix: no_test_scripts_
@@ -167,7 +171,7 @@ jobs:
 
   default_tests:
     if: ${{ inputs.single_job == '' || inputs.single_job == 'default_tests' }}
-    uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v7
+    uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@checkout-fix
     secrets: inherit
     with:
       artifact_prefix: default_tests_
@@ -188,7 +192,7 @@ jobs:
 
   default_tests_with_upgrades:
     if: ${{ inputs.single_job == '' || inputs.single_job == 'default_tests_with_upgrades' }}
-    uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v7
+    uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@checkout-fix
     secrets: inherit
     with:
       artifact_prefix: default_tests_with_upgrades_
@@ -246,7 +250,7 @@ jobs:
 
   no_tests:
     if: ${{ inputs.single_job == '' || inputs.single_job == 'no_tests' }}
-    uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v7
+    uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@checkout-fix
     secrets: inherit
     with:
       artifact_prefix: no_tests_
@@ -273,7 +277,7 @@ jobs:
 
   no_docker:
     if: ${{ inputs.single_job == '' || inputs.single_job == 'no_docker' }}
-    uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v7
+    uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@checkout-fix
     with:
       artifact_prefix: no_docker_
       cross_build_args: --no-default-features
@@ -296,7 +300,7 @@ jobs:
 
   only_docker:
     if: ${{ inputs.single_job == '' || inputs.single_job == 'only_docker' }}
-    uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v7
+    uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@checkout-fix
     secrets: inherit
     with:
       artifact_prefix: only_docker_
@@ -326,7 +330,7 @@ jobs:
 
   docker_no_secrets:
     if: ${{ inputs.single_job == '' || inputs.single_job == 'docker_no_secrets' }}
-    uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v7
+    uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@checkout-fix
     with:
       artifact_prefix: docker_no_secrets_
 
@@ -339,7 +343,7 @@ jobs:
           
   no_cross:
     if: ${{ inputs.single_job == '' || inputs.single_job == 'no_cross' }}
-    uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v7
+    uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@checkout-fix
     secrets: inherit
     with:
       artifact_prefix: no_cross_
@@ -384,7 +388,7 @@ jobs:
   
   test_with_alt_pkg:
     if: ${{ inputs.single_job == '' || inputs.single_job == 'test_with_alt_pkg' }}
-    uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v7
+    uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@checkout-fix
     secrets: inherit
     with:
       artifact_prefix: test_with_alt_pkg
@@ -410,7 +414,7 @@ jobs:
 
   test_with_alt_cargo_toml:
     if: ${{ inputs.single_job == '' || inputs.single_job == 'test_with_alt_cargo_toml' }}
-    uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v7
+    uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@checkout-fix
     secrets: inherit
     with:
       artifact_prefix: test_with_alt_cargo_toml
diff --git a/Cargo.toml b/Cargo.toml
index 30f1b87..d3ae073 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -52,6 +52,9 @@ depends = "adduser, passwd, libc6 (>= 2.27), libssl1.1"
 [package.metadata.deb.variants.debian-bookworm]
 depends = "$auto, passwd, libssl3"
 
+[package.metadata.deb.variants.ubuntu-noble]
+depends = "$auto, passwd, libssl3"
+
 [package.metadata.deb.variants.minimal]
 depends = "libc6 (>= 2.27), rsync" # a deliberately different dependency that we can test for on older O/S's.
 maintainer = "Minimal Maintainer <minimal@example.com>"
diff --git a/pkg/common/mytest-ubuntu-noble.mytest.service b/pkg/common/mytest-ubuntu-noble.mytest.service
new file mode 120000
index 0000000..f5e1099
--- /dev/null
+++ b/pkg/common/mytest-ubuntu-noble.mytest.service
@@ -0,0 +1 @@
+mytest.mytest.service
\ No newline at end of file
diff --git a/pkg/common/mytest-ubuntu-noble.mytest.timer b/pkg/common/mytest-ubuntu-noble.mytest.timer
new file mode 120000
index 0000000..f9ff398
--- /dev/null
+++ b/pkg/common/mytest-ubuntu-noble.mytest.timer
@@ -0,0 +1 @@
+mytest.mytest.timer
\ No newline at end of file
diff --git a/pkg/rules/package-build-rules.yml b/pkg/rules/package-build-rules.yml
index 42ed548..3f28b38 100644
--- a/pkg/rules/package-build-rules.yml
+++ b/pkg/rules/package-build-rules.yml
@@ -45,6 +45,7 @@ pkg:
 image:
   - "ubuntu:bionic"
   - "ubuntu:jammy"     # ubuntu/22.04
+  - "ubuntu:noble"
   - "debian:stretch"
   - "debian:buster"
   - "debian:bullseye"
diff --git a/pkg/rules/package-test-rules.yml b/pkg/rules/package-test-rules.yml
index 959eadd..7f8008e 100644
--- a/pkg/rules/package-test-rules.yml
+++ b/pkg/rules/package-test-rules.yml
@@ -26,6 +26,7 @@ pkg:
 image:
   - "ubuntu:bionic"
   - "ubuntu:jammy" # ubuntu/22.04
+  - "ubuntu:noble"
   - "debian:stretch" # should get excluded because the LXC image no longer exists
   - "debian:buster"
   - "debian:bullseye"