diff --git a/Dockerfile b/Dockerfile
index 8a5336e3..9081bd99 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,8 @@ ADD playbook.yml requirements.yml /opt/setup/
 
 RUN yum -y install epel-release \
     && yum -y install ansible sudo \
-    && ansible-galaxy install -p /opt/setup/roles -r requirements.yml
+    && ansible-galaxy install -p /opt/setup/roles -r requirements.yml \
+    && yum clean all
 
 ARG OMERO_VERSION=5.6.1
 ARG OMEGO_ADDITIONAL_ARGS=
diff --git a/Makefile b/Makefile
index ac30b7ec..c9c08d8b 100644
--- a/Makefile
+++ b/Makefile
@@ -65,13 +65,20 @@ endif
 ifndef BUILD
 	$(eval BUILD=0)
 endif
-	docker build -t $(REPO)/omero-server:$(VERSION)-$(BUILD) .
+	docker build $(BUILDARGS) -t $(REPO)/omero-server:$(VERSION)-$(BUILD) .
 	docker tag $(REPO)/omero-server:$(VERSION)-$(BUILD) $(REPO)/omero-server:$(VERSION)
 	@MAJOR_MINOR=$(shell echo $(VERSION) | cut -f1-2 -d. );\
 	docker tag $(REPO)/omero-server:$(VERSION)-$(BUILD) $(REPO)/omero-server:$$MAJOR_MINOR
 
+	docker build --build-arg=PARENT_IMAGE=$(REPO)/omero-server:$(VERSION) -t $(REPO)/omero-server-extras:$(VERSION)-$(BUILD) extras
+	docker tag $(REPO)/omero-server-extras:$(VERSION)-$(BUILD) $(REPO)/omero-server-extras:$(VERSION)
+	@MAJOR_MINOR=$(shell echo $(VERSION) | cut -f1-2 -d. );\
+	docker tag $(REPO)/omero-server-extras:$(VERSION)-$(BUILD) $(REPO)/omero-server-extras:$$MAJOR_MINOR
+
+
 docker-build: docker-build-versions
 	docker tag $(REPO)/omero-server:$(VERSION)-$(BUILD) $(REPO)/omero-server:latest
+	docker tag $(REPO)/omero-server-extras:$(VERSION)-$(BUILD) $(REPO)/omero-server-extras:latest
 
 
 docker-push-versions:
@@ -86,5 +93,11 @@ endif
 	@MAJOR_MINOR=$(shell echo $(VERSION) | cut -f1-2 -d. );\
 	docker push $(REPO)/omero-server:$$MAJOR_MINOR
 
+	docker push $(REPO)/omero-server-extras:$(VERSION)-$(BUILD)
+	docker push $(REPO)/omero-server-extras:$(VERSION)
+	@MAJOR_MINOR=$(shell echo $(VERSION) | cut -f1-2 -d. );\
+	docker push $(REPO)/omero-server-extras:$$MAJOR_MINOR
+
 docker-push: docker-push-versions
 	docker push $(REPO)/omero-server:latest
+	docker push $(REPO)/omero-server-extras:latest
diff --git a/extras/01-default-extras.omero b/extras/01-default-extras.omero
new file mode 100644
index 00000000..e9341f5d
--- /dev/null
+++ b/extras/01-default-extras.omero
@@ -0,0 +1 @@
+# OMERO.server extras
diff --git a/extras/Dockerfile b/extras/Dockerfile
new file mode 100644
index 00000000..f9457aa0
--- /dev/null
+++ b/extras/Dockerfile
@@ -0,0 +1,13 @@
+ARG PARENT_IMAGE=openmicroscopy/omero-server:latest
+FROM ${PARENT_IMAGE}
+MAINTAINER ome-devel@lists.openmicroscopy.org.uk
+
+USER root
+
+RUN yum -y install \
+    git \
+    && yum clean all
+
+ADD 01-default-extras.omero /opt/omero/server/config/
+
+USER omero-server