diff --git a/commands b/commands
index 2347cb5..65e6933 100755
--- a/commands
+++ b/commands
@@ -164,9 +164,9 @@ case "$1" in
     verify_service_name "$2"
     SERVICE="$2"; SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
     SERVICE_NAME=$(get_service_name "$SERVICE")
+    has_tty && SERVICE_TTY_OPTS="-t"
 
-    # shellcheck disable=SC2016
-    docker run -it --link "$SERVICE_NAME:redis" --rm "$PLUGIN_IMAGE" sh -c 'exec redis-cli -h "$REDIS_PORT_6379_TCP_ADDR" -p "$REDIS_PORT_6379_TCP_PORT"'
+    docker exec -i $SERVICE_TTY_OPTS "$SERVICE_NAME" redis-cli
     ;;
 
   $PLUGIN_COMMAND_PREFIX:info)
diff --git a/tests/redis_connect.bats b/tests/redis_connect.bats
index 1a6b68c..6606a7d 100755
--- a/tests/redis_connect.bats
+++ b/tests/redis_connect.bats
@@ -24,6 +24,6 @@ teardown() {
 @test "($PLUGIN_COMMAND_PREFIX:connect) success" {
   export ECHO_DOCKER_COMMAND="true"
   run dokku "$PLUGIN_COMMAND_PREFIX:connect" l
-  assert_output 'docker run -it --link dokku.redis.l:redis --rm redis sh -c exec redis-cli -h "$REDIS_PORT_6379_TCP_ADDR" -p "$REDIS_PORT_6379_TCP_PORT"'
+  assert_output 'docker exec -i -t dokku.redis.l redis-cli'
 }