diff --git a/Makefile b/Makefile
index 4606b97..c32fba1 100644
--- a/Makefile
+++ b/Makefile
@@ -3,27 +3,13 @@ include make/include.mk
 ##
 # APP
 
-.PHONY: app-bootstrap
-app-bootstrap: setup-sysctl
-ifeq ($(SETUP_NFSD),true)
-ifeq ($(HOST_SYSTEM),DARWIN)
-	$(call setup-nfsd-osx)
-endif
-endif
+app-bootstrap: setup-sysctl setup-nfsd
 
-.PHONY: app-build
-app-build: myos-base install-build-parameters
-	$(call make,docker-compose-build up)
-	$(call make,docker-compose-exec ARGS='rm -Rf /root/.npm /log-buffer/*' SERVICE=logagent)
+app-build: base install-build-parameters
+	$(call make,docker-compose-build docker-compose-up)
+	$(foreach service,$(or $(SERVICE),$(SERVICES)),$(call make,app-build-$(service)))
 	$(call make,docker-commit)
 
-.PHONY: app-install
-app-install: base node up
+app-install: base node
 
-.PHONY: app-start
 app-start: base-ssh-add
-
-.PHONY: app-tests
-app-tests:
-	echo ENV: $(env)
-	echo DOCKER_ENV: $(DOCKER_ENV)
diff --git a/ansible/ansible.mk b/ansible/ansible.mk
index cfa6c0e..5069d90 100644
--- a/ansible/ansible.mk
+++ b/ansible/ansible.mk
@@ -1,3 +1,4 @@
+# target ansible: Fire docker-build-ansible, Call ansible ANSIBLE_ARGS ARGS or ansible-run target
 .PHONY: ansible
 ansible: docker-build-ansible
 ifneq ($(ARGS),)
@@ -6,21 +7,26 @@ else
 	$(call make,ansible-run)
 endif
 
+# target ansible-playbook: Call ansible-playbook ANSIBLE_ARGS ARGS
 .PHONY: ansible-playbook
 ansible-playbook:
 	$(call ansible-playbook,$(ANSIBLE_ARGS) $(ARGS))
 
+# target ansible-pull: Call ansible-pull ANSIBLE_GIT_REPOSITORY ANSIBLE_PLAYBOOK
 .PHONY: ansible-pull
 ansible-pull:
 	$(call ansible-pull,--url $(ANSIBLE_GIT_REPOSITORY) $(if $(ANSIBLE_GIT_KEY_FILE),--key-file $(ANSIBLE_GIT_KEY_FILE)) $(if $(ANSIBLE_GIT_VERSION),--checkout $(ANSIBLE_GIT_VERSION)) $(if $(ANSIBLE_GIT_DIRECTORY),--directory $(ANSIBLE_GIT_DIRECTORY)) $(if $(ANSIBLE_TAGS),--tags $(ANSIBLE_TAGS)) $(if $(ANSIBLE_EXTRA_VARS),--extra-vars '$(ANSIBLE_EXTRA_VARS)') $(if $(findstring true,$(FORCE)),--force) $(if $(findstring true,$(DRYRUN)),--check) --full $(if $(ANSIBLE_INVENTORY),--inventory $(ANSIBLE_INVENTORY)) $(ANSIBLE_PLAYBOOK))
 
+# target ansible-pull@%: Fire get-PrivateIpAddress-% for SERVER_NAME, Call ssh-exec make ansible-pull DOCKER_IMAGE_TAG
 .PHONY: ansible-pull@%
-ansible-pull@%: aws-ec2-get-PrivateIpAddress-$(SERVER_NAME)
+ansible-pull@%: get-PrivateIpAddress-$(SERVER_NAME)
 	$(call ssh-exec,$(AWS_INSTANCE_IP),make ansible-pull ANSIBLE_DOCKER_IMAGE_TAG=$(ANSIBLE_DOCKER_IMAGE_TAG) ANSIBLE_TAGS=$(ANSIBLE_TAGS) FORCE=$(FORCE))
 
+# target ansible-run: Fire base-ssh-add docker-build-ansible ansible-run-localhost
 .PHONY: ansible-run
 ansible-run: base-ssh-add docker-build-ansible ansible-run-localhost
 
+# target ansible-run-%: Call ansible-playbook ANSIBLE_PLAYBOOK
 .PHONY: ansible-run-%
 ansible-run-%:
 	$(call ansible-playbook,$(if $(ANSIBLE_TAGS),--tags $(ANSIBLE_TAGS)) $(if $(ANSIBLE_EXTRA_VARS),--extra-vars '$(patsubst target=localhost,target=$*,$(ANSIBLE_EXTRA_VARS))') $(if $(findstring true,$(DRYRUN)),--check) $(if $(ANSIBLE_INVENTORY),--inventory $(ANSIBLE_INVENTORY)) $(ANSIBLE_PLAYBOOK))
diff --git a/ansible/def.ansible.mk b/ansible/def.ansible.mk
index 6db8c38..0be9c0c 100644
--- a/ansible/def.ansible.mk
+++ b/ansible/def.ansible.mk
@@ -38,12 +38,15 @@ define ansible-pull
 	IFS=$$'\n'; $(ECHO) env $(foreach var,$(ENV_VARS),$(if $($(var)),$(var)='$($(var))')) $(shell printenv |awk -F '=' 'NR == FNR { if($$1 !~ /^(\#|$$)/) { A[$$1]; next } } ($$1 in A)' .env.dist - 2>/dev/null) $$(cat $(ENV_FILE) 2>/dev/null |awk -F "=" '$$1 ~! /^\(#|$$\)/') ansible-pull $(ANSIBLE_ARGS) $(ANSIBLE_VERBOSE) $(1)
 endef
 else
+# function ansible: Call run ansible ANSIBLE_ARGS with arg 1
 define ansible
 	$(call run,ansible $(ANSIBLE_ARGS) $(ANSIBLE_VERBOSE) $(1))
 endef
+# function ansible-playbook: Call run ansible-playbook ANSIBLE_ARGS with arg 1
 define ansible-playbook
 	$(call run,ansible-playbook $(ANSIBLE_ARGS) $(ANSIBLE_VERBOSE) $(1))
 endef
+# function ansible-pull: Call run ansible-pull ANSIBLE_ARGS with arg 1
 define ansible-pull
 	$(call run,ansible-pull $(ANSIBLE_ARGS) $(ANSIBLE_VERBOSE) $(1))
 endef
diff --git a/aws/aws.mk b/aws/aws.mk
index 76c56f1..9e6ded1 100644
--- a/aws/aws.mk
+++ b/aws/aws.mk
@@ -1,9 +1,11 @@
+# target aws: Fire docker-build-aws, Call aws ARGS
 .PHONY: aws
 aws: docker-build-aws
 	$(call aws,$(ARGS))
 
-.PHONY: aws-codedeploy
-aws-codedeploy:
+# target aws-deploy: Call aws deploy create-deployment with application-name CODEDEPLOY_APP_NAME
+.PHONY: aws-deploy
+aws-deploy:
 	$(call aws,deploy create-deployment \
 				--application-name $(CODEDEPLOY_APP_NAME) \
 		        --deployment-config-name $(CODEDEPLOY_DEPLOYMENT_CONFIG) \
@@ -11,16 +13,19 @@ aws-codedeploy:
 		        --description "$(CODEDEPLOY_DESCRIPTION)" \
 		        --github-location repository=$(CODEDEPLOY_GITHUB_REPO)$(comma)commitId=$(CODEDEPLOY_GITHUB_COMMIT_ID))
 
-.PHONY: aws-role-create-import-image
-aws-role-create-import-image: aws-iam-create-role-$(AWS_VM_IMPORT_ROLE_NAME)  aws-iam-put-role-policy-$(AWS_VM_IMPORT_ROLE_NAME)
+# target aws-docker-login: Fire aws-ecr-get-login
+.PHONY: aws-docker-login
+aws-docker-login: aws-ecr-get-login
 
-.PHONY: aws-ecr-login
-aws-ecr-login:
+# target aws-ecr-get-login: Exec 'Call aws ecr get-login'
+.PHONY: aws-ecr-get-login
+aws-ecr-get-login:
 	$(eval DRYRUN_IGNORE := true)
 	$(eval docker_login := $(shell $(call aws,ecr get-login --no-include-email --region $(AWS_DEFAULT_REGION))))
 	$(eval DRYRUN_IGNORE := FALSE)
 	$(ECHO) $(docker_login)
 
+# target aws-iam-create-role-%: Call aws iam create-role with role-name % and role-policy file aws/policies/%-trust.json
 .PHONY: aws-iam-create-role-%
 aws-iam-create-role-%: base docker-build-aws
 	$(eval DRYRUN_IGNORE := true)
@@ -28,6 +33,7 @@ aws-iam-create-role-%: base docker-build-aws
 	$(eval DRYRUN_IGNORE := false)
 	$(call aws,iam create-role --role-name $* --assume-role-policy-document '$(json)')
 
+# target aws-iam-put-role-policy-%: Call aws iam put-role-policy with policy-name % and policy-document file aws/policies/%.json
 .PHONY: aws-iam-put-role-policy-%
 aws-iam-put-role-policy-%: base docker-build-aws
 	$(eval DRYRUN_IGNORE := true)
@@ -35,116 +41,140 @@ aws-iam-put-role-policy-%: base docker-build-aws
 	$(eval DRYRUN_IGNORE := false)
 	$(call aws,iam put-role-policy --role-name $* --policy-name $* --policy-document '$(json)')
 
+# target aws-role-create-import-image: Fire aws-iam-create-role-% aws-iam-put-role-policy-% for AWS_VM_IMPORT_ROLE_NAME
+.PHONY: aws-role-create-import-image
+aws-role-create-import-image: aws-iam-create-role-$(AWS_VM_IMPORT_ROLE_NAME)  aws-iam-put-role-policy-$(AWS_VM_IMPORT_ROLE_NAME)
+
+# target aws-s3-check-upload: Fire aws-s3api-get-head-object-etag, Eval upload=false if remote s3 file already exists
 .PHONY: aws-s3-check-upload
-aws-s3-check-upload: docker-build-aws aws-s3api-head-object-query-etag
+aws-s3-check-upload: docker-build-aws aws-s3api-get-head-object-etag
 	$(eval upload := true)
 	$(eval DRYRUN_IGNORE := true)
 	$(if $(AWS_S3_KEY_ETAG),$(if $(filter $(AWS_S3_KEY_ETAG),"$(shell cat $(PACKER_ISO_INFO) |awk '$$1 == "etag:" {print $$2}' 2>/dev/null)"),$(eval upload := false)))
 	$(eval DRYRUN_IGNORE := false)
 
+# target aws-s3-cp: Fire aws-s3-check-upload, Call aws s3 cp PACKER_ISO_FILE s3://AWS_S3_BUCKET/AWS_S3_KEY, Call aws-s3-etag-save target
 .PHONY: aws-s3-cp
 aws-s3-cp: docker-build-aws $(PACKER_ISO_FILE) aws-s3-check-upload
 	$(if $(filter $(upload),true),$(call aws,s3 cp $(PACKER_ISO_FILE) s3://$(AWS_S3_BUCKET)/$(AWS_S3_KEY)) $(call make,aws-s3-etag-save))
 
+# target aws-s3-etag-save: Fire aws-s3api-get-head-object-etag, Add line 'etag: AWS_S3_KEY_TAG' to file PACKER_ISO_INFO
 .PHONY: aws-s3-etag-save
-aws-s3-etag-save: docker-build-aws aws-s3api-head-object-query-etag
+aws-s3-etag-save: docker-build-aws aws-s3api-get-head-object-etag
 	echo "etag: $(AWS_S3_KEY_ETAG)" >> $(PACKER_ISO_INFO)
 
-.PHONY: aws-s3api-head-object-query-etag
-aws-s3api-head-object-query-etag: docker-build-aws
+# target aws-s3api-get-head-object-etag: Eval AWS_S3_KEY_ETAG, Echo 'ETag: AWS_S3_KEY_ETAG'
+.PHONY: aws-s3api-get-head-object-etag
+aws-s3api-get-head-object-etag: docker-build-aws
 	$(eval DRYRUN_IGNORE := true)
 	$(eval AWS_S3_KEY_ETAG := $(shell $(call aws,s3api head-object --bucket $(AWS_S3_BUCKET) --key $(AWS_S3_KEY) --output text --query ETag) |grep -v 'operation: Not Found' 2>/dev/null))
 	$(eval DRYRUN_IGNORE := false)
 	echo ETag: $(AWS_S3_KEY_ETAG)
 
-.PHONY: aws-s3api-head-object-query-lastmodified
-aws-s3api-head-object-query-lastmodified: docker-build-aws
+# target aws-s3api-get-head-object-lastmodified: Eval AWS_S3_KEY_DATE, Echo 'LastModified: AWS_S3_KEY_DATE'
+.PHONY: aws-s3api-get-head-object-lastmodified
+aws-s3api-get-head-object-lastmodified: docker-build-aws
 	$(eval DRYRUN_IGNORE := true)
 	$(eval AWS_S3_KEY_DATE := $(shell $(call aws,s3api head-object --bucket $(AWS_S3_BUCKET) --key $(AWS_S3_KEY) --output text --query LastModified) |grep -v 'operation: Not Found' 2>/dev/null))
 	$(eval DRYRUN_IGNORE := false)
 	echo LastModified: $(AWS_S3_KEY_DATE)
 
+# target aws-ec2-import-snapshot: Call aws ec2 import-snapshot with S3Bucket AWS_S3_BUCKET and S3Key AWS_S3_KEY
 .PHONY: aws-ec2-import-snapshot
-aws-ec2-import-snapshot: base docker-build-aws aws-s3api-head-object-query-etag aws-s3api-head-object-query-lastmodified
+aws-ec2-import-snapshot: base docker-build-aws aws-s3api-get-head-object-etag aws-s3api-get-head-object-lastmodified
 	$(eval DRYRUN_IGNORE := true)
 	$(eval json := $(shell $(call exec,envsubst < aws/import-snapshot.json)))
 	$(eval DRYRUN_IGNORE := false)
 	$(eval AWS_TASK_ID := $(shell $(call aws,ec2 import-snapshot --description '$(AWS_SNAP_DESCRIPTION)' --output text --query ImportTaskId --disk-container '$(json)')))
 	echo ImportTaskId: $(AWS_TASK_ID)
 
-.PHONY: aws-ec2-describe-import-snapshot-task-%
-aws-ec2-describe-import-snapshot-task-%: docker-build-aws
+# target aws-ec2-describe-import-snapshot-tasks-%: Call aws ec2 describe-import-snapshot-tasks with import-task-id %
+.PHONY: aws-ec2-describe-import-snapshot-tasks-%
+aws-ec2-describe-import-snapshot-tasks-%: docker-build-aws
 	$(call aws,ec2 describe-import-snapshot-tasks --import-task-ids $*)
 
+# target aws-ec2-describe-import-snapshot-tasks: Call aws ec2 describe-import-snapshots-tasks
 .PHONY: aws-ec2-describe-import-snapshot-tasks
 aws-ec2-describe-import-snapshot-tasks: docker-build-aws
 	$(call aws,ec2 describe-import-snapshot-tasks)
 
-.PHONY: aws-ec2-describe-instance-PrivateIpAddress
-aws-ec2-describe-instance-PrivateIpAddress: docker-build-aws
+# target aws-ec2-describe-instances-PrivateIpAddress: Call aws ec2 describe-instances, Print list of PrivateIpAddress
+.PHONY: aws-ec2-describe-instances-PrivateIpAddress
+aws-ec2-describe-instances-PrivateIpAddress: docker-build-aws
 	$(call aws,ec2 describe-instances --no-paginate --query 'Reservations[*].Instances[*].[Tags[?Key==`Name`].Value$(comma)PrivateIpAddress]' --output text) |sed '$$!N;s/\r\n/ /' |awk 'BEGIN {printf "%-24s%s\r\n"$(comma)"PrivateIpAddress"$(comma)"Name"}; $$1 != "None" {printf "%-24s%s\n"$(comma)$$1$(comma)$$2}'
 
-.PHONY: aws-ec2-describe-instance-PrivateIpAddress-%
-aws-ec2-describe-instance-PrivateIpAddress-%: docker-build-aws
+# target aws-ec2-describe-instances-PrivateIpAddress-%: Call aws ec2 describe-instances, Print list of PrivateIpAddress for Name matching %
+.PHONY: aws-ec2-describe-instances-PrivateIpAddress-%
+aws-ec2-describe-instances-PrivateIpAddress-%: docker-build-aws
 	$(call aws,ec2 describe-instances --no-paginate --query 'Reservations[*].Instances[*].[Tags[?Key==`Name`].Value$(comma)PrivateIpAddress]' --output text) |sed '$$!N;s/\r\n/ /' |awk 'BEGIN {printf "%-24s%s\r\n"$(comma)"PrivateIpAddress"$(comma)"Name"}; $$1 != "None" && $$2 ~ /$*/ {printf "%-24s%s\n"$(comma)$$1$(comma)$$2}'
 
-.PHONY: aws-ec2-get-PrivateIpAddress
-aws-ec2-get-PrivateIpAddress: docker-build-aws
+# target aws-ec2-get-instances-PrivateIpAddress: Eval AWS_INSTANCE_IP, Echo 'PrivateIpAddress: AWS_INSTANCE_IP'
+.PHONY: aws-ec2-get-instances-PrivateIpAddress
+aws-ec2-get-instances-PrivateIpAddress: docker-build-aws
 	$(eval DRYRUN_IGNORE := true)
 	$(eval AWS_INSTANCE_IP := $(shell $(call aws,ec2 describe-instances --no-paginate --query 'Reservations[*].Instances[*].PrivateIpAddress' --output text) 2>/dev/null))
 	$(eval DRYRUN_IGNORE := false)
 	echo PrivateIpAddress: $(AWS_INSTANCE_IP)
 
-.PHONY: aws-ec2-get-PrivateIpAddress-%
-aws-ec2-get-PrivateIpAddress-%:
+# target aws-ec2-get-instances-PrivateIpAddress-%: Eval AWS_INSTANCE_IP with Name matching %, Echo 'PrivateIpAddress: AWS_INSTANCE_IP'
+.PHONY: aws-ec2-get-instances-PrivateIpAddress-%
+aws-ec2-get-instances-PrivateIpAddress-%:
 	$(eval DRYRUN_IGNORE := true)
 	$(eval AWS_INSTANCE_IP := $(shell $(call aws,ec2 describe-instances --no-paginate --filter 'Name=tag:Name$(comma)Values=$**' --query 'Reservations[*].Instances[*].PrivateIpAddress' --output text) 2>/dev/null))
 	$(eval DRYRUN_IGNORE := false)
 	echo PrivateIpAddress: $(AWS_INSTANCE_IP)
 
-.PHONY: aws-ec2-get-snap-id-import-snapshot-task
-aws-ec2-get-snap-id-import-snapshot-task: aws-ec2-get-snap-id-import-snapshot-task-$(AWS_TASK_ID)
+# target aws-ec2-get-import-snapshot-tasks-id: Fire aws-ec2-get-import-snapshot-tasks-id-% for AWS_TASK_ID
+.PHONY: aws-ec2-get-import-snapshot-tasks-id
+aws-ec2-get-import-snapshot-tasks-id: aws-ec2-get-import-snapshot-tasks-id-$(AWS_TASK_ID)
 
-.PHONY: aws-ec2-get-snap-id-import-snapshot-task-%
-aws-ec2-get-snap-id-import-snapshot-task-%: docker-build-aws
+# target aws-ec2-get-import-snapshot-tasks-id-%: Eval AWS_SNAP_IP with import-task-ids %, Echo 'SnapshotId: AWS_SNAP_IP'
+.PHONY: aws-ec2-get-import-snapshot-tasks-id-%
+aws-ec2-get-import-snapshot-tasks-id-%: docker-build-aws
 	$(eval DRYRUN_IGNORE := true)
 	$(eval AWS_SNAP_ID := $(shell $(call aws,ec2 describe-import-snapshot-tasks --import-task-ids $* --output text --query ImportSnapshotTasks[0].SnapshotTaskDetail.SnapshotId) 2>/dev/null))
 	$(eval DRYRUN_IGNORE := false)
 	echo SnapshotId: $(AWS_SNAP_ID)
 
-.PHONY: aws-ec2-get-snap-message-import-snapshot-task-%
-aws-ec2-get-snap-message-import-snapshot-task-%: docker-build-aws
+# target aws-ec2-get-import-snapshot-tasks-message-%: Eval AWS_SNAP_MESSAGE with import-task-ids %, Echo 'StatusMessage: AWS_SNAP_MESSAGE'
+.PHONY: aws-ec2-get-import-snapshot-tasks-message-%
+aws-ec2-get-import-snapshot-tasks-message-%: docker-build-aws
 	$(eval DRYRUN_IGNORE := true)
 	$(eval AWS_SNAP_MESSAGE := $(shell $(call aws,ec2 describe-import-snapshot-tasks --import-task-ids $* --output text --query ImportSnapshotTasks[0].SnapshotTaskDetail.StatusMessage) 2>/dev/null))
 	$(eval DRYRUN_IGNORE := false)
 	echo StatusMessage: $(AWS_SNAP_MESSAGE)
 
-.PHONY: aws-ec2-get-snap-progress-import-snapshot-task-%
-aws-ec2-get-snap-progress-import-snapshot-task-%: docker-build-aws
+# target aws-ec2-get-import-snapshot-tasks-progress-%: Eval AWS_SNAP_PROGRESS with import-task-ids %, Echo 'Progress: AWS_SNAP_PROGRESS'
+.PHONY: aws-ec2-get-import-snapshot-tasks-progress-%
+aws-ec2-get-import-snapshot-tasks-progress-%: docker-build-aws
 	$(eval DRYRUN_IGNORE := true)
 	$(eval AWS_SNAP_PROGRESS := $(shell $(call aws,ec2 describe-import-snapshot-tasks --import-task-ids $* --output text --query ImportSnapshotTasks[0].SnapshotTaskDetail.Progress) 2>/dev/null))
 	$(eval DRYRUN_IGNORE := false)
 	echo Progress: $(AWS_SNAP_PROGRESS)
 
-.PHONY: aws-ec2-get-snap-size-import-snapshot-task-%
-aws-ec2-get-snap-size-import-snapshot-task-%: docker-build-aws
+# target aws-ec2-get-import-snapshot-tasks-size-%: Eval AWS_SNAP_SIZE with import-task-ids %, Echo 'DiskImageSize: AWS_SNAP_SIZE'
+.PHONY: aws-ec2-get-import-snapshot-tasks-size-%
+aws-ec2-get-import-snapshot-tasks-size-%: docker-build-aws
 	$(eval DRYRUN_IGNORE := true)
 	$(eval AWS_SNAP_SIZE := $(shell $(call aws,ec2 describe-import-snapshot-tasks --import-task-ids $* --output text --query ImportSnapshotTasks[0].SnapshotTaskDetail.DiskImageSize) 2>/dev/null))
 	$(eval DRYRUN_IGNORE := false)
 	echo DiskImageSize: $(AWS_SNAP_SIZE)
 
-.PHONY: aws-ec2-get-snap-status-import-snapshot-task-%
-aws-ec2-get-snap-status-import-snapshot-task-%: docker-build-aws
+# target aws-ec2-get-import-snapshot-tasks-status-%: Eval AWS_SNAP_STATUS with import-task-ids %, Echo 'Status: AWS_SNAP_STATUS'
+.PHONY: aws-ec2-get-import-snapshot-tasks-status-%
+aws-ec2-get-import-snapshot-tasks-status-%: docker-build-aws
 	$(eval DRYRUN_IGNORE := true)
 	$(eval AWS_SNAP_STATUS := $(shell $(call aws,ec2 describe-import-snapshot-tasks --import-task-ids $* --output text --query ImportSnapshotTasks[0].SnapshotTaskDetail.Status) 2>/dev/null))
 	$(eval DRYRUN_IGNORE := false)
 	echo Status: $(AWS_SNAP_STATUS)
 
-.PHONY: aws-ec2-wait-snap-completed-import-snapshot-task
-aws-ec2-wait-snap-completed-import-snapshot-task: aws-ec2-wait-snap-completed-import-snapshot-task-$(AWS_TASK_ID)
+# target aws-ec2-wait-import-snapshot-tasks-status-completed: Fire aws-ec2-wait-import-snapshot-tasks-status-completed-% for AWS_TASK_ID
+.PHONY: aws-ec2-wait-import-snapshot-tasks-status-completed
+aws-ec2-wait-import-snapshot-tasks-status-completed: aws-ec2-wait-import-snapshot-tasks-status-completed-$(AWS_TASK_ID)
 
-.PHONY: aws-ec2-wait-snap-completed-import-snapshot-task-%
-aws-ec2-wait-snap-completed-import-snapshot-task-%: docker-build-aws
+# target aws-ec2-wait-import-snapshot-tasks-status-completed-%: Wait SnapshotTaskDetail.Status=completed for import-task-ids %
+.PHONY: aws-ec2-wait-import-snapshot-tasks-status-completed-%
+aws-ec2-wait-import-snapshot-tasks-status-completed-%: docker-build-aws
 	while [ `$(call aws,ec2 describe-import-snapshot-tasks --import-task-ids $* --output text --query ImportSnapshotTasks[0].SnapshotTaskDetail.Status)` != "completed$$(printf '\r')" ]; \
 	do \
 		count=$$(( $${count:-0}+1 )); \
@@ -152,19 +182,22 @@ aws-ec2-wait-snap-completed-import-snapshot-task-%: docker-build-aws
 		sleep 10; \
 	done
 
-.PHONY: aws-ec2-wait-snapshot-%
-aws-ec2-wait-snapshot-%: docker-build-aws
+# target aws-ec2-wait-snapshot-completed-%: Call ec2 wait snapshot-completed with shapshot-ids %
+.PHONY: aws-ec2-wait-snapshot-completed-%
+aws-ec2-wait-snapshot-completed-%: docker-build-aws
 	$(call aws,ec2 wait snapshot-completed --snapshot-ids $* --output text)
 
+# target aws-ec2-register-image: Fire aws-ec2-get-import-snapshot-tasks-id, Eval AWS_AMI_ID with Name AWS_AMI_NAME, Echo 'ImageId: AWS_AMI_ID'
 .PHONY: aws-ec2-register-image
-aws-ec2-register-image: base docker-build-aws aws-ec2-get-snap-id-import-snapshot-task
+aws-ec2-register-image: base docker-build-aws aws-ec2-get-import-snapshot-tasks-id
 	$(eval DRYRUN_IGNORE := true)
 	$(eval json := $(shell $(call exec,envsubst < aws/register-image-device-mappings.json)))
 	$(eval DRYRUN_IGNORE := false)
 	$(eval AWS_AMI_ID := $(shell $(call aws,ec2 register-image --name '$(AWS_AMI_NAME)' --description '$(AWS_AMI_DESCRIPTION)' --architecture x86_64 --root-device-name /dev/sda1 --virtualization-type hvm --block-device-mappings '$(json)') 2>/dev/null))
 	echo ImageId: $(AWS_AMI_ID)
 
+# target aws-ami: Fire aws-s3-cp aws-ec2-import-snapshot, Call aws-ec2-wait-import-snapshot-tasks-status-completed target, Call aws-ec2-register-image target
 .PHONY: aws-ami
 aws-ami: aws-s3-cp aws-ec2-import-snapshot
-	$(call make,aws-ec2-wait-snap-completed-import-snapshot-task,,AWS_TASK_ID)
+	$(call make,aws-ec2-wait-import-snapshot-tasks-status-completed,,AWS_TASK_ID)
 	$(call make,aws-ec2-register-image,,AWS_TASK_ID)
diff --git a/aws/def.aws.mk b/aws/def.aws.mk
index 7486c4a..9811550 100644
--- a/aws/def.aws.mk
+++ b/aws/def.aws.mk
@@ -17,6 +17,7 @@ define aws
 	$(call run,$(DOCKER_SSH_AUTH) -v $$HOME/.aws:/root/.aws:ro anigeo/awscli:latest $(1))
 endef
 else
+# function aws: Call run aws with arg 1
 define aws
 	$(call run,aws $(1))
 endef
diff --git a/make/apps/common.mk b/make/apps/common.mk
index f5e5d45..75d6058 100644
--- a/make/apps/common.mk
+++ b/make/apps/common.mk
@@ -33,9 +33,6 @@ build: docker-compose-build ## Build application docker images
 # on local host
 .PHONY: build@% app-build
 build@%: myos-base
-	$(eval DRYRUN_IGNORE   := true)
-	$(eval SERVICES        ?= $(shell $(call docker-compose,--log-level critical config --services)))
-	$(eval DRYRUN_IGNORE   := false)
 	$(eval docker_images   += $(foreach service,$(SERVICES),$(if $(shell docker images -q $(DOCKER_REPOSITORY)/$(service):$(DOCKER_IMAGE_TAG) 2>/dev/null),$(service))))
 	$(eval build_app       := $(or $(filter $(DOCKER_BUILD_CACHE),false),$(filter-out $(docker_images),$(SERVICES))))
 	$(if $(build_app), \
@@ -75,7 +72,7 @@ connect@%: SERVICE ?= $(DOCKER_SERVICE)
 connect@%:
 	$(call make,ssh-connect,$(MYOS),APP SERVICE)
 
-# target deploy: Fire deploy@ENV
+# target deploy: Fire deploy@% for ENV
 .PHONY: deploy
 deploy: deploy@$(ENV) ## Deploy application dockers
 
@@ -84,7 +81,7 @@ deploy: deploy@$(ENV) ## Deploy application dockers
 .PHONY: down
 down: docker-compose-down ## Remove application dockers
 
-# target exec: Exec command in docker SERVICE
+# target exec: Exec ARGS in docker SERVICE
 # on local host
 .PHONY: exec
 exec: ## Exec command in docker SERVICE
@@ -94,7 +91,7 @@ else
 	$(call make,docker-compose-exec,,ARGS)
 endif
 
-# target exec@%: Exec command in docker SERVICE of % ENV
+# target exec@%: Exec ARGS in docker SERVICE of % ENV
 # on all remote hosts
 .PHONY: exec@%
 exec@%: SERVICE ?= $(DOCKER_SERVICE)
@@ -104,7 +101,7 @@ exec@%:
 # target install app-install: Install application
 # on local host
 .PHONY: install app-install
-install: app-install ## Install application
+install: update-app app-install ## Install application
 
 # target logs: Display application dockers logs
 # on local host
@@ -132,7 +129,7 @@ rebuild@%:
 .PHONY: recreate
 recreate: docker-compose-recreate app-start ## Recreate application dockers
 
-# target reinstall: Fire clean and call install target
+# target reinstall: Fire clean, Call .env target, Call install target
 # on local host
 .PHONY: reinstall
 reinstall: clean ## Reinstall application
@@ -148,7 +145,7 @@ release: release-create ## Create release VERSION
 .PHONY: restart
 restart: docker-compose-restart app-start ## Restart application
 
-# target run: Run command in a new docker SERVICE
+# target run: Run command ARGS in a new docker SERVICE
 # on local host
 .PHONY: run
 run: ## Run a command in a new docker
@@ -158,7 +155,7 @@ else
 	$(call make,docker-compose-run,,ARGS)
 endif
 
-# target run@%: Run command in a new docker SERVICE of % ENV
+# target run@%: Run command ARGS in a new docker SERVICE of % ENV
 # on all remote hosts
 .PHONY: run@%
 run@%: SERVICE ?= $(DOCKER_SERVICE)
@@ -182,7 +179,7 @@ ssh@%:
 stack:
 	$(foreach stackz,$(STACK),$(call docker-stack,$(stackz)))
 
-# target stack-%: Call docker-compose-% target on a given stack
+# target stack-%: Call docker-compose-% target on STACK
 ## it splits % on dashes and extracts stack from the beginning and command from
 ## the last part of %
 ## ex: stack-base-up will fire the docker-compose-up target in the base stack
@@ -194,9 +191,9 @@ stack-%:
 	  $(if $(filter $(command),$(filter-out %-%,$(patsubst docker-compose-%,%,$(filter docker-compose-%,$(MAKE_TARGETS))))), \
 	    $(call make,docker-compose-$(command) STACK="$(stack)" $(if $(filter node,$(stack)),COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME_NODE)),,ARGS COMPOSE_IGNORE_ORPHANS SERVICE)))
 
-# target start: Start application dockers
+# target start app-start: Start application dockers
 # on local host
-.PHONY: start
+.PHONY: start app-start
 start: docker-compose-start ## Start application dockers
 
 # target stop: Stop application dockers
diff --git a/make/apps/def.mk b/make/apps/def.mk
index aac4cfa..d6968d9 100644
--- a/make/apps/def.mk
+++ b/make/apps/def.mk
@@ -2,6 +2,8 @@ APP_DIR                         ?= $(CURDIR)
 APP_DOMAIN                      ?= $(ENV)$(addprefix .,$(DOMAIN))
 APP_HOST                        ?= $(APP)$(addprefix .,$(APP_DOMAIN))
 APP_PARAMETERS_REPOSITORY       ?= $(GIT_PARAMETERS_REPOSITORY)
+APP_PARENT                      ?= $(MONOREPO)
+APP_PARENT_DIR                  ?= $(MONOREPO_DIR)
 APP_PATH                        ?= /$(APP_PATH_PREFIX)
 APP_REPOSITORY                  ?= $(GIT_REPOSITORY)
 APP_SCHEME                      ?= https
@@ -9,9 +11,10 @@ APP_UPSTREAM_REPOSITORY         ?= $(or $(shell git config --get remote.upstream
 APP_URI                         ?= $(APP_HOST)$(APP_PATH)
 APP_URL                         ?= $(APP_SCHEME)://$(APP_URI)
 BUILD_ENV_VARS                  ?= APP BRANCH COMMIT DEPLOY_HOOK_URL ENV VERSION
-CONTEXT_DEBUG                   += APP_DIR APP_DOMAIN APP_HOST APP_PATH APP_URL APP_REPOSITORY APP_UPSTREAM_REPOSITORY APP_PARAMETERS_REPOSITORY CONSUL_HTTP_TOKEN
+CONTEXT_DEBUG                   += APP_DIR APP_DOMAIN APP_HOST APP_PATH APP_URL APP_REPOSITORY APP_UPSTREAM_REPOSITORY APP_PARAMETERS_REPOSITORY CONSUL_HTTP_TOKEN SERVICES
 ENV_DEPLOY                      ?= $(shell ls .git/refs/heads/)
 ENV_VARS                        += APP_DIR APP_DOMAIN APP_HOST APP_PATH APP_URL CONSUL_HTTP_TOKEN $(if $(filter true,$(MOUNT_NFS)),NFS_CONFIG)
 MOUNT_NFS                       ?= false
 NFS_CONFIG                      ?= addr=$(NFS_HOST),actimeo=3,intr,noacl,noatime,nocto,nodiratime,nolock,soft,rsize=32768,wsize=32768,tcp,rw,vers=3
 NFS_HOST                        ?= host.docker.internal
+SERVICES                        ?= $(eval DRYRUN_IGNORE := true) $(shell $(call docker-compose,--log-level critical config --services)) $(eval DRYRUN_IGNORE := false)
diff --git a/make/apps/docker.mk b/make/apps/docker.mk
index df1685a..8a3052a 100644
--- a/make/apps/docker.mk
+++ b/make/apps/docker.mk
@@ -1,7 +1,7 @@
 ##
 # DOCKER
 
-# target docker-build: Fire docker-images-myos and call docker-build-% target for each DOCKER_IMAGES
+# target docker-build: Fire docker-images-myos, Call docker-build-% target for each DOCKER_IMAGES
 .PHONY: docker-build
 docker-build: docker-images-myos
 	$(foreach image,$(or $(SERVICE),$(DOCKER_IMAGES)),$(call make,docker-build-$(image)))
@@ -17,25 +17,16 @@ docker-build-%:
 # target docker-commit: Call docker-commit for each SERVICES
 .PHONY: docker-commit
 docker-commit:
-	$(eval DRYRUN_IGNORE := true)
-	$(eval SERVICES      ?= $(shell $(call docker-compose,--log-level critical config --services)))
-	$(eval DRYRUN_IGNORE := false)
 	$(foreach service,$(or $(SERVICE),$(SERVICES)),$(call docker-commit,$(service)))
 
 # target docker-commit-%: Call docker-commit with tag % for each SERVICES
 .PHONY: docker-commit-%
 docker-commit-%:
-	$(eval DRYRUN_IGNORE := true)
-	$(eval SERVICES      ?= $(shell $(call docker-compose,--log-level critical config --services)))
-	$(eval DRYRUN_IGNORE := false)
 	$(foreach service,$(or $(SERVICE),$(SERVICES)),$(call docker-commit,$(service),,,$*))
 
-# target docker-compose-build: Fire docker-images-myos and call docker-compose build SERVICE
+# target docker-compose-build: Fire docker-images-myos, Call docker-compose build SERVICE
 .PHONY: docker-compose-build
 docker-compose-build: docker-images-myos
-	$(eval DRYRUN_IGNORE := true)
-	$(eval SERVICES      ?= $(shell $(call docker-compose,--log-level critical config --services)))
-	$(eval DRYRUN_IGNORE := false)
 	$(call docker-compose,build $(if $(filter $(DOCKER_BUILD_NO_CACHE),true),--pull --no-cache) $(if $(filter $(SERVICE),$(SERVICES)),$(SERVICE)))
 
 # target docker-compose-config: Call docker-compose config
@@ -52,9 +43,6 @@ docker-compose-connect:
 # target docker-compose-down: Call docker-compose rm SERVICE or docker-compose down
 .PHONY: docker-compose-down
 docker-compose-down:
-	$(eval DRYRUN_IGNORE := true)
-	$(eval SERVICES      ?= $(shell $(call docker-compose,--log-level critical config --services)))
-	$(eval DRYRUN_IGNORE := false)
 	$(if $(filter $(SERVICE),$(SERVICES)),$(call docker-compose,rm -fs $(SERVICE)),$(call docker-compose,down $(DOCKER_COMPOSE_DOWN_OPTIONS)))
 
 # target docker-compose-exec: Call docker-compose-exec SERVICE ARGS
@@ -66,9 +54,6 @@ docker-compose-exec:
 # target docker-compose-logs: Call docker-compose logs SERVICE
 .PHONY: docker-compose-logs
 docker-compose-logs:
-	$(eval DRYRUN_IGNORE := true)
-	$(eval SERVICES      ?= $(shell $(call docker-compose,--log-level critical config --services)))
-	$(eval DRYRUN_IGNORE := false)
 	$(call docker-compose,logs -f --tail=100 $(if $(filter $(SERVICE),$(SERVICES)),$(SERVICE))) || true
 
 # target docker-compose-ps: Call docker-compose ps
@@ -88,17 +73,11 @@ docker-compose-recreate: docker-compose-rm docker-compose-up
 # target docker-compose-restart: Call docker-compose restart SERVICE
 .PHONY: docker-compose-restart
 docker-compose-restart:
-	$(eval DRYRUN_IGNORE := true)
-	$(eval SERVICES      ?= $(shell $(call docker-compose,--log-level critical config --services)))
-	$(eval DRYRUN_IGNORE := false)
 	$(call docker-compose,restart $(if $(filter $(SERVICE),$(SERVICES)),$(SERVICE)))
 
 # target docker-compose-rm: Call docker-compose rm SERVICE
 .PHONY: docker-compose-rm
 docker-compose-rm:
-	$(eval DRYRUN_IGNORE := true)
-	$(eval SERVICES      ?= $(shell $(call docker-compose,--log-level critical config --services)))
-	$(eval DRYRUN_IGNORE := false)
 	$(call docker-compose,rm -fs $(if $(filter $(SERVICE),$(SERVICES)),$(SERVICE)))
 
 # target docker-compose-run: Call docker-compose run SERVICE ARGS
@@ -116,25 +95,16 @@ docker-compose-scale:
 # target docker-compose-start: Call docker-compose start SERVICE
 .PHONY: docker-compose-start
 docker-compose-start:
-	$(eval DRYRUN_IGNORE := true)
-	$(eval SERVICES      ?= $(shell $(call docker-compose,--log-level critical config --services)))
-	$(eval DRYRUN_IGNORE := false)
 	$(call docker-compose,start $(if $(filter $(SERVICE),$(SERVICES)),$(SERVICE)))
 
 # target docker-compose-stop: Call docker-compose stop SERVICE
 .PHONY: docker-compose-stop
 docker-compose-stop:
-	$(eval DRYRUN_IGNORE := true)
-	$(eval SERVICES      ?= $(shell $(call docker-compose,--log-level critical config --services)))
-	$(eval DRYRUN_IGNORE := false)
 	$(call docker-compose,stop $(if $(filter $(SERVICE),$(SERVICES)),$(SERVICE)))
 
-# target docker-compose-up: Fire docker-image-myos and call docker-compose up SERVICE
+# target docker-compose-up: Fire docker-image-myos, Call docker-compose up SERVICE
 .PHONY: docker-compose-up
 docker-compose-up: docker-images-myos
-	$(eval DRYRUN_IGNORE := true)
-	$(eval SERVICES      ?= $(shell $(call docker-compose,--log-level critical config --services)))
-	$(eval DRYRUN_IGNORE := false)
 	$(call docker-compose,up $(DOCKER_COMPOSE_UP_OPTIONS) $(if $(filter $(SERVICE),$(SERVICES)),$(SERVICE)))
 
 # target docker-images-myos: Call myos-docker-build-% target for each DOCKER_IMAGES_MYOS
@@ -152,7 +122,7 @@ docker-images-rm:
 docker-images-rm-%:
 	docker images |awk '$$1 ~ /^$(subst /,\/,$*)/ {print $$3}' |sort -u |while read image; do docker rmi -f $$image; done
 
-# target docker-login: Exec docker login
+# target docker-login: Exec 'docker login'
 .PHONY: docker-login
 docker-login: myos-base
 	$(ECHO) docker login
@@ -161,7 +131,7 @@ docker-login: myos-base
 .PHONY: docker-network-create
 docker-network-create: docker-network-create-$(DOCKER_NETWORK)
 
-# target docker-network-create-%: Create docker network %
+# target docker-network-create-%: Exec 'docker network create %'
 .PHONY: docker-network-create-%
 docker-network-create-%:
 	[ -n "$(shell docker network ls -q --filter name='^$*$$' 2>/dev/null)" ] \
@@ -177,7 +147,7 @@ docker-network-rm-%:
 	[ -z "$(shell docker network ls -q --filter name='^$*$$' 2>/dev/null)" ] \
 	  || { echo -n "Removing docker network $* ... " && $(ECHO) docker network rm $* >/dev/null 2>&1 && echo "done" || echo "ERROR"; }
 
-# target docker-plugin-install: Install docker plugin DOCKER_PLUGIN with DOCKER_PLUGIN_OPTIONS
+# target docker-plugin-install: Exec 'docker plugin install DOCKER_PLUGIN_OPTIONS DOCKER_PLUGIN'
 .PHONY: docker-plugin-install
 docker-plugin-install:
 	$(eval docker_plugin_state := $(shell docker plugin ls | awk '$$2 == "$(DOCKER_PLUGIN)" {print $$NF}') )
@@ -187,9 +157,6 @@ docker-plugin-install:
 .PHONY: docker-push
 docker-push:
 ifneq ($(filter $(DEPLOY),true),)
-	$(eval DRYRUN_IGNORE := true)
-	$(eval SERVICES      ?= $(shell $(call docker-compose,--log-level critical config --services)))
-	$(eval DRYRUN_IGNORE := false)
 	$(foreach service,$(or $(SERVICE),$(SERVICES)),$(call docker-push,$(service)))
 else
 	printf "${COLOR_BROWN}WARNING${COLOR_RESET}: ${COLOR_GREEN}target${COLOR_RESET} $@ ${COLOR_GREEN}not enabled in${COLOR_RESET} $(APP).\n" >&2
@@ -199,9 +166,6 @@ endif
 .PHONY: docker-push-%
 docker-push-%:
 ifneq ($(filter $(DEPLOY),true),)
-	$(eval DRYRUN_IGNORE := true)
-	$(eval SERVICES      ?= $(shell $(call docker-compose,--log-level critical config --services)))
-	$(eval DRYRUN_IGNORE := false)
 	$(foreach service,$(or $(SERVICE),$(SERVICES)),$(call docker-push,$(service),,$*))
 else
 	printf "${COLOR_BROWN}WARNING${COLOR_RESET}: ${COLOR_GREEN}target${COLOR_RESET} $@ ${COLOR_GREEN}not enabled in${COLOR_RESET} $(APP).\n" >&2
@@ -245,9 +209,6 @@ docker-run-%: docker-build-%
 .PHONY: docker-tag
 docker-tag:
 ifneq ($(filter $(DEPLOY),true),)
-	$(eval DRYRUN_IGNORE := true)
-	$(eval SERVICES      ?= $(shell $(call docker-compose,--log-level critical config --services)))
-	$(eval DRYRUN_IGNORE := false)
 	$(foreach service,$(or $(SERVICE),$(SERVICES)),$(call docker-tag,$(service)))
 else
 	printf "${COLOR_BROWN}WARNING${COLOR_RESET}: ${COLOR_GREEN}target${COLOR_RESET} $@ ${COLOR_GREEN}not enabled in${COLOR_RESET} $(APP).\n" >&2
@@ -257,9 +218,6 @@ endif
 .PHONY: docker-tag-%
 docker-tag-%:
 ifneq ($(filter $(DEPLOY),true),)
-	$(eval DRYRUN_IGNORE := true)
-	$(eval SERVICES      ?= $(shell $(call docker-compose,--log-level critical config --services)))
-	$(eval DRYRUN_IGNORE := false)
 	$(foreach service,$(or $(SERVICE),$(SERVICES)),$(call docker-tag,$(service),,,,$*))
 else
 	printf "${COLOR_BROWN}WARNING${COLOR_RESET}: ${COLOR_GREEN}target${COLOR_RESET} $@ ${COLOR_GREEN}not enabled in${COLOR_RESET} $(APP).\n" >&2
diff --git a/make/apps/myos/def.ssh.mk b/make/apps/myos/def.ssh.mk
index f20f2a9..943a52e 100644
--- a/make/apps/myos/def.ssh.mk
+++ b/make/apps/myos/def.ssh.mk
@@ -7,7 +7,7 @@ SSH_PUBLIC_HOST_KEYS            ?= $(SSH_REMOTE_HOSTS) $(SSH_BASTION_HOSTNAME)
 SSH_PRIVATE_IP_RANGE            ?= 10.10.*
 SSH_REMOTE_HOSTS                ?= github.com gitlab.com
 
-# function ssh-connect: Exec command on remote hosts with tty
+# function ssh-connect: Exec command 2 on remote hosts 1 with tty
 define ssh-connect
 	$(eval hosts := $(1))
 	$(eval command := $(2))
@@ -16,7 +16,7 @@ define ssh-connect
 	$(foreach host,$(hosts),$(call exec,ssh -t -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no $(user)@$(host) "$(command)") ||) true
 endef
 
-# function ssh-exec: Exec command on remote hosts without tty
+# function ssh-exec: Exec command 2 on remote hosts 1 without tty
 define ssh-exec
 	$(eval hosts := $(1))
 	$(eval command := $(2))
diff --git a/make/apps/myos/ssh.mk b/make/apps/myos/ssh.mk
index 5c058d2..1f06075 100644
--- a/make/apps/myos/ssh.mk
+++ b/make/apps/myos/ssh.mk
@@ -1,22 +1,26 @@
 ##
 # SSH
 
-# target ssh: Call ssh-connect with command SHELL
-.PHONY: ssh
-ssh: aws-ec2-get-PrivateIpAddress-$(SERVER_NAME) ## Connect to first remote host
-	$(call ssh-connect,$(AWS_INSTANCE_IP),$(SHELL))
+# target get-PrivateIpAddress-%: Fire aws-ec2-get-instances-PrivateIpAddress-%
+.PHONY: get-PrivateIpAddress-%
+get-PrivateIpAddress-%: aws-ec2-get-instances-PrivateIpAddress-%;
 
-# target ssh-connect: Call ssh-connect with command make connect
+# target ssh: Call ssh-connect ARGS or SHELL
+.PHONY: ssh
+ssh: get-PrivateIpAddress-$(SERVER_NAME) ## Connect to first remote host
+	$(call ssh-connect,$(AWS_INSTANCE_IP),$(if $(ARGS),$(ARGS),$(SHELL)))
+
+# target ssh-connect: Call ssh-connect make connect SERVICE
 .PHONY: ssh-connect
-ssh-connect: aws-ec2-get-PrivateIpAddress-$(SERVER_NAME)
+ssh-connect: get-PrivateIpAddress-$(SERVER_NAME)
 	$(call ssh-connect,$(AWS_INSTANCE_IP),make connect $(if $(SERVICE),SERVICE=$(SERVICE)))
 
-# target ssh-connect: Call ssh-connect with command make exec
+# target ssh-exec: Call ssh-exec make exec SERVICE ARGS
 .PHONY: ssh-exec
-ssh-exec: aws-ec2-get-PrivateIpAddress-$(SERVER_NAME)
+ssh-exec: get-PrivateIpAddress-$(SERVER_NAME)
 	$(call ssh-exec,$(AWS_INSTANCE_IP),make exec $(if $(SERVICE),SERVICE=$(SERVICE)) $(if $(ARGS),ARGS='\''"$(ARGS)"'\''))
 
-# target ssh-run: Call ssh-connect with command make run
+# target ssh-run: Call ssh-run make run SERVICE ARGS
 .PHONY: ssh-run
-ssh-run: aws-ec2-get-PrivateIpAddress-$(SERVER_NAME)
+ssh-run: get-PrivateIpAddress-$(SERVER_NAME)
 	$(call ssh-exec,$(AWS_INSTANCE_IP),make run $(if $(SERVICE),SERVICE=$(SERVICE)) $(if $(ARGS),ARGS='\''"$(ARGS)"'\''))
diff --git a/make/apps/setup.mk b/make/apps/setup.mk
index a686c0f..ee15e7c 100644
--- a/make/apps/setup.mk
+++ b/make/apps/setup.mk
@@ -7,6 +7,14 @@ ifeq ($(SETUP_SYSCTL),true)
 	$(foreach config,$(SETUP_SYSCTL_CONFIG),$(call docker-run,--privileged alpine:latest,sysctl -q -w $(config)) &&) true
 endif
 
+.PHONY: setup-nfsd
+setup-nfsd:
+ifeq ($(SETUP_NFSD),true)
+ifeq ($(HOST_SYSTEM),DARWIN)
+	$(call setup-nfsd-osx)
+endif
+endif
+
 define setup-nfsd-osx
 	$(eval dir:=$(or $(1),$(MONOREPO_DIR)))
 	$(eval uid:=$(or $(2),$(UID)))
diff --git a/make/def.mk b/make/def.mk
index 89d6a1f..ebd178d 100644
--- a/make/def.mk
+++ b/make/def.mk
@@ -4,7 +4,7 @@ dquote                          ?= "
 quote                           ?= '
 APP                             ?= $(if $(wildcard .git),$(notdir $(CURDIR)))
 APP_NAME                        ?= $(APP)
-APP_TYPE                        ?= $(if $(SUBREPO),subrepo) $(if $(MYOS),,myos)
+APP_TYPE                        ?= $(if $(SUBREPO),subrepo) $(if $(filter .,$(MYOS)),myos)
 APPS                            ?= $(if $(MONOREPO),$(sort $(patsubst $(MONOREPO_DIR)/%/.git,%,$(wildcard $(MONOREPO_DIR)/*/.git))))
 APPS_NAME                       ?= $(foreach app,$(APPS),$(or $(shell awk -F '=' '$$1 == "APP" {print $$2}' $(or $(wildcard $(MONOREPO_DIR)/$(app)/.env),$(wildcard $(MONOREPO_DIR)/$(app)/.env.$(ENV)),$(MONOREPO_DIR)/$(app)/.env.dist) 2>/dev/null),$(app)))
 BRANCH                          ?= $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
@@ -41,15 +41,16 @@ MAKE_ENV_ARGS                   ?= $(foreach var,$(filter $(ENV_VARS),$(MAKE_ENV
 MAKE_ENV_VARS                   ?= $(strip $(foreach var, $(filter-out .VARIABLES,$(.VARIABLES)), $(if $(filter environment,$(origin $(var))),$(var))))
 MAKE_FILE_ARGS                  ?= $(foreach var,$(filter $(ENV_VARS),$(MAKE_FILE_VARS)),$(var)='$($(var))')
 MAKE_FILE_VARS                  ?= $(strip $(foreach var, $(filter-out .VARIABLES,$(.VARIABLES)), $(if $(filter file,$(origin $(var))),$(var))))
+MAKE_OLDFILE                    ?= $@
 MAKE_TARGETS                    ?= $(filter-out $(.VARIABLES),$(shell $(MAKE) -qp 2>/dev/null |awk -F':' '/^[a-zA-Z0-9][^$$\#\/\t=]*:([^=]|$$)/ {print $$1}' |sort -u))
 MAKE_VARS                       ?= ENV
 MONOREPO                        ?= $(if $(filter myos,$(MYOS)),$(notdir $(CURDIR)),$(if $(APP),$(notdir $(realpath $(CURDIR)/..))))
 MONOREPO_DIR                    ?= $(if $(MONOREPO),$(if $(filter myos,$(MYOS)),$(realpath $(CURDIR)),$(if $(APP),$(realpath $(CURDIR)/..))))
-MYOS                            ?= $(if $(filter $(MAKE_DIR),$(call pop,$(MAKE_DIR))),,$(call pop,$(MAKE_DIR)))
+MYOS                            ?= $(if $(filter $(MAKE_DIR),$(call pop,$(MAKE_DIR))),.,$(call pop,$(MAKE_DIR)))
 PARAMETERS                      ?= $(RELATIVE)parameters
 QUIET                           ?= $(if $(filter false,$(VERBOSE)),--quiet)
 RECURSIVE                       ?= true
-RELATIVE                        ?= $(if $(filter myos,$(MYOS)),,../)
+RELATIVE                        ?= $(if $(filter myos,$(MYOS)),./,../)
 SHARED                          ?= $(RELATIVE)shared
 SSH_DIR                         ?= ${HOME}/.ssh
 SUBREPO                         ?= $(if $(wildcard .gitrepo),$(notdir $(CURDIR)))
@@ -129,10 +130,10 @@ define conf
 	done < "$(file)"
 endef
 
-# macro force: Run command sine die
-# return never
-## it starts command if it is not already running
-force = $$(while true; do [ $$(ps x |awk 'BEGIN {nargs=split("'"$$*"'",args)} $$field == args[1] { matched=1; for (i=1;i<=NF-field;i++) { if ($$(i+field) == args[i+1]) {matched++} } if (matched == nargs) {found++} } END {print found+0}' field=4) -eq 0 ] && $(ECHO) $(command) || sleep 1; done)
+# macro force: Run command 1 sine die
+## it starts command 1 if it is not already running
+## it returns never
+force = $$(while true; do [ $$(ps x |awk 'BEGIN {nargs=split("'"$$*"'",args)} $$field == args[1] { matched=1; for (i=1;i<=NF-field;i++) { if ($$(i+field) == args[i+1]) {matched++} } if (matched == nargs) {found++} } END {print found+0}' field=4) -eq 0 ] && $(ECHO) $(1) || sleep 1; done)
 
 # macro gid: Return GID of group 1
 gid = $(shell grep '^$(1):' /etc/group 2>/dev/null |awk -F: '{print $$3}')
diff --git a/make/help.mk b/make/help.mk
index ca34746..c9b3d1a 100644
--- a/make/help.mk
+++ b/make/help.mk
@@ -13,7 +13,7 @@ COLOR_BLUE                      ?= \033[36m
 blank1 blank2:
 	printf "\n"
 
-# target context: Call context-% for each CONTEXT
+# target context: Call context-% target for each CONTEXT
 .PHONY: context
 context:
 	printf "${COLOR_BROWN}Context:${COLOR_RESET}\n"
@@ -30,7 +30,7 @@ context-%:
 # target doc: Fire functions macros target variables
 doc: functions macros targets variables ;
 
-# target doc: Fire functions-% macros-% target-% variables-%
+# target doc-%: Fire functions-% macros-% target-% variables-%
 doc-%: functions-% macros-% targets-% variables-%;
 
 # target help: Fire usage blank1 target blank2 context
diff --git a/make/myos.mk b/make/myos.mk
index 9c8dea7..96eb74c 100644
--- a/make/myos.mk
+++ b/make/myos.mk
@@ -1,9 +1,7 @@
 ##
 # MYOS
 
-# target myos-%: call % target in MYOS folder
+# target myos-%: Call % target in MYOS folder
 .PHONY: myos-%
 myos-%: ;
-ifeq ($(wildcard $(MYOS)),$(MYOS))
 	$(call make,$*,$(MYOS))
-endif
diff --git a/make/update.mk b/make/update.mk
index 4e44dac..7dc269c 100644
--- a/make/update.mk
+++ b/make/update.mk
@@ -10,7 +10,7 @@ update-apps:
 .PHONY: update-app
 update-app: update-app-$(APP_NAME) ;
 
-# target update-app-%: Fire % target
+# target update-app-%: Fire myos-base %
 .PHONY: update-app-%
 update-app-%: myos-base % ;
 
diff --git a/openstack/def.openstack.mk b/openstack/def.openstack.mk
index 0b6e950..2e91493 100644
--- a/openstack/def.openstack.mk
+++ b/openstack/def.openstack.mk
@@ -12,6 +12,7 @@ define openstack
 	$(call run,$(DOCKER_SSH_AUTH) $(DOCKER_REPOSITORY)/openstack:$(DOCKER_IMAGE_TAG) $(1))
 endef
 else
+# function openstack: Call run openstack with arg 1
 define openstack
 	$(call run,openstack $(1))
 endef
diff --git a/openstack/openstack.mk b/openstack/openstack.mk
index 8734442..fd18fd2 100644
--- a/openstack/openstack.mk
+++ b/openstack/openstack.mk
@@ -1,7 +1,9 @@
+# target openstack: Call openstack ARGS
 .PHONY: openstack
 openstack: docker-build-openstack
 	$(call openstack,$(ARGS))
 
+# target openstack-image-create: Call openstack image create PACKER_ISO_NAME with file PACKER_ISO_FILE
 .PHONY: openstack-image-create
 openstack-image-create: $(PACKER_ISO_FILE) docker-build-openstack
 	$(call openstack,$(OPENSTACK_ARGS) image create --disk-format raw --container-format bare --file $(PACKER_ISO_FILE) "$(PACKER_ISO_NAME)")
diff --git a/packer/def.packer.mk b/packer/def.packer.mk
index e15a0d5..8a4d38b 100644
--- a/packer/def.packer.mk
+++ b/packer/def.packer.mk
@@ -86,9 +86,11 @@ endef
 
 else
 
+# function packer: Call run packer with arg 1
 define packer
 	$(call run,packer $(1))
 endef
+# function packer-qemu: Call run qemu-system-% for PACKER_QEMU_ARCH
 define packer-qemu
 	echo Running $(1)
 	$(call run,qemu-system-$(PACKER_QEMU_ARCH) $(PACKER_QEMU_ARGS) -m 512m -drive file=$(1)$(comma)format=raw -net nic$(comma)model=virtio -net user$(comma)hostfwd=tcp:$(PACKER_SSH_ADDRESS):$(PACKER_SSH_PORT)-:22 -vnc $(PACKER_VNC_ADDRESS):$(subst 590,,$(PACKER_VNC_PORT)))
@@ -96,6 +98,7 @@ endef
 
 endif
 
+# function packer-build: Call packer build with arg 1, Add build infos to file PACKER_ISO_INFO
 define packer-build
 	$(eval PACKER_TEMPLATE := $(notdir $(basename $(1))))
 	echo Building $(PACKER_ISO_FILE)
diff --git a/packer/packer.mk b/packer/packer.mk
index f3de2ca..c4664ba 100644
--- a/packer/packer.mk
+++ b/packer/packer.mk
@@ -1,17 +1,22 @@
+# target packer: Call packer ARGS
 .PHONY: packer
 packer:
 	$(call packer,$(ARGS))
 
+# target $(PACKER_ISO_FILE): Call packer-build target
 $(PACKER_ISO_FILE):
 	$(eval FORCE := true)
 	$(call make,packer-build,,FORCE)
 
+# target packer-build: Fire packer-build-% for PACKER_TEMPLATE
 .PHONY: packer-build
 packer-build: packer-build-$(PACKER_TEMPLATE) ## Build default packer template
 
+# target packer-build-templates: Fire PACKER_TEMPLATES
 .PHONY: packer-build-templates
 packer-build-templates: $(PACKER_TEMPLATES) ## Build all packer templates
 
+# target $(PACKER_TEMPLATES): Call packer-build $@
 .PHONY: $(PACKER_TEMPLATES)
 ifeq ($(HOST_SYSTEM),DARWIN)
 $(PACKER_TEMPLATES): DOCKER     ?= false
@@ -19,14 +24,17 @@ endif
 $(PACKER_TEMPLATES):
 	$(call packer-build,$@)
 
+# target packer-build-%: Call packer-build with file packer/*/%.json
 .PHONY: packer-build-%
 packer-build-%: docker-build-packer
 	$(if $(wildcard packer/*/$*.json),\
 	 $(call packer-build,$(wildcard packer/*/$*.json)))
 
+# target packer-qemu: Fire packer-quemu-% for PACKER_ISO_NAME
 .PHONY: packer-qemu
 packer-qemu: packer-qemu-$(PACKER_ISO_NAME) ## Launch iso image in qemu
 
+# target packer-qemu-%: Call packer-qemu PACKER_OUTPUT/%.iso
 .PHONY: packer-qemu-%
 ifeq ($(HOST_SYSTEM),DARWIN)
 packer-qemu-%: DOCKER           ?= false
diff --git a/stack/base.mk b/stack/base.mk
index 5868e64..afaa03c 100644
--- a/stack/base.mk
+++ b/stack/base.mk
@@ -1,14 +1,18 @@
+# target base: Fire docker-network-create stack-base-up base-ssh-add
 .PHONY: base
 base: docker-network-create stack-base-up base-ssh-add
 
+# target ssh-add: Fire base-ssh-add
 .PHONY: ssh-add
 ssh-add: base-ssh-add
 
+# target base-ssh-add: Fire base-ssh-key and exec ssh-add file SSH_PRIVATE_KEYS in folder SSH_DIR
 .PHONY: base-ssh-add
 base-ssh-add: base-ssh-key
 	$(eval SSH_PRIVATE_KEYS := $(foreach file,$(SSH_DIR)/id_rsa $(filter-out $(wildcard $(SSH_DIR)/id_rsa),$(wildcard $(SSH_DIR)/*)),$(if $(shell grep "PRIVATE KEY" $(file) 2>/dev/null),$(notdir $(file)))))
 	$(call docker-run,$(DOCKER_SSH_AUTH) $(DOCKER_IMAGE_CLI),sh -c "$(foreach file,$(patsubst %,$(SSH_DIR)/%,$(SSH_PRIVATE_KEYS)),ssh-add -l |grep -qw $$(ssh-keygen -lf $(file) 2>/dev/null |awk '{print $$2}') 2>/dev/null || ssh-add $(file) ||: &&) true")
 
+# target base-ssh-key: Setup ssh private key SSH_KEY in SSH_DIR
 .PHONY: base-ssh-key
 base-ssh-key: stack-base-up
 ifneq (,$(filter true,$(DRONE)))
diff --git a/stack/elastic.mk b/stack/elastic.mk
index 84a8847..a19c70b 100644
--- a/stack/elastic.mk
+++ b/stack/elastic.mk
@@ -5,6 +5,7 @@ ENV_VARS                        += ELASTICSEARCH_HOST ELASTICSEARCH_PASSWORD ELA
 
 elastic                         ?= elastic/curator elastic/elasticsearch elastic/kibana alpine/sysctl
 
+# target elasticsearch-delete-%: delete elasticsearch index %
 .PHONY: elasticsearch-delete-%
 elasticsearch-delete-%:
 	docker ps |awk '$$NF ~ /myos_elasticsearch/' |sed 's/^.*:\([0-9]*\)->9200\/tcp.*$$/\1/' |while read port; do echo -e "DELETE /$* HTTP/1.0\n\n" |nc localhost $$port; done
diff --git a/stack/logs.mk b/stack/logs.mk
index 46fa26d..c2c0320 100644
--- a/stack/logs.mk
+++ b/stack/logs.mk
@@ -1 +1,6 @@
 logs                            ?= sematext/logagent
+
+# target app-build-logagent: Exec 'rm -Rf /root/.npm /log-buufer/*' in docker SERVICE
+.PHONY: app-build-logagent
+app-build-logagent:
+	$(call make,docker-compose-exec ARGS='rm -Rf /root/.npm /log-buffer/*' SERVICE=logagent)
diff --git a/stack/node.mk b/stack/node.mk
index ca0ba5e..e3127bf 100644
--- a/stack/node.mk
+++ b/stack/node.mk
@@ -1,11 +1,13 @@
 ENV_VARS += DOCKER_HOST_IFACE DOCKER_HOST_INET
 
+# target node: Fire docker-network-create-% for DOCKER_NETWORK_PUBLIC node-openssl stack-node-up
 .PHONY: node
 node: docker-network-create-$(DOCKER_NETWORK_PUBLIC) node-openssl stack-node-up
 
+# target node-openssl: Create /certs/${DOMAIN}.key.pem and /certs/${DOMAIN}.crt.pem files
 .PHONY: node-openssl
 node-openssl:
-	docker run --rm --mount source=$(COMPOSE_PROJECT_NAME_INFRA_NODE)_ssl-certs,target=/certs alpine:latest [ -f /certs/$(SSL_HOSTNAME).crt.pem -a -f /certs/$(SSL_HOSTNAME).key.pem ] \
-	 || docker run --rm -e SSL_HOSTNAME=$(SSL_HOSTNAME) --mount source=$(COMPOSE_PROJECT_NAME_INFRA_NODE)_ssl-certs,target=/certs alpine:latest sh -c "apk --no-cache add openssl \
-		   && { [ -f /certs/${SSL_HOSTNAME}.key.pem ] || openssl genrsa -out /certs/${SSL_HOSTNAME}.key.pem 2048; } \
-	       && openssl req -key /certs/${SSL_HOSTNAME}.key.pem -out /certs/${SSL_HOSTNAME}.crt.pem -addext extendedKeyUsage=serverAuth -addext subjectAltName=DNS:${SSL_HOSTNAME} -subj \"/C=/ST=/L=/O=/CN=${SSL_HOSTNAME}\" -x509 -days 365"
+	docker run --rm --mount source=$(COMPOSE_PROJECT_NAME_NODE)_ssl-certs,target=/certs alpine:latest [ -f /certs/$(DOMAIN).crt.pem -a -f /certs/$(DOMAIN).key.pem ] \
+	 || docker run --rm -e DOMAIN=$(DOMAIN) --mount source=$(COMPOSE_PROJECT_NAME_NODE)_ssl-certs,target=/certs alpine:latest sh -c "apk --no-cache add openssl \
+		   && { [ -f /certs/${DOMAIN}.key.pem ] || openssl genrsa -out /certs/${DOMAIN}.key.pem 2048; } \
+	       && openssl req -key /certs/${DOMAIN}.key.pem -out /certs/${DOMAIN}.crt.pem -addext extendedKeyUsage=serverAuth -addext subjectAltName=DNS:${DOMAIN} -subj \"/C=/ST=/L=/O=/CN=${DOMAIN}\" -x509 -days 365"
diff --git a/stack/node/.env.dist b/stack/node/.env.dist
index 604255a..52fa054 100644
--- a/stack/node/.env.dist
+++ b/stack/node/.env.dist
@@ -5,4 +5,3 @@ FABIO_CONSUL_HTTP_TOKEN=01234567-89AB-CDEF-0123-456789ABCDEF
 FABIO_SERVICE_9998_TAGS=urlprefix-fabio.${APP_DOMAIN}/
 PORTAINER_SERVICE_9000_TAGS=urlprefix-portainer.${APP_DOMAIN}/
 REGISTRATOR_CONSUL_HTTP_TOKEN=01234567-89AB-CDEF-0123-456789ABCDEF
-SSL_HOSTNAME=${APP_DOMAIN}
diff --git a/stack/node/node.yml b/stack/node/node.yml
index 4aaff56..d208778 100644
--- a/stack/node/node.yml
+++ b/stack/node/node.yml
@@ -7,7 +7,7 @@ services:
       - DOCKER_BUILD_DIR=docker/consul
       context: ../..
       dockerfile: docker/consul/Dockerfile
-    image: ${DOCKER_REPOSITORY_INFRA_NODE}/consul:${DOCKER_IMAGE_TAG}
+    image: ${DOCKER_REPOSITORY_NODE}/consul:${DOCKER_IMAGE_TAG}
     environment:
       CONSUL_BIND_INTERFACE: '${DOCKER_HOST_IFACE}'
       CONSUL_CLIENT_INTERFACE: '${DOCKER_HOST_IFACE}'
@@ -38,7 +38,7 @@ services:
     - consul:/consul/data
     - /var/run/docker.sock:/var/run/docker.sock
   fabio:
-    command: -registry.backend "consul" -registry.consul.addr "consul:8500" -registry.consul.token "$FABIO_CONSUL_HTTP_TOKEN" -proxy.addr ":80,:443;cs=local" -proxy.cs "cs=local;type=file;cert=/certs/${SSL_HOSTNAME}.crt.pem;key=/certs/${SSL_HOSTNAME}.key.pem"
+    command: -registry.backend "consul" -registry.consul.addr "consul:8500" -registry.consul.token "$FABIO_CONSUL_HTTP_TOKEN" -proxy.addr ":80,:443;cs=local" -proxy.cs "cs=local;type=file;cert=/certs/${DOMAIN}.crt.pem;key=/certs/${DOMAIN}.key.pem"
     depends_on:
     - consul
     extra_hosts:
@@ -93,7 +93,7 @@ services:
     extra_hosts:
     - consul:${DOCKER_HOST_INET}
     hostname: ${HOSTNAME}
-    image: ${DOCKER_REPOSITORY_INFRA_NODE}/registrator:${DOCKER_IMAGE_TAG}
+    image: ${DOCKER_REPOSITORY_NODE}/registrator:${DOCKER_IMAGE_TAG}
     network_mode: host
     restart: always
     volumes:
diff --git a/stack/services.mk b/stack/services.mk
index ef2a1ec..e00cccd 100644
--- a/stack/services.mk
+++ b/stack/services.mk
@@ -1,2 +1,4 @@
 services                        ?= elastic memcached mysql rabbitmq redis
+
+# target services: Fire stack-service-up
 services: stack-services-up;