diff --git a/data/live-build-config/includes.chroot/var/lib/shim-signed/mok/MOK.der b/data/live-build-config/includes.chroot/var/lib/shim-signed/mok/MOK.der
new file mode 100644
index 0000000000..4e95ba0f44
Binary files /dev/null and b/data/live-build-config/includes.chroot/var/lib/shim-signed/mok/MOK.der differ
diff --git a/data/live-build-config/includes.chroot/var/lib/shim-signed/mok/MOK.pem b/data/live-build-config/includes.chroot/var/lib/shim-signed/mok/MOK.pem
new file mode 100644
index 0000000000..bb8e40f846
--- /dev/null
+++ b/data/live-build-config/includes.chroot/var/lib/shim-signed/mok/MOK.pem
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDATCCAemgAwIBAgIUPkbSS5oxEg4GgoU2JOJ3GAlwRf0wDQYJKoZIhvcNAQEL
+BQAwDzENMAsGA1UEAwwEVnlPUzAgFw0yNDA4MDYwNzEwMTBaGA8yMTI0MDcxMzA3
+MTAxMFowDzENMAsGA1UEAwwEVnlPUzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAK/m3/k7z5aua/urUuOlcx906tj227AXf8NNVN+HuKsWw4CrC8NGA0dh
+dB5e9AXY0j9LruUw5tQMAYP30D0WgH/U12ZW3/9CIItw3V1RiFECqbnBLggIMxSO
+mm4UK+wFoc3Y+aOvU9x0XyZQatCWL0T4kS+HVUlpjvQgMzLb/SakjghXBt0hxYjO
+kul94rAkRukg30/XChgCeATm3doBdXBV6P07yiQ/WhhUNQ0EhxDWIUlnF8ftOEPl
+Ob77947ciMaSxtCgRVXrIErX44nsGrRcfTtcKpqcpds1mUAANdH+4D3K0X6pjWvw
+jidmHTWeoyLiSOOA23NSkirZ5V+uBAsCAwEAAaNTMFEwHQYDVR0OBBYEFHtckvLm
+b12W4fTzdEi6jrSfqQ/8MB8GA1UdIwQYMBaAFHtckvLmb12W4fTzdEi6jrSfqQ/8
+MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBABO3I/5epSxdoeDo
+pW/1CLa5CXRcPj/c5lgroFgh+lHDohGmHXxIMHQ72BVZdJ1iuXXFu9dhUwWyx9Kv
+11bZE0rg/DsuunxVFop0QLWPvgoEZw72x5pJ5Hu4Zjz1YDMvIQN2lCrL65k0zBo0
+PoZfEp4vnJ/SMFklqEz6sjqZw76jAJ8HT4cqd3sf24BH4hGgoZ6+uDbUZiRoiWSB
+U7u7XHDeOoothlF63IVukEs+oKgKJGUr0czVrCIukP3aKR4C83/PwOLKxZYWvJvL
+lMqAGyufm1urlIAzwhcTMjnY4DopMb7JOqDJzBHWCxFHZPBhYEZ/yZUM5TQr6hsC
+2i7qkX0=
+-----END CERTIFICATE-----
diff --git a/data/live-build-config/includes.chroot/var/lib/shim-signed/mok/MOK.priv b/data/live-build-config/includes.chroot/var/lib/shim-signed/mok/MOK.priv
new file mode 100644
index 0000000000..1cd855aa69
--- /dev/null
+++ b/data/live-build-config/includes.chroot/var/lib/shim-signed/mok/MOK.priv
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCv5t/5O8+Wrmv7
+q1LjpXMfdOrY9tuwF3/DTVTfh7irFsOAqwvDRgNHYXQeXvQF2NI/S67lMObUDAGD
+99A9FoB/1NdmVt//QiCLcN1dUYhRAqm5wS4ICDMUjppuFCvsBaHN2Pmjr1PcdF8m
+UGrQli9E+JEvh1VJaY70IDMy2/0mpI4IVwbdIcWIzpLpfeKwJEbpIN9P1woYAngE
+5t3aAXVwVej9O8okP1oYVDUNBIcQ1iFJZxfH7ThD5Tm++/eO3IjGksbQoEVV6yBK
+1+OJ7Bq0XH07XCqanKXbNZlAADXR/uA9ytF+qY1r8I4nZh01nqMi4kjjgNtzUpIq
+2eVfrgQLAgMBAAECggEAOKJIdXnU3epdmQNxphrUZInjvSRJ2jnOqGZjD68mfWtQ
+WcJ4gJAvqRFO7iJbRfCnzLpE3sTuZNJSwJcOpER07fNswKXy67/yM4MMuqlwDskh
+NU3l0K83JwS84vk6pPyxOlIEGjfuc7nCEtdsdKkOIhI3yIo1ovPKE360jUj4CjMD
+Wkm3CUxIQS+HabNxu4ug2B2/63FE4ZxBoLI/pYtce1tf2ggkzdCIniDS0w6d+kb4
+JzqGW8ae38ghVJu5YHgEOwjkshbfj2RAADjbKbRlq7M+cucruJQxsTafa1Ru3zhx
+h1R4QpHujETc5vVcLv5twj2BYRk9iBvR1wzUS781NQKBgQDZXfEclk1Nr5FSpXpq
+ckU2mWHCmeNAjGSnxAveH2ZVMlvVZA7kVh2rylnO2NRZMbJkrc6tT5rfFROD1Zkj
+Tttnu/PgXO5c4Gr+z7cc2qynmJk4iYafJgecFemXSgWxaer4IMyjJ60e3n3sLdhs
+MagZam3wjQV/xTmEzh5bM0SGnQKBgQDPKkwU0BFlgTiiKlfVTz8kQqLl1WEHmRsk
+/iWaYiFXKCV1pDpihVbMIuDhGDMN3I5YWWSH06kqhdbAEEgrFd6tOY88BaWlfB78
+49ORG2nlesK26dqoNMjv9clNtczGi2dNSDoNqq3ffy5fqUUmaRXZQjJWVCH+yLS/
+gpb37CDgxwKBgBRDAn+0rv4H2JcIn9GeVz9QquE18Q4KSDOvPZ/181cLu623hv/X
+2yoxUY/LfHfX/xYNcY+MNRaIY2pNldnJtwADcCdA4mM79B1OhXYmGCQDQH0ZrLfX
+FqyBCmY02zT/d4yrmge3YhbXjItgdqUXN+Eun5LlwlZ3rvXnNMMxkzitAoGAMpoa
+S1snZKvTsYi2O5xHyAuezpT4RmrXfom1lagyjJ95xup+eGIpeWNrmo/WqKQfAOWU
+8Lh6sbBPbEqN1jhZU+ajXf3jIDDZQNxFaURQ8YSy2wr0JfH+wt4+dYTaqASVDwN9
+aqkuH1FpemRWR7OTaqYItZ2HUDymKcE0Lwq2XTECgYBxMmZPpgmFLTfrT2k9LB+1
+9XiYZTSWwu/dMC9g0DR+2BPxk69Pc6eGErfl8IZvI5DcKrXznXtXow+GoU50wKak
+MrdMnUH0RQRmtuV5f+Or4aBExZmObACQTcWOsFSikzOP5EJo8rxM7Cyv7bIIPbrx
+MuDXlC53EPnE8VcjMhKEiw==
+-----END PRIVATE KEY-----
diff --git a/scripts/image-build/build-vyos-image b/scripts/image-build/build-vyos-image
index 44ce2d5f34..40a5208c31 100755
--- a/scripts/image-build/build-vyos-image
+++ b/scripts/image-build/build-vyos-image
@@ -549,6 +549,14 @@ if __name__ == "__main__":
             with open(file_path, 'w') as f:
                 f.write(build_config["default_config"])
 
+        ## Initialize build manifest
+        manifest = {
+            'build_config' : build_config,
+            'artifacts' : [iso_file],
+            'smoketest_iso' : iso_file,
+            'pre_build_config' : pre_build_config
+        }
+
         ## Configure live-build
         lb_config_tmpl = jinja2.Template("""
         lb config noauto \
@@ -644,3 +652,8 @@ Pin-Priority: 600
                 target = f"{os.path.splitext(raw_image)[0]}.{image_ext}"
                 print(f"I: Building {f} file {target}")
                 cmd(f"qemu-img convert -f raw -O {f} {image_opts} {raw_image} {target}")
+
+        manifest['artifacts'].append(raw_image)
+
+    with open('manifest.json', 'w') as f:
+        f.write(json.dumps(manifest))