diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000000..dedb85173a
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,10 @@
+.github
+.git
+changelog
+docs
+examples
+grpc-tests
+tests
+tools
+vendor-bin
+*.md
diff --git a/.drone.yml b/.drone.yml
index ea0f912a3b..0fabe3b46d 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -65,7 +65,7 @@ steps:
 
 - name: publish-docker-reva-latest
   pull: always
-  image: registry.cern.ch/docker.io/plugins/docker
+  image: plugins/docker
   settings:
     repo: cs3org/reva
     tags: latest
@@ -74,10 +74,13 @@ steps:
       from_secret: dockerhub_username
     password:
       from_secret: dockerhub_password
+    custom_dns:
+      - 128.142.17.5
+      - 128.142.16.5
 
 - name: publish-docker-revad-latest
   pull: always
-  image: registry.cern.ch/docker.io/plugins/docker
+  image: plugins/docker
   settings:
     repo: cs3org/revad
     tags: latest
@@ -86,6 +89,24 @@ steps:
       from_secret: dockerhub_username
     password:
       from_secret: dockerhub_password
+    custom_dns:
+      - 128.142.17.5
+      - 128.142.16.5
+
+- name: publish-docker-revad-eos-latest
+  pull: always
+  image: plugins/docker
+  settings:
+    repo: cs3org/revad-eos
+    tags: latest
+    dockerfile: Dockerfile.revad-eos
+    username:
+      from_secret: dockerhub_username
+    password:
+      from_secret: dockerhub_password
+    custom_dns:
+      - 128.142.17.5
+      - 128.142.16.5
 
 ---
 kind: pipeline
@@ -202,7 +223,7 @@ steps:
 
 - name: docker-reva-tag
   pull: always
-  image: registry.cern.ch/docker.io/plugins/docker
+  image: plugins/docker
   settings:
     repo: cs3org/reva
     tags: ${DRONE_TAG}
@@ -211,10 +232,13 @@ steps:
       from_secret: dockerhub_username
     password:
       from_secret: dockerhub_password
+    custom_dns:
+    - 128.142.17.5
+    - 128.142.16.5
 
 - name: docker-revad-tag
   pull: always
-  image: registry.cern.ch/docker.io/plugins/docker
+  image: plugins/docker
   settings:
     repo: cs3org/revad
     tags: ${DRONE_TAG}
@@ -223,6 +247,24 @@ steps:
       from_secret: dockerhub_username
     password:
       from_secret: dockerhub_password
+    custom_dns:
+    - 128.142.17.5
+    - 128.142.16.5
+
+- name: docker-revad-eos-tag
+  pull: always
+  image: plugins/docker
+  settings:
+    repo: cs3org/revad-eos
+    tags: ${DRONE_TAG}
+    dockerfile: Dockerfile.revad-eos
+    username:
+      from_secret: dockerhub_username
+    password:
+      from_secret: dockerhub_password
+    custom_dns:
+    - 128.142.17.5
+    - 128.142.16.5
 
 ---
 kind: pipeline
diff --git a/Dockerfile.revad-eos b/Dockerfile.revad-eos
new file mode 100644
index 0000000000..a3f540761e
--- /dev/null
+++ b/Dockerfile.revad-eos
@@ -0,0 +1,28 @@
+# Copyright 2018-2021 CERN
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# In applying this license, CERN does not waive the privileges and immunities
+# granted to it by virtue of its status as an Intergovernmental Organization
+# or submit itself to any jurisdiction.
+FROM golang:1.15 as builder
+
+WORKDIR /go/src/github/cs3org/reva
+COPY . .
+RUN make build-revad-docker && \
+    cp /go/src/github/cs3org/reva/cmd/revad/revad /go/bin/revad
+
+FROM gitlab-registry.cern.ch/dss/eos:c8_4.8.15
+RUN mkdir -p /usr/local/bin
+COPY --from=builder /go/bin/revad /go/bin/
+RUN chmod +x /go/bin/revad
diff --git a/changelog/unreleased/revad-eos-docker-image.md b/changelog/unreleased/revad-eos-docker-image.md
new file mode 100644
index 0000000000..30b7e9cbdc
--- /dev/null
+++ b/changelog/unreleased/revad-eos-docker-image.md
@@ -0,0 +1,6 @@
+Enhancement: Docker image for cs3org/revad-eos
+
+Based on eos:c8_4.8.15 (Centos8, version 4.8.15). To be used when the
+Reva daemon needs IPC with xrootd/eos via stdin/out.
+
+https://github.com/cs3org/reva/pull/1386