diff --git a/bootstrap/etc/lofar20rc.sh b/bootstrap/etc/lofar20rc.sh
index 9cccdceb446a884df73c7cae1953df67ce80315e..1e9efc4a3a973e1620354c196ca625c5a3cf817d 100755
--- a/bootstrap/etc/lofar20rc.sh
+++ b/bootstrap/etc/lofar20rc.sh
@@ -11,14 +11,6 @@
 export LOFAR20_DIR=${1:-${PWD}}
 echo "Setting LOFAR20_DIR=${LOFAR20_DIR}"
 
-# This needs to be modified for a development environment.
-# Example:  ~/lofar2.0/
-# The current setting is for a production environment.
-export TANGO_SKA_LOCAL_DIR=${LOFAR20_DIR}
-
-export TANGO_SKA_CONTAINER_DIR=${LOFAR20_DIR}/ska-docker/
-export TANGO_SKA_CONTAINER_MOUNT=${TANGO_SKA_LOCAL_DIR}:${TANGO_SKA_CONTAINER_DIR}:ro
-
 
 # This needs to be modified for a development environment.
 # Example:  ~/lofar2.0/tango
@@ -44,7 +36,7 @@ export TANGO_HOST=$(hostname):10000
 #
 
 # Provide the -v parameters for Docker and the -e ENV variables.
-export TANGO_CONTAINER_ENV="-e TANGO_SKA_CONTAINER_DIR=${TANGO_SKA_CONTAINER_DIR} -e TANGO_LOFAR_CONTAINER_DIR=${TANGO_LOFAR_CONTAINER_DIR}"
+export TANGO_CONTAINER_ENV="-e TANGO_LOFAR_CONTAINER_DIR=${TANGO_LOFAR_CONTAINER_DIR}"
 
 # Remove all LOFAR1 related environment modifications
 function remove_lofar()
diff --git a/docker-compose/Makefile b/docker-compose/Makefile
index f1b2cc5788c9f75cead9c8fdfaa1793e86f2cb81..1b7983ed19bd5ada525d91d30f45fb1d45fea012 100644
--- a/docker-compose/Makefile
+++ b/docker-compose/Makefile
@@ -101,7 +101,6 @@ DOCKER_COMPOSE_ARGS := DISPLAY=$(DISPLAY) \
     TANGO_HOST=$(TANGO_HOST) \
     NETWORK_MODE=$(NETWORK_MODE) \
     XAUTHORITY_MOUNT=$(XAUTHORITY_MOUNT) \
-    TANGO_SKA_CONTAINER_MOUNT=$(TANGO_SKA_CONTAINER_MOUNT) \
     TANGO_LOFAR_CONTAINER_MOUNT=$(TANGO_LOFAR_CONTAINER_MOUNT) \
     TANGO_LOFAR_CONTAINER_DIR=${TANGO_LOFAR_CONTAINER_DIR} MYSQL_HOST=$(MYSQL_HOST) \
     CONTAINER_NAME_PREFIX=$(CONTAINER_NAME_PREFIX) \
diff --git a/docker-compose/archiver.yml b/docker-compose/archiver.yml
index f471de6285a23e9d4969b4d840e9b83accaac22e..98200f610c887a6a40cdc27c8e87dfbdac8b22a7 100644
--- a/docker-compose/archiver.yml
+++ b/docker-compose/archiver.yml
@@ -63,7 +63,6 @@ services:
              json2tango -w -a -u /tango-archiver/data/archiver-devices.json &&
              sleep infinity"
     volumes:
-      - ${TANGO_SKA_CONTAINER_MOUNT}
       - ${TANGO_LOFAR_CONTAINER_MOUNT}
       - ${HOME}:/hosthome
       - ../docker/tango/tango-archiver:/tango-archiver
diff --git a/docker-compose/itango.yml b/docker-compose/itango.yml
index d131d405371bc6ff7e59892587b2bd2aba9d1fd6..4c12fe3a00fe8ee5fda3a26668bc24adcbf25a72 100644
--- a/docker-compose/itango.yml
+++ b/docker-compose/itango.yml
@@ -21,7 +21,6 @@ services:
     container_name: ${CONTAINER_NAME_PREFIX}itango
     network_mode: ${NETWORK_MODE}
     volumes:
-        - ${TANGO_SKA_CONTAINER_MOUNT}
         - ${TANGO_LOFAR_CONTAINER_MOUNT}
         - ${HOME}:/hosthome
     environment:
diff --git a/docker-compose/jive.yml b/docker-compose/jive.yml
index 5148d1d15c5ef74501e21f9777839e3c4cd724bf..d3b8b06f9778e3e5f53953a5f2eb26725d657e60 100644
--- a/docker-compose/jive.yml
+++ b/docker-compose/jive.yml
@@ -3,7 +3,7 @@
 # display.
 #
 # This container will always run on the same network as the host,
-# to make sure the DISPLAY variable can be used verbatim. For the 
+# to make sure the DISPLAY variable can be used verbatim. For the
 # same reason, TANGO_HOST is hardcoded to be at localhost:10000:
 # the docker network offering our tangodb also exposes it on port 10000
 # on the host.
@@ -23,7 +23,6 @@ services:
     network_mode: host
     volumes:
       - ${XAUTHORITY_MOUNT}
-      - ${TANGO_SKA_CONTAINER_MOUNT}
       - ${TANGO_LOFAR_CONTAINER_MOUNT}
       - ${HOME}:/hosthome
     environment:
diff --git a/docker-compose/jupyter.yml b/docker-compose/jupyter.yml
index dbabfadba86064c724d9073f3077132716da5438..0ac641b22f78a6a1d332e572dc3d9b6db470a5bf 100644
--- a/docker-compose/jupyter.yml
+++ b/docker-compose/jupyter.yml
@@ -18,7 +18,6 @@ services:
     container_name: ${CONTAINER_NAME_PREFIX}jupyter
     network_mode: ${NETWORK_MODE}
     volumes:
-        - ${TANGO_SKA_CONTAINER_MOUNT}
         - ${TANGO_LOFAR_CONTAINER_MOUNT}
         - ${TANGO_LOFAR_LOCAL_DIR}/jupyter-notebooks:/jupyter-notebooks:rw
         - ${HOME}:/hosthome
diff --git a/docker-compose/pogo.yml b/docker-compose/pogo.yml
index c9770ca7b355ea57a96e06b7d76a2d995c3e41a6..9e2d377c1c40f3276f979af621d986a04a04a6b7 100644
--- a/docker-compose/pogo.yml
+++ b/docker-compose/pogo.yml
@@ -26,7 +26,6 @@ services:
     volumes:
       - pogo:/home/tango
       - ${XAUTHORITY_MOUNT}
-      - ${TANGO_SKA_CONTAINER_MOUNT}
       - ${TANGO_LOFAR_CONTAINER_MOUNT}
       - ${HOME}:/hosthome:rw
     environment: