diff --git a/manager/manager/manager.py b/manager/manager/manager.py
index 943eeaa..be85314 100644
--- a/manager/manager/manager.py
+++ b/manager/manager/manager.py
@@ -689,8 +689,8 @@ def on_run_application(self, event):
                     "source /workspace/code/install/setup.bash && ros2 run academy academyCode"
                 ],
                 stdin=open("/dev/pts/" + console_fd, "r"),
-                stdout=sys.stdout,
-                stderr=subprocess.STDOUT,
+                stdout=open("/dev/pts/" + console_fd, "w"),
+                stderr=sys.stdout,
                 bufsize=1024,
                 universal_newlines=True,
                 shell=True,
@@ -717,8 +717,8 @@ def on_run_application(self, event):
         self.application_process = subprocess.Popen(
             ["python3", entrypoint],
             stdin=open("/dev/pts/" + console_fd, "r"),
-            stdout=sys.stdout,
-            stderr=subprocess.STDOUT,
+            stdout=open("/dev/pts/" + console_fd, "w"),
+            stderr=sys.stdout,
             bufsize=1024,
             universal_newlines=True,
         )
diff --git a/manager/manager/vnc/vnc_server.py b/manager/manager/vnc/vnc_server.py
index 91bc690..2aa71e3 100755
--- a/manager/manager/vnc/vnc_server.py
+++ b/manager/manager/vnc/vnc_server.py
@@ -39,16 +39,23 @@ def start_vnc(self, display, internal_port, external_port):
         self.threads.append(turbovnc_thread)
         wait_for_xserver(display)
 
+        certs = ""
+        
+        if os.path.isfile("/etc/certs/cert.pem"):
+           certs = "--cert /etc/certs/cert.pem --key /etc/certs/privkey.pem"
+
         # Start noVNC with default port 6080 listening to VNC server on 5900
         if self.get_ros_version() == "2":
             novnc_cmd = (
                 f"/noVNC/utils/novnc_proxy --listen {external_port} "
-                f"--vnc localhost:{internal_port}"
+                f"--vnc localhost:{internal_port} "
+                f"{certs}"
             )
         else:
             novnc_cmd = (
                 f"/noVNC/utils/launch.sh --listen {external_port} "
-                f"--vnc localhost:{internal_port}"
+                f"--vnc localhost:{internal_port} "
+                f"{certs}"
             )
 
         novnc_thread = DockerThread(novnc_cmd)