diff --git a/app-emulation/cri-o/Manifest b/app-containers/cri-o/Manifest
similarity index 100%
rename from app-emulation/cri-o/Manifest
rename to app-containers/cri-o/Manifest
diff --git a/app-emulation/cri-o/cri-o-1.21.0.ebuild b/app-containers/cri-o/cri-o-1.21.0.ebuild
similarity index 100%
rename from app-emulation/cri-o/cri-o-1.21.0.ebuild
rename to app-containers/cri-o/cri-o-1.21.0.ebuild
diff --git a/app-emulation/cri-o/cri-o-1.21.4.ebuild b/app-containers/cri-o/cri-o-1.21.4.ebuild
similarity index 100%
rename from app-emulation/cri-o/cri-o-1.21.4.ebuild
rename to app-containers/cri-o/cri-o-1.21.4.ebuild
diff --git a/app-emulation/cri-o/cri-o-1.22.1.ebuild b/app-containers/cri-o/cri-o-1.22.1.ebuild
similarity index 100%
rename from app-emulation/cri-o/cri-o-1.22.1.ebuild
rename to app-containers/cri-o/cri-o-1.22.1.ebuild
diff --git a/app-emulation/cri-o/files/cri-o.logrotated b/app-containers/cri-o/files/cri-o.logrotated
similarity index 100%
rename from app-emulation/cri-o/files/cri-o.logrotated
rename to app-containers/cri-o/files/cri-o.logrotated
diff --git a/app-emulation/cri-o/files/crio.initd b/app-containers/cri-o/files/crio.initd
similarity index 100%
rename from app-emulation/cri-o/files/crio.initd
rename to app-containers/cri-o/files/crio.initd
diff --git a/app-emulation/cri-o/metadata.xml b/app-containers/cri-o/metadata.xml
similarity index 100%
rename from app-emulation/cri-o/metadata.xml
rename to app-containers/cri-o/metadata.xml
diff --git a/profiles/updates/4Q-2021 b/profiles/updates/4Q-2021
index 84d6192b4cc12..cb230041d8fc4 100644
--- a/profiles/updates/4Q-2021
+++ b/profiles/updates/4Q-2021
@@ -37,3 +37,4 @@ move app-emulation/buildah app-containers/buildah
 move app-emulation/cadvisor app-containers/cadvisor
 move app-emulation/conmon app-containers/conmon
 move app-emulation/containers-storage app-containers/containers-storage
+move app-emulation/cri-o app-containers/cri-o