diff --git a/src/runtime/cli/kata-check_amd64.go b/src/runtime/cli/kata-check_amd64.go
index e3ec31776e..3dd2e38753 100644
--- a/src/runtime/cli/kata-check_amd64.go
+++ b/src/runtime/cli/kata-check_amd64.go
@@ -53,7 +53,7 @@ const acrnDevice = "/dev/acrn_vhm"
 // Due to this several macros are not defined in Linux headers.
 // Until the support is available, directly use the value instead
 // of macros.
-//https://github.com/kata-containers/kata-containers/src/runtime/issues/1784
+//https://github.com/kata-containers/runtime/issues/1784
 const ioctl_ACRN_CREATE_VM = 0x43000010  //nolint
 const ioctl_ACRN_DESTROY_VM = 0x43000011 //nolint
 
diff --git a/src/runtime/cli/main.go b/src/runtime/cli/main.go
index 6e4b69ce1e..7a11efe2b0 100644
--- a/src/runtime/cli/main.go
+++ b/src/runtime/cli/main.go
@@ -282,7 +282,7 @@ func beforeSubcommands(c *cli.Context) error {
 		rootless.SetRootless(*r)
 	}
 	// Support --systed-cgroup
-	// Issue: https://github.com/kata-containers/kata-containers/src/runtime/issues/2428
+	// Issue: https://github.com/kata-containers/runtime/issues/2428
 
 	ignoreConfigLogs := false
 	var traceRootSpan string
diff --git a/src/runtime/virtcontainers/acrn.go b/src/runtime/virtcontainers/acrn.go
index c0dd107671..e28e250b69 100644
--- a/src/runtime/virtcontainers/acrn.go
+++ b/src/runtime/virtcontainers/acrn.go
@@ -105,7 +105,7 @@ const acrnDevice = "/dev/acrn_vhm"
 // Due to this several macros are not defined in Linux headers.
 // Until the support is available, directly use the value instead
 // of macros.
-//https://github.com/kata-containers/kata-containers/src/runtime/issues/1784
+//https://github.com/kata-containers/runtime/issues/1784
 const ioctl_ACRN_GET_PLATFORM_INFO = 0x43000003 //nolint
 
 const (
diff --git a/src/runtime/virtcontainers/container.go b/src/runtime/virtcontainers/container.go
index 7c765f690b..eaab22442e 100644
--- a/src/runtime/virtcontainers/container.go
+++ b/src/runtime/virtcontainers/container.go
@@ -823,7 +823,7 @@ func (c *Container) create() (err error) {
 		normalAttachedDevs []ContainerDevice //for q35: normally attached devices
 		delayAttachedDevs  []ContainerDevice //for q35: delay attached devices, for example, large bar space device
 	)
-	// Fix: https://github.com/kata-containers/kata-containers/src/runtime/issues/2460
+	// Fix: https://github.com/kata-containers/runtime/issues/2460
 	if machineType == QemuQ35 {
 		// add Large Bar space device to delayAttachedDevs
 		for _, device := range c.devices {
@@ -1326,7 +1326,7 @@ func (c *Container) attachDevices(devices []ContainerDevice) error {
 
 	// since devices with large bar space require delayed attachment,
 	// the devices need to be split into two lists, normalAttachedDevs and delayAttachedDevs.
-	// so c.device is not used here. See issue https://github.com/kata-containers/kata-containers/src/runtime/issues/2460.
+	// so c.device is not used here. See issue https://github.com/kata-containers/runtime/issues/2460.
 	for _, dev := range devices {
 		if err := c.sandbox.devManager.AttachDevice(dev.ID, c.sandbox); err != nil {
 			return err
@@ -1364,7 +1364,7 @@ func (c *Container) cgroupsCreate() (err error) {
 		return errorMissingOCISpec
 	}
 
-	// https://github.com/kata-containers/kata-containers/src/runtime/issues/168
+	// https://github.com/kata-containers/runtime/issues/168
 	resources := specs.LinuxResources{
 		CPU: nil,
 	}
@@ -1450,7 +1450,7 @@ func (c *Container) cgroupsUpdate(resources specs.LinuxResources) error {
 		return fmt.Errorf("Could not load cgroup %v: %v", c.state.CgroupPath, err)
 	}
 
-	// Issue: https://github.com/kata-containers/kata-containers/src/runtime/issues/168
+	// Issue: https://github.com/kata-containers/runtime/issues/168
 	r := specs.LinuxResources{
 		CPU: validCPUResources(resources.CPU),
 	}
diff --git a/src/runtime/virtcontainers/device/drivers/block.go b/src/runtime/virtcontainers/device/drivers/block.go
index 6fecbb45ed..7c88d937e0 100644
--- a/src/runtime/virtcontainers/device/drivers/block.go
+++ b/src/runtime/virtcontainers/device/drivers/block.go
@@ -97,7 +97,7 @@ func (device *BlockDevice) Attach(devReceiver api.DeviceReceiver) (err error) {
 			//Longer term block based VM rootfs should be added
 			//as a regular block device which eliminates the
 			//offset.
-			//https://github.com/kata-containers/kata-containers/src/runtime/issues/1061
+			//https://github.com/kata-containers/runtime/issues/1061
 			globalIdx = index + 1
 		}
 
diff --git a/src/runtime/virtcontainers/fc.go b/src/runtime/virtcontainers/fc.go
index 60df0f2520..80680f012c 100644
--- a/src/runtime/virtcontainers/fc.go
+++ b/src/runtime/virtcontainers/fc.go
@@ -203,7 +203,7 @@ func (fc *firecracker) createSandbox(ctx context.Context, id string, networkNS N
 	defer span.Finish()
 
 	//TODO: check validity of the hypervisor config provided
-	//https://github.com/kata-containers/kata-containers/src/runtime/issues/1065
+	//https://github.com/kata-containers/runtime/issues/1065
 	fc.id = fc.truncateID(id)
 	fc.state.set(notReady)
 	fc.config = *hypervisorConfig
@@ -233,7 +233,7 @@ func (fc *firecracker) createSandbox(ctx context.Context, id string, networkNS N
 	fc.netNSPath = networkNS.NetNsPath
 
 	// Till we create lower privileged kata user run as root
-	// https://github.com/kata-containers/kata-containers/src/runtime/issues/1869
+	// https://github.com/kata-containers/runtime/issues/1869
 	fc.uid = "0"
 	fc.gid = "0"
 
@@ -381,7 +381,7 @@ func (fc *firecracker) fcInit(timeout int) error {
 			"--id", fc.id,
 			"--node", "0", //FIXME: Comprehend NUMA topology or explicit ignore
 			"--exec-file", fc.config.HypervisorPath,
-			"--uid", "0", //https://github.com/kata-containers/kata-containers/src/runtime/issues/1869
+			"--uid", "0", //https://github.com/kata-containers/runtime/issues/1869
 			"--gid", "0",
 			"--chroot-base-dir", fc.chrootBaseDir,
 		}
diff --git a/src/runtime/virtcontainers/kata_agent.go b/src/runtime/virtcontainers/kata_agent.go
index 39f64ba19d..650a4dfb44 100644
--- a/src/runtime/virtcontainers/kata_agent.go
+++ b/src/runtime/virtcontainers/kata_agent.go
@@ -1082,8 +1082,8 @@ func (k *kataAgent) constraintGRPCSpec(grpcSpec *grpc.Spec, passSeccomp bool) {
 	}
 
 	// By now only CPU constraints are supported
-	// Issue: https://github.com/kata-containers/kata-containers/src/runtime/issues/158
-	// Issue: https://github.com/kata-containers/kata-containers/src/runtime/issues/204
+	// Issue: https://github.com/kata-containers/runtime/issues/158
+	// Issue: https://github.com/kata-containers/runtime/issues/204
 	grpcSpec.Linux.Resources.Devices = nil
 	grpcSpec.Linux.Resources.Pids = nil
 	grpcSpec.Linux.Resources.BlockIO = nil
diff --git a/src/runtime/virtcontainers/pkg/rootless/rootless.go b/src/runtime/virtcontainers/pkg/rootless/rootless.go
index 46be13a7d0..507549fa2a 100644
--- a/src/runtime/virtcontainers/pkg/rootless/rootless.go
+++ b/src/runtime/virtcontainers/pkg/rootless/rootless.go
@@ -74,7 +74,7 @@ func isRootlessFunc() bool {
 		SetRootless(true)
 		// --rootless and --systemd-cgroup options must honoured
 		// but with the current implementation this is not possible
-		// https://github.com/kata-containers/kata-containers/src/runtime/issues/2412
+		// https://github.com/kata-containers/runtime/issues/2412
 		if os.Geteuid() != 0 {
 			return true
 		}
diff --git a/src/runtime/virtcontainers/proxy.go b/src/runtime/virtcontainers/proxy.go
index 4aa6e8a202..772d7fc084 100644
--- a/src/runtime/virtcontainers/proxy.go
+++ b/src/runtime/virtcontainers/proxy.go
@@ -191,7 +191,7 @@ func (p *proxyBuiltin) watchConsole(proto, console string, logger *logrus.Entry)
 			return err
 		}
 		// TODO: please see
-		// https://github.com/kata-containers/kata-containers/src/runtime/issues/1940.
+		// https://github.com/kata-containers/runtime/issues/1940.
 	case consoleProtoPty:
 		fallthrough
 	default:
@@ -247,7 +247,7 @@ func (p *proxyBuiltin) start(params proxyParams) (int, string, error) {
 
 	// For firecracker, it hasn't support the console watching and it's consoleURL
 	// will be set empty.
-	// TODO: add support for hybrid vsocks, see https://github.com/kata-containers/kata-containers/src/runtime/issues/2098
+	// TODO: add support for hybrid vsocks, see https://github.com/kata-containers/runtime/issues/2098
 	if params.debug && params.consoleURL != "" && !strings.HasPrefix(params.consoleURL, kataclient.HybridVSockScheme) {
 		err := p.watchConsole(buildinProxyConsoleProto, params.consoleURL, params.logger)
 		if err != nil {
diff --git a/src/runtime/virtcontainers/qemu.go b/src/runtime/virtcontainers/qemu.go
index b8e466bc5e..2e60f6d2a2 100644
--- a/src/runtime/virtcontainers/qemu.go
+++ b/src/runtime/virtcontainers/qemu.go
@@ -2066,7 +2066,7 @@ func calcHotplugMemMiBSize(mem uint32, memorySectionSizeMB uint32) (uint32, erro
 		return mem, nil
 	}
 
-	// TODO: hot add memory aligned to memory section should be more properly. See https://github.com/kata-containers/kata-containers/src/runtime/pull/624#issuecomment-419656853
+	// TODO: hot add memory aligned to memory section should be more properly. See https://github.com/kata-containers/runtime/pull/624#issuecomment-419656853
 	return uint32(math.Ceil(float64(mem)/float64(memorySectionSizeMB))) * memorySectionSizeMB, nil
 }
 
diff --git a/src/runtime/virtcontainers/qemu_amd64.go b/src/runtime/virtcontainers/qemu_amd64.go
index 773e93c24d..b043a9e0c3 100644
--- a/src/runtime/virtcontainers/qemu_amd64.go
+++ b/src/runtime/virtcontainers/qemu_amd64.go
@@ -160,7 +160,7 @@ func (q *qemuAmd64) cpuModel() string {
 	cpuModel := defaultCPUModel
 
 	// VMX is not migratable yet.
-	// issue: https://github.com/kata-containers/kata-containers/src/runtime/issues/1750
+	// issue: https://github.com/kata-containers/runtime/issues/1750
 	if q.vmFactory {
 		virtLog.WithField("subsystem", "qemuAmd64").Warn("VMX is not migratable yet: turning it off")
 		cpuModel += ",vmx=off"
diff --git a/src/runtime/virtcontainers/qemu_s390x.go b/src/runtime/virtcontainers/qemu_s390x.go
index beaad5eae4..df890a7d9b 100644
--- a/src/runtime/virtcontainers/qemu_s390x.go
+++ b/src/runtime/virtcontainers/qemu_s390x.go
@@ -152,7 +152,7 @@ func (q *qemuS390x) appendCCWBlockDevice(devices []govmmQemu.Device, drive confi
 }
 
 // appendVhostUserDevice throws an error if vhost devices are tried to be used.
-// See issue https://github.com/kata-containers/kata-containers/src/runtime/issues/659
+// See issue https://github.com/kata-containers/runtime/issues/659
 func (q *qemuS390x) appendVhostUserDevice(devices []govmmQemu.Device, attr config.VhostUserDeviceAttrs) ([]govmmQemu.Device, error) {
 	return nil, fmt.Errorf("No vhost-user devices supported on s390x")
 }
diff --git a/src/runtime/virtcontainers/utils/utils_linux_ppc64le.go b/src/runtime/virtcontainers/utils/utils_linux_ppc64le.go
index 9444b1d7d5..a49ae5737b 100644
--- a/src/runtime/virtcontainers/utils/utils_linux_ppc64le.go
+++ b/src/runtime/virtcontainers/utils/utils_linux_ppc64le.go
@@ -10,7 +10,7 @@ package utils
 
 // _IOC_WRITE is 1 for arch generic and 4 for powerpc
 // Code reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/powerpc/include/uapi/asm/ioctl.h
-// Explanation: https://github.com/kata-containers/kata-containers/src/runtime/pull/1989#issuecomment-525993135
+// Explanation: https://github.com/kata-containers/runtime/pull/1989#issuecomment-525993135
 const ioctlVhostVsockSetGuestCid = 0x8008AF60
 
 func getIoctlVhostVsockGuestCid() uintptr {