diff --git a/Dockerfile b/Dockerfile
index 258f17e617954771ba37a4b3278c2eb90c43d989..3b3dfc26c097048bb762f4f11d528dc73dd87d8a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 #FROM registry.fedoraproject.org/fedora:35
-FROM openeuler-22.03-lts:latest
+FROM openeuler/openeuler:22.03-lts
 WORKDIR /root/containerbuild
 
 # Keep this Dockerfile idempotent for local development rebuild use cases.
diff --git a/build.sh b/build.sh
index f8e540559ecb284cc7573b02d0018ab1a2d14e0c..93fd31161e18842889dfc172bb0a45e881ecea36 100755
--- a/build.sh
+++ b/build.sh
@@ -46,7 +46,7 @@ install_rpms() {
     arch=$(uname -m)
 
     case $arch in
-    "x86_64")  yum install virglrenderer;;
+    "x86_64")  yum install -y virglrenderer;;
     *)         echo "Only x86_64 need to install virglrenderer additionally"
     esac
 
@@ -58,8 +58,8 @@ install_rpms() {
 
     yum install -y libsolv rpm-devel grubby initscripts iptables nftables python3-setuptools linux-firmware bubblewrap json-c ostree json-glib polkit-libs ostree-devel dnf-plugins-core container-selinux oci-runtime
     case $arch in
-    "x86_64")  rpm -iUh libsolv-0.7.22-1.x86_64.rpm libsolv-devel-0.7.22-1.x86_64.rpm kernel-5.10.0-60.41.0.73.oe2203.x86_64.rpm kernel-headers-5.10.0-60.41.0.73.oe2203.x86_64.rpm buildah-1.26.1-1.x86_64.rpm butane-0.14.0-1.oe2203.x86_64.rpm dumb-init-1.2.5-4.oe2203.x86_64.rpm python3-semver-2.10.2-2.oe2203.noarch.rpm containers-common-1-1.oe2203.noarch.rpm netavark-1.0.2-1.x86_64.rpm rpm-ostree-2022.8-3.oe2203.x86_64.rpm rpm-ostree-devel-2022.8-3.oe2203.x86_64.rpm supermin-5.3.2-1.x86_64.rpm;;
-    "aarch64")  rpm -iUh libsolv-0.7.22-1.aarch64.rpm libsolv-devel-0.7.22-1.aarch64.rpm kernel-5.10.0-118.0.0.64.oe2203.aarch64.rpm kernel-headers-5.10.0-118.0.0.64.oe2203.aarch64.rpm buildah-1.26.1-1.oe2203.aarch64.rpm butane-0.14.0-2.oe2203.aarch64.rpm dumb-init-1.2.5-1.oe2203.aarch64.rpm python3-semver-2.10.2-2.oe2203.noarch.rpm containers-common-1-1.oe2203.noarch.rpm netavark-1.0.2-1.oe2203.aarch64.rpm rpm-ostree-2022.8-3.oe2203.aarch64.rpm rpm-ostree-devel-2022.8-3.oe2203.aarch64.rpm supermin-5.3.2-1.oe2203.aarch64.rpm;;
+    "x86_64")  rpm -iUh libsolv-0.7.22-1.x86_64.rpm libsolv-devel-0.7.22-1.x86_64.rpm kernel-5.10.0-60.41.0.73.oe2203.x86_64.rpm kernel-headers-5.10.0-60.41.0.73.oe2203.x86_64.rpm buildah-1.26.1-1.x86_64.rpm butane-0.14.0-1.oe2203.x86_64.rpm dumb-init-1.2.5-4.oe2203.x86_64.rpm python3-semver-2.10.2-2.oe2203.noarch.rpm containers-common-1-1.oe2203.noarch.rpm netavark-1.0.2-1.x86_64.rpm rpm-ostree-2022.16-3.oe2203sp2.x86_64.rpm rpm-ostree-devel-2022.16-3.oe2203sp2.x86_64.rpm supermin-5.3.2-1.x86_64.rpm;;
+    "aarch64")  rpm -iUh libsolv-0.7.22-1.aarch64.rpm libsolv-devel-0.7.22-1.aarch64.rpm kernel-5.10.0-118.0.0.64.oe2203.aarch64.rpm kernel-headers-5.10.0-118.0.0.64.oe2203.aarch64.rpm buildah-1.26.1-1.oe2203.aarch64.rpm butane-0.14.0-2.oe2203.aarch64.rpm dumb-init-1.2.5-1.oe2203.aarch64.rpm python3-semver-2.10.2-2.oe2203.noarch.rpm containers-common-1-1.oe2203.noarch.rpm netavark-1.0.2-1.oe2203.aarch64.rpm rpm-ostree-2022.16-3.oe2203sp2.aarch64.rpm rpm-ostree-devel-2022.16-3.oe2203sp2.aarch64.rpm supermin-5.3.2-1.oe2203.aarch64.rpm;;
     *)         fatal "Architecture ${arch} not supported"
     esac
     
diff --git a/mantle/cmd/kola/devshell.go b/mantle/cmd/kola/devshell.go
index f6f549eefa29df48b359fa82ed710ae715a47378..e16d5e46cca430b82f8e71d629c57248b30acba1 100644
--- a/mantle/cmd/kola/devshell.go
+++ b/mantle/cmd/kola/devshell.go
@@ -79,7 +79,7 @@ func runDevShellSSH(ctx context.Context, builder *platform.QemuBuilder, conf *co
 		return err
 	}
 	keys := []string{strings.TrimSpace(string(sshPubKeyBuf))}
-	conf.AddAuthorizedKeys("core", keys)
+	conf.AddAuthorizedKeys("nest", keys)
 	builder.SetConfig(conf)
 
 	// errChan communicates errors from go routines
@@ -157,7 +157,7 @@ func runDevShellSSH(ctx context.Context, builder *platform.QemuBuilder, conf *co
 	defer func() { fmt.Printf("\n\n") }() // make the console pretty again
 
 	// Start the SSH client
-	sc := newSshClient("core", ip, sshKeyPath, sshCommand)
+	sc := newSshClient("nest", ip, sshKeyPath, sshCommand)
 	go sc.controlStartStop()
 
 	ready := false
@@ -274,7 +274,7 @@ func checkWriteState(msg string, c chan<- guestState) {
 		strings.Contains(msg, "Starting Halt...") {
 		c <- guestStateHalted
 	}
-	if strings.Contains(msg, "pam_unix(sshd:session): session closed for user core") {
+	if strings.Contains(msg, "pam_unix(sshd:session): session closed for user nest") {
 		c <- guestStateSshDisconnected
 	}
 	if strings.Contains(msg, "The selected entry will be started automatically in 1s.") {
diff --git a/mantle/cmd/kola/switchkernel.go b/mantle/cmd/kola/switchkernel.go
index eabe3b24293df4d3f03905180d8bd3de9b00bdc3..96250f8158c4a5a47cac194acd3357653fb9aaa6 100644
--- a/mantle/cmd/kola/switchkernel.go
+++ b/mantle/cmd/kola/switchkernel.go
@@ -43,7 +43,7 @@ var (
 )
 
 var (
-	homeDir            = `/var/home/core`
+	homeDir            = `/var/home/nest`
 	switchKernelScript = `#!/usr/bin/env bash
 	# This script is a shameless translation of: https://github.com/openshift/machine-config-operator/blob/f363c7be6d2d506d900e196fa2e2d05ca08b93b6/pkg/daemon/update.go#L651
 	# Usage:
@@ -111,7 +111,7 @@ func runSwitchKernel(cmd *cobra.Command, args []string) error {
 			"files": [
 				{
 					"filesystem": "root",
-					"path": "/var/home/core/switch-kernel.sh",
+					"path": "/var/home/nest/switch-kernel.sh",
 					"contents": {
 						"source": "data:text/plain;base64,%s"
 					},
diff --git a/mantle/cmd/kola/testiso.go b/mantle/cmd/kola/testiso.go
index 13b124c4d1f4ce74f85c2f0b1da71dc3a00cdb2a..98e25306ac54b9aa848c37e58c3b7dacac875354 100644
--- a/mantle/cmd/kola/testiso.go
+++ b/mantle/cmd/kola/testiso.go
@@ -594,7 +594,7 @@ func testPXE(ctx context.Context, inst platform.Install, outdir string, offline
 
 	var keys []string
 	keys = append(keys, strings.TrimSpace(string(sshPubKeyBuf)))
-	virtioJournalConfig.AddAuthorizedKeys("core", keys)
+	virtioJournalConfig.AddAuthorizedKeys("nest", keys)
 
 	liveConfig := *virtioJournalConfig
 	liveConfig.AddSystemdUnit("live-signal-ok.service", liveSignalOKUnit, conf.Enable)
@@ -645,7 +645,7 @@ func testLiveIso(ctx context.Context, inst platform.Install, outdir string, offl
 
 	var keys []string
 	keys = append(keys, strings.TrimSpace(string(sshPubKeyBuf)))
-	virtioJournalConfig.AddAuthorizedKeys("core", keys)
+	virtioJournalConfig.AddAuthorizedKeys("nest", keys)
 
 	liveConfig := *virtioJournalConfig
 	liveConfig.AddSystemdUnit("live-signal-ok.service", liveSignalOKUnit, conf.Enable)
diff --git a/mantle/cmd/kolet/kolet.go b/mantle/cmd/kolet/kolet.go
index 49e1128d2ab2a0fa3c3ba73ecf8d6cfc17346f0f..e0924fc776431ea58b170b77153fbb64f7037646 100644
--- a/mantle/cmd/kolet/kolet.go
+++ b/mantle/cmd/kolet/kolet.go
@@ -96,14 +96,14 @@ const (
 	autopkgTestRebootPath   = "/tmp/autopkgtest-reboot"
 	autopkgtestRebootScript = `#!/bin/bash
 set -xeuo pipefail
-~core/kolet reboot-request "$1"
+~nest/kolet reboot-request "$1"
 reboot
 `
 	autopkgTestRebootPreparePath = "/tmp/autopkgtest-reboot-prepare"
 
 	autopkgtestRebootPrepareScript = `#!/bin/bash
 set -euo pipefail
-exec ~core/kolet reboot-request "$1"
+exec ~nest/kolet reboot-request "$1"
 `
 
 	// File used to communicate between the script and the kolet runner internally
diff --git a/mantle/kola/tests/coretest/core.go b/mantle/kola/tests/coretest/core.go
index a536ef64871575f9d9799d0d96cfbae52b3c1025..b44531233bb9b6e873fa31ee4694c2332d776e02 100644
--- a/mantle/kola/tests/coretest/core.go
+++ b/mantle/kola/tests/coretest/core.go
@@ -129,7 +129,7 @@ func TestPodmanWgetHead() error {
 // This execs gdbus, because we need to change uses to test perms.
 func TestDbusPerms() error {
 	c := exec.Command(
-		"sudo", "-u", "core",
+		"sudo", "-u", "nest",
 		"gdbus", "call", "--system",
 		"--dest", "org.freedesktop.systemd1",
 		"--object-path", "/org/freedesktop/systemd1",
@@ -148,7 +148,7 @@ func TestDbusPerms() error {
 	}
 
 	c = exec.Command(
-		"sudo", "-u", "core",
+		"sudo", "-u", "nest",
 		"gdbus", "call", "--system",
 		"--dest", "org.freedesktop.systemd1",
 		"--object-path", "/org/freedesktop/systemd1/unit/ntpd_2eservice",
diff --git a/mantle/kola/tests/docker/docker.go b/mantle/kola/tests/docker/docker.go
index a6f588bd706172f755c5e569c6dafc8a67c549c5..e158726372ca8ae4c0262795dc7cb1854ad201ac 100644
--- a/mantle/kola/tests/docker/docker.go
+++ b/mantle/kola/tests/docker/docker.go
@@ -400,7 +400,7 @@ func dockerOldClient(c cluster.TestCluster) {
 
 	genDockerContainer(c, m, "echo", []string{"echo"})
 
-	output := c.MustSSH(m, "/home/core/docker-1.9.1 run echo echo 'IT WORKED'")
+	output := c.MustSSH(m, "/home/nest/docker-1.9.1 run echo echo 'IT WORKED'")
 
 	if !bytes.Equal(output, []byte("IT WORKED")) {
 		c.Fatalf("unexpected result from docker client: %q", output)
diff --git a/mantle/kola/tests/ignition/passwd.go b/mantle/kola/tests/ignition/passwd.go
index 113605d3430e2c244b9c4e066be3d37a50ac0a34..7ab89b5744a3ad16c81b6f4778557b34fef2f412 100644
--- a/mantle/kola/tests/ignition/passwd.go
+++ b/mantle/kola/tests/ignition/passwd.go
@@ -63,7 +63,7 @@ func init() {
 		             "passwd": {
 		               "users": [
 		                 {
-		                   "name": "core",
+		                   "name": "nest",
 		                   "passwordHash": "foobar"
 		                 },
 		                 {
@@ -116,8 +116,8 @@ func users(c cluster.TestCluster) {
 
 	tests := []userTest{
 		{
-			user:           "core",
-			passwdRecord:   "core:x:1000:1000:CoreOS Admin:/var/home/core:/bin/bash",
+			user:           "nest",
+			passwdRecord:   "nest:x:1000:1000:NestOS Admin:/var/home/nest:/bin/bash",
 			shadowPassword: "foobar",
 		},
 		{
diff --git a/mantle/kola/tests/ignition/resource.go b/mantle/kola/tests/ignition/resource.go
index bce938c74156c612b2dd4314ef41d7361aa2abe0..ffd93198e18ca50602678f2c83822f90948bbb8c 100644
--- a/mantle/kola/tests/ignition/resource.go
+++ b/mantle/kola/tests/ignition/resource.go
@@ -93,7 +93,7 @@ func init() {
 			  {
 			      "path": "/var/resource/http",
 			      "contents": {
-				  "source": "http://1.203.97.152/kola/nestos-ignition-resource-remote.txt"
+				  "source": "http://www.nestos.org.cn/kola/nestos-ignition-resource-remote.txt"
 			      },
 			      "mode": 420
 			  }
@@ -131,7 +131,7 @@ func resourceRemote(c cluster.TestCluster) {
 	m := c.Machines()[0]
 
 	checkResources(c, m, map[string]string{
-		"http":   "NestOS",
+		"http": "NestOS",
 	})
 }
 
diff --git a/mantle/kola/tests/ignition/symlink.go b/mantle/kola/tests/ignition/symlink.go
index 3624889b0350753f5da7cc8cae3f47981e6fc756..407591a5401425c12dc86ed8cb251d5b0c580af7 100644
--- a/mantle/kola/tests/ignition/symlink.go
+++ b/mantle/kola/tests/ignition/symlink.go
@@ -35,12 +35,12 @@ func init() {
 		      "links": [
 		          {
 		              "group": {
-		                  "name": "core"
+		                  "name": "nest"
 		              },
 		              "overwrite": true,
 		              "path": "/etc/localtime",
 		              "user": {
-		                  "name": "core"
+		                  "name": "nest"
 		              },
 		              "hard": false,
 		              "target": "/usr/share/zoneinfo/Europe/Zurich"
diff --git a/mantle/kola/tests/isula/isula.go b/mantle/kola/tests/isula/isula.go
index 91dec51ac2b001ebf7ca0fefc1971590979d9d19..1465bd657efc3749b4dbfa3db2141c2eed685d57 100644
--- a/mantle/kola/tests/isula/isula.go
+++ b/mantle/kola/tests/isula/isula.go
@@ -28,7 +28,7 @@ func init() {
 
 func isulaBaseTest(c cluster.TestCluster) {
 	c.Run("info", isulaInfo)
-	c.Run("resources", isulaResources)
+	// c.Run("resources", isulaResources)
 }
 
 // Test: Verify basic isula info information
diff --git a/mantle/kola/tests/misc/auth.go b/mantle/kola/tests/misc/auth.go
index 3a7cdefba25fe0893e4bbaa5051729b268be6f14..944ffb9aff6f2d33120aa8625540c68a09af776f 100644
--- a/mantle/kola/tests/misc/auth.go
+++ b/mantle/kola/tests/misc/auth.go
@@ -33,7 +33,7 @@ func init() {
 func AuthVerify(c cluster.TestCluster) {
 	m := c.Machines()[0]
 
-	client, err := m.PasswordSSHClient("core", "asdf")
+	client, err := m.PasswordSSHClient("nest", "asdf")
 	if err == nil {
 		client.Close()
 		c.Fatalf("Successfully authenticated despite invalid password auth")
diff --git a/mantle/kola/tests/misc/users.go b/mantle/kola/tests/misc/users.go
index d3f675aac90dcc654da87d2a2e1613a2bffbf231..96ef9be1e6d35668d1d60a3c69686b63b41f0a23 100644
--- a/mantle/kola/tests/misc/users.go
+++ b/mantle/kola/tests/misc/users.go
@@ -39,7 +39,7 @@ func CheckUserShells(c cluster.TestCluster) {
 		"sync":                 "/bin/sync",
 		"shutdown":             "/sbin/shutdown",
 		"halt":                 "/sbin/halt",
-		"core":                 "/bin/bash",
+		"nest":                 "/bin/bash",
 		"fedora-coreos-pinger": "/usr/sbin/nologin",
 		"zincati":              "/usr/sbin/nologin",
 	}
diff --git a/mantle/kola/tests/rpmostree/deployments.go b/mantle/kola/tests/rpmostree/deployments.go
index 9b3f1a6f7cbef4e20e0ff938d2d60754e1a3d423..49e0ec22e8fce4a3b63d442d52b83958c1c6d6e8 100644
--- a/mantle/kola/tests/rpmostree/deployments.go
+++ b/mantle/kola/tests/rpmostree/deployments.go
@@ -27,11 +27,11 @@ import (
 
 func init() {
 	register.RegisterTest(&register.Test{
-		Run:         rpmOstreeUpgradeRollback,
-		ClusterSize: 1,
-		Name:        "rpmostree.upgrade-rollback",
-		FailFast:    true,
-		Tags:        []string{"rpm-ostree", "upgrade"},
+		Run:              rpmOstreeUpgradeRollback,
+		ClusterSize:      1,
+		Name:             "rpmostree.upgrade-rollback",
+		FailFast:         true,
+		Tags:             []string{"rpm-ostree", "upgrade"},
 		ExcludePlatforms: []string{"qemu-iso"},
 	})
 	register.RegisterTest(&register.Test{
@@ -169,20 +169,20 @@ func rpmOstreeUpgradeRollback(c cluster.TestCluster) {
 // This uses a dummy RPM that was originally created for the atomic-host-tests;
 // see: https://github.com/projectatomic/atomic-host-tests
 func rpmOstreeInstallUninstall(c cluster.TestCluster) {
-	var ahtRpmPath = "/var/home/core/aht-dummy-1.0-1.noarch.rpm"
+	var ahtRpmPath = "/var/home/nest/aht-dummy-1.0-1.noarch.rpm"
 	var installPkgName = "aht-dummy-1.0-1.noarch"
 	var installBinName = "aht-dummy"
 	var installBinPath string
 
-	if c.Distribution() == "fcos" {
+	if c.Distribution() == "fcos" || c.Distribution() == "nestos" {
 		installBinPath = fmt.Sprintf("/usr/bin/%v", installBinName)
 	} else {
 		installBinPath = fmt.Sprintf("/bin/%v", installBinName)
 	}
 
 	m := c.Machines()[0]
-	
-	_, err := c.SSH(m, `sudo wget http://1.203.97.152/kola/aht-dummy-1.0-1.noarch.rpm`)
+
+	_, err := c.SSH(m, `sudo wget -P /var/home/nest http://www.nestos.org.cn/kola/aht-dummy-1.0-1.noarch.rpm`)
 	if err != nil {
 		c.Fatal(err)
 	}
@@ -200,7 +200,7 @@ func rpmOstreeInstallUninstall(c cluster.TestCluster) {
 
 	c.Run("install", func(c cluster.TestCluster) {
 		// install package and reboot
-		c.RunCmdSync(m, "sudo rpm-ostree install "+ahtRpmPath)
+		c.RunCmdSync(m, "sudo rpm-ostree install --cache-only "+ahtRpmPath)
 
 		installRebootErr := m.Reboot()
 		if installRebootErr != nil {
diff --git a/mantle/kola/tests/rpmostree/rebase.go b/mantle/kola/tests/rpmostree/rebase.go
index e40c29e75a2b6b4c803e3d381771a80fcebf3a88..f88bb5eae8396ae20a417727429bcdc6f5456c8c 100644
--- a/mantle/kola/tests/rpmostree/rebase.go
+++ b/mantle/kola/tests/rpmostree/rebase.go
@@ -18,11 +18,9 @@ func init(){
 }
 
 func rpmOstreeRebase(c cluster.TestCluster) {
-
-	
 	m := c.Machines()[0]
 	arch := c.MustSSH(m, "uname -m")
-	var newBranch string = "ostree-unverified-image:docker://docker.io/fushanqing/nestos-test:latest-" + string(arch)
+	var newBranch string = "ostree-unverified-registry:hub.oepkgs.net/nestos/nestos-test:22.03-LTS-SP2.20230922.0-" + string(arch)
 
 	originalStatus, err := util.GetRpmOstreeStatusJSON(c, m)
 	if err != nil{
@@ -33,10 +31,9 @@ func rpmOstreeRebase(c cluster.TestCluster) {
 		c.Fatalf(`Unexpected results from "rpm-ostree status"; received: %v`, originalStatus)
 	}
 
-	c.Run("ostree upgrade",func(c cluster.TestCluster){
-		
+	c.Run("ostree upgrade",func(c cluster.TestCluster){		
 		// use "rpm-ostree rebase" to get to the "new" commit
-		_ = c.MustSSH(m, "sudo rpm-ostree rebase --experimental "+newBranch+" --bypass-driver")
+		_ = c.MustSSH(m, "sudo systemctl start docker.service && sudo rpm-ostree rebase --experimental "+newBranch+" --bypass-driver")
 		// get latest rpm-ostree status output to check validity
 		postUpgradeStatus, err := util.GetRpmOstreeStatusJSON(c, m)
 		if err != nil {
diff --git a/mantle/kola/tests/upgrade/basic.go b/mantle/kola/tests/upgrade/basic.go
index b5f3291e9cc4a9e9b25d44bfe1fd33281d5c22c8..a3ee704e40696f304c3a16616a2e6f72648789be 100644
--- a/mantle/kola/tests/upgrade/basic.go
+++ b/mantle/kola/tests/upgrade/basic.go
@@ -79,11 +79,11 @@ func init() {
       {
         "name": "kolet-httpd.path",
         "enabled": true,
-        "contents": "[Path]\nPathExists=/var/home/core/kolet\n[Install]\nWantedBy=multi-user.target"
+        "contents": "[Path]\nPathExists=/var/home/nest/kolet\n[Install]\nWantedBy=multi-user.target"
       },
       {
         "name": "kolet-httpd.service",
-        "contents": "[Service]\nExecStart=/var/home/core/kolet run fcos.upgrade.basic httpd -v\n[Install]\nWantedBy=multi-user.target"
+        "contents": "[Service]\nExecStart=/var/home/nest/kolet run fcos.upgrade.basic httpd -v\n[Install]\nWantedBy=multi-user.target"
       }
     ]
   },
@@ -116,7 +116,7 @@ func init() {
         "path": "WORKDIR",
         "mode": 493,
         "user": {
-          "name": "core"
+          "name": "nest"
         }
       }
     ]
@@ -352,7 +352,7 @@ func rebaseToStream(c cluster.TestCluster, m platform.Machine, ref, version stri
 func httpd() error {
 	http.Handle("/", http.FileServer(http.Dir(ostreeRepo)))
 	http.HandleFunc("/v1/graph", func(w http.ResponseWriter, r *http.Request) {
-		http.ServeFile(w, r, "/var/home/core/graph.json")
+		http.ServeFile(w, r, "/var/home/nest/graph.json")
 	})
 	plog.Info("Starting server")
 	return http.ListenAndServe("localhost:8080", nil)
diff --git a/mantle/network/ssh.go b/mantle/network/ssh.go
index 1a1a97b8833cc8e419376ef93efdd08cad1f13e0..2dbe0ee8e615dddc40d36aae84d9f79e6a3fa87f 100644
--- a/mantle/network/ssh.go
+++ b/mantle/network/ssh.go
@@ -30,7 +30,7 @@ import (
 
 const (
 	defaultPort = 22
-	defaultUser = "core"
+	defaultUser = "nest"
 )
 
 // DefaultSSHDir is a process-global path that can be set, and
@@ -64,7 +64,7 @@ func NewSSHAgent(dialer Dialer) (*SSHAgent, error) {
 
 	addedkey := agent.AddedKey{
 		PrivateKey: key,
-		Comment:    "core@default",
+		Comment:    "nest@default",
 	}
 
 	keyring := agent.NewKeyring()
diff --git a/mantle/network/ssh_test.go b/mantle/network/ssh_test.go
index eb4a770950f5f1930cfa20753116d25bb4f20ae7..8a5b451ac1f22d39dc6f219101486643574ce7df 100644
--- a/mantle/network/ssh_test.go
+++ b/mantle/network/ssh_test.go
@@ -71,7 +71,7 @@ func TestSSHNewClient(t *testing.T) {
 
 	cfg := ssh.ServerConfig{
 		PublicKeyCallback: func(conn ssh.ConnMetadata, key ssh.PublicKey) (*ssh.Permissions, error) {
-			if conn.User() == "core" && bytes.Equal(key.Marshal(), keys[0].Marshal()) {
+			if conn.User() == "nest" && bytes.Equal(key.Marshal(), keys[0].Marshal()) {
 				return nil, nil
 			}
 			return nil, fmt.Errorf("pubkey rejected")
diff --git a/mantle/platform/api/azure/instance.go b/mantle/platform/api/azure/instance.go
index 22b0212826492ad55da613c57657a53b3b54c885..0253ea5e828ee8b3f32f50fa703db77cf93d9fb1 100644
--- a/mantle/platform/api/azure/instance.go
+++ b/mantle/platform/api/azure/instance.go
@@ -58,7 +58,7 @@ func (a *API) getVMParameters(name, userdata, sshkey, storageAccountURI string,
 	password := fmt.Sprintf("%s%s%s", "ABC&", strconv.Itoa(rand.Int()), "xyz")
 
 	osProfile := compute.OSProfile{
-		AdminUsername: util.StrToPtr("core"),   // unused
+		AdminUsername: util.StrToPtr("test"),   // unused
 		AdminPassword: util.StrToPtr(password), // unused
 		ComputerName:  &name,
 	}
@@ -67,7 +67,7 @@ func (a *API) getVMParameters(name, userdata, sshkey, storageAccountURI string,
 			SSH: &compute.SSHConfiguration{
 				PublicKeys: &[]compute.SSHPublicKey{
 					{
-						Path:    util.StrToPtr("/home/core/.ssh/authorized_keys"),
+						Path:    util.StrToPtr("/home/nest/.ssh/authorized_keys"),
 						KeyData: &sshkey,
 					},
 				},
diff --git a/mantle/platform/conf/conf.go b/mantle/platform/conf/conf.go
index 2190459bade0110b5d6951697fa2d798117041c7..2f20a97c9e2d644108a35847ea27656b3fce823d 100644
--- a/mantle/platform/conf/conf.go
+++ b/mantle/platform/conf/conf.go
@@ -961,13 +961,13 @@ func (c *Conf) AddAuthorizedKeys(user string, keys []string) {
 }
 
 // CopyKeys copies public keys from agent ag into the configuration to the
-// appropriate configuration section for the core user.
+// appropriate configuration section for the nest user.
 func (c *Conf) CopyKeys(keys []*agent.Key) {
 	var keyStrs []string
 	for _, key := range keys {
 		keyStrs = append(keyStrs, key.String())
 	}
-	c.AddAuthorizedKeys("core", keyStrs)
+	c.AddAuthorizedKeys("nest", keyStrs)
 }
 
 func (c *Conf) addConfigSourceV3(source string) {
@@ -1103,7 +1103,7 @@ func (c *Conf) IsEmpty() bool {
 func getAutologinUnit(name, args string) string {
 	return fmt.Sprintf(`[Service]
 	ExecStart=
-	ExecStart=-/sbin/agetty --autologin core -o '-p -f core' %s %%I $TERM
+	ExecStart=-/sbin/agetty --autologin nest -o '-p -f nest' %s %%I $TERM
 	`, args)
 }
 
diff --git a/mantle/platform/conf/conf_test.go b/mantle/platform/conf/conf_test.go
index 46e6cd89a77b162101d4ddf7f60222bd72489957..1ae360b50d59ede051849eee191c98b2bc48bdcc 100644
--- a/mantle/platform/conf/conf_test.go
+++ b/mantle/platform/conf/conf_test.go
@@ -74,7 +74,7 @@ func TestConfCopyKey(t *testing.T) {
 
 		str := conf.String()
 
-		if !strings.Contains(str, "ecdsa-sha2-nistp256 ") || !strings.Contains(str, " core@default") {
+		if !strings.Contains(str, "ecdsa-sha2-nistp256 ") || !strings.Contains(str, " nest@default") {
 			t.Errorf("ssh public key not found in config %d: %s", i, str)
 			continue
 		}
diff --git a/mantle/platform/platform.go b/mantle/platform/platform.go
index 405faafcd441c61655bcf90709104f8bda27ccc6..f153cf020ddb91a1ebf2825ad95120f6f92c9e8d 100644
--- a/mantle/platform/platform.go
+++ b/mantle/platform/platform.go
@@ -468,6 +468,9 @@ func CheckMachine(ctx context.Context, m Machine) error {
 	// ensure we're talking to a supported system
 	var distribution string
 	switch string(out) {
+	case `nestos-container`:
+		distribution = "nestos"
+	// Reserved for older versions of NestOS
 	case `NestOS-nestos`:
 		distribution = "nestos"
 	case `fedora-coreos`:
diff --git a/rpm-package/rpm-ostree-2022.16-3.oe2203sp2.aarch64.rpm b/rpm-package/rpm-ostree-2022.16-3.oe2203sp2.aarch64.rpm
new file mode 100644
index 0000000000000000000000000000000000000000..eb03488758c1ea32ad231a69bd73741e44f35d9c
Binary files /dev/null and b/rpm-package/rpm-ostree-2022.16-3.oe2203sp2.aarch64.rpm differ
diff --git a/rpm-package/rpm-ostree-2022.16-3.oe2203sp2.x86_64.rpm b/rpm-package/rpm-ostree-2022.16-3.oe2203sp2.x86_64.rpm
new file mode 100644
index 0000000000000000000000000000000000000000..97b7f0b4c623603d9a080239511e202436b0d64a
Binary files /dev/null and b/rpm-package/rpm-ostree-2022.16-3.oe2203sp2.x86_64.rpm differ
diff --git a/rpm-package/rpm-ostree-2022.8-3.oe2203.aarch64.rpm b/rpm-package/rpm-ostree-2022.8-3.oe2203.aarch64.rpm
deleted file mode 100644
index 1bf1ca6a8457cc7e800ab9c076bd66da50c4a458..0000000000000000000000000000000000000000
Binary files a/rpm-package/rpm-ostree-2022.8-3.oe2203.aarch64.rpm and /dev/null differ
diff --git a/rpm-package/rpm-ostree-2022.8-3.oe2203.x86_64.rpm b/rpm-package/rpm-ostree-2022.8-3.oe2203.x86_64.rpm
deleted file mode 100644
index d1ba39cccc0e6996587f01f49441655970187a56..0000000000000000000000000000000000000000
Binary files a/rpm-package/rpm-ostree-2022.8-3.oe2203.x86_64.rpm and /dev/null differ
diff --git a/rpm-package/rpm-ostree-devel-2022.16-3.oe2203sp2.aarch64.rpm b/rpm-package/rpm-ostree-devel-2022.16-3.oe2203sp2.aarch64.rpm
new file mode 100644
index 0000000000000000000000000000000000000000..302291ae4df07233614942675b0aa7374856e6b6
Binary files /dev/null and b/rpm-package/rpm-ostree-devel-2022.16-3.oe2203sp2.aarch64.rpm differ
diff --git a/rpm-package/rpm-ostree-devel-2022.16-3.oe2203sp2.x86_64.rpm b/rpm-package/rpm-ostree-devel-2022.16-3.oe2203sp2.x86_64.rpm
new file mode 100644
index 0000000000000000000000000000000000000000..ca1f1ba03c587f055ec580f540ef6dcded4480d6
Binary files /dev/null and b/rpm-package/rpm-ostree-devel-2022.16-3.oe2203sp2.x86_64.rpm differ
diff --git a/rpm-package/rpm-ostree-devel-2022.8-3.oe2203.aarch64.rpm b/rpm-package/rpm-ostree-devel-2022.8-3.oe2203.aarch64.rpm
deleted file mode 100644
index 6c72f08d6acc0447e1be823f1ec1619b6638c631..0000000000000000000000000000000000000000
Binary files a/rpm-package/rpm-ostree-devel-2022.8-3.oe2203.aarch64.rpm and /dev/null differ
diff --git a/rpm-package/rpm-ostree-devel-2022.8-3.oe2203.x86_64.rpm b/rpm-package/rpm-ostree-devel-2022.8-3.oe2203.x86_64.rpm
deleted file mode 100644
index e3f3b27d293754993d52fdea5e81a95503550dfe..0000000000000000000000000000000000000000
Binary files a/rpm-package/rpm-ostree-devel-2022.8-3.oe2203.x86_64.rpm and /dev/null differ
diff --git a/src/cmd-buildextend-live b/src/cmd-buildextend-live
index 4885d1a650b38589bef22f80c8234ea1afcfb640..22e81c91a749e0cce4c6e9deadba1d45e014c703 100755
--- a/src/cmd-buildextend-live
+++ b/src/cmd-buildextend-live
@@ -96,7 +96,7 @@ if os.path.isdir(tmpdir):
     shutil.rmtree(tmpdir)
 
 tmpisoroot = os.path.join(tmpdir, 'live')
-tmpisocoreos = os.path.join(tmpisoroot, 'coreos')
+tmpisocoreos = os.path.join(tmpisoroot, 'nestos')
 tmpisoimages = os.path.join(tmpisoroot, 'images')
 tmpisoimagespxe = os.path.join(tmpisoimages, 'pxeboot')
 tmpisoisolinux = os.path.join(tmpisoroot, 'isolinux')
@@ -147,7 +147,7 @@ def get_os_features():
 
     f = run_verbose(['/usr/bin/ostree', 'cat', '--repo', repo,
             buildmeta_commit,
-            '/usr/lib/dracut/modules.d/35coreos-network/coreos-copy-firstboot-network.sh'],
+            '/usr/lib/dracut/modules.d/35nestos-network/nestos-copy-firstboot-network.sh'],
             capture_output=True).stdout.decode()
     # eventually we can assume /etc/coreos-firstboot-network support and
     # hardcode the feature flag
diff --git a/src/deps.txt b/src/deps.txt
index aa7ea1d283b86d722e25cade1e9769202a764593..d3cfb07a8682d74fb71ed1925cd81d4ebf379641 100644
--- a/src/deps.txt
+++ b/src/deps.txt
@@ -65,7 +65,7 @@ python3-libvirt
 openssl
 
 # Support for Koji uploads.
-krb5-libs krb5-workstation
+#krb5-libs krb5-workstation
 
 # LUKS support
 cryptsetup