diff --git a/docker/images/n8n-ubuntu/Dockerfile b/docker/images/n8n-ubuntu/Dockerfile
index 2b44afe401..892c86de63 100644
--- a/docker/images/n8n-ubuntu/Dockerfile
+++ b/docker/images/n8n-ubuntu/Dockerfile
@@ -6,7 +6,7 @@ RUN if [ -z "$N8N_VERSION" ] ; then echo "The N8N_VERSION argument is missing!"
 
 RUN \
 	apt-get update && \
-	apt-get -y install graphicsmagick
+	apt-get -y install graphicsmagick gosu
 
 # Set a custom user to not have n8n run as root
 USER root
@@ -15,4 +15,5 @@ RUN npm_config_user=root npm install -g n8n@${N8N_VERSION}
 
 WORKDIR /data
 
-CMD "n8n"
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/docker/images/n8n-ubuntu/docker-entrypoint.sh b/docker/images/n8n-ubuntu/docker-entrypoint.sh
new file mode 100755
index 0000000000..e39ba8f38e
--- /dev/null
+++ b/docker/images/n8n-ubuntu/docker-entrypoint.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ -d /root/.n8n ] ; then
+  chmod o+rx /root
+  chown -R node /root/.n8n
+  ln -s /root/.n8n /home/node/
+fi
+
+exec gosu node n8n
diff --git a/docker/images/n8n/Dockerfile b/docker/images/n8n/Dockerfile
index c2a1d2551d..d609d00363 100644
--- a/docker/images/n8n/Dockerfile
+++ b/docker/images/n8n/Dockerfile
@@ -5,7 +5,7 @@ ARG N8N_VERSION
 RUN if [ -z "$N8N_VERSION" ] ; then echo "The N8N_VERSION argument is missing!" ; exit 1; fi
 
 # Update everything and install needed dependencies
-RUN apk add --update graphicsmagick tzdata git
+RUN apk add --update graphicsmagick tzdata git tini su-exec
 
 # # Set a custom user to not have n8n run as root
 USER root
@@ -18,4 +18,5 @@ RUN apk --update add --virtual build-dependencies python build-base ca-certifica
 
 WORKDIR /data
 
-CMD ["n8n"]
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+ENTRYPOINT ["tini", "--", "/docker-entrypoint.sh"]
diff --git a/docker/images/n8n/docker-entrypoint.sh b/docker/images/n8n/docker-entrypoint.sh
new file mode 100755
index 0000000000..c574c3ae70
--- /dev/null
+++ b/docker/images/n8n/docker-entrypoint.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ -d /root/.n8n ] ; then
+  chmod o+rx /root
+  chown -R node /root/.n8n
+  ln -s /root/.n8n /home/node/
+fi
+
+exec su-exec node n8n
diff --git a/packages/editor-ui/src/components/ExpressionEdit.vue b/packages/editor-ui/src/components/ExpressionEdit.vue
index 46bf5d9a41..ada71f6869 100644
--- a/packages/editor-ui/src/components/ExpressionEdit.vue
+++ b/packages/editor-ui/src/components/ExpressionEdit.vue
@@ -102,7 +102,7 @@ export default Vue.extend({
 	margin-top: 1em;
 }
 
-/deep/ .expression-dialog {
+::v-deep .expression-dialog {
 	.el-dialog__header {
 		padding: 0;
 	}
diff --git a/packages/editor-ui/src/components/MultipleParameter.vue b/packages/editor-ui/src/components/MultipleParameter.vue
index 0fdf96fb50..7ba38ad738 100644
--- a/packages/editor-ui/src/components/MultipleParameter.vue
+++ b/packages/editor-ui/src/components/MultipleParameter.vue
@@ -138,7 +138,7 @@ export default mixins(genericHelpers)
 	}
 }
 
-/deep/ .duplicate-parameter-item {
+::v-deep .duplicate-parameter-item {
 	position: relative;
 	margin-top: 0.5em;
 	padding-top: 0.5em;
@@ -148,11 +148,11 @@ export default mixins(genericHelpers)
 	}
 }
 
-/deep/ .duplicate-parameter-input-item {
+::v-deep .duplicate-parameter-input-item {
 	margin: 0.5em 0 0.25em 2em;
 }
 
-/deep/ .duplicate-parameter-item + .duplicate-parameter-item {
+::v-deep .duplicate-parameter-item + .duplicate-parameter-item {
 	.collection-parameter-wrapper {
 		border-top: 1px dashed #999;
 		padding-top: 0.5em;
diff --git a/packages/node-dev/src/Build.ts b/packages/node-dev/src/Build.ts
index 42e0c11e80..ddb74add0a 100644
--- a/packages/node-dev/src/Build.ts
+++ b/packages/node-dev/src/Build.ts
@@ -64,7 +64,7 @@ export async function buildFiles (options?: IBuildOptions): Promise<string> {
 	options = options || {};
 
 	// Get the path of the TypeScript cli of this project
-	const tscPath = join(__dirname, '../../node_modules/typescript/bin/tsc');
+	const tscPath = join(__dirname, '../../node_modules/.bin/tsc');
 
 	const tsconfigData = await createCustomTsconfig();