diff --git a/AT_CSC/ATDome/ATDome.yaml b/AT_CSC/ATDome/ATDome.yaml
new file mode 100644
index 0000000..a774391
--- /dev/null
+++ b/AT_CSC/ATDome/ATDome.yaml
@@ -0,0 +1,32 @@
+$schema: http://json-schema.org/draft-07/schema#
+$id: https://github.com/lsst-ts/ts_ATDome/blob/master/schema/ATDome.yaml
+# title must end with one or more spaces followed by the schema version, which must begin with "v"
+title: ATDome v1
+description: Schema for ATDome configuration files
+type: object
+properties:
+  host:
+    description: IP address of the TCP/IP interface
+    type: string
+    format: hostname
+    default: "192.168.1.46"
+  port:
+    description: Port number of the TCP/IP interface
+    type: integer
+    default: 17310
+  connection_timeout:
+    description: Time limit for connecting to the TCP/IP interface (sec)
+    type: number
+    exclusiveMinimum: 0
+    default: 10
+  read_timeout:
+    description: Time limit for reading data from the TCP/IP interface (sec)
+    type: number
+    exclusiveMinimum: 0
+    default: 10
+required:
+  - host
+  - port
+  - connection_timeout
+  - read_timeout
+additionalProperties: false
diff --git a/AT_CSC/ATPTG/docker-compose.yaml b/AT_CSC/ATPTG/docker-compose.yaml
index 9a8d166..2bdadd2 100644
--- a/AT_CSC/ATPTG/docker-compose.yaml
+++ b/AT_CSC/ATPTG/docker-compose.yaml
@@ -6,6 +6,15 @@ services:
     environment:
       - OSPL_URI=${OSPL_URI}
       - LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
-    network_mode: "host"
+    networks:
+      control-network:
+        ipv4_address: "192.168.1.203"
     volumes:
       - ${OSPL_CONFIG_PATH}:${OSPL_MOUNT_POINT}
+
+networks:
+  default:
+    external:
+      name: control-network
+  control-network:
+    external: true
diff --git a/AT_CSC/README.md b/AT_CSC/README.md
index 6faa3ed..99a948d 100644
--- a/AT_CSC/README.md
+++ b/AT_CSC/README.md
@@ -1 +1,4 @@
-Compose files for CSCs that talk to real hardware. No simmmulators! 
+
+Compose files for CSCs that talk to real hardware. No simmulators!
+
+Use the compose file in this directory to launch all the CSCs.
diff --git a/AT_CSC/docker-compose.yaml b/AT_CSC/docker-compose.yaml
new file mode 100644
index 0000000..bb61e69
--- /dev/null
+++ b/AT_CSC/docker-compose.yaml
@@ -0,0 +1,59 @@
+version: '3.6'
+
+services:
+
+  atptg:
+    image: tiagorib/ptkernel:rc0.5_sal3.9
+    container_name: atptg
+    environment:
+      - LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
+    networks:
+      control-network:
+        ipv4_address: "192.168.1.211"
+
+  atdome-csc:
+    image: lsstts/at_dome:3.9-0.5
+    container_name: atdome
+    environment:
+      - LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
+    networks:
+      control-network:
+        ipv4_address: "192.168.1.212"
+
+  atdometrajectory-sim:
+    image: lsstts/at_dome_trajectory_sim:3.9-0.6a
+    container_name: atdometrajectory
+    environment:
+      - LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
+    networks:
+      control-network:
+        ipv4_address: "192.168.1.213"
+
+  HexapodCSC:
+    image: lsstts/ts_athexapod:3.9-dm-19762
+    container_name: athexapod
+    environment:
+      - LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
+    networks:
+      control-network:
+        ipv4_address: "192.168.1.214"
+    volumes:
+      - ./ATHexapod/startCSC.sh:/home/saluser/startCSC.sh
+      - ./ATHexapod/tcpConfiguration.yaml:/home/saluser/repos/ts_salobjATHexapod/bin/settingFiles/Test/1/tcpConfiguration.yaml
+    entrypoint: ["/home/saluser/startCSC.sh"]
+
+  ataos:
+    image: lsstts/ataos:DM-19890
+    container_name: ataos
+    environment:
+      - LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
+    networks:
+      control-network:
+        ipv4_address: "192.168.1.215"
+
+networks:
+  default:
+    external:
+      name: control-network
+  control-network:
+    external: true
diff --git a/AT_EFD/dimm_command_setup.sh b/AT_EFD/dimm_command_setup.sh
new file mode 100755
index 0000000..b9333df
--- /dev/null
+++ b/AT_EFD/dimm_command_setup.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+# Source this file when starting the container to set it up
+
+echo "#"
+echo "# Loading LSST Stack"
+source /opt/lsst/software/stack/loadLSST.bash
+setup lsst_distrib
+echo "#"
+echo "# Loading sal environment"
+source repos/ts_sal/setup.env
+echo "#"
+echo "# Setting up sal, salobj and scriptqueue"
+ 
+setup ts_xml -t current
+setup ts_sal -t current
+setup ts_salobj -t current
+setup ts_scriptqueue -t current
+
+~/repos/ts_sal/test/DIMM/cpp/src/sacpp_DIMM_command_efdwriter
+#~/repos/ts_sal/test/DIMM/cpp/src/sacpp_DIMM_event_efdwriter &> /dev/null &
+#~/repos/ts_sal/test/DIMM/cpp/src/sacpp_DIMM_telemetry_efdwriter &> /dev/null &
+
+/bin/bash --rcfile /home/saluser/.bash_rc
diff --git a/AT_EFD/dimm_event_setup.sh b/AT_EFD/dimm_event_setup.sh
new file mode 100755
index 0000000..a6dc591
--- /dev/null
+++ b/AT_EFD/dimm_event_setup.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+# Source this file when starting the container to set it up
+
+echo "#"
+echo "# Loading LSST Stack"
+source /opt/lsst/software/stack/loadLSST.bash
+setup lsst_distrib
+echo "#"
+echo "# Loading sal environment"
+source repos/ts_sal/setup.env
+echo "#"
+echo "# Setting up sal, salobj and scriptqueue"
+ 
+setup ts_xml -t current
+setup ts_sal -t current
+setup ts_salobj -t current
+setup ts_scriptqueue -t current
+
+#~/repos/ts_sal/test/DIMM/cpp/src/sacpp_DIMM_command_efdwriter &> /dev/null &
+~/repos/ts_sal/test/DIMM/cpp/src/sacpp_DIMM_event_efdwriter
+#~/repos/ts_sal/test/DIMM/cpp/src/sacpp_DIMM_telemetry_efdwriter &> /dev/null &
+
+/bin/bash --rcfile /home/saluser/.bash_rc
diff --git a/AT_EFD/dimm_setup.sh b/AT_EFD/dimm_setup.sh
new file mode 100755
index 0000000..d370a70
--- /dev/null
+++ b/AT_EFD/dimm_setup.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+# Source this file when starting the container to set it up
+
+echo "#"
+echo "# Loading LSST Stack"
+source /opt/lsst/software/stack/loadLSST.bash
+setup lsst_distrib
+echo "#"
+echo "# Loading sal environment"
+source repos/ts_sal/setup.env
+echo "#"
+echo "# Setting up sal, salobj and scriptqueue"
+ 
+setup ts_xml -t current
+setup ts_sal -t current
+setup ts_salobj -t current
+setup ts_scriptqueue -t current
+
+#~/repos/ts_sal/test/DIMM/cpp/src/sacpp_DIMM_command_efdwriter &> /dev/null &
+#~/repos/ts_sal/test/DIMM/cpp/src/sacpp_DIMM_event_efdwriter &> /dev/null &
+#~/repos/ts_sal/test/DIMM/cpp/src/sacpp_DIMM_telemetry_efdwriter &> /dev/null &
+
+/bin/bash --rcfile /home/saluser/.bash_rc
diff --git a/AT_EFD/dimm_telemetry_setup.sh b/AT_EFD/dimm_telemetry_setup.sh
new file mode 100755
index 0000000..a180adb
--- /dev/null
+++ b/AT_EFD/dimm_telemetry_setup.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+# Source this file when starting the container to set it up
+
+echo "#"
+echo "# Loading LSST Stack"
+source /opt/lsst/software/stack/loadLSST.bash
+setup lsst_distrib
+echo "#"
+echo "# Loading sal environment"
+source repos/ts_sal/setup.env
+echo "#"
+echo "# Setting up sal, salobj and scriptqueue"
+ 
+setup ts_xml -t current
+setup ts_sal -t current
+setup ts_salobj -t current
+setup ts_scriptqueue -t current
+
+#~/repos/ts_sal/test/DIMM/cpp/src/sacpp_DIMM_command_efdwriter &> /dev/null &
+#~/repos/ts_sal/test/DIMM/cpp/src/sacpp_DIMM_event_efdwriter &> /dev/null &
+~/repos/ts_sal/test/DIMM/cpp/src/sacpp_DIMM_telemetry_efdwriter
+
+/bin/bash --rcfile /home/saluser/.bash_rc
diff --git a/AT_EFD/docker-compose.yaml b/AT_EFD/docker-compose.yaml
index 850fd0e..79f0949 100644
--- a/AT_EFD/docker-compose.yaml
+++ b/AT_EFD/docker-compose.yaml
@@ -1,103 +1,154 @@
-version: "3"
+version: '3.6'
 
 services:
-        EFD_Updater:
-                image: lsstts/efd_writers
-                volumes:
-                        - ./efd_population.sh:/home/saluser/efd_population.sh
-                network_mode: "host"
-                entrypoint: ["/home/saluser/efd_population.sh"]
+#        EFD_Updater:
+#                image: lsstts/efd_writers
+#                volumes:
+#                        - ./efd_population.sh:/home/saluser/efd_population.sh
+#                network_mode: "host"
+#                entrypoint: ["/home/saluser/efd_population.sh"]
 
         EFD_MariaDB:
                 image: mariadb:latest
-                ports: 
-                        - "3306:3306"
                 environment:
                         - MYSQL_ROOT_PASSWORD=lssttest
                         - MYSQL_DATABASE=EFD
                         - MYSQL_USER=efduser
                         - MYSQL_PASSWORD=lssttest
-                restart: on-failure
-                network_mode: "host"
-                #volumes:
-                        #- ${PWD}/mariadb:/var/lib/mysql
+                volumes:
+                        - ${HOME}/efd/mysql:/var/lib/mysql
+                networks:
+                        control-network:
+                                ipv4_address: "192.168.1.2"
+
         EFD_ATDome:
-                image: lsstts/efd_writers
+                image: lsstts/efd_writers:DM-20529
                 environment:
                         - LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
                         - LSST_EFD_HOST=${LSST_EFD_HOST}
                         - LSST_KAFKA_BROKERS=localhost
-                network_mode: "host"
                 volumes:
-                        - ${OSPL_CONFIG_PATH}:${OSPL_MOUNT_POINT}
                         - ./efd_writers.sh:/home/saluser/efd_writers.sh
+                networks:
+                        control-network:
+                                ipv4_address: "192.168.1.3"
                 entrypoint: ["/home/saluser/efd_writers.sh", "ATDome", "efdwriter"]
+
         EFD_ATHexapod:
-                image: lsstts/efd_writers
+                image: lsstts/efd_writers:DM-20529
                 environment:
                         - LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
                         - LSST_EFD_HOST=${LSST_EFD_HOST}
                         - LSST_KAFKA_BROKERS=localhost
-                network_mode: "host"
+                networks:
+                        control-network:
+                                ipv4_address: "192.168.1.4"
                 volumes:
-                        - ${OSPL_CONFIG_PATH}:${OSPL_MOUNT_POINT}
                         - ./efd_writers.sh:/home/saluser/efd_writers.sh
                 entrypoint: ["/home/saluser/efd_writers.sh" , "ATHexapod" , "efdwriter"]
 
         EFD_ATMCS:
-                image: lsstts/efd_writers
+                image: lsstts/efd_writers:20190514
                 environment:
                         - LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
                         - LSST_EFD_HOST=${LSST_EFD_HOST}
                         - LSST_KAFKA_BROKERS=localhost
-                network_mode: "host"
+                networks:
+                        control-network:
+                                ipv4_address: "192.168.1.6"
                 volumes:
-                        - ${OSPL_CONFIG_PATH}:${OSPL_MOUNT_POINT}
                         - ./efd_writers.sh:/home/saluser/efd_writers.sh
                 entrypoint: ["/home/saluser/efd_writers.sh" , "ATMCS" , "efdwriter"]
         EFD_ATptg:
-                image: lsstts/efd_writers
+                image: lsstts/efd_writers:20190514
                 environment:
                         - LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
                         - LSST_EFD_HOST=${LSST_EFD_HOST}
                         - LSST_KAFKA_BROKERS=localhost
-                network_mode: "host"
+                networks:
+                        control-network:
+                                ipv4_address: "192.168.1.7"
                 volumes:
-                        - ${OSPL_CONFIG_PATH}:${OSPL_MOUNT_POINT}
                         - ./efd_writers.sh:/home/saluser/efd_writers.sh
                 entrypoint: ["/home/saluser/efd_writers.sh" , "ATPtg" , "efdwriter"]
         EFD_ATDomeTrajectory:
-                image: lsstts/efd_writers
+                image: lsstts/efd_writers:20190514
                 environment:
                         - LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
                         - LSST_EFD_HOST=${LSST_EFD_HOST}
                         - LSST_KAFKA_BROKERS=localhost
-                network_mode: "host"
+                networks:
+                        control-network:
+                                ipv4_address: "192.168.1.8"
                 volumes:
-                        - ${OSPL_CONFIG_PATH}:${OSPL_MOUNT_POINT}
                         - ./efd_writers.sh:/home/saluser/efd_writers.sh
                 entrypoint: ["/home/saluser/efd_writers.sh" , "ATDomeTrajectory" , "efdwriter"]
         EFD_ATPneumatics:
-                image: lsstts/efd_writers
+                image: lsstts/efd_writers:20190514
                 environment:
                         - LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
                         - LSST_EFD_HOST=${LSST_EFD_HOST}
                         - LSST_KAFKA_BROKERS=localhost
-                network_mode: "host"
+                networks:
+                        control-network:
+                                ipv4_address: "192.168.1.9"
                 volumes:
                         - ${OSPL_CONFIG_PATH}:${OSPL_MOUNT_POINT}
                         - ./efd_writers.sh:/home/saluser/efd_writers.sh
                 entrypoint: ["/home/saluser/efd_writers.sh" , "ATPneumatics" , "efdwriter"]
         EFD_ATAOS:
-                image: lsstts/efd_writers
+                image: lsstts/efd_writers:20190514
                 environment:
                         - LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
                         - LSST_EFD_HOST=${LSST_EFD_HOST}
                         - LSST_KAFKA_BROKERS=localhost
-                network_mode: "host"
+                networks:
+                        control-network:
+                                ipv4_address: "192.168.1.10"
                 volumes:
-                        - ${OSPL_CONFIG_PATH}:${OSPL_MOUNT_POINT}
-                        - ./ospl.xml:/opt/OpenSpliceDDS/V6.9.0/HDE/x86_64.linux/etc/config/ospl.xml
                         - ./efd_writers.sh:/home/saluser/efd_writers.sh
                 entrypoint: ["/home/saluser/efd_writers.sh" , "ATAOS" , "efdwriter"]
- 
+        EFD_DIMM:
+                image: lsstts/efd_writers:DM-20529
+                environment:
+                        - LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
+                        - LSST_EFD_HOST=${LSST_EFD_HOST}
+                        - LSST_KAFKA_BROKERS=localhost
+                networks:
+                        control-network:
+                                ipv4_address: "192.168.1.11"
+                volumes:
+                        - ./efd_writers.sh:/home/saluser/efd_writers.sh
+                entrypoint: ["/home/saluser/efd_writers.sh" , "DIMM" , "efdwriter"]
+        EFD_Scripts:
+                image: lsstts/efd_writers:DM-20529
+                environment:
+                        - LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
+                        - LSST_EFD_HOST=${LSST_EFD_HOST}
+                        - LSST_KAFKA_BROKERS=localhost
+                networks:
+                        control-network:
+                                ipv4_address: "192.168.1.12"
+                volumes:
+                        - ./efd_writers.sh:/home/saluser/efd_writers.sh
+                entrypoint: ["/home/saluser/efd_writers.sh" , "Scripts" , "efdwriter"]
+
+        EFD_ScriptQueue:
+                image: lsstts/efd_writers:DM-20529
+                environment:
+                        - LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
+                        - LSST_EFD_HOST=${LSST_EFD_HOST}
+                        - LSST_KAFKA_BROKERS=localhost
+                networks:
+                        control-network:
+                                ipv4_address: "192.168.1.13"
+                volumes:
+                        - ./efd_writers.sh:/home/saluser/efd_writers.sh
+                entrypoint: ["/home/saluser/efd_writers.sh" , "ScriptQueue" , "efdwriter"]
+
+networks:
+  default:
+    external:
+      name: control-network
+  control-network:
+    external: true
diff --git a/AT_EFD/efd_population.sh b/AT_EFD/efd_population.sh
index 56a7166..a7bd967 100755
--- a/AT_EFD/efd_population.sh
+++ b/AT_EFD/efd_population.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-cat /opt/lsst/ts_sal/sql/*.sqldef | mysql -u efduser -p'lssttest' -h 139.229.162.118 EFD 
+cat /opt/lsst/ts_sal/sql/*.sqldef | mysql -u efduser -p'lssttest' -h 192.168.1.2 EFD
diff --git a/AT_EFD/efd_writers.sh b/AT_EFD/efd_writers.sh
index 2e273f8..a3d599e 100755
--- a/AT_EFD/efd_writers.sh
+++ b/AT_EFD/efd_writers.sh
@@ -1,14 +1,26 @@
 #!/bin/bash
 
-source /opt/lsst/ts_sal/setupEFD.env
+echo "#"
+echo "# Loading LSST Stack"
+source /opt/lsst/software/stack/loadLSST.bash
+setup lsst_distrib
+echo "#"
+echo "# Loading sal environment"
+source repos/ts_sal/setup.env
+echo "#"
+echo "# Setting up sal, salobj and scriptqueue"
+
+setup ts_xml -t current
+setup ts_sal -t current
 
 CSC=$1	# CSC name
 DBTYPE=$2	# influxwriter, efdwriter, kafkawriter
 
 echo $LSST_EFD_HOST
+echo $LSST_DDS_DOMAIN
 
 export LSST_EFD_HOST
 
-/opt/lsst/ts_sal/bin/sacpp_${CSC}_command_${DBTYPE} &
-/opt/lsst/ts_sal/bin/sacpp_${CSC}_event_${DBTYPE} &
-/opt/lsst/ts_sal/bin/sacpp_${CSC}_telemetry_${DBTYPE} 
+./repos/ts_sal/test/${CSC}/cpp/src/sacpp_${CSC}_command_${DBTYPE} &> /dev/null &
+./repos/ts_sal/test/${CSC}/cpp/src/sacpp_${CSC}_event_${DBTYPE} &> /dev/null &
+./repos/ts_sal/test/${CSC}/cpp/src/sacpp_${CSC}_telemetry_${DBTYPE} &> /dev/null
diff --git a/setup.env b/setup.env
index 8e9384d..44a939a 100644
--- a/setup.env
+++ b/setup.env
@@ -1,6 +1,6 @@
 
-export OSPL_CONFIG_PATH=/home/auxtel/ospl.xml
-export OSPL_MOUNT_POINT=/home/saluser/ospl.xml
+export OSPL_CONFIG_PATH=$HOME/ospl.xml
+export OSPL_MOUNT_POINT=$HOME/ospl.xml
 export OSPL_URI=file://$OSPL_MOUNT_POINT
 export LSST_DDS_DOMAIN=atsimulatorcsc
 export LSST_EFD_HOST=139.229.162.118
diff --git a/users_jupyter_servers/README.md b/users_jupyter_servers/README.md
new file mode 100644
index 0000000..d73e883
--- /dev/null
+++ b/users_jupyter_servers/README.md
@@ -0,0 +1,5 @@
+# Users Jupyter Servers
+
+This docker compose file is used to launch jupyter notebook servers for
+users on a host.
+
diff --git a/users_jupyter_servers/diag01_notebook_config.py b/users_jupyter_servers/diag01_notebook_config.py
new file mode 100644
index 0000000..062aa6c
--- /dev/null
+++ b/users_jupyter_servers/diag01_notebook_config.py
@@ -0,0 +1,2 @@
+
+c.NotebookApp.token = 'cae9f84684c2f8b650d3d49d098cda2bca6a1fdf5ec193ab'
diff --git a/users_jupyter_servers/diag01_setup.sh b/users_jupyter_servers/diag01_setup.sh
new file mode 100644
index 0000000..e007a29
--- /dev/null
+++ b/users_jupyter_servers/diag01_setup.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+# Source this file when starting the container to set it up
+
+. ~/.bash_profile
+echo "#"
+echo "# Loading sal environment"
+. repos/ts_sal/setup.env
+echo "#"
+echo "# Loading LSST Stack"
+. /opt/lsst/software/stack/loadLSST.bash
+setup lsst_distrib
+echo "#"
+echo "# Setting up sal, salobj and scriptqueue"
+
+setup ts_xml -t current
+setup ts_sal -t current
+setup ts_salobj -t current
+setup ts_scriptqueue -t current
+
+echo "#"
+echo "# Starting jupyter lab server"
+
+jupyter lab --ip 192.168.1.201 --port 8885 --no-browser
diff --git a/users_jupyter_servers/diag02_notebook_config.py b/users_jupyter_servers/diag02_notebook_config.py
new file mode 100644
index 0000000..72ee85c
--- /dev/null
+++ b/users_jupyter_servers/diag02_notebook_config.py
@@ -0,0 +1,2 @@
+
+c.NotebookApp.token = '07949ec5b8f05fdaee1b2b7af9d018488568a586378a36b5'
diff --git a/users_jupyter_servers/diag02_setup.sh b/users_jupyter_servers/diag02_setup.sh
new file mode 100644
index 0000000..c9af93c
--- /dev/null
+++ b/users_jupyter_servers/diag02_setup.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+# Source this file when starting the container to set it up
+
+. ~/.bash_profile
+echo "#"
+echo "# Loading sal environment"
+. repos/ts_sal/setup.env
+echo "#"
+echo "# Loading LSST Stack"
+. /opt/lsst/software/stack/loadLSST.bash
+setup lsst_distrib
+echo "#"
+echo "# Setting up sal, salobj and scriptqueue"
+
+setup ts_xml -t current
+setup ts_sal -t current
+setup ts_salobj -t current
+setup ts_scriptqueue -t current
+
+echo "#"
+echo "# Starting jupyter lab server"
+
+jupyter lab --ip 192.168.1.202 --port 8885 --no-browser
diff --git a/users_jupyter_servers/diag03_notebook_config.py b/users_jupyter_servers/diag03_notebook_config.py
new file mode 100644
index 0000000..f24d55e
--- /dev/null
+++ b/users_jupyter_servers/diag03_notebook_config.py
@@ -0,0 +1,2 @@
+
+c.NotebookApp.token = '80ac08ce252f4e6ce9592a6f4fa6f31868bbaaccf65130a1'
diff --git a/users_jupyter_servers/diag03_setup.sh b/users_jupyter_servers/diag03_setup.sh
new file mode 100644
index 0000000..59aafb1
--- /dev/null
+++ b/users_jupyter_servers/diag03_setup.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+# Source this file when starting the container to set it up
+
+. ~/.bash_profile
+echo "#"
+echo "# Loading sal environment"
+. repos/ts_sal/setup.env
+echo "#"
+echo "# Loading LSST Stack"
+. /opt/lsst/software/stack/loadLSST.bash
+setup lsst_distrib
+echo "#"
+echo "# Setting up sal, salobj and scriptqueue"
+
+setup ts_xml -t current
+setup ts_sal -t current
+setup ts_salobj -t current
+setup ts_scriptqueue -t current
+
+echo "#"
+echo "# Starting jupyter lab server"
+
+jupyter lab --ip 192.168.1.203 --port 8885 --no-browser
diff --git a/users_jupyter_servers/docker-compose.yml b/users_jupyter_servers/docker-compose.yml
new file mode 100644
index 0000000..5f6ffc8
--- /dev/null
+++ b/users_jupyter_servers/docker-compose.yml
@@ -0,0 +1,55 @@
+version: "3.4"
+
+services:
+
+  diag01:
+    image: lsstts/develop-env:20190514
+    container_name: diag01
+    environment:
+      - LSST_DDS_DOMAIN=$LSST_DDS_DOMAIN
+    volumes:
+      - $HOME/develop_diag01:/home/saluser/develop
+      - ./diag01_notebook_config.py:/home/saluser/.jupyter/jupyter_notebook_config.py
+      - ./diag01_setup.sh:/home/saluser/.setup.sh
+    stdin_open: true
+    tty: true
+    networks:
+      control-network:
+        ipv4_address: "192.168.1.201"
+
+  diag02:
+    image: lsstts/develop-env:20190514
+    container_name: diag02
+    environment:
+      - LSST_DDS_DOMAIN=$LSST_DDS_DOMAIN
+    volumes:
+      - $HOME/develop_diag02:/home/saluser/develop
+      - ./diag02_notebook_config.py:/home/saluser/.jupyter/jupyter_notebook_config.py
+      - ./diag02_setup.sh:/home/saluser/.setup.sh
+    stdin_open: true
+    tty: true
+    networks:
+      control-network:
+        ipv4_address: "192.168.1.202"
+
+  diag03:
+    image: lsstts/develop-env:20190514
+    container_name: diag03
+    environment:
+      - LSST_DDS_DOMAIN=$LSST_DDS_DOMAIN
+    volumes:
+      - $HOME/develop_diag03:/home/saluser/develop
+      - ./diag03_notebook_config.py:/home/saluser/.jupyter/jupyter_notebook_config.py
+      - ./diag03_setup.sh:/home/saluser/.setup.sh
+    stdin_open: true
+    tty: true
+    networks:
+      control-network:
+        ipv4_address: "192.168.1.203"
+
+networks:
+  default:
+    external:
+      name: control-network
+  control-network:
+    external: true