diff --git a/docker/Dockerfile.builder b/docker/Dockerfile.builder
index 1073062..44ab664 100644
--- a/docker/Dockerfile.builder
+++ b/docker/Dockerfile.builder
@@ -2,9 +2,9 @@
 # Our entire toolchain runs in alpine
 FROM alpine:3.13.5 AS builder
 
-ENV PATH "$PATH:/root/.cargo/bin"
+ENV PATH="$PATH:/root/.cargo/bin" \
 # Needed for proper compiling of openssl-dev
-ENV RUSTFLAGS "-C target-feature=-crt-static"
+    RUSTFLAGS="-C target-feature=-crt-static"
 
 # Add the build user
 # Install dependencies
diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
index 7aa9d09..6e99da7 100644
--- a/docker/Dockerfile.dev
+++ b/docker/Dockerfile.dev
@@ -7,7 +7,6 @@ ENV RUST_BACKTRACE 1
 COPY --chown=builder:builder Cargo.toml Cargo.lock ./
 COPY --chown=builder:builder src/ ./src/
 COPY --chown=builder:builder migrations/ ./migrations/
-COPY --chown=builder:builder ./docker/entrypoint_dev.sh /entrypoint.sh
 COPY --chown=builder:builder ./Rocket.toml /app/Rocket.toml
 
-ENTRYPOINT ["/entrypoint.sh"]
+ENTRYPOINT ["cargo"]
diff --git a/docker/Dockerfile.rel b/docker/Dockerfile.rel
index ae0d597..b2114e1 100644
--- a/docker/Dockerfile.rel
+++ b/docker/Dockerfile.rel
@@ -19,7 +19,6 @@ COPY --chown=builder:builder migrations/ ./migrations/
 RUN cargo install \
     --path . \
     --root /app/output \
-    --target x86_64-unknown-linux-musl \
     --features frontend
 
 
diff --git a/docker/entrypoint_dev.sh b/docker/entrypoint_dev.sh
deleted file mode 100755
index 0838bce..0000000
--- a/docker/entrypoint_dev.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env sh
-
-# All this file does is inject the target
-cargo "$@" --target x86_64-unknown-linux-musl
diff --git a/fejctl b/fejctl
index 57f7443..391f78e 100755
--- a/fejctl
+++ b/fejctl
@@ -19,6 +19,13 @@ function dc() {
     done
     shift $((OPTIND-1))
 
+    if [[ "$build_builder" -eq 1 ]]; then
+        DOCKER_BUILDKIT=1 docker build \
+            -t "$image-builder:latest" \
+            -f docker/Dockerfile.builder \
+            .
+    fi
+
     if [[ "$release" -eq 1 ]]; then
         DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1 docker-compose \
             --file docker/docker-compose.yml \