diff --git a/Dockerfile b/Dockerfile
index 675ddce6..b665d47a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -74,7 +74,6 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
     --mount=type=cache,target=/go/pkg/mod \
     CGO_ENABLED=1 xx-go build \
     -gcflags "all=-N -l" \
-    -a -installsuffix cgo \
     -ldflags "-X github.com/Wikid82/CaddyProxyManagerPlus/backend/internal/version.Version=${VERSION} \
               -X github.com/Wikid82/CaddyProxyManagerPlus/backend/internal/version.GitCommit=${VCS_REF} \
               -X github.com/Wikid82/CaddyProxyManagerPlus/backend/internal/version.BuildTime=${BUILD_DATE}" \
@@ -104,7 +103,7 @@ FROM ${CADDY_IMAGE}
 WORKDIR /app
 
 # Install runtime dependencies for CPM+ (no bash needed)
-RUN apk --no-cache add ca-certificates sqlite-libs \
+RUN apk --no-cache add ca-certificates sqlite-libs tzdata \
     && apk --no-cache upgrade
 
 # Copy Caddy binary from caddy-builder (overwriting the one from base image)
diff --git a/docker-compose.local.yml b/docker-compose.local.yml
index 73030a33..fe613ccd 100644
--- a/docker-compose.local.yml
+++ b/docker-compose.local.yml
@@ -14,7 +14,7 @@ services:
     environment:
       - CPM_ENV=development
       - CPMP_DEBUG=1
-      - TZ=UTC # Set timezone (e.g., America/New_York)
+      - TZ=America/New_York
       - CPM_HTTP_PORT=8080
       - CPM_DB_PATH=/app/data/cpm.db
       - CPM_FRONTEND_DIR=/app/frontend/dist
@@ -23,7 +23,6 @@ services:
       - CPM_CADDY_BINARY=caddy
       - CPM_IMPORT_CADDYFILE=/import/Caddyfile
       - CPM_IMPORT_DIR=/app/data/imports
-      - TZ=AMERICA/NEW_YORK
     extra_hosts:
       - "host.docker.internal:host-gateway"
     cap_add: