diff --git a/.travis.yml b/.travis.yml
index 310824f0da38afeaa2b896ab70f0331febc8127e..e2d9723737d5b0367242f96ca2ec088a2b195cb1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,5 @@ branches:
 
 script:
   - mntdir='/mnt/ocs-manager'
-  #- docker run --rm -v $(pwd):${mntdir} ubuntu:16.04 /bin/bash -c "sh ${mntdir}/scripts/build-docker.sh snap"
-  #- docker run --rm -v $(pwd):${mntdir} ubuntu:16.04 /bin/bash -c "sh ${mntdir}/scripts/build-docker.sh flatpak"
   - docker run --rm -v $(pwd):${mntdir} ubuntu:14.04 /bin/bash -c "sh ${mntdir}/scripts/build-docker.sh appimage"
   - cat transfer.log
diff --git a/app/configs/application.json b/app/configs/application.json
index 9155b13773b917cc06ec3f6aa3d7c9b718f1dcdf..7bb8aacac73c9747489f6669c9b693b270f25560 100644
--- a/app/configs/application.json
+++ b/app/configs/application.json
@@ -1,7 +1,7 @@
 {
     "id": "ocs-manager",
     "name": "ocs-manager",
-    "version": "0.5.3",
+    "version": "0.5.4",
     "organization": "Opendesktop.org",
     "domain": "org.opendesktop.ocs-manager",
     "icon": ":/desktop/ocs-manager.svg",
diff --git a/app/src/websockets/websocketserver.cpp b/app/src/websockets/websocketserver.cpp
index 0c52dabfd5534ea95ded0e587205fd4d77c08c42..405af58a9d4ee8b863e415d3ed12f0a9cdce1160 100644
--- a/app/src/websockets/websocketserver.cpp
+++ b/app/src/websockets/websocketserver.cpp
@@ -55,6 +55,10 @@ WebSocketServer::~WebSocketServer()
 bool WebSocketServer::start()
 {
     if (wsServer_->listen(QHostAddress::Any, serverPort_)) {
+        auto application = configHandler_->getUsrConfigApplication();
+        application["websocket_url"] = serverUrl().toString();
+        configHandler_->setUsrConfigApplication(application);
+
         emit started();
         return true;
     }
@@ -63,6 +67,10 @@ bool WebSocketServer::start()
 
 void WebSocketServer::stop()
 {
+    auto application = configHandler_->getUsrConfigApplication();
+    application["websocket_url"] = QString("");
+    configHandler_->setUsrConfigApplication(application);
+
     wsServer_->close();
 }
 
diff --git a/pkg/appimage/appimage.sh b/pkg/appimage/appimage.sh
index 8da0874d6d3aea8412e1c4cd20777f044f6d91b4..46c1d79eb7a2c3a8a87dac04af61eccb21cb0df3 100644
--- a/pkg/appimage/appimage.sh
+++ b/pkg/appimage/appimage.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 PKGNAME='ocs-manager'
-PKGVER='0.5.3'
+PKGVER='0.5.4'
 PKGREL='1'
 
 curl -L -o linuxdeployqt "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
diff --git a/scripts/build-docker.sh b/scripts/build-docker.sh
index f6e1726bd550f8702532358426934c558da5a9d7..4a1cac647c9da71e01ddbcec044e3d0425288536 100644
--- a/scripts/build-docker.sh
+++ b/scripts/build-docker.sh
@@ -25,14 +25,6 @@ transfer_file() {
     fi
 }
 
-build_snap() {
-    echo 'Not implemented yet'
-}
-
-build_flatpak() {
-    echo 'Not implemented yet'
-}
-
 build_appimage() {
     # docker-image: ubuntu:14.04
 
@@ -63,13 +55,21 @@ build_appimage() {
     transfer_file "$(find "${PROJDIR}/build_"*${BUILDTYPE} -type f -name "${PKGNAME}*.AppImage")"
 }
 
-if [ "${BUILDTYPE}" = 'snap' ]; then
+build_snap() {
+    echo 'Not implemented yet'
+}
+
+build_flatpak() {
+    echo 'Not implemented yet'
+}
+
+if [ "${BUILDTYPE}" = 'appimage' ]; then
+    build_appimage
+elif [ "${BUILDTYPE}" = 'snap' ]; then
     build_snap
 elif [ "${BUILDTYPE}" = 'flatpak' ]; then
     build_flatpak
-elif [ "${BUILDTYPE}" = 'appimage' ]; then
-    build_appimage
 else
-    echo "sh $(basename "${0}") [snap|flatpak|appimage]"
+    echo "sh $(basename "${0}") [appimage|snap|flatpak]"
     exit 1
 fi
diff --git a/scripts/build.sh b/scripts/build.sh
index a403d8a5bf31d71b451616bd45fb2f7cd9556d6d..36363d99ca74442c5152e8c9a27f0667205a7b3b 100644
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -20,14 +20,6 @@ export_srcarchive() {
     $(cd "${PROJDIR}" && git archive --prefix="${PKGNAME}/" --output="${filepath}" HEAD)
 }
 
-build_snap() {
-    echo 'Not implemented yet'
-}
-
-build_flatpak() {
-    echo 'Not implemented yet'
-}
-
 build_appimage() {
     cd "${PROJDIR}"
     mkdir -p "${BUILDDIR}"
@@ -39,13 +31,21 @@ build_appimage() {
     sh appimage.sh
 }
 
-if [ "${BUILDTYPE}" = 'snap' ]; then
+build_snap() {
+    echo 'Not implemented yet'
+}
+
+build_flatpak() {
+    echo 'Not implemented yet'
+}
+
+if [ "${BUILDTYPE}" = 'appimage' ]; then
+    build_appimage
+elif [ "${BUILDTYPE}" = 'snap' ]; then
     build_snap
 elif [ "${BUILDTYPE}" = 'flatpak' ]; then
     build_flatpak
-elif [ "${BUILDTYPE}" = 'appimage' ]; then
-    build_appimage
 else
-    echo "sh $(basename "${0}") [snap|flatpak|appimage]"
+    echo "sh $(basename "${0}") [appimage|snap|flatpak]"
     exit 1
 fi