diff --git a/client/golang/Makefile b/client/golang/Makefile
new file mode 100644
index 0000000..73970f7
--- /dev/null
+++ b/client/golang/Makefile
@@ -0,0 +1,2 @@
+build:
+	go build -ldflags="-s -w" -o saprus client.go
diff --git a/client/client.go b/client/golang/client.go
similarity index 94%
rename from client/client.go
rename to client/golang/client.go
index 311edd9..b907abc 100644
--- a/client/client.go
+++ b/client/golang/client.go
@@ -102,8 +102,8 @@ func main() {
 	// Listen timeout
 	select {
 		case returnMSG := <- addrChan:
-			fmt.Printf("Discovery Server: %s\n", strings.Fields(returnMSG)[1])
+			fmt.Printf("%s\n", strings.Fields(returnMSG)[1])
 		case <- time.After(5 * time.Second):
-			fmt.Printf("Discovery Server not found\n")
+			fmt.Printf("error\n")
 	}
 }
diff --git a/client/go.mod b/client/golang/go.mod
similarity index 100%
rename from client/go.mod
rename to client/golang/go.mod
diff --git a/server/Dockerfile b/server/Dockerfile
new file mode 100644
index 0000000..9809e62
--- /dev/null
+++ b/server/Dockerfile
@@ -0,0 +1,9 @@
+FROM golang:1.18.2-alpine
+
+RUN mkdir -p /src
+
+COPY server.go /src
+
+WORKDIR /src
+
+RUN go build server.go
diff --git a/server/Makefile b/server/Makefile
new file mode 100644
index 0000000..9be2200
--- /dev/null
+++ b/server/Makefile
@@ -0,0 +1,2 @@
+docker_build:
+	docker build . -t saprus_server:latest