diff --git a/docker-compose-tunnels.yml b/docker-compose-tunnels.yml
index ba9feb7..f9c16b6 100644
--- a/docker-compose-tunnels.yml
+++ b/docker-compose-tunnels.yml
@@ -6,8 +6,6 @@ services:
     hostname: ${DOMAIN_NAME:?err}
     volumes:
       - './http-root:/var/lib/nginx/html/http-root:ro'
-      - './data/acme-webroot:/var/lib/nginx/html/acme:ro'
-      - './data/letsencrypt/etc:/etc/letsencrypt:ro'
       - './preset/nginx.conf:/etc/nginx/nginx.conf:ro'
       - './preset/conf.d-tunnels:/etc/nginx/conf.d:ro'
     image: nginx
@@ -31,11 +29,11 @@ services:
     restart: unless-stopped
 
   cloudflared:
-    image: cloudflare/cloudflared:2022.5.0
+    image: erisamoe/cloudflared
     container_name: cloudflared
-    command: tunnel run --url http://nginx ${DOMAIN_NAME:?err}
-    user: root
+    command: --origincert /root/.cloudflared/cert.pem tunnel run --url http://nginx ${DOMAIN_NAME:?err}
     restart: unless-stopped
     volumes:
       - './data/cloudflared/etc:/etc/cloudflared'
       - './data/cloudflared/home:/root'
+      - './preset/passwd:/etc/passwd'
diff --git a/preset/passwd b/preset/passwd
new file mode 100644
index 0000000..0cabc85
--- /dev/null
+++ b/preset/passwd
@@ -0,0 +1 @@
+root:x:0:0::/root:/bin/bash
\ No newline at end of file
diff --git a/run b/run
index e589eea..e9b3592 100755
--- a/run
+++ b/run
@@ -31,8 +31,8 @@ if [ "$USE_TUNNELS" != "true" ]; then
   fi
 elif [ ! -e "./data/cloudflared/home/.cloudflared/cert.pem" ]; then
   docker-compose -f docker-compose-tunnels.yml run --rm cloudflared login
-  docker-compose -f docker-compose-tunnels.yml run --rm cloudflared tunnel create $DOMAIN_NAME
-  docker-compose -f docker-compose-tunnels.yml run --rm cloudflared tunnel route dns $DOMAIN_NAME $DOMAIN_NAME
+  docker-compose -f docker-compose-tunnels.yml run --rm cloudflared --origincert /root/.cloudflared/cert.pem tunnel create $DOMAIN_NAME
+  docker-compose -f docker-compose-tunnels.yml run --rm cloudflared --origincert /root/.cloudflared/cert.pem tunnel route dns $DOMAIN_NAME $DOMAIN_NAME
 fi
 
 if [ ! -e ./http-root/chaotic-aur ]; then
@@ -54,7 +54,9 @@ if [ ! -e ./data/syncthing/config.xml ]; then
 fi
 
 if [ "$USE_TUNNELS" != "true" ]; then
+  docker-compose -f docker-compose.yml pull
   docker-compose -f docker-compose.yml up -d
 else
+  docker-compose -f docker-compose-tunnels.yml pull
   docker-compose -f docker-compose-tunnels.yml up -d
 fi
diff --git a/stop b/stop
index 9e64ae6..dd3fb82 100755
--- a/stop
+++ b/stop
@@ -7,5 +7,10 @@ if [[ $EUID -ne 0 ]]; then
     exit 1
 fi
 
-docker-compose -f docker-compose.yml down
-docker-compose -f docker-compose-tunnels.yml down
+if [ -e "./data/cloudflared/home/.cloudflared/cert.pem" ]; then
+    docker-compose -f docker-compose-tunnels.yml down
+    docker-compose -f docker-compose.yml down
+else
+    docker-compose -f docker-compose.yml down
+    docker-compose -f docker-compose-tunnels.yml down
+fi