diff --git a/Makefile b/Makefile
index bbd00e4..477890a 100644
--- a/Makefile
+++ b/Makefile
@@ -236,8 +236,6 @@ install.docker: docker-docs
 	install ${SELINUXOPT} -m 644 docs/docker*.1 -t $(MANDIR)/man1
 
 install.systemd:
-	install ${SELINUXOPT} -m 644 -D contrib/varlink/io.podman.socket ${SYSTEMDDIR}/io.podman.socket
-	install ${SELINUXOPT} -m 644 -D contrib/varlink/io.podman.service ${SYSTEMDDIR}/io.podman.service
 	install ${SELINUXOPT} -m 644 -D contrib/varlink/podman.conf ${TMPFILESDIR}/podman.conf
 
 install.python:
diff --git a/libpod.conf b/libpod.conf
index cef5a12..3a363e2 100644
--- a/libpod.conf
+++ b/libpod.conf
@@ -30,7 +30,7 @@ conmon_env_vars = [
 ]
 
 # CGroup Manager - valid values are "systemd" and "cgroupfs"
-cgroup_manager = "systemd"
+cgroup_manager = "cgroupfs"
 
 # Directory for persistent libpod files (database, etc)
 # By default, this will be configured relative to where containers/storage
diff --git a/cmd/podman/libpodruntime/runtime.go b/cmd/podman/libpodruntime/runtime.go
index 9d1347cc..f1f2b963 100644
--- a/cmd/podman/libpodruntime/runtime.go
+++ b/cmd/podman/libpodruntime/runtime.go
@@ -105,6 +105,10 @@ func GetRuntimeWithStorageOpts(c *cli.Context, storageOpts *storage.StoreOptions
 
 	if c.GlobalIsSet("cgroup-manager") {
 		options = append(options, libpod.WithCgroupManager(c.GlobalString("cgroup-manager")))
+	} else {
+		if rootless.IsRootless() {
+			options = append(options, libpod.WithCgroupManager("cgroupfs"))
+		}
 	}
 
 	// TODO flag to set libpod static dir?