diff --git a/docs/development/plugin-triggers.md b/docs/development/plugin-triggers.md
index 2ed8b55f2..443e0d0be 100644
--- a/docs/development/plugin-triggers.md
+++ b/docs/development/plugin-triggers.md
@@ -1199,6 +1199,22 @@ fi
 plugn trigger receive-app $APP $newrev
 ```
 
+### `resource-get-property`
+
+- Description: Fetches a given resource property value
+- Invoked by:
+- Arguments: `$APP` `$PROC_TYPE` `$RESOURCE_TYPE` `$PROPERTY`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+APP="$1"; PROC_TYPE="$2" RESOURCE_TYPE="$3" PROPERTY="$4"
+
+# TODO
+```
+
 ### `retire-container-failed`
 
 - Description: Allows you to run commands if/when retiring old containers has failed
diff --git a/plugins/app-json/internal-functions b/plugins/app-json/internal-functions
index a3351df47..46feb92d1 100755
--- a/plugins/app-json/internal-functions
+++ b/plugins/app-json/internal-functions
@@ -83,6 +83,10 @@ execute_script() {
   # strip --restart args from DOCKER_ARGS
   local DOCKER_ARGS=$(sed -e "s/--restart=[[:graph:]]\+[[:blank:]]\?//g" <<<"$DOCKER_ARGS")
 
+  local IMAGE_SOURCE_TYPE="dockerfile"
+  is_image_herokuish_based "$IMAGE" && IMAGE_SOURCE_TYPE="herokuish"
+  DOCKER_ARGS+=$(: | plugn trigger docker-args-process-deploy "$APP" "$IMAGE_TAG" "$IMAGE_SOURCE_TYPE" "$PHASE_SCRIPT_KEY")
+
   # eval args as array to respect escapes
   declare -a ARG_ARRAY
   eval "ARG_ARRAY=($DOCKER_ARGS)"
diff --git a/plugins/common/functions b/plugins/common/functions
index 0cf7fc690..c5e9af265 100755
--- a/plugins/common/functions
+++ b/plugins/common/functions
@@ -533,6 +533,9 @@ dokku_build() {
 
       local DOCKER_ARGS=$(: | plugn trigger docker-args-build "$APP" "$IMAGE_SOURCE_TYPE")
       [[ "$DOKKU_TRACE" ]] && DOCKER_ARGS+=" -e TRACE=true "
+      local IMAGE_SOURCE_TYPE="herokuish"
+      DOCKER_ARGS+=$(: | plugn trigger docker-args-process-run "$APP" "$IMAGE_TAG" "$IMAGE_SOURCE_TYPE" "$PHASE_SCRIPT_KEY")
+
       declare -a ARG_ARRAY
       eval "ARG_ARRAY=($DOCKER_ARGS)"
       # shellcheck disable=SC2086
@@ -558,6 +561,9 @@ dokku_build() {
 
       [[ "$DOKKU_DOCKERFILE_CACHE_BUILD" == "false" ]] && DOKKU_DOCKER_BUILD_OPTS="$DOKKU_DOCKER_BUILD_OPTS --no-cache"
       local DOCKER_ARGS=$(: | plugn trigger docker-args-build "$APP" "$IMAGE_SOURCE_TYPE")
+      local IMAGE_SOURCE_TYPE="dockerfile"
+      DOCKER_ARGS+=$(: | plugn trigger docker-args-process-run "$APP" "$IMAGE_TAG" "$IMAGE_SOURCE_TYPE" "$PHASE_SCRIPT_KEY")
+
       # strip --volume and -v args from DOCKER_ARGS
       local DOCKER_ARGS=$(sed -e "s/--volume=[[:graph:]]\+[[:blank:]]\?//g" -e "s/-v[[:blank:]]\?[[:graph:]]\+[[:blank:]]\?//g" <<<"$DOCKER_ARGS")
       declare -a ARG_ARRAY
diff --git a/plugins/scheduler-docker-local/scheduler-deploy b/plugins/scheduler-docker-local/scheduler-deploy
index ef042625d..99f73a262 100755
--- a/plugins/scheduler-docker-local/scheduler-deploy
+++ b/plugins/scheduler-docker-local/scheduler-deploy
@@ -25,6 +25,8 @@ scheduler-docker-local-scheduler-deploy() {
   plugn trigger pre-deploy "$APP" "$IMAGE_TAG"
 
   is_image_herokuish_based "$IMAGE" && DOKKU_HEROKUISH=true
+  local IMAGE_SOURCE_TYPE="dockerfile"
+  [[ "$DOKKU_HEROKUISH" == "true" ]] && IMAGE_SOURCE_TYPE="herokuish"
   local DOKKU_SCALE_FILE="$DOKKU_ROOT/$APP/DOKKU_SCALE"
   local oldids=$(get_app_container_ids "$APP")
 
@@ -69,6 +71,7 @@ scheduler-docker-local-scheduler-deploy() {
       local DOCKER_ARGS
       DOCKER_ARGS=$(: | plugn trigger docker-args-deploy "$APP" "$IMAGE_TAG" "$PROC_TYPE" "$CONTAINER_INDEX")
       DOCKER_ARGS+=" -e DYNO=$PROC_TYPE.$CONTAINER_INDEX "
+      DOCKER_ARGS+=$(: | plugn trigger docker-args-process-deploy "$APP" "$IMAGE_TAG" "$IMAGE_SOURCE_TYPE" "$PROC_TYPE" "$CONTAINER_INDEX")
       [[ "$DOKKU_TRACE" ]] && DOCKER_ARGS+=" -e TRACE=true "
 
       declare -a ARG_ARRAY
diff --git a/plugins/scheduler-docker-local/scheduler-run b/plugins/scheduler-docker-local/scheduler-run
index c28318c60..0b3a228ff 100755
--- a/plugins/scheduler-docker-local/scheduler-run
+++ b/plugins/scheduler-docker-local/scheduler-run
@@ -27,6 +27,10 @@ scheduler-docker-local-scheduler-run() {
   local DOCKER_ARGS=$(: | plugn trigger docker-args-run "$APP" "$IMAGE_TAG")
   [[ "$DOKKU_TRACE" ]] && local DOCKER_ARGS+=" -e TRACE=true "
 
+  local IMAGE_SOURCE_TYPE="dockerfile"
+  is_image_herokuish_based "$IMAGE" && IMAGE_SOURCE_TYPE="herokuish"
+  DOCKER_ARGS+=$(: | plugn trigger docker-args-process-run "$APP" "$IMAGE_TAG" "$IMAGE_SOURCE_TYPE" "$PHASE_SCRIPT_KEY")
+
   declare -a ARG_ARRAY
   eval "ARG_ARRAY=($DOCKER_ARGS)"
 
@@ -38,7 +42,7 @@ scheduler-docker-local-scheduler-run() {
   fi
 
   has_tty && DOKKU_RUN_OPTS+=" -i -t"
-  is_image_herokuish_based "$IMAGE" && local EXEC_CMD="/exec"
+  [[ "$IMAGE_SOURCE_TYPE" == "herokuish" ]] && local EXEC_CMD="/exec"
 
   DOKKU_QUIET_OUTPUT=1 extract_procfile "$APP"
 
diff --git a/tests/unit/10_apps.bats b/tests/unit/10_apps.bats
old mode 100755
new mode 100644
index e92e07a2c..ccb4bbf44
--- a/tests/unit/10_apps.bats
+++ b/tests/unit/10_apps.bats
@@ -2,11 +2,11 @@
 
 load test_helper
 
-setup () {
+setup() {
   global_setup
 }
 
-teardown () {
+teardown() {
   global_teardown
 }
 
diff --git a/tests/unit/20_resource.bats b/tests/unit/20_resource.bats
new file mode 100644
index 000000000..372fad236
--- /dev/null
+++ b/tests/unit/20_resource.bats
@@ -0,0 +1,137 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+setup() {
+  global_setup
+  create_app
+}
+
+teardown() {
+  destroy_app
+  global_teardown
+}
+
+@test "(docker-options) resource:limit" {
+  run /bin/bash -c "dokku resource:limit $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output_contains "resource limits $TEST_APP information"
+
+  deploy_app
+  run /bin/bash -c "dokku resource:limit --memory 512MB $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  run /bin/bash -c "docker inspect --format '{{.HostConfig.Memory}}' $CID"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output "0"
+
+  dokku ps:rebuild "$TEST_APP"
+  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  run /bin/bash -c "docker inspect --format '{{.HostConfig.Memory}}' $CID"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output "536870912"
+
+  run /bin/bash -c "dokku resource:limit --memory 1024MB --process-type worker $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  dokku ps:rebuild "$TEST_APP"
+  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  run /bin/bash -c "docker inspect --format '{{.HostConfig.Memory}}' $CID"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output "536870912"
+
+  run /bin/bash -c "dokku resource:limit-clear --process-type worker $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  dokku ps:rebuild "$TEST_APP"
+  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  run /bin/bash -c "docker inspect --format '{{.HostConfig.Memory}}' $CID"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output "536870912"
+
+  run /bin/bash -c "dokku resource:limit-clear --process-type web $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  dokku ps:rebuild "$TEST_APP"
+  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  run /bin/bash -c "docker inspect --format '{{.HostConfig.Memory}}' $CID"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output "0"
+}
+
+@test "(docker-options) resource:reserve" {
+  run /bin/bash -c "dokku resource:reserve $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output_contains "resource reservation $TEST_APP information"
+
+  deploy_app
+  run /bin/bash -c "dokku resource:reserve --memory 512MB $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  run /bin/bash -c "docker inspect --format '{{.HostConfig.MemoryReservation}}' $CID"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output "0"
+
+  dokku ps:rebuild "$TEST_APP"
+  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  run /bin/bash -c "docker inspect --format '{{.HostConfig.MemoryReservation}}' $CID"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output "536870912"
+
+  run /bin/bash -c "dokku resource:reserve --memory 1024MB --process-type worker $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  dokku ps:rebuild "$TEST_APP"
+  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  run /bin/bash -c "docker inspect --format '{{.HostConfig.MemoryReservation}}' $CID"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output "536870912"
+
+  run /bin/bash -c "dokku resource:reserve-clear --process-type worker $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  dokku ps:rebuild "$TEST_APP"
+  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  run /bin/bash -c "docker inspect --format '{{.HostConfig.MemoryReservation}}' $CID"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output "536870912"
+
+  run /bin/bash -c "dokku resource:reserve-clear --process-type web $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  dokku ps:rebuild "$TEST_APP"
+  CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  run /bin/bash -c "docker inspect --format '{{.HostConfig.MemoryReservation}}' $CID"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output "0"
+}