diff --git a/Makefile b/Makefile
index 712283e..2a3b381 100644
--- a/Makefile
+++ b/Makefile
@@ -4,8 +4,9 @@ JITSI_BUILD ?= latest
 JITSI_REPO ?= jitsi
 JITSI_SERVICES ?= base base-java web prosody jicofo jvb jigasi etherpad
 
+BUILD_ARGS := --build-arg JITSI_REPO=$(JITSI_REPO)
 ifeq ($(FORCE_REBUILD), 1)
-  BUILD_ARGS = "--no-cache"
+  BUILD_ARGS := $(BUILD_ARGS) --no-cache
 endif
 
 
@@ -14,7 +15,7 @@ all:	build-all
 release: tag-all push-all
 
 build:
-	$(MAKE) BUILD_ARGS=$(BUILD_ARGS) JITSI_REPO=$(JITSI_REPO) JITSI_RELEASE=$(JITSI_RELEASE) -C $(JITSI_SERVICE) build
+	$(MAKE) BUILD_ARGS="$(BUILD_ARGS)" JITSI_REPO="$(JITSI_REPO)" JITSI_RELEASE="$(JITSI_RELEASE)" -C $(JITSI_SERVICE) build
 
 tag:
 	docker tag $(JITSI_REPO)/$(JITSI_SERVICE):latest $(JITSI_REPO)/$(JITSI_SERVICE):$(JITSI_BUILD)
diff --git a/base-java/Dockerfile b/base-java/Dockerfile
index 2d18fef..ae3d481 100644
--- a/base-java/Dockerfile
+++ b/base-java/Dockerfile
@@ -1,4 +1,5 @@
-FROM jitsi/base
+ARG JITSI_REPO=jitsi
+FROM ${JITSI_REPO}/base
 
 RUN	\
 	mkdir -p /usr/share/man/man1 && \
diff --git a/jicofo/Dockerfile b/jicofo/Dockerfile
index fe6eeb6..0752581 100644
--- a/jicofo/Dockerfile
+++ b/jicofo/Dockerfile
@@ -1,4 +1,5 @@
-FROM jitsi/base-java
+ARG JITSI_REPO=jitsi
+FROM ${JITSI_REPO}/base-java
 
 RUN \
 	apt-dpkg-wrap apt-get update && \
diff --git a/jigasi/Dockerfile b/jigasi/Dockerfile
index 0112891..482fb06 100644
--- a/jigasi/Dockerfile
+++ b/jigasi/Dockerfile
@@ -1,4 +1,5 @@
-FROM jitsi/base-java
+ARG JITSI_REPO=jitsi
+FROM ${JITSI_REPO}/base-java
 
 RUN \
 	apt-dpkg-wrap apt-get update && \
diff --git a/jvb/Dockerfile b/jvb/Dockerfile
index 30f3ea5..6a46614 100644
--- a/jvb/Dockerfile
+++ b/jvb/Dockerfile
@@ -1,4 +1,5 @@
-FROM jitsi/base-java
+ARG JITSI_REPO=jitsi
+FROM ${JITSI_REPO}/base-java
 
 RUN \
 	apt-dpkg-wrap apt-get update && \
diff --git a/prosody/Dockerfile b/prosody/Dockerfile
index fe92f99..dac9fc6 100644
--- a/prosody/Dockerfile
+++ b/prosody/Dockerfile
@@ -1,4 +1,5 @@
-FROM jitsi/base
+ARG JITSI_REPO=jitsi
+FROM ${JITSI_REPO}/base
 
 RUN \
     apt-dpkg-wrap apt-get update \
diff --git a/web/Dockerfile b/web/Dockerfile
index c9c4e67..6d06268 100644
--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -1,4 +1,5 @@
-FROM jitsi/base
+ARG JITSI_REPO=jitsi
+FROM ${JITSI_REPO}/base
 
 RUN \
 	apt-dpkg-wrap apt-get update && \