diff --git a/Docker/Stratis.CirrusD.TestNet/Dockerfile b/Docker/Stratis.CirrusD.TestNet/Dockerfile
index db549b469d..7e8ddc692b 100644
--- a/Docker/Stratis.CirrusD.TestNet/Dockerfile
+++ b/Docker/Stratis.CirrusD.TestNet/Dockerfile
@@ -3,7 +3,8 @@ FROM mcr.microsoft.com/dotnet/core/sdk:3.1
 ARG VERSION=master
 ENV VERSION=${VERSION}
 
-RUN git clone https://github.com/stratisproject/StratisFullNode.git -b "release/${VERSION}" && cd /StratisFullNode/src/Stratis.CirrusD && dotnet build
+RUN if [ "$VERSION" = "master" ]; then git clone https://github.com/stratisproject/StratisFullNode.git; else git clone https://github.com/stratisproject/StratisFullNode.git -b "release/${VERSION}"; fi 
+RUN cd /StratisFullNode/src/Stratis.StraxD && dotnet build
 VOLUME /root/.stratisfullnode
 WORKDIR /StratisFullNode/src/Stratis.CirrusD
 EXPOSE 26179 26175 38223
diff --git a/Docker/Stratis.CirrusD/Dockerfile b/Docker/Stratis.CirrusD/Dockerfile
index 0c4d9ac91a..ad18db3d76 100644
--- a/Docker/Stratis.CirrusD/Dockerfile
+++ b/Docker/Stratis.CirrusD/Dockerfile
@@ -3,7 +3,8 @@ FROM mcr.microsoft.com/dotnet/core/sdk:3.1
 ARG VERSION=master
 ENV VERSION=${VERSION}
 
-RUN git clone https://github.com/stratisproject/StratisFullNode.git -b "release/${VERSION}" && cd /StratisFullNode/src/Stratis.CirrusD && dotnet build
+RUN if [ "$VERSION" = "master" ]; then git clone https://github.com/stratisproject/StratisFullNode.git; else git clone https://github.com/stratisproject/StratisFullNode.git -b "release/${VERSION}"; fi 
+RUN cd /StratisFullNode/src/Stratis.StraxD && dotnet build
 VOLUME /root/.stratisfullnode
 WORKDIR /StratisFullNode/src/Stratis.CirrusD
 EXPOSE 16179 16175 37223
diff --git a/Docker/Stratis.StraxD.TestNet/Dockerfile b/Docker/Stratis.StraxD.TestNet/Dockerfile
index cab17597e8..e474d62252 100644
--- a/Docker/Stratis.StraxD.TestNet/Dockerfile
+++ b/Docker/Stratis.StraxD.TestNet/Dockerfile
@@ -3,7 +3,8 @@ FROM mcr.microsoft.com/dotnet/core/sdk:3.1
 ARG VERSION=master
 ENV VERSION=${VERSION}
 
-RUN git clone https://github.com/stratisproject/StratisFullNode.git -b "release/${VERSION}" && cd /StratisFullNode/src/Stratis.StraxD && dotnet build
+RUN if [ "$VERSION" = "master" ]; then git clone https://github.com/stratisproject/StratisFullNode.git; else git clone https://github.com/stratisproject/StratisFullNode.git -b "release/${VERSION}"; fi 
+RUN cd /StratisFullNode/src/Stratis.StraxD && dotnet build
 VOLUME /root/.stratisfullnode
 WORKDIR /StratisFullNode/src/Stratis.StraxD
 EXPOSE 27103 27104 27105
diff --git a/Docker/Stratis.StraxD/Dockerfile b/Docker/Stratis.StraxD/Dockerfile
index a8c7af1347..496c65a695 100644
--- a/Docker/Stratis.StraxD/Dockerfile
+++ b/Docker/Stratis.StraxD/Dockerfile
@@ -3,7 +3,8 @@ FROM mcr.microsoft.com/dotnet/core/sdk:3.1
 ARG VERSION=master
 ENV VERSION=${VERSION}
 
-RUN git clone https://github.com/stratisproject/StratisFullNode.git -b "release/${VERSION}" && cd /StratisFullNode/src/Stratis.StraxD && dotnet build
+RUN if [ "$VERSION" = "master" ]; then git clone https://github.com/stratisproject/StratisFullNode.git; else git clone https://github.com/stratisproject/StratisFullNode.git -b "release/${VERSION}"; fi 
+RUN cd /StratisFullNode/src/Stratis.StraxD && dotnet build
 VOLUME /root/.stratisfullnode
 WORKDIR /StratisFullNode/src/Stratis.StraxD
 EXPOSE 17105 17104 17103