diff --git a/createdisk.sh b/createdisk.sh
index 8d437c57..55ceb778 100755
--- a/createdisk.sh
+++ b/createdisk.sh
@@ -108,25 +108,27 @@ EOF
 # Add gvisor-tap-vsock service
 ${SSH} core@${VM_IP} 'sudo bash -x -s' <<EOF
   podman create --name=gvisor-tap-vsock quay.io/crcont/gvisor-tap-vsock:latest
-  podman cp gvisor-tap-vsock:/vm /usr/local/bin/
+  podman cp gvisor-tap-vsock:/vm /usr/local/bin/gvforwarder
   podman rm gvisor-tap-vsock
-  tee /etc/systemd/system/gvisor-tap-vsock.service <<ETE
+  tee /etc/systemd/system/gv-user-network@.service <<TEE
   [Unit]
-  Description=gvisor-tap-vsock traffic forwarder
-  Wants=network-online.target
-  After=network-online.target
+  Description=gvisor-tap-vsock Network Traffic Forwarder
+  After=NetworkManager.service
+  BindsTo=sys-devices-virtual-net-%i.device
+  After=sys-devices-virtual-net-%i.device
 
   [Service]
-  Restart=on-failure
-  TimeoutStopSec=70
-  ExecStart=/usr/local/bin/vm -preexisting -debug
+  Environment=GV_VSOCK_PORT="1024"
+  EnvironmentFile=-/etc/sysconfig/gv-user-network
+  ExecStart=/usr/local/bin/gvforwarder -preexisting -iface %i -url vsock://2:\\\${GV_VSOCK_PORT}/connect
 
   [Install]
-  WantedBy=default.target
-  ETE
-
+  WantedBy=multi-user.target
+  TEE
+  systemctl daemon-reload
+  systemctl enable gv-user-network@tap0.service
   systemctl daemon-reload
-  systemctl enable gvisor-tap-vsock.service
+
 EOF
 
 # Add dummy crio-wipe service to instance
diff --git a/gv-user-network@.service b/gv-user-network@.service
new file mode 100644
index 00000000..7574f6ce
--- /dev/null
+++ b/gv-user-network@.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=gvisor-tap-vsock Network Traffic Forwarder
+After=NetworkManager.service
+BindsTo=sys-devices-virtual-net-%i.device
+After=sys-devices-virtual-net-%i.device
+[Service]
+Environment=GV_VSOCK_PORT="1024"
+EnvironmentFile=-/etc/sysconfig/gv-user-network
+ExecStart=/usr/libexec/podman/gvforwarder -preexisting -iface %i -url vsock://2:${GV_VSOCK_PORT}/connect
+[Install]
+WantedBy=multi-user.target