diff --git a/login-app/.gitignore b/login-app/.gitignore
deleted file mode 100644
index a46884d..0000000
--- a/login-app/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-login
diff --git a/pkg/login-app/Dockerfile b/pkg/login-app/Dockerfile
new file mode 100644
index 0000000..fef3694
--- /dev/null
+++ b/pkg/login-app/Dockerfile
@@ -0,0 +1,25 @@
+FROM golang:alpine as gobuild
+
+ENV GOOS linux
+ENV GOARCH amd64
+
+RUN apk add --no-cache git pkgconfig ncurses-dev ncurses-static gcc libc-dev
+
+WORKDIR /go/src/login-app
+
+ADD cmd ./
+
+RUN go get -d -v
+RUN go build -v -tags netgo -ldflags '-w -extldflags "-static -lpanelw -lncursesw"'
+
+
+FROM alpine
+MAINTAINER Pierre-Olivier Mercier <nemunaire@nemunai.re>
+
+EXPOSE 8081
+
+COPY --from=gobuild /go/src/login-app/login-app /bin/login-app
+COPY --from=gobuild /etc/terminfo/l/linux /etc/terminfo/l/linux
+COPY --from=gobuild /usr/share/udhcpc/default.script /usr/share/udhcpc/default.script
+
+ENTRYPOINT ["/bin/login-app"]
diff --git a/pkg/login-app/build.yml b/pkg/login-app/build.yml
new file mode 100644
index 0000000..f12a2cf
--- /dev/null
+++ b/pkg/login-app/build.yml
@@ -0,0 +1,2 @@
+image: adlin-login-app
+network: true
diff --git a/pkg/login-app/cmd/login-app b/pkg/login-app/cmd/login-app
new file mode 100755
index 0000000..62b51b3
Binary files /dev/null and b/pkg/login-app/cmd/login-app differ
diff --git a/login-app/login.go b/pkg/login-app/cmd/login.go
similarity index 100%
rename from login-app/login.go
rename to pkg/login-app/cmd/login.go
diff --git a/login-app/main.go b/pkg/login-app/cmd/main.go
similarity index 100%
rename from login-app/main.go
rename to pkg/login-app/cmd/main.go
diff --git a/login-app/windows.go b/pkg/login-app/cmd/windows.go
similarity index 100%
rename from login-app/windows.go
rename to pkg/login-app/cmd/windows.go