diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..0b3779e
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,5 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
diff --git a/src/typo3-frankenphp/.devcontainer/Dockerfile b/src/typo3-frankenphp/.devcontainer/Dockerfile
index 08912a2..dbd6ea4 100644
--- a/src/typo3-frankenphp/.devcontainer/Dockerfile
+++ b/src/typo3-frankenphp/.devcontainer/Dockerfile
@@ -13,12 +13,13 @@ USER root
 
 EXPOSE 80 443
 RUN addgroup --gid ${DEVCONTAINER_SERVICE_ID} ${DEVCONTAINER_SERVICE_NAME} && \
-    adduser --gid ${DEVCONTAINER_SERVICE_ID} --no-create-home --home /nonexistent --comment "devcontainer service user" \
-        --disabled-password --shell /bin/false --uid ${DEVCONTAINER_SERVICE_ID} $DEVCONTAINER_SERVICE_NAME
+    adduser --gid ${DEVCONTAINER_SERVICE_ID} --home /home/${DEVCONTAINER_SERVICE_NAME} --comment "devcontainer service user" \
+        --disabled-password --shell /bin/bash --uid ${DEVCONTAINER_SERVICE_ID} $DEVCONTAINER_SERVICE_NAME
 
 RUN apt-get update && \
     apt-get install -y \
         locales-all \
+        sudo \
         openssh-client \
         vim \
         procps \
@@ -28,6 +29,12 @@ RUN apt-get update && \
     apt-get install -y iproute2 iputils-ping && \
     install-php-extensions calendar bcmath exif ftp mysqli pdo pdo_mysql gmp intl zip \
         gd imagick xdebug opcache tokenizer json iconv mbstring curl phar session simplexml xml @composer && \
-    apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+    apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
+    mkdir -v -m 777 ${WORKSPACE_ROOT}
 
-ENTRYPOINT [ "/bin/bash" ]
+COPY ./allsudoers /etc/sudoers.d/allsudoers
+COPY ./docker-entrypoint.sh /
+
+USER ${DEVCONTAINER_SERVICE_NAME}
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/src/typo3-frankenphp/.devcontainer/allsudoers b/src/typo3-frankenphp/.devcontainer/allsudoers
new file mode 100644
index 0000000..49615de
--- /dev/null
+++ b/src/typo3-frankenphp/.devcontainer/allsudoers
@@ -0,0 +1 @@
+ALL ALL = NOPASSWD: ALL
diff --git a/src/typo3-frankenphp/.devcontainer/devcontainer.json b/src/typo3-frankenphp/.devcontainer/devcontainer.json
index 97b0e0b..e9345f4 100644
--- a/src/typo3-frankenphp/.devcontainer/devcontainer.json
+++ b/src/typo3-frankenphp/.devcontainer/devcontainer.json
@@ -6,9 +6,8 @@
 		"context": ".",
 		"dockerfile": "Dockerfile",
 		"args": {
-			"DEVCONTAINER_SERVICE_NAME": "devcontainer",
+			"DEVCONTAINER_SERVICE_NAME": "typo3dev",
 			"DEVCONTAINER_SERVICE_ID": "10000",
-			"COMPOSE_PROFILES": "frankenphp",
 			"PHP_VERSION": "${localEnv:PHP_VERSION}"
 		}
 	},
@@ -30,9 +29,14 @@
 				},
 				"files.autoSave": "afterDelay",
 				"files.autoSaveDelay": 1000,
+				"files.eol": "\n",
+				"files.trimTrailingWhitespace": true,
+				"files.insertFinalNewline": true,
+				"git.autofetch": true,
 				"git.postCommitCommand": "push",
-				"git.path": "/usr/bin/git"
+				"git.path": "/usr/bin/git",
+				"gitAutoStage.enable": true
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/typo3-frankenphp/.devcontainer/docker-entrypoint.sh b/src/typo3-frankenphp/.devcontainer/docker-entrypoint.sh
new file mode 100644
index 0000000..d78182d
--- /dev/null
+++ b/src/typo3-frankenphp/.devcontainer/docker-entrypoint.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+umask 0000
+/bin/bash
\ No newline at end of file