diff --git a/Makefile b/Makefile
index 8edd1f6..77e0ee1 100644
--- a/Makefile
+++ b/Makefile
@@ -18,11 +18,9 @@ gaia:
 	go install github.com/cs3org/gaia@latest
 
 dist: clean gaia 
-	go env
 	make reva
-	make revad-ceph
-	mv cmd/revad/revad cmd/revad/revad-ceph
 	gaia build --with github.com/cernbox/reva-plugins --with github.com/cs3org/reva=$(shell pwd) -o ./cmd/revad/revad
+	gaia build --with github.com/cernbox/reva-plugins --with github.com/cs3org/reva=$(shell pwd) -o ./cmd/revad/revad-ceph --tags ceph
 	@mkdir -p $(PACKAGE)-$(VERSION)
 	cp -r cmd/revad/revad cmd/revad/revad-ceph cmd/reva/reva $(PACKAGE)-$(VERSION)
 	tar cpfz ./$(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION)