diff --git a/apps/app-runner/Dockerfile.nextjs.deno.2.0.0 b/apps/app-runner/Dockerfile.nextjs.deno.2.0.0
new file mode 100644
index 0000000..eb59713
--- /dev/null
+++ b/apps/app-runner/Dockerfile.nextjs.deno.2.0.0
@@ -0,0 +1,12 @@
+FROM denoland/deno:debian-2.0.0
+
+ARG TARGETARCH
+
+# COPY --from=denoland/deno:alpine-2.0.0 /bin/deno /usr/bin/deno
+
+# RUN apk add --update npm
+
+RUN apt-get update -y
+RUN apt-get install -y npm
+
+COPY app-runner_${TARGETARCH} /usr/bin/app-runner
diff --git a/apps/app-runner/Makefile b/apps/app-runner/Makefile
index 94f98ab..2bf49c2 100644
--- a/apps/app-runner/Makefile
+++ b/apps/app-runner/Makefile
@@ -5,6 +5,7 @@
 manifest_dest_golang_1_20_0=docker://docker.io/$(repo_name)/app-runner:golang-1.20.0
 manifest_dest_hugo_latest=docker://docker.io/$(repo_name)/app-runner:hugo-latest
 manifest_dest_php_8_2_apache=docker://docker.io/$(repo_name)/app-runner:php-8.2-apache
+manifest_dest_nextjs_deno_2_0_0=docker://docker.io/$(repo_name)/app-runner:nextjs-deno-2.0.0
 endif
 
 clean:
@@ -84,5 +85,20 @@
 	$(podman) manifest push $(repo_name)/app-runner:php-8.2-apache $(manifest_dest_php_8_2_apache)
 	$(podman) manifest rm $(repo_name)/app-runner:php-8.2-apache
 
+# Nextjs
+
+push_nextjs_deno_2_0_0_arm64: clean build_arm64
+	$(podman) build --platform linux/arm64 --tag=$(repo_name)/app-runner:nextjs-deno-2.0.0-arm64 -f Dockerfile.nextjs.deno.2.0.0 .
+	$(podman) push $(repo_name)/app-runner:nextjs-deno-2.0.0-arm64
+
+push_nextjs_deno_2_0_0_amd64: clean build_amd64
+	$(podman) build --platform linux/amd64 --tag=$(repo_name)/app-runner:nextjs-deno-2.0.0-amd64 -f Dockerfile.nextjs.deno.2.0.0 .
+	$(podman) push $(repo_name)/app-runner:nextjs-deno-2.0.0-amd64
+
+push_nextjs_deno_2_0_0: push_nextjs_deno_2_0_0_arm64 push_nextjs_deno_2_0_0_amd64
+	$(podman) manifest create $(repo_name)/app-runner:nextjs-deno-2.0.0 $(repo_name)/app-runner:nextjs-deno-2.0.0-arm64 $(repo_name)/app-runner:nextjs-deno-2.0.0-amd64
+	$(podman) manifest push $(repo_name)/app-runner:nextjs-deno-2.0.0 $(manifest_dest_nextjs_deno_2_0_0)
+	$(podman) manifest rm $(repo_name)/app-runner:nextjs-deno-2.0.0
+
 # all
-push: push_golang_1_22_0 push_golang_1_20_0 push_hugo push_php_8_2_apache
+push: push_golang_1_22_0 push_golang_1_20_0 push_hugo push_php_8_2_apache push_nextjs_deno_2_0_0
diff --git a/apps/app-runner/main.go b/apps/app-runner/main.go
index 21be651..3d1e397 100644
--- a/apps/app-runner/main.go
+++ b/apps/app-runner/main.go
@@ -4,6 +4,7 @@
 	"encoding/json"
 	"flag"
 	"fmt"
+	"log"
 	"net"
 	"os"
 
@@ -99,5 +100,7 @@
 		panic(err)
 	}
 	s := NewServer(*port, *appId, *repoAddr, signer, *appDir, cmds, self, *managerAddr)
-	s.Start()
+	if err := s.Start(); err != nil {
+		log.Fatal(err)
+	}
 }
diff --git a/apps/app-runner/server.go b/apps/app-runner/server.go
index 6f1e97a..2da5060 100644
--- a/apps/app-runner/server.go
+++ b/apps/app-runner/server.go
@@ -113,7 +113,7 @@
 			Stdout: logM,
 			Stderr: logM,
 		}
-		fmt.Printf("Running: %s\n", c.Bin)
+		fmt.Printf("Running: %s %s\n", c.Bin, c.Args)
 		if i < len(s.runCommands)-1 {
 			if err := cmd.Run(); err != nil {
 				return err