diff --git a/CDB/LOFAR_ConfigDb.json b/CDB/LOFAR_ConfigDb.json
index cee2cb24cbd336bf17d25760b2f13d599ea17ddb..6886437ce7cf02ee741b5b70f07ebfbf71b08b4d 100644
--- a/CDB/LOFAR_ConfigDb.json
+++ b/CDB/LOFAR_ConfigDb.json
@@ -1,6 +1,6 @@
 {
     "servers": {
-        "docker_device": {
+        "Docker": {
             "STAT": {
                 "Docker": {
                     "STAT/Docker/1": {}
@@ -14,7 +14,7 @@
                 }
             }
         },
-        "observation_control": {
+        "ObservationControl": {
             "STAT": {
                 "ObservationControl": {
                     "STAT/ObservationControl/1": {}
diff --git a/CDB/stations/simulators_ConfigDb.json b/CDB/stations/simulators_ConfigDb.json
index 615976f006bbf571adbca93b75e3d172c30f68a4..df2ffc1c1194282f7cc92cd0e7df1e5eb90b3a58 100644
--- a/CDB/stations/simulators_ConfigDb.json
+++ b/CDB/stations/simulators_ConfigDb.json
@@ -28,7 +28,7 @@
                                 "apspu-sim"
                             ],
                             "OPC_Server_Port": [
-                                "4843"
+                                "4842"
                             ],
                             "OPC_Time_Out": [
                                 "5.0"
diff --git a/bin/start-ds.sh b/bin/start-ds.sh
index e7fab7e9331b4512f9caf13bb9096146605fd4d9..7b601c4c8f5e24ac56755ad08a1203a6cbba62d2 100755
--- a/bin/start-ds.sh
+++ b/bin/start-ds.sh
@@ -25,7 +25,7 @@ else
   mkdir -p /tmp/tangostationcontrol
   python3 setup.py build --build-base /tmp/tangostationcontrol egg_info --egg-base /tmp/tangostationcontrol bdist_wheel --dist-dir /tmp/tangostationcontrol || exit 1
   # shellcheck disable=SC2012
-  sudo pip install "$(ls -Art /tmp/tangostationcontrol/*.whl | tail -n 1)"
+  sudo pip install --force-reinstall "$(ls -Art /tmp/tangostationcontrol/*.whl | tail -n 1)"
 fi
 
 /usr/local/bin/wait-for-it.sh "$TANGO_HOST" --timeout=30 --strict -- "$@"
diff --git a/docker-compose/device-apsct.yml b/docker-compose/device-apsct.yml
index 3d5a2e034de34f77d80b5a28305dc5617874f48f..60f65fc47ed81822242282fc743846221acec2d9 100644
--- a/docker-compose/device-apsct.yml
+++ b/docker-compose/device-apsct.yml
@@ -32,13 +32,10 @@ services:
         - ..:/opt/lofar/tango:rw
     environment:
       - TANGO_HOST=${TANGO_HOST}
+    working_dir: /opt/lofar/tango
     entrypoint:
-      - /usr/local/bin/wait-for-it.sh
-      - ${TANGO_HOST}
-      - --timeout=30
-      - --strict
-      - --
+      - bin/start-ds.sh
       # configure CORBA to _listen_ on 0:port, but tell others we're _reachable_ through ${HOSTNAME}:port, since CORBA
       # can't know about our Docker port forwarding
-      - python3 -u /opt/lofar/tango/devices/devices/apsct.py STAT -v -ORBendPoint giop:tcp:0:5709 -ORBendPointPublish giop:tcp:${HOSTNAME}:5709
+      - l2ss-apsct Apsct STAT -v  -v -ORBendPoint giop:tcp:0:5709 -ORBendPointPublish giop:tcp:${HOSTNAME}:5709
     restart: on-failure
diff --git a/docker-compose/device-apspu.yml b/docker-compose/device-apspu.yml
index 04b89ac4a19efddf56c2b9a72ef05d05f54159db..b694b09518215e293d19e1ff551f4f608e6f818d 100644
--- a/docker-compose/device-apspu.yml
+++ b/docker-compose/device-apspu.yml
@@ -32,13 +32,10 @@ services:
         - ..:/opt/lofar/tango:rw
     environment:
       - TANGO_HOST=${TANGO_HOST}
+    working_dir: /opt/lofar/tango
     entrypoint:
-      - /usr/local/bin/wait-for-it.sh
-      - ${TANGO_HOST}
-      - --timeout=30
-      - --strict
-      - --
+      - bin/start-ds.sh
       # configure CORBA to _listen_ on 0:port, but tell others we're _reachable_ through ${HOSTNAME}:port, since CORBA
       # can't know about our Docker port forwarding
-      - python3 -u /opt/lofar/tango/devices/devices/apspu.py STAT -v -ORBendPoint giop:tcp:0:5710 -ORBendPointPublish giop:tcp:${HOSTNAME}:5710
+      - l2ss-apspu Apspu STAT -v -ORBendPoint giop:tcp:0:5710 -ORBendPointPublish giop:tcp:${HOSTNAME}:5710
     restart: on-failure
diff --git a/docker-compose/device-boot.yml b/docker-compose/device-boot.yml
index 9a4a13ff7494ec0e85af3581ba33a73477c86cf8..3db111410fafde9901fd8f91cb40a1c3560e4242 100644
--- a/docker-compose/device-boot.yml
+++ b/docker-compose/device-boot.yml
@@ -31,6 +31,7 @@ services:
       - ..:/opt/lofar/tango:rw
     environment:
       - TANGO_HOST=${TANGO_HOST}
+    working_dir: /opt/lofar/tango
     entrypoint:
       - bin/start-ds.sh
       # configure CORBA to _listen_ on 0:port, but tell others we're _reachable_ through ${HOSTNAME}:port, since CORBA
diff --git a/tangostationcontrol/setup.cfg b/tangostationcontrol/setup.cfg
index daee0edbff26ee8f44613d75dd8a6bcd411906e0..e6101c890893c961e1eff27ce3d3ab4e019ea312 100644
--- a/tangostationcontrol/setup.cfg
+++ b/tangostationcontrol/setup.cfg
@@ -34,6 +34,8 @@ where=./
 
 [options.entry_points]
 console_scripts =
+    l2ss-apsct = tangostationcontrol.devices.apsct:main
+    l2ss-apspu = tangostationcontrol.devices.apspu:main
     l2ss-boot = tangostationcontrol.devices.boot:main
     l2ss-docker-device = tangostationcontrol.devices.docker_device:main
     l2ss-observation = tangostationcontrol.devices.observation:main
@@ -41,10 +43,10 @@ console_scripts =
     l2ss-receiver = tangostationcontrol.devices.recv:main
     l2ss-sdp = tangostationcontrol.devices.sdp.sdp:main
     l2ss-sst = tangostationcontrol.devices.sdp.sst:main
-    l2ss-unb2 = tangostationcontrol.devices.unb2:main
-    l2ss-xst = tangostationcontrol.devices.sdp.xst:main
     l2ss-statistics-reader = tangostationcontrol.statistics_writer.statistics_reader:main
     l2ss-statistics-writer = tangostationcontrol.statistics_writer.statistics_writer:main
+    l2ss-unb2 = tangostationcontrol.devices.unb2:main
+    l2ss-xst = tangostationcontrol.devices.sdp.xst:main
 
 # The following entry points should eventually be removed / replaced
     l2ss-cold-start = tangostationcontrol.toolkit.lts_cold_start:main
diff --git a/tangostationcontrol/tangostationcontrol/common/lofar_logging.py b/tangostationcontrol/tangostationcontrol/common/lofar_logging.py
index 46d417c67987b1cec37897552ad35446ac7fdae1..cfff61966f11a06c2fcf0e336da32eba24bfbfe2 100644
--- a/tangostationcontrol/tangostationcontrol/common/lofar_logging.py
+++ b/tangostationcontrol/tangostationcontrol/common/lofar_logging.py
@@ -150,7 +150,7 @@ def configure_logger(logger: logging.Logger=None, log_extra=None, debug=False):
         from logstash_async.handler import AsynchronousLogstashHandler, LogstashFormatter
 
         # log to the tcp_input of logstash in our ELK stack
-        handler = AsynchronousLogstashHandler("elk", 5959, database_path='pending_log_messages.db')
+        handler = AsynchronousLogstashHandler("elk", 5959, database_path='/tmp/lofar_pending_log_messages.db')
 
         # configure log messages
         formatter = LogstashFormatter(extra=log_extra, tags=["python", "lofar"])
diff --git a/tangostationcontrol/tangostationcontrol/devices/apsct.py b/tangostationcontrol/tangostationcontrol/devices/apsct.py
index b32c5d0c8b1637a99f7e429c44083246491fe332..add4e146cdb5fb4282a49f9394c552465b088a26 100644
--- a/tangostationcontrol/tangostationcontrol/devices/apsct.py
+++ b/tangostationcontrol/tangostationcontrol/devices/apsct.py
@@ -11,31 +11,25 @@
 
 """
 
-# TODO(Corne): Remove sys.path.append hack once packaging is in place!
-import os, sys
-currentdir = os.path.dirname(os.path.realpath(__file__))
-parentdir = os.path.dirname(currentdir)
-sys.path.append(parentdir)
-
 # PyTango imports
 from tango import DebugIt
 from tango.server import run, command
-from tango.server import device_property, attribute
-from tango import AttrWriteType
+from tango import AttrWriteType, DevState
 import numpy
 # Additional import
 
-from device_decorators import *
-
-from clients.attribute_wrapper import attribute_wrapper
-from devices.opcua_device import opcua_device
-from common.lofar_logging import device_logging_to_python, log_exceptions
+from tangostationcontrol.clients.attribute_wrapper import attribute_wrapper
+from tangostationcontrol.common.entrypoint import entry
+from tangostationcontrol.common.lofar_logging import device_logging_to_python, log_exceptions
+from tangostationcontrol.devices.device_decorators import *
+from tangostationcontrol.devices.opcua_device import opcua_device
 
 import logging
 logger = logging.getLogger()
 
 __all__ = ["APSCT", "main"]
 
+
 @device_logging_to_python()
 class APSCT(opcua_device):
     # -----------------
@@ -120,17 +114,10 @@ class APSCT(opcua_device):
         """
         self.opcua_connection.call_method(["APSCT_on"])
 
+
 # ----------
 # Run server
 # ----------
-def main(args=None, **kwargs):
-    """Main function of the APSCT module."""
-
-    from common.lofar_logging import configure_logger
-    configure_logger()
-
-    return run((APSCT,), args=args, **kwargs)
-
-
-if __name__ == '__main__':
-    main()
+def main(**kwargs):
+    """Main function of the ObservationControl module."""
+    return entry(APSCT, **kwargs)
diff --git a/tangostationcontrol/tangostationcontrol/devices/apspu.py b/tangostationcontrol/tangostationcontrol/devices/apspu.py
index 3daab9c071a73b75a4d28def984d4794d4aa7aef..88a677fcb1cd743e1e59f8fe3aecbbb2a0992cba 100644
--- a/tangostationcontrol/tangostationcontrol/devices/apspu.py
+++ b/tangostationcontrol/tangostationcontrol/devices/apspu.py
@@ -11,28 +11,20 @@
 
 """
 
-# TODO(Corne): Remove sys.path.append hack once packaging is in place!
-import os, sys
-currentdir = os.path.dirname(os.path.realpath(__file__))
-parentdir = os.path.dirname(currentdir)
-sys.path.append(parentdir)
-
 # PyTango imports
-from tango import DebugIt
-from tango.server import run, command
-from tango.server import device_property, attribute
 from tango import AttrWriteType
 import numpy
 # Additional import
 
-from device_decorators import *
-
-from clients.attribute_wrapper import attribute_wrapper
-from devices.opcua_device import opcua_device
-from common.lofar_logging import device_logging_to_python, log_exceptions
+from tangostationcontrol.devices.device_decorators import *
+from tangostationcontrol.common.entrypoint import entry
+from tangostationcontrol.clients.attribute_wrapper import attribute_wrapper
+from tangostationcontrol.devices.opcua_device import opcua_device
+from tangostationcontrol.common.lofar_logging import device_logging_to_python, log_exceptions
 
 __all__ = ["APSPU", "main"]
 
+
 @device_logging_to_python()
 class APSPU(opcua_device):
     # -----------------
@@ -71,17 +63,10 @@ class APSPU(opcua_device):
     # Commands
     # --------
 
+
 # ----------
 # Run server
 # ----------
-def main(args=None, **kwargs):
-    """Main function of the APSPU module."""
-
-    from common.lofar_logging import configure_logger
-    configure_logger()
-
-    return run((APSPU,), args=args, **kwargs)
-
-
-if __name__ == '__main__':
-    main()
+def main(**kwargs):
+    """Main function of the ObservationControl module."""
+    return entry(APSPU, **kwargs)
diff --git a/tangostationcontrol/tangostationcontrol/devices/boot.py b/tangostationcontrol/tangostationcontrol/devices/boot.py
index 355a8c944361feaee09b70196450a5401c598565..5b0acd2a587f6076e3a416151a30369a8a924478 100644
--- a/tangostationcontrol/tangostationcontrol/devices/boot.py
+++ b/tangostationcontrol/tangostationcontrol/devices/boot.py
@@ -21,9 +21,9 @@ from tango import AttrWriteType, DeviceProxy, DevState
 # Additional import
 import numpy
 
-from device_decorators import *
+from tangostationcontrol.devices.device_decorators import *
 
-from tangostationcontrol.common.entry import entry
+from tangostationcontrol.common.entrypoint import entry
 from tangostationcontrol.devices.lofar_device import lofar_device
 from tangostationcontrol.common.lofar_logging import device_logging_to_python, log_exceptions
 
diff --git a/tangostationcontrol/tangostationcontrol/devices/docker_device.py b/tangostationcontrol/tangostationcontrol/devices/docker_device.py
index 5ed02acdb942f2fb6ec33c3c433ac18687962bc8..00f42ca816e1e8219cde06913ef633961a15366e 100644
--- a/tangostationcontrol/tangostationcontrol/devices/docker_device.py
+++ b/tangostationcontrol/tangostationcontrol/devices/docker_device.py
@@ -19,7 +19,7 @@ import numpy
 import asyncio
 # Additional import
 
-from device_decorators import *
+from tangostationcontrol.devices.device_decorators import *
 
 # Additional import
 from tangostationcontrol.common.entrypoint import entry
diff --git a/tangostationcontrol/tangostationcontrol/devices/recv.py b/tangostationcontrol/tangostationcontrol/devices/recv.py
index a920dd59e393da0d5497700e31fb064fedae7ad9..4ac93d85abcf66d4c8dc25ab60a1fae89fbef794 100644
--- a/tangostationcontrol/tangostationcontrol/devices/recv.py
+++ b/tangostationcontrol/tangostationcontrol/devices/recv.py
@@ -15,7 +15,7 @@
 from tango import DebugIt
 from tango.server import run, command
 from tango.server import device_property, attribute
-from tango import AttrWriteType
+from tango import AttrWriteType, DevState
 import numpy
 
 # Additional import
diff --git a/tangostationcontrol/tangostationcontrol/devices/unb2.py b/tangostationcontrol/tangostationcontrol/devices/unb2.py
index 9ca54c5fbc4eaaba2a205744cad23af1bb139691..c4f623c5df5846858dd8d0aa0ab5fd53dff56ac3 100644
--- a/tangostationcontrol/tangostationcontrol/devices/unb2.py
+++ b/tangostationcontrol/tangostationcontrol/devices/unb2.py
@@ -14,7 +14,7 @@
 # PyTango imports
 from tango.server import run, command
 from tango.server import device_property, attribute
-from tango import AttrWriteType, DebugIt
+from tango import AttrWriteType, DebugIt, DevState
 # Additional import
 
 from tangostationcontrol.common.entrypoint import entry