diff --git a/.env b/.env
new file mode 100644
index 0000000..9b6f3f6
--- /dev/null
+++ b/.env
@@ -0,0 +1,2 @@
+UID=1002 #$(id -u)
+GID=1002 #$(id -g)
diff --git a/dev/Dockerfile b/dev/Dockerfile
index 4c4e30d..26e4ebb 100644
--- a/dev/Dockerfile
+++ b/dev/Dockerfile
@@ -1,6 +1,9 @@
 FROM golang:1.15-alpine3.12
 
 ARG GOPROXY
+ARG UID
+ARG GID
+
 ENV GOPROXY ${GOPROXY:-direct}
 
 ARG GITEA_VERSION
@@ -15,6 +18,8 @@ WORKDIR /src
 
 EXPOSE 22 3000
 
+RUN echo DEBUG: "gg ${GID} uu ${UID}"
+
 RUN apk --no-cache add \
     bash \
     ca-certificates \
@@ -29,13 +34,13 @@ RUN apk --no-cache add \
     gnupg
 
 RUN addgroup \
-    -S -g 1000 \
+    -S -g ${GID} \
     git && \
   adduser \
     -S -H -D \
     -h /home/git \
     -s /bin/bash \
-    -u 1000 \
+    -u ${UID} \
     -G git \
     git && \
   echo "git:$(dd if=/dev/urandom bs=24 count=1 status=none | base64)" | chpasswd
diff --git a/docker-compose.yml b/docker-compose.yml
index 3fbfea8..dac33e1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,10 +1,14 @@
 version: '3.1'
 services:
   gitea-dev:
-    build: dev
+    build:
+      context: dev
+      args:
+        UID: "${UID}"
+        GID: "${GID}"
     ports:
       - 3000:3000
-    user: 1000:1000
+    user: "${UID}:${GID}"
     volumes:
        - ./home:/home
        - ./src:/src