diff --git a/docker/scripts/gnb-aw2s_entrypoint.sh b/docker/scripts/gnb-aw2s_entrypoint.sh
index 7085800d1312ff11bf36cb336870c171fd51b7f3..7df325d78b5c535a4d45d0c99fa4d5a565cb5808 100755
--- a/docker/scripts/gnb-aw2s_entrypoint.sh
+++ b/docker/scripts/gnb-aw2s_entrypoint.sh
@@ -9,14 +9,29 @@ echo "=================================="
 echo "/proc/sys/kernel/core_pattern=$(cat /proc/sys/kernel/core_pattern)"
 
 if [ ! -f $CONFIGFILE ]; then
-  echo "No configuration file found: please mount at $CONFIGFILE"
-  exit 255
+  echo "No configuration file $CONFIGFILE found: attempting to find YAML config"
+  YAML_CONFIGFILE=$PREFIX/etc/gnb.yaml
+  if [ ! -f $YAML_CONFIGFILE ]; then
+    echo "No configuration file $YAML_CONFIGFILE found. Please mount either at $CONFIGFILE or $YAML_CONFIGFILE"
+    exit 255
+  fi
+  CONFIGFILE=$YAML_CONFIGFILE
 fi
 
 echo "=================================="
 echo "== Configuration file:"
 cat $CONFIGFILE
 
+new_args=()
+
+while [[ $# -gt 0 ]]; do
+  new_args+=("$1")
+  shift
+done
+
+new_args+=("-O")
+new_args+=("$CONFIGFILE")
+
 # enable printing of stack traces on assert
 export OAI_GDBSTACKS=1
 
@@ -24,7 +39,6 @@ echo "=================================="
 echo "== Starting gNB soft modem with AW2S"
 if [[ -v USE_ADDITIONAL_OPTIONS ]]; then
     echo "Additional option(s): ${USE_ADDITIONAL_OPTIONS}"
-    new_args=()
     while [[ $# -gt 0 ]]; do
         new_args+=("$1")
         shift
@@ -35,6 +49,6 @@ if [[ -v USE_ADDITIONAL_OPTIONS ]]; then
     echo "${new_args[@]}"
     exec "${new_args[@]}"
 else
-    echo "$@"
-    exec "$@"
+    echo "${new_args[@]}"
+    exec "${new_args[@]}"
 fi