diff --git a/.dockerignore b/.dockerignore
index 86cebba44b..699751e025 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,2 +1,8 @@
+.git
 .pytest_cache
 __pycache__
+*.egg-info
+build
+docs
+dist
+test-reports
diff --git a/bin/aca-py b/bin/aca-py
index 5712164a10..6f37514a44 100755
--- a/bin/aca-py
+++ b/bin/aca-py
@@ -22,11 +22,11 @@ if ENABLE_PTVSD or "--debug" in sys.argv:
 
 from aries_cloudagent.commands import run_command  # noqa
 
-if len(sys.argv) > 1:
+if len(sys.argv) > 1 and sys.argv[1] and sys.argv[1][0] != "-":
     command = sys.argv[1]
     args = sys.argv[2:]
 else:
     command = None
-    args = []
+    args = sys.argv[1:]
 
 run_command(command, args)
diff --git a/scripts/run_tests_indy b/scripts/run_tests_indy
index 1cada05a62..80d0c75f21 100755
--- a/scripts/run_tests_indy
+++ b/scripts/run_tests_indy
@@ -24,6 +24,6 @@ if [ ! -z "$POSTGRES_URL" ]; then
 fi
 
 $DOCKER run --rm -ti --name aries-cloudagent-runner \
-  -v "$(pwd)/../test-reports:/usr/src/app/test-reports" \
+  -v "$(pwd)/../test-reports:/home/indy/src/test-reports" \
   $DOCKER_ARGS \
   aries-cloudagent-test "$@"