diff --git a/scripts/source_development_defaults.sh b/scripts/source_development_defaults.sh
index 88abc6342..0369f0fa1 100644
--- a/scripts/source_development_defaults.sh
+++ b/scripts/source_development_defaults.sh
@@ -1,55 +1,66 @@
 #!/usr/bin/env bash
 
 if [[ "$OSTYPE" == 'linux'* ]]; then
   export MYSQL_UNIX_PORT="${XDG_RUNTIME_DIR:-/run/user/$UID}/mysql.sock"
   export ANDROID_HOME="${ANDROID_HOME:-$HOME/Android/Sdk}"
 fi
 
 if [[ "$OSTYPE" == 'darwin'* ]]; then
   MARIADB_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/MariaDB"
   export MYSQL_UNIX_PORT="$MARIADB_DIR"/mysql.sock
   export ANDROID_HOME="${ANDROID_HOME:-$HOME/Library/Android/sdk}"
 fi
 
 # User defaults of
 # https://www.rabbitmq.com/configure.html#supported-environment-variables
 export RABBITMQ_NODENAME=comm
 export RABBITMQ_DEFAULT_PASS=comm
 export RABBITMQ_DEFAULT_USER=comm
 export RABBITMQ_HOME=${XDG_DATA_HOME:-$HOME/.local/share}/RabbitMQ
 export RABBITMQ_MNESIA_BASE=${RABBITMQ_HOME}/mnesia
 export RABBITMQ_LOG_BASE=${RABBITMQ_HOME}/logs
 export RABBITMQ_LOGS=${RABBITMQ_LOG_BASE}/comm.log
 export RABBITMQ_PLUGINS_EXPAND_DIR=${RABBITMQ_HOME}/plugins_expand
 export RABBITMQ_PID_FILE=${RABBITMQ_HOME}/rabbitmq.pid
 
 export PATH="$PATH":"$ANDROID_HOME"/emulator:"$ANDROID_HOME"/tools
 export PATH="$PATH":"$ANDROID_HOME"/tools/bin:"$ANDROID_HOME"/platform-tools
 
 # ANDROID_SDK_ROOT is deprecated, but it's still used by some tooling
 # such as sdkmanager. ANDROID_HOME is the new prefered env var.
 export ANDROID_SDK_ROOT="${ANDROID_SDK_ROOT:-$ANDROID_HOME}"
 
 export PATH="$PATH":./node_modules/.bin
 
 # Development helpers
 PRJ_ROOT="$(git rev-parse --show-toplevel)"
 export PATH="$PATH":${PRJ_ROOT}/scripts/bin
 
 # mysql2 package wants stable prefixes for temporary directory paths
 # 'nix develop' will set TMP and related variables to something different each
 # invocation
 export TMP=/tmp/app.comm
 export TEMP="$TMP"
 export TMPDIR="$TMP"
 export TEMPDIR="$TMP"
 
 mkdir -p "$TMP"
 
 # For cargo + rustup applications, ensure cargo user bin directory is on path
 if [[ ! "$PATH" =~ \.cargo/bin ]]; then
   export PATH="$PATH":${HOME}/.cargo/bin
 fi
 
 # For development and local testing, point to localstack
 export LOCALSTACK_ENDPOINT=http://localhost:4566
+export AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID:-test}
+export AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY:-test}
+
+# Create easier-to-use shortcut for localstack
+awslocal() {
+  aws --endpoint-url=http://localhost:4566 "$@"
+}
+# Enable shell completions
+if [[ $(basename "$0") == "bash" ]]; then
+  complete -C aws_completer awslocal
+fi