diff --git a/src/.s2i/bin/run b/src/.s2i/bin/run
index 6d72aa35..fdd48a87 100755
--- a/src/.s2i/bin/run
+++ b/src/.s2i/bin/run
@@ -1,68 +1,87 @@
 #!/bin/bash
 
 shopt -s dotglob
 
 pushd /opt/app-root/src
 
 echo "----> Remove bootstrap cache"
 find bootstrap/cache/ -type f ! -name ".gitignore" -delete
 
 if [ -z ${APP_KEY} ]; then
     echo "----> Run artisan key:generate"
     ./artisan key:generate
     unset APP_KEY
 fi
 
 if [ -z ${JWT_SECRET} ]; then
     echo "----> Run artisan jwt:secret"
     ./artisan jwt:secret --always-no
 fi
 
 echo "----> Run artisan clear-compiled"
 ./artisan clear-compiled
 
-if [[ "${LARAVEL_ENV}" != "production" || "$LARAVEL_ENV{}" != "prod" ]]; then
+if [ "${LARAVEL_ENV}" != "production" -a "${LARAVEL_ENV}" != "prod" ]; then
     echo "----> Run artisan cache:clear"
     ./artisan ${ARTISAN_VERBOSITY} cache:clear || true
 fi
 
 # rpm -qv chromium
 # if [ ! -z "$(rpm -qv chromium 2>/dev/null)" ]; then
 #     echo "---- Run artisan dusk:chrome-driver"
 #     chver=$(rpmquery --queryformat="%{VERSION}" chromium | awk -F'.' '{print $1}')
 #     ./artisan dusk:chrome-driver ${chver}
 # fi
 
 if [ ! -f 'resources/countries.php' ]; then
     echo "----> Run artisan data:countries"
     ./artisan data:countries
 fi
 
 rm -rvf bootstrap/cache/
 mkdir -vp bootstrap/cache/
 chown default bootstrap/cache
 
 ./artisan db:ping --wait || exit 1
 
 ./artisan migrate --force || :
 #./artisan db:seed --force || :
 
 env
 
-case ${HKCCP_APP} in
-    worker|WORKER )
-        echo "----> Running worker "
-        exec ./artisan queue:work;;
-    server|SERVER )
-        echo "----> Running server "
-        exec ./artisan serve;;
-    apache|APACHE|httpd|HTTPD )
-        echo "----> Starting httpd "
-        /usr/libexec/s2i/run 2>&1;;
+if [ -z "${KOLAB_ROLE}" -a ! -z "${HKCCP_APP}" ]; then
+    echo "WARNING: Use env KOLAB_ROLE, not HKCCP_APP"
+    KOLAB_ROLE=$HKCCP_APP
+fi
+
+case ${KOLAB_ROLE} in
+    apache|APACHE|httpd|HTTPD)
+        echo "----> Starting httpd"
+        /usr/libexec/s2i/run 2>&1
+    ;;
+
+    horizon|HORIZON)
+        echo "----> Starting horizon"
+        ./artisan horizon
+    ;;
+
+    server|SERVER)
+        echo "----> Running server"
+        exec ./artisan serve
+    ;;
+
     swoole|SWOOLE )
         echo "----> Running swoole"
-        exec ./artisan swoole:http start;;
+        exec ./artisan swoole:http start
+    ;;
+
+    worker|WORKER )
+        echo "----> Running worker"
+        exec ./artisan queue:work
+    ;;
+
     * )
         echo "----> Sleeping"
-        exec sleep 10000;;
+        exec sleep 10000
+    ;;
 esac