diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..06475fb2
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "docker/rucio-tracers"]
+	path = docker/rucio-tracers
+	url = https://github.com/dmwm/rucio-tracers
diff --git a/docker/rucio-tracer/Dockerfile b/docker/rucio-tracer/Dockerfile
deleted file mode 100644
index c4d06777..00000000
--- a/docker/rucio-tracer/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM golang:latest as go-builder
-MAINTAINER Valentin Kuznetsov vkuznet@gmail.com
-
-# build procedure
-ENV WDIR=/data
-WORKDIR $WDIR
-RUN mkdir -p /data/{server,messanger,gopath} && mkdir /build
-ENV GOPATH=/data/gopath
-ARG CGO_ENABLED=0
-WORKDIR $WDIR/server
-RUN curl -ksLO https://raw.githubusercontent.com/vkuznet/RucioTraces/main/server/main.go
-RUN go mod init github.com/vkuznet/RucioTraces/server && go mod tidy && \
-    go build -o /build/rucio-tracer -ldflags="-s -w -extldflags -static" /data/server/main.go
-WORKDIR $WDIR/messanger
-RUN curl -ksLO https://raw.githubusercontent.com/vkuznet/RucioTraces/main/messanger/main.go
-RUN go mod init github.com/vkuznet/RucioTraces/messanger && go mod tidy && \
-    go build -o /build/rucio-messanger -ldflags="-s -w -extldflags -static" /data/messanger/main.go
-
-FROM alpine:3.15
-RUN mkdir -p /data
-COPY --from=go-builder /build/rucio-tracer /data/
-COPY --from=go-builder /build/rucio-messanger /data/
diff --git a/docker/rucio-tracers b/docker/rucio-tracers
new file mode 160000
index 00000000..068185ee
--- /dev/null
+++ b/docker/rucio-tracers
@@ -0,0 +1 @@
+Subproject commit 068185eec59bf821e33f4bd954b05905153b420e