diff --git a/Dockerfile b/Dockerfile
index a35045d02a..5abf53592b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,8 +17,11 @@ WORKDIR /src
 COPY go.mod go.sum /src/
 RUN go mod download -x
 COPY . .
-RUN rm -rf /src/webconsole/dist
-RUN GOOS=linux GOARCH=amd64 WEBCONSOLE=default make immuadmin-static immudb-static
+RUN make clean
+RUN make prerequisites
+RUN make swagger
+RUN make swagger/dist
+RUN GOOS=linux GOARCH=amd64 WEBCONSOLE=default SWAGGER=true make immudb-static immuadmin-static 
 RUN mkdir /empty
 
 FROM scratch
diff --git a/build/Dockerfile b/build/Dockerfile
index 6ff1b355d7..e518bfe201 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -3,8 +3,12 @@ WORKDIR /src
 COPY go.mod go.sum /src/
 RUN go mod download -x
 COPY . .
-RUN rm -rf /src/webconsole/dist
-RUN GOOS=linux GOARCH=amd64 WEBCONSOLE=default SWAGGER=true make immuadmin-static immudb-static
+RUN make clean
+RUN make prerequisites
+RUN make swagger
+RUN make swagger/dist
+RUN GOOS=linux GOARCH=amd64 WEBCONSOLE=default SWAGGER=true make immudb-static
+RUN GOOS=linux GOARCH=amd64 make immuadmin-static
 RUN mkdir /empty
 
 FROM debian:bullseye-slim as bullseye-slim
diff --git a/build/Dockerfile.alma b/build/Dockerfile.alma
index a7f3d7bb6a..82ee543636 100644
--- a/build/Dockerfile.alma
+++ b/build/Dockerfile.alma
@@ -1,8 +1,12 @@
 FROM golang:1.18 as build
 WORKDIR /src
 COPY . .
-RUN rm -rf /src/webconsole/dist
-RUN GOOS=linux GOARCH=amd64 WEBCONSOLE=default SWAGGER=true make immuadmin-static immudb-static
+RUN make clean
+RUN make prerequisites
+RUN make swagger
+RUN make swagger/dist
+RUN GOOS=linux GOARCH=amd64 WEBCONSOLE=default SWAGGER=true make immudb-static
+RUN GOOS=linux GOARCH=amd64 make immuadmin-static
 RUN mkdir /empty
 
 FROM almalinux:8-minimal as alma
diff --git a/build/Dockerfile.full b/build/Dockerfile.full
index 5e3e1009a5..d21d594eb9 100644
--- a/build/Dockerfile.full
+++ b/build/Dockerfile.full
@@ -3,8 +3,12 @@ WORKDIR /src
 COPY go.mod go.sum /src/
 RUN go mod download -x
 COPY . .
-RUN rm -rf /src/webconsole/dist
-RUN GOOS=linux GOARCH=amd64 WEBCONSOLE=default SWAGGER=true make immuadmin-static immudb-static immuclient-static
+RUN make clean
+RUN make prerequisites
+RUN make swagger
+RUN make swagger/dist
+RUN GOOS=linux GOARCH=amd64 WEBCONSOLE=default SWAGGER=true make immudb-static
+RUN GOOS=linux GOARCH=amd64 make immuadmin-static immuclient-static
 RUN mkdir /empty
 
 FROM debian:11.7-slim as bullseye-slim