diff --git a/configs/devkit/linux/agent/Ubuntu.devkit.Dockerfile b/configs/devkit/linux/agent/Ubuntu.devkit.Dockerfile
new file mode 100644
index 000000000..827b4afcb
--- /dev/null
+++ b/configs/devkit/linux/agent/Ubuntu.devkit.Dockerfile
@@ -0,0 +1,16 @@
+#
+# The DevKit container is the environment in which TeamCity is executed. It is as an environment for the testing ...
+# ... of potential tooling extension and security testing purposes.
+#
+
+# @param teamCityImage TeamCity Agent Docker Image
+ARG teamCityImage
+
+FROM ${teamCityImage}
+
+USER root
+
+RUN rm -rf /opt/buildagent
+USER buildagent
+
+CMD ["sleep", "infinity"]
diff --git a/configs/devkit/linux/server/ubuntu/Ubuntu.devkit.Dockerfile b/configs/devkit/linux/server/ubuntu/Ubuntu.devkit.Dockerfile
new file mode 100644
index 000000000..56145f8ce
--- /dev/null
+++ b/configs/devkit/linux/server/ubuntu/Ubuntu.devkit.Dockerfile
@@ -0,0 +1,16 @@
+#
+# The DevKit container is the environment in which TeamCity is executed. It is as an environment for the testing ...
+# ... of potential tooling extension and security testing purposes.
+#
+
+# @param teamCityImage TeamCity Server Docker Image
+ARG teamCityImage
+
+FROM ${teamCityImage}
+
+USER root
+
+RUN rm -rf /opt/teamcity
+USER tcuser:tcuser
+
+CMD ["sleep", "infinity"]