diff --git a/checkbox-core-snap/series16/snap/snapcraft.yaml b/checkbox-core-snap/series16/snap/snapcraft.yaml
index 12a78e2068..e2f5f26015 100644
--- a/checkbox-core-snap/series16/snap/snapcraft.yaml
+++ b/checkbox-core-snap/series16/snap/snapcraft.yaml
@@ -55,6 +55,8 @@ slots:
 package-repositories:
   - type: apt
     ppa: checkbox-dev/stable
+  - type: apt
+    ppa: colin-king/stress-ng
 
 parts:
   version-calculator:
@@ -94,33 +96,12 @@ parts:
       - libbsd-dev
     after: [version-calculator]
 ################################################################################
-# Upstream: https://kernel.ubuntu.com/git/cking/stress-ng.git/plain/snap/snapcraft.yaml
   stress-ng:
-    source-tag: "V0.15.07"
-    # stress-ng remains at version 0.15.07 because libipsec-mb-dev and libxxhash-dev are not available for Ubuntu 16.04 (Xenial).
-    source-depth: 1
-    plugin: make
-    build-environment:
-      - CFLAGS: "-fstack-protector-strong -Wformat -Werror=format-security"
-      - LDFLAGS: "-Wl,-z,relro -lrt"
-    source: https://github.com/ColinIanKing/stress-ng.git
-    make-parameters:
-      - STATIC=1 VERBOSE=1
+    plugin: nil
     stage-packages:
-      - libjudydebian1
-      - libsctp1
+      - stress-ng
     build-packages:
-      - gcc
-      - make
-      - zlib1g-dev
-      - libbsd-dev
-      - libgcrypt20-dev
-      - libkeyutils-dev
-      - libapparmor-dev
-      - libaio-dev
-      - libcap-dev
-      - libsctp-dev
-      - libjudy-dev
+      - stress-ng
     after: [fwts]
 ################################################################################
 # Upstream: https://kernel.ubuntu.com/git/cking/snapcraft-snaps.git/tree/acpica/snapcraft.yaml
diff --git a/checkbox-core-snap/series18/snap/snapcraft.yaml b/checkbox-core-snap/series18/snap/snapcraft.yaml
index 3032bd2dff..f1640aeb90 100644
--- a/checkbox-core-snap/series18/snap/snapcraft.yaml
+++ b/checkbox-core-snap/series18/snap/snapcraft.yaml
@@ -59,6 +59,8 @@ slots:
 package-repositories:
   - type: apt
     ppa: checkbox-dev/stable
+  - type: apt
+    ppa: colin-king/stress-ng
 
 parts:
   version-calculator:
@@ -98,41 +100,12 @@ parts:
       - libbsd-dev
     after: [version-calculator]
 ################################################################################
-# Upstream: https://kernel.ubuntu.com/git/cking/stress-ng.git/plain/snap/snapcraft.yaml
   stress-ng:
-    source-tag: "V0.15.09"
-    source-depth: 1
-    plugin: make
-    build-environment:
-      - CFLAGS: "-fstack-protector-strong -Wformat -Werror=format-security"
-      - LDFLAGS: "-Wl,-z,relro -lrt"
-    source: https://github.com/ColinIanKing/stress-ng.git
-    make-parameters:
-      - STATIC=1 VERBOSE=1
+    plugin: nil
     stage-packages:
-      - libjpeg-turbo8
-      - libjudydebian1
-      - libsctp1
-      - libxxhash0
+      - stress-ng
     build-packages:
-      - gcc
-      - make
-      - zlib1g-dev
-      - libbsd-dev
-      - libgcrypt20-dev
-      - libkeyutils-dev
-      - libapparmor-dev
-      - libaio-dev
-      - libcap-dev
-      - libsctp-dev
-      - libatomic1
-      - libjudy-dev
-      - libjpeg-dev
-      - libkmod-dev
-      - libattr1-dev
-      - libxxhash-dev
-      - libmd-dev
-      - on amd64: [ libipsec-mb-dev ]
+      - stress-ng
     after: [fwts]
 ################################################################################
 # Upstream: https://kernel.ubuntu.com/git/cking/snapcraft-snaps.git/tree/acpica/snapcraft.yaml
diff --git a/checkbox-core-snap/series20/snap/snapcraft.yaml b/checkbox-core-snap/series20/snap/snapcraft.yaml
index 81a0546bd6..86246e03c3 100644
--- a/checkbox-core-snap/series20/snap/snapcraft.yaml
+++ b/checkbox-core-snap/series20/snap/snapcraft.yaml
@@ -59,6 +59,8 @@ slots:
 package-repositories:
   - type: apt
     ppa: checkbox-dev/stable
+  - type: apt
+    ppa: colin-king/stress-ng
 
 parts:
   version-calculator:
@@ -100,36 +102,12 @@ parts:
       - libbsd-dev
     after: [version-calculator]
 ################################################################################
-# Upstream: https://kernel.ubuntu.com/git/cking/stress-ng.git/plain/snap/snapcraft.yaml
   stress-ng:
-    source-tag: "V0.15.09"
-    source-depth: 1
-    plugin: make
-    build-environment:
-      - CFLAGS: "-fstack-protector-strong -Wformat -Werror=format-security"
-      - LDFLAGS: "-Wl,-z,relro -lrt"
-    source: https://github.com/ColinIanKing/stress-ng.git
-    make-parameters:
-      - STATIC=1 VERBOSE=1
+    plugin: nil
+    stage-packages:
+      - stress-ng
     build-packages:
-      - gcc
-      - make
-      - zlib1g-dev
-      - libbsd-dev
-      - libgcrypt20-dev
-      - libkeyutils-dev
-      - libapparmor-dev
-      - libaio-dev
-      - libcap-dev
-      - libsctp-dev
-      - libatomic1
-      - libjudy-dev
-      - libjpeg-dev
-      - libkmod-dev
-      - libattr1-dev
-      - libxxhash-dev
-      - libmd-dev
-      - on amd64: [ libipsec-mb-dev ]
+      - stress-ng
     after: [fwts]
 ################################################################################
 # Upstream: https://kernel.ubuntu.com/git/cking/snapcraft-snaps.git/tree/acpica/snapcraft.yaml
diff --git a/checkbox-core-snap/series22/snap/snapcraft.yaml b/checkbox-core-snap/series22/snap/snapcraft.yaml
index 5390937c92..81a54aff2c 100644
--- a/checkbox-core-snap/series22/snap/snapcraft.yaml
+++ b/checkbox-core-snap/series22/snap/snapcraft.yaml
@@ -63,6 +63,8 @@ slots:
 package-repositories:
   - type: apt
     ppa: checkbox-dev/stable
+  - type: apt
+    ppa: colin-king/stress-ng
 
 parts:
   version-calculator:
@@ -104,36 +106,12 @@ parts:
       - libbsd-dev
     after: [version-calculator]
 ################################################################################
-# Upstream: https://kernel.ubuntu.com/git/cking/stress-ng.git/plain/snap/snapcraft.yaml
   stress-ng:
-    source-tag: "V0.15.09"
-    source-depth: 1
-    plugin: make
-    build-environment:
-      - CFLAGS: "-fstack-protector-strong -Wformat -Werror=format-security"
-      - LDFLAGS: "-Wl,-z,relro -lrt"
-    source: https://github.com/ColinIanKing/stress-ng.git
-    make-parameters:
-      - STATIC=1 VERBOSE=1
+    plugin: nil
+    stage-packages:
+      - stress-ng
     build-packages:
-      - gcc
-      - make
-      - zlib1g-dev
-      - libbsd-dev
-      - libgcrypt20-dev
-      - libkeyutils-dev
-      - libapparmor-dev
-      - libaio-dev
-      - libcap-dev
-      - libsctp-dev
-      - libatomic1
-      - libjudy-dev
-      - libjpeg-dev
-      - libkmod-dev
-      - libattr1-dev
-      - libxxhash-dev
-      - libmd-dev
-      - on amd64: [ libipsec-mb-dev ]
+      - stress-ng
     after: [fwts]
 ################################################################################
 # Upstream: https://kernel.ubuntu.com/git/cking/snapcraft-snaps.git/tree/acpica/snapcraft.yaml
diff --git a/checkbox-core-snap/series24/snap/snapcraft.yaml b/checkbox-core-snap/series24/snap/snapcraft.yaml
index 9c7b6991e7..30b620027e 100644
--- a/checkbox-core-snap/series24/snap/snapcraft.yaml
+++ b/checkbox-core-snap/series24/snap/snapcraft.yaml
@@ -60,6 +60,10 @@ slots:
     read:
       - /
 
+package-repositories:
+  - type: apt
+    ppa: colin-king/stress-ng
+
 parts:
   version-calculator:
     plugin: dump