diff --git a/docker/images/yoda_eus/Dockerfile b/docker/images/yoda_eus/Dockerfile
index 2fa2fcde2..355425910 100644
--- a/docker/images/yoda_eus/Dockerfile
+++ b/docker/images/yoda_eus/Dockerfile
@@ -6,7 +6,7 @@ ARG TAG=development
 ENV YODA_EUS_REPO "https://github.com/UtrechtUniversity/yoda-external-user-service.git"
 ENV YODA_EUS_BRANCH "development"
 ENV YODA_PORTAL_REPO "https://github.com/UtrechtUniversity/yoda-portal.git"
-ENV YODA_PORTAL_BRANCH "development"
+ENV YODA_PORTAL_BRANCH "$TAG"
 
 # Network settings
 EXPOSE 80
diff --git a/docker/images/yoda_irods_icat/Dockerfile b/docker/images/yoda_irods_icat/Dockerfile
index a841c7711..9f7fe7b80 100644
--- a/docker/images/yoda_irods_icat/Dockerfile
+++ b/docker/images/yoda_irods_icat/Dockerfile
@@ -12,7 +12,7 @@ ENV IRODS_UU_MSVC_VERSION_RELEASE "2"
 ENV YUM_REPO_FILE_LOC "https://packages.irods.org/renci-irods.yum.repo"
 ENV YUM_IRODS_REPO_SIGNING_KEY_LOC="https://packages.irods.org/irods-signing-key.asc"
 ENV YODA_RULESET_REPO "https://github.com/UtrechtUniversity/yoda-ruleset.git"
-ENV YODA_RULESET_BRANCH "development"
+ENV YODA_RULESET_BRANCH "$TAG"
 ENV PRE_BUILD_RULESET_DEPENDENCIES "yes"
 
 # Network settings
diff --git a/docker/images/yoda_portal/Dockerfile b/docker/images/yoda_portal/Dockerfile
index e460f710d..aca2d4858 100644
--- a/docker/images/yoda_portal/Dockerfile
+++ b/docker/images/yoda_portal/Dockerfile
@@ -4,7 +4,7 @@ LABEL maintainer="Yoda team <yoda@uu.nl>"
 # Application settings
 ARG TAG=development
 ENV YODA_PORTAL_REPO "https://github.com/UtrechtUniversity/yoda-portal.git"
-ENV YODA_PORTAL_BRANCH "development"
+ENV YODA_PORTAL_BRANCH="$TAG"
 
 # Network settings
 EXPOSE 80
diff --git a/docker/images/yoda_public/Dockerfile b/docker/images/yoda_public/Dockerfile
index 83c12efe8..dbe904f6b 100644
--- a/docker/images/yoda_public/Dockerfile
+++ b/docker/images/yoda_public/Dockerfile
@@ -4,7 +4,7 @@ LABEL maintainer="Yoda team <yoda@uu.nl>"
 # Application settings
 ARG TAG=development
 ENV MOAI_REPO "https://github.com/UtrechtUniversity/yoda-moai.git"
-ENV MOAI_BRANCH "development"
+ENV MOAI_BRANCH "$TAG"
 
 # Network settings
 EXPOSE 80
diff --git a/docker/images/yoda_web_mock/Dockerfile b/docker/images/yoda_web_mock/Dockerfile
index ee469e7ce..f68ab8303 100644
--- a/docker/images/yoda_web_mock/Dockerfile
+++ b/docker/images/yoda_web_mock/Dockerfile
@@ -4,7 +4,7 @@ LABEL maintainer="Yoda team <yoda@uu.nl>"
 # Application settings
 ARG TAG=development
 ENV YODA_MOCK_REPO "https://github.com/UtrechtUniversity/yoda-web-mock.git"
-ENV YODA_MOCK_BRANCH "development"
+ENV YODA_MOCK_BRANCH "$TAG"
 
 # Network settings
 EXPOSE 80