diff --git a/Makefile b/Makefile
index cf47cda18471a2fd87d3be1202155305e6c25bfc..f1c46c83d7bb1d474595629e0a4cc790eb23d483 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ ifeq ($(VERSION),)
 	VERSION = latest
 endif
 
-clean: clean-aws/efs clean-ceph/cephfs clean-ceph/rbd clean-flex clean-gluster/block clean-iscsi/targetd clean-local-volume/provisioner clean-local-volume/bootstrapper clean-nfs-client clean-nfs
+clean: clean-aws/efs clean-ceph/cephfs clean-ceph/rbd clean-flex clean-gluster/block clean-gluster/glusterfs clean-iscsi/targetd clean-local-volume/provisioner clean-local-volume/bootstrapper clean-nfs-client clean-nfs
 .PHONY: clean
 
 test: test-aws/efs test-local-volume/provisioner test-nfs
@@ -89,6 +89,16 @@ clean-gluster/block:
 	make clean
 .PHONY: clean-gluster/block
 
+gluster/glusterfs:
+	cd gluster/glusterfs; \
+	make container
+.PHONY: gluster/glusterfs
+
+clean-gluster/glusterfs:
+	cd gluster/glusterfs; \
+	make clean
+.PHONY: clean-gluster/glusterfs
+
 iscsi/targetd:
 	cd iscsi/targetd; \
 	make container
@@ -169,6 +179,11 @@ push-glusterblock-provisioner:
 	make push
 .PHONY: push-glusterblock-provisioner
 
+push-glusterfs-simple-provisioner:
+	cd gluster/glusterfs; \
+	make push
+.PHONY: push-glusterfs-simple-provisioner
+
 push-iscsi-controller:
 	cd iscsi/targetd; \
 	make push
diff --git a/deploy.sh b/deploy.sh
index 6962d020dd4696b63559934d88f4ad76957ebb75..f10102faf8af78f9f74af4a4743cf14b5f23d8d8 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -26,6 +26,7 @@ provisioners=(
 efs-provisioner
 cephfs-provisioner
 glusterblock-provisioner
+glusterfs-simple-provisioner
 iscsi-controller
 local-volume-provisioner-bootstrap
 local-volume-provisioner
diff --git a/gluster/glusterfs/Makefile b/gluster/glusterfs/Makefile
index de6914d890c0272f804156835185b1d397982736..ec1c811d1eed6b8a7d7f71965cdf186bd2a4c412 100644
--- a/gluster/glusterfs/Makefile
+++ b/gluster/glusterfs/Makefile
@@ -12,9 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-IMAGE = external_storage/glusterfs-simple-provisioner
-
-VERSION := latest
+ifeq ($(REGISTRY),)
+	REGISTRY = quay.io/external_storage/
+endif
+ifeq ($(VERSION),)
+	VERSION = latest
+endif
+IMAGE = $(REGISTRY)glusterfs-simple-provisioner:$(VERSION)
+MUTABLE_IMAGE = $(REGISTRY)glusterfs-simple-provisioner:latest
 
 all build:
 	GOOS=linux go install -v ./cmd/glusterfs-simple-provisioner
@@ -31,11 +36,13 @@ container: build quick-container
 
 quick-container:
 	cp glusterfs-simple-provisioner deploy/docker/glusterfs-simple-provisioner
-	docker build -t $(IMAGE):$(VERSION) deploy/docker
+	docker build -t $(MUTABLE_IMAGE) deploy/docker
+	docker tag $(MUTABLE_IMAGE) $(IMAGE)
 .PHONY: quick-container
 
 push: container
-	docker push $(IMAGE):$(VERSION)
+	docker push $(IMAGE)
+	docker push $(MUTABLE_IMAGE)
 .PHONY: push
 
 clean:
diff --git a/test.sh b/test.sh
index 433802c33ff82d87a6ff918608b6f261dfeac005..6a060bae83d62d9520bd77ff232e2b820624d150 100755
--- a/test.sh
+++ b/test.sh
@@ -88,6 +88,7 @@ elif [ "$TEST_SUITE" = "everything-else" ]; then
 	make ceph/rbd
 	make flex
 	make gluster/block
+	make gluster/glusterfs
 	make iscsi/targetd
 	make test-iscsi/targetd
 	make nfs-client