diff --git a/script/cibuild b/script/cibuild
index 458561f..10c4c0c 100755
--- a/script/cibuild
+++ b/script/cibuild
@@ -6,3 +6,16 @@ set -e
 
 cd "$(dirname "$0")/.."
 
+echo "  => Baue Image localhost/kontor-spring:0.3.0"
+buildah build -t kontor-spring:0.3.0 kontor-spring
+echo "  => Baue Image localhost/kontor-api:0.3.0"
+buildah build -t kontor-api:0.3.0 kontor-api
+echo "  => Baue Image localhost/kontor-quarkus:0.3.0"
+buildah build -t kontor-quarkus:0.3.0 kontor-quarkus
+echo "  => Baue Image localhost/kontor-echo:0.3.0"
+buildah build -t kontor-echo:0.3.0 kontor-echo
+echo "  => Baue Image localhost/kontor-fiber:0.3.0"
+buildah build -t kontor-fiber:0.3.0 kontor-fiber
+echo "  => Baue Image localhost/kontor-javalin:0.3.0"
+buildah build -t kontor-javalin:0.3.0 kontor-javalin
+
diff --git a/script/setup b/script/setup
index 4dfc66e..9b81bff 100755
--- a/script/setup
+++ b/script/setup
@@ -8,6 +8,9 @@ cd "$(dirname "$0")/.."
 
 script/bootstrap
 
+script/cibuild
+
+
 echo "==> Setting up pod kontor"
 if podman pod exists kontor; then
     echo "  => pod kontor exists"
@@ -88,9 +91,6 @@ fi
 echo "==> Setting up container kontor-spring"
 if podman image exists localhost/kontor-spring:0.3.0; then
     echo "  => Image localhost/kontor-spring:0.3.0 available"
-else
-    echo "  => Baue Image localhost/kontor-spring:0.3.0"
-    buildah build -t kontor-spring:0.3.0 kontor-spring
 fi
 if podman container exists kontor-spring; then
     if podman ps -q --filter "name=kontor-spring"; then
@@ -109,9 +109,6 @@ fi
 echo "==> Setting up container kontor-api"
 if podman image exists localhost/kontor-api:0.3.0; then
     echo "  => Image localhost/kontor-api:0.3.0 available"
-else
-    echo "  => Baue Image localhost/kontor-api:0.3.0"
-    buildah build -t kontor-api:0.3.0 kontor-api
 fi
 if podman container exists kontor-api; then
     if podman ps -q --filter "name=kontor-api"; then
@@ -134,9 +131,6 @@ fi
 echo "==> Setting up container kontor-quarkus"
 if podman image exists localhost/kontor-quarkus:0.3.0; then
     echo "  => Image localhost/kontor-quarkus:0.3.0 available"
-else
-    echo "  => Baue Image localhost/kontor-quarkus:0.3.0"
-    buildah build -t kontor-quarkus:0.3.0 kontor-quarkus
 fi
 if podman container exists kontor-quarkus; then
     if podman ps -q --filter "name=kontor-quarkus"; then
@@ -159,9 +153,6 @@ fi
 echo "==> Setting up container kontor-echo"
 if podman image exists localhost/kontor-echo:0.3.0; then
     echo "  => Image localhost/kontor-echo:0.3.0 available"
-else
-    echo "  => Baue Image localhost/kontor-echo:0.3.0"
-    buildah build -t kontor-echo:0.3.0 kontor-echo
 fi
 if podman container exists kontor-echo; then
     if podman ps -q --filter "name=kontor-echo"; then
@@ -184,9 +175,6 @@ fi
 echo "==> Setting up container kontor-fiber"
 if podman image exists localhost/kontor-fiber:0.3.0; then
     echo "  => Image localhost/kontor-fiber:0.3.0 available"
-else
-    echo "  => Baue Image localhost/kontor-fiber:0.3.0"
-    buildah build -t kontor-fiber:0.3.0 kontor-fiber
 fi
 if podman container exists kontor-fiber; then
     if podman ps -q --filter "name=kontor-fiber"; then
@@ -209,11 +197,7 @@ fi
 echo "==> Setting up container kontor-javalin"
 if podman image exists localhost/kontor-javalin:0.3.0; then
     echo "  => Image localhost/kontor-javalin:0.3.0 available"
-else
-    echo "  => Baue Image localhost/kontor-javalin:0.3.0"
-    buildah build -t kontor-javalin:0.3.0 kontor-javalin
 fi
-
 if podman container exists kontor-javalin; then
     if podman ps -q --filter "name=kontor-javalin"; then
         echo "  => kontor-javalin is running"