diff --git a/functions/server b/functions/server
index b421e9f..47774a8 100644
--- a/functions/server
+++ b/functions/server
@@ -3,6 +3,7 @@
 function server_help() {
   usage_general
   cat<<EOF
+    $(basename ${0})   {--attach}
 commands:
     create    [servername] [network name]
     start     [servername] [port] (ip)
@@ -74,6 +75,9 @@ function server_start() {
 
   log i "Starting container '${1}' with image '${version}/${software}:${build}' on port '$([[ -n "${3}" ]] && echo ${3}:)${2}'"
   startContainer "${1}" "${version}/${software}:${build}" "${2}" "${3}" "${podman_network}"
+  if (( DIRECTLY_ATTACH )); then
+    server_attach "${1}"
+  fi
 }
 
 function server_stop() {
diff --git a/pms-cli b/pms-cli
index b2b5abb..0446f4c 100755
--- a/pms-cli
+++ b/pms-cli
@@ -13,6 +13,7 @@ for util in ${ROOTPATH}/utils/*; do
 done
 
 # VARIABLES
+declare DIRECTLY_ATTACH=0
 declare debuglevel=3
 
 function usage_general() {
@@ -57,6 +58,10 @@ while true; do
     -v|--verbose)
       debuglevel=4
     ;;
+    --attach)
+      shift
+      DIRECTLY_ATTACH=1
+    ;;
     *)
       COMMAND="$1"
       SUBCOMMAND="$2"