diff --git a/docker/Dockerfile b/docker/Dockerfile
index 203c6520e1c2aaea271921555edbf6c7edbc5421..c7432ab0a42f6d14cbe7e0178c222f62911c97c0 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -184,9 +184,9 @@ RUN apt-get update -y && \
                           wget git  python3-nose python3-coverage \
                           python3-astropy
 
-RUN A=$CZ; git clone https://git.astron.nl/ao/sdco/pyautoplot.git ${INSTALLDIR}/pyautoplot && \
+RUN A=$DA; git clone https://git.astron.nl/ao/sdco/pyautoplot.git ${INSTALLDIR}/pyautoplot && \
     cd ${INSTALLDIR}/pyautoplot && \
-    git checkout tmss && \
+    git checkout master && \
     python3 setup.py install
 
 
diff --git a/scripts/create_html b/scripts/create_html
index 8c55d34ac9e67492c82ea7775cb8f8906ce0dec4..27b0bc69f838868cc8af8e3b1934de9e3c29d137 100755
--- a/scripts/create_html
+++ b/scripts/create_html
@@ -14,8 +14,8 @@ from numpy import array, floor
 # insert TESTLINE in the relevant filenames, e.g. index[TESTLINE].html. Ultimately, TESTLINE could be auto-filled
 # depending on the TAG environment variable (if it exists and doesn't say 'latest'). For normal use, leave TESTLINE an
 # empty string (""). Note that TESTLINE doesn't necessarily propagate to programs/scripts called from within this one.
-TESTLINE = "-test"
-#TESTLINE = ""
+#TESTLINE = "-test"
+TESTLINE = ""
 
 # Data with a completeness figure below this value is flagged as odd sized
 DATA_INCOMPLETE_THRESHOLD = 0.005  # (==) 0.5%
diff --git a/scripts/launch-msplots.sh b/scripts/launch-msplots.sh
index b5c279acfb906658585b1fe5f4bb07cc53b414e1..7812bb056f211542f8dc5c68844f068d79b8ab95 100755
--- a/scripts/launch-msplots.sh
+++ b/scripts/launch-msplots.sh
@@ -16,8 +16,8 @@
 TESTLINE=""
 
 # Normally, one would want to use pyautoplot:latest (PYAUTOPLOT_TAG=latest). This can be overriden however
-PYAUTOPLOT_TAG=test
-#PYAUTOPLOT_TAG=latest
+#PYAUTOPLOT_TAG=test
+PYAUTOPLOT_TAG=latest
 
 HOSTNAME=`hostname`
 PATH="$PATH:/opt/cep/pyautoplot/bin"