diff --git a/ubuntu.sh b/ubuntu.sh
index defc3476b6a77c65fa4d5fe28ca4dfdbfc5f12a5..f5935b1d9f9528a9363a56484d7c12f45b4fbfef 100644
--- a/ubuntu.sh
+++ b/ubuntu.sh
@@ -708,7 +708,7 @@ if $redis_local; then
 	tput setaf 7;
 	if [ -f /etc/redis/redis.conf ]; then
 		echo "requirepass $redis_pass" > /etc/redis/misskey.conf
-		$method != "systemd" && echo "bind $docker_host_ip" >> /etc/redis/misskey.conf
+		[ $method != "systemd" ] && echo "bind $docker_host_ip" >> /etc/redis/misskey.conf
 
 		if ! grep "include /etc/redis/misskey.conf" /etc/redis/redis.conf; then
 			echo "include /etc/redis/misskey.conf" >> /etc/redis/redis.conf;
@@ -719,8 +719,8 @@ if $redis_local; then
 		echo "Couldn't find /etc/redis/redis.conf."
 		echo "Please modify redis config in another shell like following."
 		echo ""
-		$method != "systemd" && echo "requirepass $redis_pass"
-		echo "bind $docker_host_ip"
+		echo "requirepass $redis_pass"
+		$method != "systemd" && echo "bind $docker_host_ip"
 		echo ""
 		read -r -p "Press Enter key to continue> "
 	fi
@@ -799,7 +799,7 @@ tput setaf 3;
 echo "Process: build docker image;"
 tput setaf 7;
 
-sudo -u "$misskey_user" XDG_RUNTIME_DIR=/run/user/$m_uid DOCKER_HOST=unix:///run/user/$m_uid/docker.sock docker build -t $docker_repository "/home/$misskey_user/$misskey_directory"
+sudo -u "$misskey_user" XDG_RUNTIME_DIR=/run/user/$m_uid DOCKER_HOST=unix:///run/user/$m_uid/docker.sock docker build -t $docker_repository "/home/$misskey_user/$misskey_directory";
 #endregion
 fi
 
@@ -824,7 +824,7 @@ tput setaf 3;
 echo "Process: docker run;"
 tput setaf 7;
 docker_container=$(sudo -u "$misskey_user" XDG_RUNTIME_DIR=/run/user/$m_uid DOCKER_HOST=unix:///run/user/$m_uid/docker.sock docker run -d -p $misskey_port:$misskey_port --add-host=$misskey_localhost:$docker_host_ip -v /home/$misskey_user/$misskey_directory/files:/misskey/files -v "/home/$misskey_user/$misskey_directory/.config/default.yml":/misskey/.config/default.yml:ro --restart unless-stopped -t "$docker_repository");
-echo $docker_container
+echo $docker_container;
 su "$misskey_user" << MKEOF
 set -eu;
 cd ~;
diff --git a/update.ubuntu.sh b/update.ubuntu.sh
index 197ade01a9f5d34214b82ea3e0a55fa70f0aa5cc..241816edf5464e5b8802d59ce1727aa3a963b08c 100644
--- a/update.ubuntu.sh
+++ b/update.ubuntu.sh
@@ -46,17 +46,17 @@ if [ -f "/root/.misskey.env" ]; then
 		misskey_directory=misskey;
 		misskey_localhost=localhost;
 		method=systemd;
-		echo "use default"
+		echo "use default";
 	fi
 else
 	misskey_user=misskey;
 	misskey_directory=misskey;
 	misskey_localhost=localhost;
 	method=systemd;
-	echo "use default"
+	echo "use default";
 fi
 
-echo "method: $method / user: $misskey_user / dir: $misskey_directory / $misskey_localhost:$misskey_port"
+echo "method: $method / user: $misskey_user / dir: $misskey_directory / $misskey_localhost:$misskey_port";
 
 if [ $method == "systemd" ]; then
 #region systemd
@@ -90,7 +90,9 @@ else
 fi
 #endregion
 else
-	oldid=$(sudo docker images --no-trunc --format "{{.ID}}" $docker_repository)
+	m_uid=$(id -u "$misskey_user");
+	oldid=$(sudo docker images --no-trunc --format "{{.ID}}" $docker_repository);
+	docker="sudo -u \"$misskey_user\" XDG_RUNTIME_DIR=/run/user/$m_uid DOCKER_HOST=unix:///run/user/$m_uid/docker.sock docker";
 
 	if [ $method == "docker" ]; then
 		if [ $# == 1 ]; then
@@ -98,15 +100,19 @@ else
 		else
 			docker_repository="local/misskey:latest";
 		fi
+
+		$docker build -t $docker_repository "/home/$misskey_user/$misskey_directory";
+
 	else
 		if [ $# == 1 ]; then
 			docker_repository="$1";
 		else
 			docker_repository="misskey/misskey:latest";
 		fi
-		
+
+		$docker pull "$docker_repository";
 	fi
 
-	docker_container=$(sudo -u "$misskey_user" XDG_RUNTIME_DIR=/run/user/$m_uid DOCKER_HOST=unix:///run/user/$m_uid/docker.sock docker run -d -p $misskey_port:$misskey_port --add-host=$misskey_localhost:$docker_host_ip -v /home/$misskey_user/$misskey_directory/files:/misskey/files -v "/home/$misskey_user/$misskey_directory/.config/default.yml":/misskey/.config/default.yml:ro --restart unless-stopped -t "$docker_repository");
-	sudo docker image rm local/misskey:latest
+	docker_container=$($docker run -d -p $misskey_port:$misskey_port --add-host=$misskey_localhost:$docker_host_ip -v /home/$misskey_user/$misskey_directory/files:/misskey/files -v "/home/$misskey_user/$misskey_directory/.config/default.yml":/misskey/.config/default.yml:ro --restart unless-stopped -t "$docker_repository");
+	$docker image rm "$oldid"
 fi