diff --git a/apps/maddy/Dockerfile b/apps/maddy/Dockerfile
deleted file mode 100644
index 7218ec3..0000000
--- a/apps/maddy/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM giolekva/maddy:v0.4.4 AS maddy
-
-# FROM alpine:latest
-
-# COPY --from=maddy /usr/bin/maddyctl /usr/bin
-COPY maddy-web /usr/bin
-RUN chmod +x /usr/bin/maddy-web
diff --git a/apps/maddy/web/.gitignore b/apps/maddy/web/.gitignore
new file mode 100644
index 0000000..797200e
--- /dev/null
+++ b/apps/maddy/web/.gitignore
@@ -0,0 +1 @@
+maddy-web
diff --git a/apps/maddy/web/Dockerfile b/apps/maddy/web/Dockerfile
new file mode 100644
index 0000000..8c057e1
--- /dev/null
+++ b/apps/maddy/web/Dockerfile
@@ -0,0 +1,4 @@
+FROM giolekva/maddy:v0.4.4 AS maddy
+
+COPY maddy-web /usr/bin
+RUN chmod +x /usr/bin/maddy-web
diff --git a/apps/maddy/Makefile b/apps/maddy/web/Makefile
similarity index 68%
rename from apps/maddy/Makefile
rename to apps/maddy/web/Makefile
index 38a2eaf..7c054fc 100644
--- a/apps/maddy/Makefile
+++ b/apps/maddy/web/Makefile
@@ -1,16 +1,15 @@
-build:
-	go1.16 build -o maddy-web *.go
-
 clean:
 	rm -f maddy-web
 
-image: clean build
-	docker build --tag=giolekva/maddy-web .
+build: clean
+	go build -o maddy-web *.go
+
+image: build
+	docker build --tag=giolekva/maddy-web:latest .
 
 push: image
 	docker push giolekva/maddy-web:latest
 
-
 push_arm64: export GOOS=linux
 push_arm64: export GOARCH=arm64
 push_arm64: export CGO_ENABLED=0
diff --git a/apps/maddy/web/go.mod b/apps/maddy/web/go.mod
new file mode 100644
index 0000000..4b7d8aa
--- /dev/null
+++ b/apps/maddy/web/go.mod
@@ -0,0 +1,3 @@
+module github.com/giolekva/pcloud/apps/maddy/web
+
+go 1.16
diff --git a/apps/maddy/main.go b/apps/maddy/web/main.go
similarity index 100%
rename from apps/maddy/main.go
rename to apps/maddy/web/main.go
diff --git a/apps/maddy/templates/index.html b/apps/maddy/web/templates/index.html
similarity index 100%
rename from apps/maddy/templates/index.html
rename to apps/maddy/web/templates/index.html