diff --git a/docker_images/installer/Dockerfile b/docker_images/installer/Dockerfile
index 39f6e83..6ad7475 100644
--- a/docker_images/installer/Dockerfile
+++ b/docker_images/installer/Dockerfile
@@ -1,4 +1,4 @@
-FROM git.zontreck.com/ariascreations/conanservermanager:latest
+FROM git.zontreck.com/ariascreations/conanservermanager:stable
 
 RUN echo "Welcome to the Server Installer"
 
diff --git a/docker_images/installer/install.sh b/docker_images/installer/install.sh
index 4c574c8..f596375 100644
--- a/docker_images/installer/install.sh
+++ b/docker_images/installer/install.sh
@@ -1,9 +1,8 @@
 #!/bin/bash
 
-cp /app/server /mnt/server/server
 pushd /mnt/server
 
-./server
+/app/server
 
 popd
 echo "Initial Install completed"
\ No newline at end of file
diff --git a/docker_images/latest/Dockerfile b/docker_images/latest/Dockerfile
index e5d994c..4390680 100644
--- a/docker_images/latest/Dockerfile
+++ b/docker_images/latest/Dockerfile
@@ -7,4 +7,13 @@ FROM git.zontreck.com/ariascreations/conanservermanager:stable
 
 COPY ./entrypoint.sh /entrypoint.sh
 
+EXPOSE 25306/tcp
+EXPOSE 7777/tcp
+EXPOSE 7777/udp
+EXPOSE 7778/udp
+EXPOSE 7779/tcp
+EXPOSE 7779/udp
+EXPOSE 7780/tcp
+EXPOSE 7780/udp
+
 ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]
\ No newline at end of file
diff --git a/docker_images/latest/entrypoint.sh b/docker_images/latest/entrypoint.sh
index 4a86a9d..b26899a 100644
--- a/docker_images/latest/entrypoint.sh
+++ b/docker_images/latest/entrypoint.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 # Copied the entrypoint and slightly altered, from parkervcp's dart yolk.
 
-
 cd /home/container
 
 # Print Dart version
diff --git a/lib/statemachine.dart b/lib/statemachine.dart
index b36c074..5d21073 100644
--- a/lib/statemachine.dart
+++ b/lib/statemachine.dart
@@ -220,7 +220,7 @@ class StateMachine {
               }
             }
 
-            if (send) {
+            if (send && settings.inst!.timer.enabled) {
               // Send the alert message
               SessionData.CURRENT_INTERVAL = current;
               if (current.type == WarnType.Intrusive) {
@@ -236,7 +236,8 @@ class StateMachine {
             }
 
             // Check Total Seconds
-            if (SessionData.timer.getTotalSeconds() == 0) {
+            if (SessionData.timer.getTotalSeconds() == 0 &&
+                settings.inst!.timer.enabled) {
               SessionData.shutdownPending = true;
             }