diff --git a/hack/all-in-one/microshift-aio b/hack/all-in-one/microshift-aio
index 3081749896..b9ef31061d 100755
--- a/hack/all-in-one/microshift-aio
+++ b/hack/all-in-one/microshift-aio
@@ -2,7 +2,6 @@
 
 set -euxo pipefail
 
-microshift_start() {
 setsebool -P container_manage_cgroup true
 
 if ! /usr/bin/podman volume exists microshift-data
@@ -10,31 +9,8 @@ then
   /usr/bin/podman volume create microshift-data
 fi
 
-/usr/bin/podman run -d --rm \
-  --name microshift-aio --privileged \
-  -v /lib/modules:/lib/modules \
-  -v microshift-data:/var/lib \
-  --label "io.containers.autoupdate=registry" \
-  -p 6443:6443 quay.io/microshift/microshift:4.7.0-0.microshift-2021-08-31-224727-aio
-
 [[ -d /etc/microshift-aio ]] || mkdir /etc/microshift-aio
 cat <<EOF > /etc/microshift-aio/microshift-aio.conf
 export KUBECONFIG=$(/usr/bin/podman volume inspect microshift-data --format "{{.Mountpoint}}")/microshift/resources/kubeadmin/kubeconfig
 EOF
-}
-
-microshift_stop() {
-    /usr/bin/podman stop -t 20 microshift-aio
-}
 
-arg="$1"
-if [[ $arg == "start" ]]
-then
-  microshift_start
-elif [[ $arg == "stop" ]]
-then
-  microshift_stop
-else
-  echo "$arg: unknown argument-only allowed 'start' and 'stop'"
-  exit 1
-fi
diff --git a/hack/all-in-one/microshift-aio.service b/hack/all-in-one/microshift-aio.service
index b9a907b1a1..fc1834a571 100644
--- a/hack/all-in-one/microshift-aio.service
+++ b/hack/all-in-one/microshift-aio.service
@@ -1,15 +1,25 @@
+# container-microshift-aio.service
+# autogenerated by Podman 3.3.1
+# Tue Sep 28 16:00:39 UTC 2021
+
 [Unit]
 Description=microshift all-in-one
+Documentation=man:podman-generate-systemd(1)
 Wants=network-online.target
 After=network-online.target
-RequiresMountsFor=/run/containers/storage
+RequiresMountsFor=%t/containers
 
 [Service]
+Environment=PODMAN_SYSTEMD_UNIT=%n
 Restart=on-failure
 TimeoutStopSec=70
-ExecStart=/bin/bash /usr/bin/microshift-aio start
-ExecStop=/bin/bash /usr/bin/microshift-aio stop
-Type=forking
+ExecStartPre=/bin/rm -f %t/%n.ctr-id
+ExecStartPre=/bin/bash /usr/bin/microshift-aio # not autogenerated
+ExecStart=/usr/bin/podman run --cidfile=%t/%n.ctr-id --sdnotify=conmon --cgroups=no-conmon --rm --replace -d --name microshift-aio --privileged -v /lib/modules:/lib/modules -v microshift-data:/var/lib --label io.containers.autoupdate=registry -p 6443:6443 quay.io/microshift/microshift:4.7.0-0.microshift-2021-08-31-224727-aio
+ExecStop=/usr/bin/podman stop --ignore --cidfile=%t/%n.ctr-id
+ExecStopPost=/usr/bin/podman rm -f --ignore --cidfile=%t/%n.ctr-id
+Type=notify
+NotifyAccess=all
 
 [Install]
 WantedBy=multi-user.target default.target