diff --git a/.air.toml b/.air.toml
index 6972386..1558d14 100644
--- a/.air.toml
+++ b/.air.toml
@@ -3,10 +3,10 @@ tmp_dir = "tmp"
 
 [build]
 bin = "./tmp/goaway"
-args_bin = ["--dns-port=6121", "--dot-port=6122", "--doh-port=9012", "--webserver-port=8080", "--log-level=0", "--logging=true", "--auth=false", "--statistics-retention=7", "--dashboard=false", "--ansi=true"]
+args_bin = [ "--dns-port=6121", "--dot-port=6122", "--doh-port=9012", "--webserver-port=8080", "--log-level=0", "--logging=true", "--auth=false", "--statistics-retention=7", "--dashboard=false", "--ansi=true" ]
 cmd = 'go build -o goaway -ldflags="-X main.version=0.0.0 -X main.commit=ead2d7830add26d53ecab3c907a290f0cdc1e078 -X main.date=2025-04-11T13:37:56Z" -o ./tmp/goaway .'
-exclude_dir = ["assets", "tmp", "vendor", "client", "test", "resources"]
-include_ext = ["go", "tpl", "tmpl", "html", "css", "js", "jsx", "ts", "tsx"]
+exclude_dir = [ "assets", "tmp", "vendor", "client", "test", "resources" ]
+include_ext = [ "go", "tpl", "tmpl", "html", "css", "js", "jsx", "ts", "tsx" ]
 
 [color]
 build = "yellow"
diff --git a/Dockerfile.dev b/Dockerfile.dev
index c446711..4053359 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -1,33 +1,12 @@
-FROM golang:1.24-alpine AS builder
+FROM golang:1.25-alpine
 
-RUN apk add --no-cache git ca-certificates
+WORKDIR /app
 
-WORKDIR /src
+RUN mkdir -p /.cache && chmod 777 /.cache
+
+RUN go install github.com/air-verse/air@latest
 
 COPY go.mod go.sum ./
 RUN go mod download
 
-COPY . .
-
-RUN CGO_ENABLED=0 go build -o goaway -ldflags="-X main.version=0.50.0 -X main.commit=ead2d7830add26d53ecab3c907a290f0cdc1e078 -X main.date=2025-04-11T13:37:56Z" .
-
-FROM alpine:3.22
-
-ARG DNS_PORT=6121
-ARG WEBSITE_PORT=8080
-
-ENV DNS_PORT=${DNS_PORT} WEBSITE_PORT=${WEBSITE_PORT}
-
-RUN apk add --no-cache bash ca-certificates && \
-    mkdir -p /app && \
-    rm -rf /var/cache/apk/* /tmp/* /var/tmp/*
-
-WORKDIR /app
-
-COPY --from=builder /src/goaway ./goaway
-
-COPY updater.sh ./
-
-EXPOSE ${DNS_PORT}/tcp ${DNS_PORT}/udp ${WEBSITE_PORT}/tcp
-
-ENTRYPOINT [ "./goaway" ]
+CMD ["air", "-c", ".air.toml", "-build.args_bin", "--dashboard=true"]
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 9aa85ab..e507fa3 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -5,6 +5,9 @@ services:
       context: .
       dockerfile: Dockerfile.dev
     restart: unless-stopped
+    user: 1000:1000
+    volumes:
+      - ./:/app
     environment:
       - DNS_PORT=6121
       - WEBSITE_PORT=8080