diff --git a/container_files/usr-local-bin/entrypoint.sh b/container_files/usr-local-bin/entrypoint.sh
index fcafe4f8..20b5dce0 100755
--- a/container_files/usr-local-bin/entrypoint.sh
+++ b/container_files/usr-local-bin/entrypoint.sh
@@ -10,6 +10,14 @@ if [ "$#" -eq 0 ];
    setupFiles
    runCommand
 else
-  echo executing $@
-  exec "$@"
+
+  if [ "$@" = "/opt/grouper/grouperWebapp/WEB-INF/bin/gsh.sh" ]
+    then 
+      GROUPER_ENTRYPOINT_COMMAND=gsh
+    else
+      GROUPER_ENTRYPOINT_COMMAND="$@"
+  fi
+
+  echo executing GROUPER_ENTRYPOINT_COMMAND
+  exec "$GROUPER_ENTRYPOINT_COMMAND"
 fi