diff --git a/linux/ecosystem/apache2/php8.0/Dockerfile b/linux/ecosystem/apache2/php8.0/Dockerfile
index 044d2e2bf..10ea14baa 100644
--- a/linux/ecosystem/apache2/php8.0/Dockerfile
+++ b/linux/ecosystem/apache2/php8.0/Dockerfile
@@ -56,9 +56,9 @@ RUN echo "TLS_REQCERT never" >> /etc/ldap/ldap.conf
 ##################################################################
 #                   Installing IOnCube addon
 ##################################################################
-RUN echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.4.so" >> ${PHP_DIR}/apache2/php.ini && \
-    php -m && \
-    php -v
+#RUN echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.4.so" >> ${PHP_DIR}/apache2/php.ini && \
+#    php -m && \
+#    php -v
 
 ##################################################################
 #                   Installing timezonedb addon
diff --git a/linux/ecosystem/teamcity/agent/latest/Dockerfile b/linux/ecosystem/teamcity/agent/latest/Dockerfile
index 91a721d13..2649f02f4 100644
--- a/linux/ecosystem/teamcity/agent/latest/Dockerfile
+++ b/linux/ecosystem/teamcity/agent/latest/Dockerfile
@@ -47,7 +47,8 @@ RUN useradd -m buildagent && \
 
 #Install packages
 RUN curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - && \
-    echo 'deb  https://download.docker.com/linux/debian buster test' > /etc/apt/sources.list.d/docker.list  && \
+    echo 'deb  https://download.docker.com/linux/debian bullseye test' > /etc/apt/sources.list.d/docker.list  && \
+    echo 'deb  https://download.docker.com/linux/debian bullseye nightly' >> /etc/apt/sources.list.d/docker.list  && \
     apt-cache policy docker-ce && \
     apt-get update && \
     apt-get install -y --no-install-recommends --allow-unauthenticated \
diff --git a/linux/ecosystem/teamcity/agent/php8.0/Dockerfile b/linux/ecosystem/teamcity/agent/php8.0/Dockerfile
new file mode 100644
index 000000000..6d4817dc5
--- /dev/null
+++ b/linux/ecosystem/teamcity/agent/php8.0/Dockerfile
@@ -0,0 +1,69 @@
+FROM epicmorg/php:php8.0
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java11
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \
+    echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated adoptopenjdk-11-hotspot && \
+    mkdir /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre && \
+    ln -s /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre/lib
+
+##################################################################
+#                   teamcity minimal agent
+##################################################################
+LABEL dockerImage.teamcity.version="latest" \
+      dockerImage.teamcity.buildNumber="latest"
+
+VOLUME /data/teamcity_agent/conf
+
+ENV CONFIG_FILE=/data/teamcity_agent/conf/buildAgent.properties
+ENV LANG=C.UTF-8
+ENV GIT_SSH_VARIANT=ssh
+
+COPY run-agent.sh /run-agent.sh
+RUN chmod +x /run-agent.sh && \
+    sync
+
+COPY run-services.sh /run-services.sh
+RUN chmod +x /run-services.sh && \
+    sync
+
+ADD https://teamcity.jetbrains.com/update/buildAgent.zip /buildAgent.zip
+RUN unzip -q /buildAgent.zip -d /opt/buildagent && \
+    mv /opt/buildagent/conf /opt/buildagent/conf_dist && \
+    rm -rfv /buildAgent.zip
+
+RUN useradd -m buildagent && \
+    chmod +x /opt/buildagent/bin/*.sh && \
+    chmod +x /run-agent.sh /run-services.sh && sync
+
+##################################################################
+#                   php
+##################################################################
+RUN php -m && \
+    php -v
+
+
+##################################################################
+#                   cleaninig up
+##################################################################
+RUN apt clean -y && \
+    apt-get clean all && \
+    apt autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /var/cache/apt/archives/*.deb && \
+    rm -rfv /tmp/deb/* && \
+    rm -rfv /tmp/composer-setup.php && \
+    rm -rfv /tmp/amxx_base_latest.tar.gz && \
+    rm -rfv /tmp/atlassian-plugin-sdk.deb && \
+    rm -rfv /tmp/addons
+
+CMD ["/run-services.sh"]
+
+EXPOSE 9090
diff --git a/linux/ecosystem/teamcity/agent/php8.0/Makefile b/linux/ecosystem/teamcity/agent/php8.0/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/ecosystem/teamcity/agent/php8.0/Makefile
@@ -0,0 +1,19 @@
+all: app
+
+app:
+	make build
+	make deploy
+	make clean
+
+build:
+	docker-compose build --compress --parallel
+
+deploy:
+	docker-compose push
+
+clean:
+	docker container prune -f
+	docker image prune -f
+	docker network prune -f
+	docker volume prune -f
+	docker system prune -af
diff --git a/linux/ecosystem/teamcity/agent/php8.0/README.md b/linux/ecosystem/teamcity/agent/php8.0/README.md
new file mode 100644
index 000000000..b53fe01e8
--- /dev/null
+++ b/linux/ecosystem/teamcity/agent/php8.0/README.md
@@ -0,0 +1,93 @@
+## TeamCity Minimal Build Agent
+
+[<img src="http://jb.gg/badges/official.svg" height="20"/>](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
+
+This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image.
+
+<img src="https://raw.githubusercontent.com/JetBrains/teamcity-docker-images/master/logo/GitHub.png" height="20" align="center"/> More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md).
+
+The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes.
+You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server.
+
+This minimal image adds just a  TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/teamcity-agent](https://hub.docker.com/r/jetbrains/teamcity-agent/).
+
+## How to Use This Image
+
+Pull the TeamCity minimal image from the Docker Hub Repository:
+
+```
+jetbrains/teamcity-minimal-agent
+``` 
+&nbsp;
+and use the following command to start a container with TeamCity agent running inside 
+a Linux container:
+
+```
+docker run -it -e SERVER_URL="<url to TeamCity server>"  \ 
+    -v <path to agent config folder>:/data/teamcity_agent/conf  \      
+    jetbrains/teamcity-minimal-agent
+```
+&nbsp;
+or a Windows container:
+```
+docker run -it -e SERVER_URL="<url to TeamCity server>" 
+    -v <path to agent config folder>:C:/BuildAgent/conf      
+    jetbrains/teamcity-minimal-agent
+```
+where `<url to TeamCity server>` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container.
+`<path to agent config folder>` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create.
+    
+Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases.
+
+When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html).
+
+All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved.
+
+TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server.
+
+### Agent Image Environment Variables
+
+- **SERVER_URL** - URL of the TeamCity server agent will connect to
+- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted
+- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI.
+- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected  
+- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default  
+
+### Windows Containers Limitations
+
+The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers).
+ 
+## Customization
+
+You can customize the image via the usual Docker procedure:
+
+1. Run the image
+```
+docker run -it -e SERVER_URL="<url to TeamCity server>"  \ 
+    -v <path to agent config folder>:/data/teamcity_agent/conf  \
+    --name="my-customized-agent"  \
+    jetbrains/teamcity-minimal-agent  \
+```
+2. Enter the container 
+```
+docker exec -it my-customized-agent bash
+```
+
+3. Change whatever you need
+4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container
+```
+docker commit my-customized-agent <the registry where you what to store the image>
+```
+
+## License
+
+The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html).
+TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html).
+
+## Feedback
+
+Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW).
+
+## Other TeamCity Images
+* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/)
+* [Build Agent](https://hub.docker.com/r/jetbrains/teamcity-agent/)
diff --git a/linux/ecosystem/teamcity/agent/php8.0/docker-compose.yml b/linux/ecosystem/teamcity/agent/php8.0/docker-compose.yml
new file mode 100644
index 000000000..c51ed1d0f
--- /dev/null
+++ b/linux/ecosystem/teamcity/agent/php8.0/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+  app:
+    image: "epicmorg/teamcity-agent:php8.0"
+    build:
+      context: .
diff --git a/linux/ecosystem/teamcity/agent/php8.0/run-agent.sh b/linux/ecosystem/teamcity/agent/php8.0/run-agent.sh
new file mode 100755
index 000000000..a9ded1d14
--- /dev/null
+++ b/linux/ecosystem/teamcity/agent/php8.0/run-agent.sh
@@ -0,0 +1,90 @@
+#!/bin/bash
+
+check() {
+   if [[ $? != 0 ]]; then
+      echo "Error! Stopping the script."
+      exit 1
+   fi
+}
+
+configure() {
+  if [[ $# -gt 0 ]]; then
+    echo "run agent.sh configure $@"
+    ${AGENT_DIST}/bin/agent.sh configure "$@"; check
+  fi
+}
+
+reconfigure() {
+    declare -a opts
+    [[ -n "${SERVER_URL}" ]]  && opts[${#opts[@]}]='--server-url' && opts[${#opts[@]}]="$SERVER_URL"
+    [[ -n "${AGENT_TOKEN}" ]] && opts[${#opts[@]}]='--auth-token' && opts[${#opts[@]}]="$AGENT_TOKEN"
+    [[ -n "${AGENT_NAME}" ]]  && opts[${#opts[@]}]='--name'       && opts[${#opts[@]}]="$AGENT_NAME"
+    [[ -n "${OWN_ADDRESS}" ]] && opts[${#opts[@]}]='--ownAddress' && opts[${#opts[@]}]="$OWN_ADDRESS"
+    [[ -n "${OWN_PORT}" ]]    && opts[${#opts[@]}]='--ownPort'    && opts[${#opts[@]}]="$OWN_PORT"
+    if [[ 0 -ne "${#opts[@]}" ]]; then
+      # Using sed to strip double quotes produced by docker-compose
+      for i in $(seq 0 $(expr ${#opts[@]} - 1)); do
+        opts[$i]="$(echo "${opts[$i]}" | sed -e 's/""/"/g')"
+      done
+      configure "${opts[@]}"
+      echo "File buildAgent.properties was updated"
+    fi
+    for AGENT_OPT in ${AGENT_OPTS}; do
+      echo ${AGENT_OPT} >>  ${CONFIG_DIR}/buildAgent.properties
+    done
+}
+
+prepare_conf() {
+    echo "Will prepare agent config" ;
+    cp -p ${AGENT_DIST}/conf_dist/*.* ${CONFIG_DIR}/; check
+    cp -p ${CONFIG_DIR}/buildAgent.dist.properties ${CONFIG_DIR}/buildAgent.properties; check
+    reconfigure
+    echo "File buildAgent.properties was created and updated" ;
+}
+
+AGENT_DIST=/opt/buildagent
+
+CONFIG_DIR=/data/teamcity_agent/conf
+
+LOG_DIR=/opt/buildagent/logs
+
+
+rm -f ${LOG_DIR}/*.pid
+
+if [ -f ${CONFIG_DIR}/buildAgent.properties ] ; then
+   echo "File buildAgent.properties was found in ${CONFIG_DIR}" ;
+   reconfigure
+else
+   echo "Will create new buildAgent.properties using distributive" ;
+   if [[ -n "${SERVER_URL}" ]]; then
+      echo "TeamCity URL is provided: ${SERVER_URL}"
+   else
+      echo "TeamCity URL is not provided, but is required."
+      exit 1
+   fi
+   prepare_conf
+fi
+
+if [ -z "$RUN_AS_BUILDAGENT" -o "$RUN_AS_BUILDAGENT" = "false" -o "$RUN_AS_BUILDAGENT" = "no" ]; then
+    ${AGENT_DIST}/bin/agent.sh start
+else
+    echo "Make sure build agent directory ${AGENT_DIST} is owned by buildagent user"
+    chown -R buildagent:buildagent ${AGENT_DIST}
+    check; sync
+    
+    echo "Start build agent under buildagent user"
+    sudo -E -u buildagent HOME=/home/buildagent ${AGENT_DIST}/bin/agent.sh start
+fi
+
+
+
+while [ ! -f ${LOG_DIR}/teamcity-agent.log ];
+do
+   echo -n "."
+   sleep 1
+done
+
+trap '${AGENT_DIST}/bin/agent.sh stop force; while ps -p $(cat $(ls -1 ${LOG_DIR}/*.pid)) &>/dev/null; do sleep 1; done; kill %%' SIGINT SIGTERM SIGHUP
+
+tail -qF ${LOG_DIR}/teamcity-agent.log &
+wait
diff --git a/linux/ecosystem/teamcity/agent/php8.0/run-services.sh b/linux/ecosystem/teamcity/agent/php8.0/run-services.sh
new file mode 100755
index 000000000..a574dd68a
--- /dev/null
+++ b/linux/ecosystem/teamcity/agent/php8.0/run-services.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+echo '/run-services.sh'
+
+for entry in /services/*.sh
+do
+  if [[ -f "$entry" ]]; then
+    echo "$entry"
+    [[ ! -x "$entry" ]] && (chmod +x "$entry"; sync)
+    "$entry"
+  fi
+done
+
+echo '/run-agent.sh'
+exec '/run-agent.sh'
diff --git a/linux/ecosystem/teamcity/agent/php8.0/sources.sid.list b/linux/ecosystem/teamcity/agent/php8.0/sources.sid.list
new file mode 100644
index 000000000..d3d573cdc
--- /dev/null
+++ b/linux/ecosystem/teamcity/agent/php8.0/sources.sid.list
@@ -0,0 +1,7 @@
+#main
+deb http://ftp.ru.debian.org/debian/ sid main contrib non-free
+deb-src http://ftp.ru.debian.org/debian/ sid main contrib non-free
+
+##multimedia
+#deb http://ftp.ru.debian.org/debian-multimedia/ sid main non-free
+#deb-src http://ftp.ru.debian.org/debian-multimedia/ sid main non-free
diff --git a/linux/ecosystem/teamcity/agent/php8.1-not-ready/Dockerfile b/linux/ecosystem/teamcity/agent/php8.1-not-ready/Dockerfile
new file mode 100644
index 000000000..2a544cc0a
--- /dev/null
+++ b/linux/ecosystem/teamcity/agent/php8.1-not-ready/Dockerfile
@@ -0,0 +1,69 @@
+FROM epicmorg/php:php8.1
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java11
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \
+    echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated adoptopenjdk-11-hotspot && \
+    mkdir /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre && \
+    ln -s /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre/lib
+
+##################################################################
+#                   teamcity minimal agent
+##################################################################
+LABEL dockerImage.teamcity.version="latest" \
+      dockerImage.teamcity.buildNumber="latest"
+
+VOLUME /data/teamcity_agent/conf
+
+ENV CONFIG_FILE=/data/teamcity_agent/conf/buildAgent.properties
+ENV LANG=C.UTF-8
+ENV GIT_SSH_VARIANT=ssh
+
+COPY run-agent.sh /run-agent.sh
+RUN chmod +x /run-agent.sh && \
+    sync
+
+COPY run-services.sh /run-services.sh
+RUN chmod +x /run-services.sh && \
+    sync
+
+ADD https://teamcity.jetbrains.com/update/buildAgent.zip /buildAgent.zip
+RUN unzip -q /buildAgent.zip -d /opt/buildagent && \
+    mv /opt/buildagent/conf /opt/buildagent/conf_dist && \
+    rm -rfv /buildAgent.zip
+
+RUN useradd -m buildagent && \
+    chmod +x /opt/buildagent/bin/*.sh && \
+    chmod +x /run-agent.sh /run-services.sh && sync
+
+##################################################################
+#                   php
+##################################################################
+RUN php -m && \
+    php -v
+
+
+##################################################################
+#                   cleaninig up
+##################################################################
+RUN apt clean -y && \
+    apt-get clean all && \
+    apt autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /var/cache/apt/archives/*.deb && \
+    rm -rfv /tmp/deb/* && \
+    rm -rfv /tmp/composer-setup.php && \
+    rm -rfv /tmp/amxx_base_latest.tar.gz && \
+    rm -rfv /tmp/atlassian-plugin-sdk.deb && \
+    rm -rfv /tmp/addons
+
+CMD ["/run-services.sh"]
+
+EXPOSE 9090
diff --git a/linux/ecosystem/teamcity/agent/php8.1-not-ready/Makefile b/linux/ecosystem/teamcity/agent/php8.1-not-ready/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/ecosystem/teamcity/agent/php8.1-not-ready/Makefile
@@ -0,0 +1,19 @@
+all: app
+
+app:
+	make build
+	make deploy
+	make clean
+
+build:
+	docker-compose build --compress --parallel
+
+deploy:
+	docker-compose push
+
+clean:
+	docker container prune -f
+	docker image prune -f
+	docker network prune -f
+	docker volume prune -f
+	docker system prune -af
diff --git a/linux/ecosystem/teamcity/agent/php8.1-not-ready/README.md b/linux/ecosystem/teamcity/agent/php8.1-not-ready/README.md
new file mode 100644
index 000000000..b53fe01e8
--- /dev/null
+++ b/linux/ecosystem/teamcity/agent/php8.1-not-ready/README.md
@@ -0,0 +1,93 @@
+## TeamCity Minimal Build Agent
+
+[<img src="http://jb.gg/badges/official.svg" height="20"/>](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
+
+This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image.
+
+<img src="https://raw.githubusercontent.com/JetBrains/teamcity-docker-images/master/logo/GitHub.png" height="20" align="center"/> More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md).
+
+The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes.
+You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server.
+
+This minimal image adds just a  TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/teamcity-agent](https://hub.docker.com/r/jetbrains/teamcity-agent/).
+
+## How to Use This Image
+
+Pull the TeamCity minimal image from the Docker Hub Repository:
+
+```
+jetbrains/teamcity-minimal-agent
+``` 
+&nbsp;
+and use the following command to start a container with TeamCity agent running inside 
+a Linux container:
+
+```
+docker run -it -e SERVER_URL="<url to TeamCity server>"  \ 
+    -v <path to agent config folder>:/data/teamcity_agent/conf  \      
+    jetbrains/teamcity-minimal-agent
+```
+&nbsp;
+or a Windows container:
+```
+docker run -it -e SERVER_URL="<url to TeamCity server>" 
+    -v <path to agent config folder>:C:/BuildAgent/conf      
+    jetbrains/teamcity-minimal-agent
+```
+where `<url to TeamCity server>` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container.
+`<path to agent config folder>` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create.
+    
+Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases.
+
+When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html).
+
+All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved.
+
+TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server.
+
+### Agent Image Environment Variables
+
+- **SERVER_URL** - URL of the TeamCity server agent will connect to
+- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted
+- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI.
+- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected  
+- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default  
+
+### Windows Containers Limitations
+
+The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers).
+ 
+## Customization
+
+You can customize the image via the usual Docker procedure:
+
+1. Run the image
+```
+docker run -it -e SERVER_URL="<url to TeamCity server>"  \ 
+    -v <path to agent config folder>:/data/teamcity_agent/conf  \
+    --name="my-customized-agent"  \
+    jetbrains/teamcity-minimal-agent  \
+```
+2. Enter the container 
+```
+docker exec -it my-customized-agent bash
+```
+
+3. Change whatever you need
+4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container
+```
+docker commit my-customized-agent <the registry where you what to store the image>
+```
+
+## License
+
+The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html).
+TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html).
+
+## Feedback
+
+Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW).
+
+## Other TeamCity Images
+* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/)
+* [Build Agent](https://hub.docker.com/r/jetbrains/teamcity-agent/)
diff --git a/linux/ecosystem/teamcity/agent/php8.1-not-ready/docker-compose.yml b/linux/ecosystem/teamcity/agent/php8.1-not-ready/docker-compose.yml
new file mode 100644
index 000000000..b0105d767
--- /dev/null
+++ b/linux/ecosystem/teamcity/agent/php8.1-not-ready/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+  app:
+    image: "epicmorg/teamcity-agent:php8.1"
+    build:
+      context: .
diff --git a/linux/ecosystem/teamcity/agent/php8.1-not-ready/run-agent.sh b/linux/ecosystem/teamcity/agent/php8.1-not-ready/run-agent.sh
new file mode 100755
index 000000000..a9ded1d14
--- /dev/null
+++ b/linux/ecosystem/teamcity/agent/php8.1-not-ready/run-agent.sh
@@ -0,0 +1,90 @@
+#!/bin/bash
+
+check() {
+   if [[ $? != 0 ]]; then
+      echo "Error! Stopping the script."
+      exit 1
+   fi
+}
+
+configure() {
+  if [[ $# -gt 0 ]]; then
+    echo "run agent.sh configure $@"
+    ${AGENT_DIST}/bin/agent.sh configure "$@"; check
+  fi
+}
+
+reconfigure() {
+    declare -a opts
+    [[ -n "${SERVER_URL}" ]]  && opts[${#opts[@]}]='--server-url' && opts[${#opts[@]}]="$SERVER_URL"
+    [[ -n "${AGENT_TOKEN}" ]] && opts[${#opts[@]}]='--auth-token' && opts[${#opts[@]}]="$AGENT_TOKEN"
+    [[ -n "${AGENT_NAME}" ]]  && opts[${#opts[@]}]='--name'       && opts[${#opts[@]}]="$AGENT_NAME"
+    [[ -n "${OWN_ADDRESS}" ]] && opts[${#opts[@]}]='--ownAddress' && opts[${#opts[@]}]="$OWN_ADDRESS"
+    [[ -n "${OWN_PORT}" ]]    && opts[${#opts[@]}]='--ownPort'    && opts[${#opts[@]}]="$OWN_PORT"
+    if [[ 0 -ne "${#opts[@]}" ]]; then
+      # Using sed to strip double quotes produced by docker-compose
+      for i in $(seq 0 $(expr ${#opts[@]} - 1)); do
+        opts[$i]="$(echo "${opts[$i]}" | sed -e 's/""/"/g')"
+      done
+      configure "${opts[@]}"
+      echo "File buildAgent.properties was updated"
+    fi
+    for AGENT_OPT in ${AGENT_OPTS}; do
+      echo ${AGENT_OPT} >>  ${CONFIG_DIR}/buildAgent.properties
+    done
+}
+
+prepare_conf() {
+    echo "Will prepare agent config" ;
+    cp -p ${AGENT_DIST}/conf_dist/*.* ${CONFIG_DIR}/; check
+    cp -p ${CONFIG_DIR}/buildAgent.dist.properties ${CONFIG_DIR}/buildAgent.properties; check
+    reconfigure
+    echo "File buildAgent.properties was created and updated" ;
+}
+
+AGENT_DIST=/opt/buildagent
+
+CONFIG_DIR=/data/teamcity_agent/conf
+
+LOG_DIR=/opt/buildagent/logs
+
+
+rm -f ${LOG_DIR}/*.pid
+
+if [ -f ${CONFIG_DIR}/buildAgent.properties ] ; then
+   echo "File buildAgent.properties was found in ${CONFIG_DIR}" ;
+   reconfigure
+else
+   echo "Will create new buildAgent.properties using distributive" ;
+   if [[ -n "${SERVER_URL}" ]]; then
+      echo "TeamCity URL is provided: ${SERVER_URL}"
+   else
+      echo "TeamCity URL is not provided, but is required."
+      exit 1
+   fi
+   prepare_conf
+fi
+
+if [ -z "$RUN_AS_BUILDAGENT" -o "$RUN_AS_BUILDAGENT" = "false" -o "$RUN_AS_BUILDAGENT" = "no" ]; then
+    ${AGENT_DIST}/bin/agent.sh start
+else
+    echo "Make sure build agent directory ${AGENT_DIST} is owned by buildagent user"
+    chown -R buildagent:buildagent ${AGENT_DIST}
+    check; sync
+    
+    echo "Start build agent under buildagent user"
+    sudo -E -u buildagent HOME=/home/buildagent ${AGENT_DIST}/bin/agent.sh start
+fi
+
+
+
+while [ ! -f ${LOG_DIR}/teamcity-agent.log ];
+do
+   echo -n "."
+   sleep 1
+done
+
+trap '${AGENT_DIST}/bin/agent.sh stop force; while ps -p $(cat $(ls -1 ${LOG_DIR}/*.pid)) &>/dev/null; do sleep 1; done; kill %%' SIGINT SIGTERM SIGHUP
+
+tail -qF ${LOG_DIR}/teamcity-agent.log &
+wait
diff --git a/linux/ecosystem/teamcity/agent/php8.1-not-ready/run-services.sh b/linux/ecosystem/teamcity/agent/php8.1-not-ready/run-services.sh
new file mode 100755
index 000000000..a574dd68a
--- /dev/null
+++ b/linux/ecosystem/teamcity/agent/php8.1-not-ready/run-services.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+echo '/run-services.sh'
+
+for entry in /services/*.sh
+do
+  if [[ -f "$entry" ]]; then
+    echo "$entry"
+    [[ ! -x "$entry" ]] && (chmod +x "$entry"; sync)
+    "$entry"
+  fi
+done
+
+echo '/run-agent.sh'
+exec '/run-agent.sh'
diff --git a/linux/ecosystem/teamcity/agent/php8.1-not-ready/sources.sid.list b/linux/ecosystem/teamcity/agent/php8.1-not-ready/sources.sid.list
new file mode 100644
index 000000000..d3d573cdc
--- /dev/null
+++ b/linux/ecosystem/teamcity/agent/php8.1-not-ready/sources.sid.list
@@ -0,0 +1,7 @@
+#main
+deb http://ftp.ru.debian.org/debian/ sid main contrib non-free
+deb-src http://ftp.ru.debian.org/debian/ sid main contrib non-free
+
+##multimedia
+#deb http://ftp.ru.debian.org/debian-multimedia/ sid main non-free
+#deb-src http://ftp.ru.debian.org/debian-multimedia/ sid main non-free