diff --git a/plugins/builder-lambda/builder-build b/plugins/builder-lambda/builder-build
new file mode 100755
index 000000000..547556fb2
--- /dev/null
+++ b/plugins/builder-lambda/builder-build
@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+source "$PLUGIN_AVAILABLE_PATH/config/functions"
+source "$PLUGIN_AVAILABLE_PATH/builder-lambda/internal-functions"
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+
+trigger-builder-lambda-builder-build() {
+  declare desc="builder-lambda builder-build plugin trigger"
+  declare trigger="builder-build"
+  declare BUILDER_TYPE="$1" APP="$2" SOURCECODE_WORK_DIR="$3"
+
+  if [[ "$BUILDER_TYPE" != "lambda" ]]; then
+    return
+  fi
+
+  # write lambda file out
+
+  dokku_log_info1 "Building $APP from Dockerfile"
+
+  local IMAGE=$(get_app_image_name "$APP")
+  local DOCKER_BUILD_LABEL_ARGS="--label=org.label-schema.schema-version=1.0 --label=org.label-schema.vendor=dokku --label=com.dokku.app-name=$APP"
+
+  pushd "$SOURCECODE_WORK_DIR" &>/dev/null
+
+  # extract first port from Dockerfile
+  suppress_output dos2unix Dockerfile
+  local DOCKERFILE_PORTS=$(get_dockerfile_exposed_ports Dockerfile)
+  [[ -n "$DOCKERFILE_PORTS" ]] && config_set --no-restart "$APP" DOKKU_DOCKERFILE_PORTS="$DOCKERFILE_PORTS"
+  plugn trigger pre-build-lambda "$APP"
+
+  [[ "$DOKKU_DOCKERFILE_CACHE_BUILD" == "false" ]] && DOKKU_DOCKER_BUILD_OPTS="$DOKKU_DOCKER_BUILD_OPTS --no-cache"
+  local DOCKER_ARGS=$(: | plugn trigger docker-args-build "$APP" "$BUILDER_TYPE")
+  DOCKER_ARGS+=$(: | plugn trigger docker-args-process-build "$APP" "$BUILDER_TYPE")
+
+  # strip --link, --volume and -v args from DOCKER_ARGS
+  local DOCKER_ARGS=$(sed -e "s/^--link=[[:graph:]]\+[[:blank:]]\?//g" -e "s/^--link[[:blank:]]\?[[:graph:]]\+[[:blank:]]\?//g" -e "s/^--volume=[[:graph:]]\+[[:blank:]]\?//g" -e "s/^--volume[[:blank:]]\?[[:graph:]]\+[[:blank:]]\?//g" -e "s/^-v[[:blank:]]\?[[:graph:]]\+[[:blank:]]\?//g" <<<"$DOCKER_ARGS")
+  declare -a ARG_ARRAY
+  eval "ARG_ARRAY=($DOCKER_ARGS)"
+
+  "$DOCKER_BIN" image build $DOCKER_BUILD_LABEL_ARGS $DOKKU_GLOBAL_BUILD_ARGS "${ARG_ARRAY[@]}" "${DOKKU_DOCKER_BUILD_OPTS[@]}" -t $IMAGE .
+
+  plugn trigger post-build-lambda "$APP"
+}
+
+trigger-builder-lambda-builder-build "$@"
diff --git a/plugins/builder-lambda/builder-detect b/plugins/builder-lambda/builder-detect
new file mode 100755
index 000000000..1f87e2ae3
--- /dev/null
+++ b/plugins/builder-lambda/builder-detect
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+source "$PLUGIN_AVAILABLE_PATH/config/functions"
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+
+trigger-builder-lambda-builder-detect() {
+  declare desc="builder-lambda builder-detect plugin trigger"
+  declare trigger="builder-detect"
+  declare APP="$1" SOURCECODE_WORK_DIR="$2"
+
+  if [[ -f "$SOURCECODE_WORK_DIR/lambda.yml" ]]; then
+    echo "lambda"
+    return
+  fi
+}
+
+trigger-builder-lambda-builder-detect "$@"
diff --git a/plugins/builder-lambda/builder-release b/plugins/builder-lambda/builder-release
new file mode 100755
index 000000000..d77bd95a2
--- /dev/null
+++ b/plugins/builder-lambda/builder-release
@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+
+trigger-builder-lambda-builder-release() {
+  declare desc="builder-lambda builder-release plugin trigger"
+  declare trigger="builder-release"
+  declare BUILDER_TYPE="$1" APP="$2" IMAGE_TAG="$3"
+
+  if [[ "$BUILDER_TYPE" != "lambda" ]]; then
+    return
+  fi
+
+  local DOCKER_BUILD_LABEL_ARGS="--label=org.label-schema.schema-version=1.0 --label=org.label-schema.vendor=dokku --label=com.dokku.app-name=$APP  --label=com.dokku.image-stage=release --label=dokku"
+
+  plugn trigger pre-release-lambda "$APP" "$IMAGE_TAG"
+
+  TMP_WORK_DIR="$(mktemp -d "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")"
+  trap "rm -rf '$TMP_WORK_DIR' >/dev/null" RETURN INT TERM EXIT
+
+  local IMAGE=$(get_app_image_name "$APP" "$IMAGE_TAG")
+  if ! suppress_output "$DOCKER_BIN" image build "${DOCKER_BUILD_LABEL_ARGS[@]}" $DOKKU_GLOBAL_BUILD_ARGS -f "$PLUGIN_AVAILABLE_PATH/builder-lambda/dockerfiles/builder-release.Dockerfile" --build-arg APP_IMAGE="$IMAGE" -t $IMAGE "$TMP_WORK_DIR"; then
+    dokku_log_warn "Failure injecting docker labels on image"
+    return 1
+  fi
+
+  plugn trigger post-release-lambda "$APP" "$IMAGE_TAG"
+  plugn trigger post-release-builder "$BUILDER_TYPE" "$APP" "$IMAGE"
+}
+
+trigger-builder-lambda-builder-release "$@"
diff --git a/plugins/builder-lambda/commands b/plugins/builder-lambda/commands
new file mode 100755
index 000000000..0e355afce
--- /dev/null
+++ b/plugins/builder-lambda/commands
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_AVAILABLE_PATH/builder-lambda/help-functions"
+
+case "$1" in
+  help | builder-lambda:help)
+    cmd-builder-lambda-help "$@"
+    ;;
+
+  *)
+    exit "$DOKKU_NOT_IMPLEMENTED_EXIT"
+    ;;
+
+esac
diff --git a/plugins/builder-lambda/dockerfiles/builder-release.Dockerfile b/plugins/builder-lambda/dockerfiles/builder-release.Dockerfile
new file mode 100644
index 000000000..cca256f21
--- /dev/null
+++ b/plugins/builder-lambda/dockerfiles/builder-release.Dockerfile
@@ -0,0 +1,2 @@
+ARG APP_IMAGE
+FROM $APP_IMAGE
diff --git a/plugins/builder-lambda/help-functions b/plugins/builder-lambda/help-functions
new file mode 100755
index 000000000..341fe44ac
--- /dev/null
+++ b/plugins/builder-lambda/help-functions
@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+
+cmd-builder-lambda-help() {
+  declare desc="help command"
+  declare CMD="$1"
+  local plugin_name="builder-lambda"
+  local plugin_description="Manage the lambda builder integration for an app"
+
+  if [[ "$CMD" == "${plugin_name}:help" ]]; then
+    echo -e "Usage: dokku ${plugin_name}[:COMMAND]"
+    echo ''
+    echo "$plugin_description"
+    echo ''
+    echo 'Additional commands:'
+    fn-help-content | sort | column -c2 -t -s,
+  elif [[ $(ps -o command= $PPID) == *"--all"* ]]; then
+    fn-help-content
+  else
+    cat <<help_desc
+    $plugin_name, $plugin_description
+help_desc
+  fi
+}
+
+fn-help-content() {
+  declare desc="return help content"
+  cat <<help_content
+    builder-lambda:report [<app>] [<flag>], Displays a builder-lambda report for one or more apps
+    builder-lambda:set <app> <property> (<value>), Set or clear a builder-lambda property for an app
+help_content
+}
diff --git a/plugins/builder-lambda/install b/plugins/builder-lambda/install
new file mode 100755
index 000000000..b3fd166e8
--- /dev/null
+++ b/plugins/builder-lambda/install
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/property-functions"
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+
+trigger-builder-lambda-install() {
+  declare desc="installs the builder-lambda plugin"
+  declare trigger="install"
+
+  fn-plugin-property-setup "builder-lambda"
+}
+
+trigger-builder-lambda-install "$@"
diff --git a/plugins/builder-lambda/internal-functions b/plugins/builder-lambda/internal-functions
new file mode 100755
index 000000000..136fab6cf
--- /dev/null
+++ b/plugins/builder-lambda/internal-functions
@@ -0,0 +1,71 @@
+#!/usr/bin/env bash
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/property-functions"
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+
+cmd-builder-lambda-report() {
+  declare desc="displays a builder-lambda report for one or more apps"
+  declare cmd="builder-lambda:report"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1" INFO_FLAG="$2"
+
+  if [[ -n "$APP" ]] && [[ "$APP" == --* ]]; then
+    INFO_FLAG="$APP"
+    APP=""
+  fi
+
+  if [[ -z "$APP" ]] && [[ -z "$INFO_FLAG" ]]; then
+    INFO_FLAG="true"
+  fi
+
+  if [[ -z "$APP" ]]; then
+    for app in $(dokku_apps); do
+      cmd-builder-lambda-report-single "$app" "$INFO_FLAG" | tee || true
+    done
+  else
+    cmd-builder-lambda-report-single "$APP" "$INFO_FLAG"
+  fi
+}
+
+cmd-builder-lambda-report-single() {
+  declare APP="$1" INFO_FLAG="$2"
+  if [[ "$INFO_FLAG" == "true" ]]; then
+    INFO_FLAG=""
+  fi
+  verify_app_name "$APP"
+  local flag_map=(
+    "--builder-lambda-language: $(fn-builder-lambda-language "$APP")"
+  )
+
+  if [[ -z "$INFO_FLAG" ]]; then
+    dokku_log_info2_quiet "${APP} builder-lambda information"
+    for flag in "${flag_map[@]}"; do
+      key="$(echo "${flag#--}" | cut -f1 -d' ' | tr - ' ')"
+      dokku_log_verbose "$(printf "%-30s %-25s" "${key^}" "${flag#*: }")"
+    done
+  else
+    local match=false
+    local value_exists=false
+    for flag in "${flag_map[@]}"; do
+      valid_flags="${valid_flags} $(echo "$flag" | cut -d':' -f1)"
+      if [[ "$flag" == "${INFO_FLAG}:"* ]]; then
+        value=${flag#*: }
+        size="${#value}"
+        if [[ "$size" -ne 0 ]]; then
+          echo "$value" && match=true && value_exists=true
+        else
+          match=true
+        fi
+      fi
+    done
+    [[ "$match" == "true" ]] || dokku_log_fail "Invalid flag passed, valid flags:${valid_flags}"
+    [[ "$value_exists" == "true" ]] || dokku_log_fail "not deployed"
+  fi
+}
+
+fn-builder-lambda-language() {
+  declare APP="$1"
+
+  fn-plugin-property-get "builder-lambda" "$APP" "language" ""
+}
diff --git a/plugins/builder-lambda/plugin.toml b/plugins/builder-lambda/plugin.toml
new file mode 100644
index 000000000..223a9dd01
--- /dev/null
+++ b/plugins/builder-lambda/plugin.toml
@@ -0,0 +1,4 @@
+[plugin]
+description = "dokku core builder-lambda plugin"
+version = "0.27.0"
+[plugin.config]
diff --git a/plugins/builder-lambda/post-app-clone-setup b/plugins/builder-lambda/post-app-clone-setup
new file mode 100755
index 000000000..086a05200
--- /dev/null
+++ b/plugins/builder-lambda/post-app-clone-setup
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/property-functions"
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+
+trigger-builder-lambda-post-app-clone-setup() {
+  declare desc="sets up properties for new app"
+  declare trigger="post-app-clone-setup"
+  declare OLD_APP="$1" NEW_APP="$2"
+
+  fn-plugin-property-clone "builder-lambda" "$OLD_APP" "$NEW_APP"
+}
+
+trigger-builder-lambda-post-app-clone-setup "$@"
diff --git a/plugins/builder-lambda/post-app-rename-setup b/plugins/builder-lambda/post-app-rename-setup
new file mode 100755
index 000000000..c947a84b3
--- /dev/null
+++ b/plugins/builder-lambda/post-app-rename-setup
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/property-functions"
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+
+trigger-builder-lambda-post-app-rename-setup() {
+  declare desc="updates settings for new app"
+  declare trigger="post-app-rename-setup"
+  declare OLD_APP="$1" NEW_APP="$2"
+
+  fn-plugin-property-clone "builder-lambda" "$OLD_APP" "$NEW_APP"
+  fn-plugin-property-destroy "builder-lambda" "$OLD_APP"
+}
+
+trigger-builder-lambda-post-app-rename-setup "$@"
diff --git a/plugins/builder-lambda/post-delete b/plugins/builder-lambda/post-delete
new file mode 100755
index 000000000..ce2d88aa7
--- /dev/null
+++ b/plugins/builder-lambda/post-delete
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/property-functions"
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+
+trigger-builder-lambda-post-delete() {
+  declare desc="destroys the builder-lambda properties for a given app"
+  declare trigger="post-delete"
+  declare APP="$1"
+
+  fn-plugin-property-destroy "builder-lambda" "$APP"
+}
+
+trigger-builder-lambda-post-delete "$@"
diff --git a/plugins/builder-lambda/report b/plugins/builder-lambda/report
new file mode 100755
index 000000000..3271b3684
--- /dev/null
+++ b/plugins/builder-lambda/report
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+source "$PLUGIN_AVAILABLE_PATH/builder-lambda/internal-functions"
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+
+cmd-builder-lambda-report-single "$@"
diff --git a/plugins/builder-lambda/subcommands/default b/plugins/builder-lambda/subcommands/default
new file mode 100755
index 000000000..124c65ef9
--- /dev/null
+++ b/plugins/builder-lambda/subcommands/default
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+source "$PLUGIN_AVAILABLE_PATH/builder-lambda/help-functions"
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+
+cmd-builder-lambda-help "builder-lambda:help"
diff --git a/plugins/builder-lambda/subcommands/report b/plugins/builder-lambda/subcommands/report
new file mode 100755
index 000000000..9f56cd32f
--- /dev/null
+++ b/plugins/builder-lambda/subcommands/report
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+source "$PLUGIN_AVAILABLE_PATH/builder-lambda/internal-functions"
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+
+cmd-builder-lambda-report "$@"
diff --git a/plugins/builder-lambda/subcommands/set b/plugins/builder-lambda/subcommands/set
new file mode 100755
index 000000000..554742e8d
--- /dev/null
+++ b/plugins/builder-lambda/subcommands/set
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/property-functions"
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+
+cmd-builder-lambda-set() {
+  declare desc="set or clear a builder-lambda property for an app"
+  declare cmd="builder-lambda:set"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1" KEY="$2" VALUE="$3"
+  local VALID_KEYS=("language")
+  [[ "$APP" == "--global" ]] || verify_app_name "$APP"
+
+  [[ -z "$KEY" ]] && dokku_log_fail "No key specified"
+
+  if ! fn-in-array "$KEY" "${VALID_KEYS[@]}"; then
+    dokku_log_fail "Invalid key specified, valid keys include: language"
+  fi
+
+  if [[ -n "$VALUE" ]]; then
+    dokku_log_info2_quiet "Setting ${KEY} to ${VALUE}"
+    fn-plugin-property-write "builder-lambda" "$APP" "$KEY" "$VALUE"
+  else
+    dokku_log_info2_quiet "Unsetting ${KEY}"
+    fn-plugin-property-delete "builder-lambda" "$APP" "$KEY"
+  fi
+}
+
+cmd-builder-lambda-set "$@"