diff --git a/CHANGELOG.md b/CHANGELOG.md
index 138f91756..f43865c59 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 	* updated `base` images
 	* added `node19`, `node4`, `node6`, `node8`
 	* added `amxX 1.10`
+	* added `dotnet7`
 * `oct`
 	* just fixes
 * `sep`
diff --git a/linux/advanced/vscode-server/amxx/1.10/Dockerfile b/linux/advanced/vscode-server/amxx/1.10/Dockerfile
index 8978f9853..14968e525 100644
--- a/linux/advanced/vscode-server/amxx/1.10/Dockerfile
+++ b/linux/advanced/vscode-server/amxx/1.10/Dockerfile
@@ -40,7 +40,6 @@ RUN export AMXX_BASE_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.
     mv -f /tmp/addons/amxmodx/* $AMXX_INSTALL_PATH && \
     chmod +x $AMXX_BIN_PATH/amxxpc && \
     tar -C $AMXX_INC_PATH -xvf /tmp/inc.tar && \
-    chown -R buildagent:buildagent $AMXX_INC_PATH && \
     chmod -R 700 $AMXX_INC_PATH && \
     chmod +x $AMXX_BIN_PATH/compile.sh
 
diff --git a/linux/advanced/vscode-server/amxx/1.9/Dockerfile b/linux/advanced/vscode-server/amxx/1.9/Dockerfile
index 991ccb5b5..634c50be4 100644
--- a/linux/advanced/vscode-server/amxx/1.9/Dockerfile
+++ b/linux/advanced/vscode-server/amxx/1.9/Dockerfile
@@ -24,7 +24,7 @@ ENV BuildDocker true
 #    export AMXX_TS_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.9/amxmodx-latest-base-linux` && \
 #
 # Install packages
-ENV AMXX_VERSION=1.10
+ENV AMXX_VERSION=1.9
 ENV AMXX_INSTALL_PATH=/opt/amxmodx/$AMXX_VERSION
 ENV AMXX_BIN_PATH=$AMXX_INSTALL_PATH/scripting
 ENV AMXX_INC_PATH=$AMXX_BIN_PATH/include
@@ -39,7 +39,6 @@ RUN export AMXX_BASE_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.
     cd /tmp && tar -zxf /tmp/amxx_base_latest.tar.gz && cd / && \
     mv -f /tmp/addons/amxmodx/* $AMXX_INSTALL_PATH && \
     tar -C $AMXX_INC_PATH -xvf /tmp/inc.tar && \
-    chown -R buildagent:buildagent $AMXX_INC_PATH && \
     chmod -R 700 $AMXX_INC_PATH && \
     chmod +x $AMXX_BIN_PATH/amxxpc && \
     chmod +x $AMXX_BIN_PATH/compile.sh
diff --git a/linux/advanced/vscode-server/devops/Dockerfile b/linux/advanced/vscode-server/devops/Dockerfile
index f0e4b4fa9..87e410871 100644
--- a/linux/advanced/vscode-server/devops/Dockerfile
+++ b/linux/advanced/vscode-server/devops/Dockerfile
@@ -172,45 +172,53 @@ RUN curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
     echo 'deb [arch=amd64,arm64,armhf] https://packages.microsoft.com/ubuntu/20.04/prod focal main' > /etc/apt/sources.list.d/microsoft.dotnet.list  && \
     apt-get update && \
     apt-get install -y --no-install-recommends --allow-unauthenticated \
-      dotnet-sdk-2.1 \
-      dotnet-runtime-deps-2.1 \
-      dotnet-runtime-2.1 \
-      dotnet-hostfxr-2.1 \
-      dotnet-sdk-3.1 \
-      dotnet-targeting-pack-3.1 \
-      dotnet-runtime-deps-3.1 \
-      dotnet-runtime-3.1 \
-      dotnet-hostfxr-3.1 \
-      dotnet-apphost-pack-3.1 \
-      dotnet-sdk-5.0 \
-      dotnet-targeting-pack-5.0 \
-      dotnet-runtime-deps-5.0 \
-      dotnet-runtime-5.0 \
-      dotnet-hostfxr-5.0 \
-      dotnet-apphost-pack-5.0 \
+#      dotnet-sdk-2.1 \
+#      dotnet-runtime-deps-2.1 \
+#      dotnet-runtime-2.1 \
+#      dotnet-hostfxr-2.1 \
+#      dotnet-sdk-3.1 \
+#      dotnet-targeting-pack-3.1 \
+#      dotnet-runtime-deps-3.1 \
+#      dotnet-runtime-3.1 \
+#      dotnet-hostfxr-3.1 \
+#      dotnet-apphost-pack-3.1 \
+#      dotnet-sdk-5.0 \
+#      dotnet-targeting-pack-5.0 \
+#      dotnet-runtime-deps-5.0 \
+#      dotnet-runtime-5.0 \
+#      dotnet-hostfxr-5.0 \
+#      dotnet-apphost-pack-5.0 \
       dotnet-sdk-6.0 \
       dotnet-targeting-pack-6.0 \
       dotnet-runtime-deps-6.0 \
       dotnet-runtime-6.0 \
       dotnet-hostfxr-6.0 \
       dotnet-apphost-pack-6.0 \
+      dotnet-sdk-7.0 \
+      dotnet-targeting-pack-7.0 \
+      dotnet-runtime-deps-7.0 \
+      dotnet-runtime-7.0 \
+      dotnet-hostfxr-7.0 \
+      dotnet-apphost-pack-7.0 \
       dotnet-host \
       procdump \
       procmon \
       powershell-preview \
       powershell
 
+RUN mkdir -p /usr/share/dotnet/host/fxr
+
 # Trigger .NET CLI first run experience by running arbitrary cmd to populate local package cache
 RUN dotnet help && \
     pwsh-preview -v && \
     pwsh -v
 
 # install dotnet tools
-RUN dotnet tool list -g && \
-    dotnet tool install -g dotnet-script && \
-    curl -s https://raw.githubusercontent.com/filipw/dotnet-script/master/install/install.sh | bash && \
-    dotnet tool list -g && \
-    dotnet-script --version
+#RUN dotnet tool list -g && \
+#    dotnet tool install -g dotnet-script && \
+#    curl -s https://raw.githubusercontent.com/filipw/dotnet-script/master/install/install.sh | bash && \
+#    dotnet tool list -g && \
+#    dotnet-script --version
 
 
 ##################################################################
@@ -230,32 +238,39 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E03280
     ca-certificates-mono \
     mono-xsp4
 
+
 ##################################################################
-#                    AMXXModX setup
+#                    teamcity AMXXModX setup
 ##################################################################
 #
 # Reserved for future
-#    export AMXX_CSTRIKE_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.9/amxmodx-latest-cstrike-linux` && \
-#    export AMXX_DOD_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.9/amxmodx-latest-dod-linux` && \
-#    export AMXX_ESF_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.9/amxmodx-latest-esf-linux` && \
-#    export AMXX_NS_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.9/amxmodx-latest-ns-linux` && \
-#    export AMXX_TFC_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.9/amxmodx-latest-tfc-linux` && \
-#    export AMXX_TS_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.9/amxmodx-latest-base-linux` && \
-#
+#    export AMXX_CSTRIKE_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.10/amxmodx-latest-cstrike-linux` && \
+#    export AMXX_DOD_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.10/amxmodx-latest-dod-linux` && \
+#    export AMXX_ESF_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.10/amxmodx-latest-esf-linux` && \
+#    export AMXX_NS_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.10/amxmodx-latest-ns-linux` && \
+#    export AMXX_TFC_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.10/amxmodx-latest-tfc-linux` && \
+#    export AMXX_TS_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.10/amxmodx-latest-base-linux` && \
+
 # Install packages
-ENV AMXX_VERSION=1.9
+ENV AMXX_VERSION=1.10
 ENV AMXX_INSTALL_PATH=/opt/amxmodx/$AMXX_VERSION
 ENV AMXX_BIN_PATH=$AMXX_INSTALL_PATH/scripting
+ENV AMXX_INC_PATH=$AMXX_BIN_PATH/include
 ENV PATH=$PATH:$AMXX_BIN_PATH
 ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$AMXX_BIN_PATH
 
-RUN export AMXX_BASE_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.9/amxmodx-latest-base-linux` && \
+COPY inc.tar /tmp
+
+RUN export AMXX_BASE_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.10/amxmodx-latest-base-linux` && \
     mkdir -p $AMXX_INSTALL_PATH && \
     curl -SL https://www.amxmodx.org/amxxdrop/{$AMXX_VERSION}/{$AMXX_BASE_LATEST_VERSION} -o /tmp/amxx_base_latest.tar.gz && \
     cd /tmp && tar -zxf /tmp/amxx_base_latest.tar.gz && cd / && \
     mv -f /tmp/addons/amxmodx/* $AMXX_INSTALL_PATH && \
     chmod +x $AMXX_BIN_PATH/amxxpc && \
-    chmod +x $AMXX_BIN_PATH/compile.sh
+    chmod +x $AMXX_BIN_PATH/compile.sh && \
+    tar -C $AMXX_INC_PATH -xvf /tmp/inc.tar && \
+    chmod -R 700 $AMXX_INC_PATH && \
+    amxxpc --help 2>&1 | head -n 1
 
 ##################################################################
 #                   Android SDK
diff --git a/linux/advanced/vscode-server/devops/inc.tar b/linux/advanced/vscode-server/devops/inc.tar
new file mode 100644
index 000000000..533c3a1b5
Binary files /dev/null and b/linux/advanced/vscode-server/devops/inc.tar differ
diff --git a/linux/advanced/vscode-server/dotnet-full/Dockerfile b/linux/advanced/vscode-server/dotnet-full/Dockerfile
index 66d5df641..ee601300c 100644
--- a/linux/advanced/vscode-server/dotnet-full/Dockerfile
+++ b/linux/advanced/vscode-server/dotnet-full/Dockerfile
@@ -52,12 +52,12 @@ RUN curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
 #      dotnet-runtime-5.0 \
 #      dotnet-hostfxr-5.0 \
 #      dotnet-apphost-pack-5.0 \
-#      dotnet-sdk-6.0 \
-#      dotnet-targeting-pack-6.0 \
-#      dotnet-runtime-deps-6.0 \
-#      dotnet-runtime-6.0 \
-#      dotnet-hostfxr-6.0 \
-#      dotnet-apphost-pack-6.0 \
+      dotnet-sdk-6.0 \
+      dotnet-targeting-pack-6.0 \
+      dotnet-runtime-deps-6.0 \
+      dotnet-runtime-6.0 \
+      dotnet-hostfxr-6.0 \
+      dotnet-apphost-pack-6.0 \
       dotnet-sdk-7.0 \
       dotnet-targeting-pack-7.0 \
       dotnet-runtime-deps-7.0 \
@@ -70,17 +70,19 @@ RUN curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
       powershell-preview \
       powershell
 
+RUN mkdir -p /usr/share/dotnet/host/fxr
+
 # Trigger .NET CLI first run experience by running arbitrary cmd to populate local package cache
 RUN dotnet help && \
     pwsh-preview -v && \
     pwsh -v
 
 # install dotnet tools
-RUN dotnet tool list -g && \
-    dotnet tool install -g dotnet-script && \
-    curl -s https://raw.githubusercontent.com/filipw/dotnet-script/master/install/install.sh | bash && \
-    dotnet tool list -g && \
-    dotnet-script --version
+#RUN dotnet tool list -g && \
+#    dotnet tool install -g dotnet-script && \
+#    curl -s https://raw.githubusercontent.com/filipw/dotnet-script/master/install/install.sh | bash && \
+#    dotnet tool list -g && \
+#    dotnet-script --version
 
 ##################################################################
 #                    Mono
diff --git a/linux/advanced/vscode-server/dotnet/Dockerfile b/linux/advanced/vscode-server/dotnet/Dockerfile
index 47933a5ce..95a6d767f 100644
--- a/linux/advanced/vscode-server/dotnet/Dockerfile
+++ b/linux/advanced/vscode-server/dotnet/Dockerfile
@@ -52,12 +52,12 @@ RUN curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
 #      dotnet-runtime-5.0 \
 #      dotnet-hostfxr-5.0 \
 #      dotnet-apphost-pack-5.0 \
-#      dotnet-sdk-6.0 \
-#      dotnet-targeting-pack-6.0 \
-#      dotnet-runtime-deps-6.0 \
-#      dotnet-runtime-6.0 \
-#      dotnet-hostfxr-6.0 \
-#      dotnet-apphost-pack-6.0 \
+      dotnet-sdk-6.0 \
+      dotnet-targeting-pack-6.0 \
+      dotnet-runtime-deps-6.0 \
+      dotnet-runtime-6.0 \
+      dotnet-hostfxr-6.0 \
+      dotnet-apphost-pack-6.0 \
       dotnet-sdk-7.0 \
       dotnet-targeting-pack-7.0 \
       dotnet-runtime-deps-7.0 \
@@ -70,17 +70,20 @@ RUN curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
       powershell-preview \
       powershell
 
+
+RUN mkdir -p /usr/share/dotnet/host/fxr
+
 # Trigger .NET CLI first run experience by running arbitrary cmd to populate local package cache
 RUN dotnet help && \
     pwsh-preview -v && \
     pwsh -v
 
 # install dotnet tools
-RUN dotnet tool list -g && \
-    dotnet tool install -g dotnet-script && \
-    curl -s https://raw.githubusercontent.com/filipw/dotnet-script/master/install/install.sh | bash && \
-    dotnet tool list -g && \
-    dotnet-script --version
+#RUN dotnet tool list -g && \
+#    dotnet tool install -g dotnet-script && \
+#    curl -s https://raw.githubusercontent.com/filipw/dotnet-script/master/install/install.sh | bash && \
+#    dotnet tool list -g && \
+#    dotnet-script --version
 
 ##################################################################
 #                   cleaninig up
diff --git a/linux/ecosystem/gitlab/runner/amxx-sdk/1.10/Dockerfile b/linux/ecosystem/gitlab/runner/amxx-sdk/1.10/Dockerfile
index 0ea462726..024cb78fe 100644
--- a/linux/ecosystem/gitlab/runner/amxx-sdk/1.10/Dockerfile
+++ b/linux/ecosystem/gitlab/runner/amxx-sdk/1.10/Dockerfile
@@ -32,7 +32,7 @@ RUN export AMXX_BASE_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.
     chmod +x $AMXX_BIN_PATH/amxxpc && \
     chmod +x $AMXX_BIN_PATH/compile.sh && \
     tar -C $AMXX_INC_PATH -xvf /tmp/inc.tar && \
-    chown -R buildagent:buildagent $AMXX_INC_PATH && \
+    chown -R gitlab-runner:gitlab-runner $AMXX_INC_PATH && \
     chmod -R 700 $AMXX_INC_PATH && \
     amxxpc --help 2>&1 | head -n 1
 
diff --git a/linux/ecosystem/gitlab/runner/amxx-sdk/1.9/Dockerfile b/linux/ecosystem/gitlab/runner/amxx-sdk/1.9/Dockerfile
index 455ade5c8..7bfeb45b2 100644
--- a/linux/ecosystem/gitlab/runner/amxx-sdk/1.9/Dockerfile
+++ b/linux/ecosystem/gitlab/runner/amxx-sdk/1.9/Dockerfile
@@ -18,9 +18,12 @@ ARG DEBIAN_FRONTEND=noninteractive
 ENV AMXX_VERSION=1.9
 ENV AMXX_INSTALL_PATH=/opt/amxmodx/$AMXX_VERSION
 ENV AMXX_BIN_PATH=$AMXX_INSTALL_PATH/scripting
+ENV AMXX_INC_PATH=$AMXX_BIN_PATH/include
 ENV PATH=$PATH:$AMXX_BIN_PATH
 ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$AMXX_BIN_PATH
 
+COPY inc.tar /tmp
+
 RUN export AMXX_BASE_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.9/amxmodx-latest-base-linux` && \
     mkdir -p $AMXX_INSTALL_PATH && \
     curl -SL https://www.amxmodx.org/amxxdrop/{$AMXX_VERSION}/{$AMXX_BASE_LATEST_VERSION} -o /tmp/amxx_base_latest.tar.gz && \
@@ -28,6 +31,9 @@ RUN export AMXX_BASE_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.
     mv -f /tmp/addons/amxmodx/* $AMXX_INSTALL_PATH && \
     chmod +x $AMXX_BIN_PATH/amxxpc && \
     chmod +x $AMXX_BIN_PATH/compile.sh && \
+    tar -C $AMXX_INC_PATH -xvf /tmp/inc.tar && \
+    chown -R gitlab-runner:gitlab-runner $AMXX_INC_PATH && \
+    chmod -R 700 $AMXX_INC_PATH && \
     amxxpc --help 2>&1 | head -n 1
 
 ##################################################################
diff --git a/linux/ecosystem/gitlab/runner/dotnet-sdk/Dockerfile b/linux/ecosystem/gitlab/runner/dotnet-sdk/Dockerfile
index c8a71be3a..f504b95cc 100644
--- a/linux/ecosystem/gitlab/runner/dotnet-sdk/Dockerfile
+++ b/linux/ecosystem/gitlab/runner/dotnet-sdk/Dockerfile
@@ -36,28 +36,34 @@ RUN curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
       libssl1.1 \
       libstdc++6 \
       zlib1g \
-      dotnet-sdk-2.1 \
-      dotnet-runtime-deps-2.1 \
-      dotnet-runtime-2.1 \
-      dotnet-hostfxr-2.1 \
-      dotnet-sdk-3.1 \
-      dotnet-targeting-pack-3.1 \
-      dotnet-runtime-deps-3.1 \
-      dotnet-runtime-3.1 \
-      dotnet-hostfxr-3.1 \
-      dotnet-apphost-pack-3.1 \
-      dotnet-sdk-5.0 \
-      dotnet-targeting-pack-5.0 \
-      dotnet-runtime-deps-5.0 \
-      dotnet-runtime-5.0 \
-      dotnet-hostfxr-5.0 \
-      dotnet-apphost-pack-5.0 \
-      dotnet-sdk-6.0 \
-      dotnet-targeting-pack-6.0 \
-      dotnet-runtime-deps-6.0 \
-      dotnet-runtime-6.0 \
-      dotnet-hostfxr-6.0 \
-      dotnet-apphost-pack-6.0 \
+#      dotnet-sdk-2.1 \
+#      dotnet-runtime-deps-2.1 \
+#      dotnet-runtime-2.1 \
+#      dotnet-hostfxr-2.1 \
+#      dotnet-sdk-3.1 \
+#      dotnet-targeting-pack-3.1 \
+#      dotnet-runtime-deps-3.1 \
+#      dotnet-runtime-3.1 \
+#      dotnet-hostfxr-3.1 \
+#      dotnet-apphost-pack-3.1 \
+#      dotnet-sdk-5.0 \
+#      dotnet-targeting-pack-5.0 \
+#      dotnet-runtime-deps-5.0 \
+#      dotnet-runtime-5.0 \
+#      dotnet-hostfxr-5.0 \
+#      dotnet-apphost-pack-5.0 \
+#      dotnet-sdk-6.0 \
+#      dotnet-targeting-pack-6.0 \
+#      dotnet-runtime-deps-6.0 \
+#      dotnet-runtime-6.0 \
+#      dotnet-hostfxr-6.0 \
+#      dotnet-apphost-pack-6.0 \
+      dotnet-sdk-7.0 \
+      dotnet-targeting-pack-7.0 \
+      dotnet-runtime-deps-7.0 \
+      dotnet-runtime-7.0 \
+      dotnet-hostfxr-7.0 \
+      dotnet-apphost-pack-7.0 \
       dotnet-host \
       procdump \
 #      procmon \
diff --git a/linux/ecosystem/gitlab/runner/php7.3/Dockerfile b/linux/ecosystem/gitlab/runner/php7.3/Dockerfile
index 8504eca93..092aabda7 100644
--- a/linux/ecosystem/gitlab/runner/php7.3/Dockerfile
+++ b/linux/ecosystem/gitlab/runner/php7.3/Dockerfile
@@ -14,38 +14,6 @@ ENV GIT_SSH_VARIANT=ssh
 RUN mkdir -p ${GITLAB_RUNNER_HOME} ${GITLAB_RUNNER_CONF} ${GITLAB_RUNNER_CONF}/certs && \
     chmod -R 700 /etc/gitlab-runner
 
-##################################################################
-#                    docker setup
-##################################################################
-
-#Install packages
-RUN curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - && \
-    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 \
-      docker-ce \
-      docker-ce-cli \
-      containerd.io systemd && \
-    systemctl disable docker && \
-    docker --version
-
-COPY run-docker.sh /services/run-docker.sh
-RUN chmod +x /services/run-docker.sh && \
-    sync
-
-##################################################################
-#                    docker compose setup
-##################################################################
-
-#Install packages
-RUN export  DOCKER_COMPOSE_VERSION=`curl --silent https://api.github.com/repos/docker/compose/releases/latest | jq .name -r` && \
-    echo "Latest compose is: ${DOCKER_COMPOSE_VERSION}" && \
-    curl -SL https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-Linux-x86_64 -o /usr/local/bin/docker-compose && \
-    chmod +x /usr/local/bin/docker-compose && \
-    docker-compose --version
-
 ##################################################################
 #                    gitlab runner setup
 ##################################################################
@@ -54,7 +22,6 @@ RUN cd /tmp && \
     chmod +x /tmp/install-gitlab-runner.sh && \
     bash /tmp/install-gitlab-runner.sh && \
 #    useradd --comment 'GitLab Runner' --create-home gitlab-runner --shell /bin/bash && \
-    usermod -aG docker gitlab-runner && \
     cat /etc/passwd && \
     gitlab-runner --version
 
diff --git a/linux/ecosystem/teamcity/agent/dotnet-sdk/Dockerfile b/linux/ecosystem/teamcity/agent/dotnet-sdk/Dockerfile
index d14b35235..306782237 100644
--- a/linux/ecosystem/teamcity/agent/dotnet-sdk/Dockerfile
+++ b/linux/ecosystem/teamcity/agent/dotnet-sdk/Dockerfile
@@ -36,28 +36,34 @@ RUN curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
       libssl1.1 \
       libstdc++6 \
       zlib1g \
-      dotnet-sdk-2.1 \
-      dotnet-runtime-deps-2.1 \
-      dotnet-runtime-2.1 \
-      dotnet-hostfxr-2.1 \
-      dotnet-sdk-3.1 \
-      dotnet-targeting-pack-3.1 \
-      dotnet-runtime-deps-3.1 \
-      dotnet-runtime-3.1 \
-      dotnet-hostfxr-3.1 \
-      dotnet-apphost-pack-3.1 \
-      dotnet-sdk-5.0 \
-      dotnet-targeting-pack-5.0 \
-      dotnet-runtime-deps-5.0 \
-      dotnet-runtime-5.0 \
-      dotnet-hostfxr-5.0 \
-      dotnet-apphost-pack-5.0 \
-      dotnet-sdk-6.0 \
-      dotnet-targeting-pack-6.0 \
-      dotnet-runtime-deps-6.0 \
-      dotnet-runtime-6.0 \
-      dotnet-hostfxr-6.0 \
-      dotnet-apphost-pack-6.0 \
+#      dotnet-sdk-2.1 \
+#      dotnet-runtime-deps-2.1 \
+#      dotnet-runtime-2.1 \
+#      dotnet-hostfxr-2.1 \
+#      dotnet-sdk-3.1 \
+#      dotnet-targeting-pack-3.1 \
+#      dotnet-runtime-deps-3.1 \
+#      dotnet-runtime-3.1 \
+#      dotnet-hostfxr-3.1 \
+#      dotnet-apphost-pack-3.1 \
+#      dotnet-sdk-5.0 \
+#      dotnet-targeting-pack-5.0 \
+#      dotnet-runtime-deps-5.0 \
+#      dotnet-runtime-5.0 \
+#      dotnet-hostfxr-5.0 \
+#      dotnet-apphost-pack-5.0 \
+#      dotnet-sdk-6.0 \
+#      dotnet-targeting-pack-6.0 \
+#      dotnet-runtime-deps-6.0 \
+#      dotnet-runtime-6.0 \
+#      dotnet-hostfxr-6.0 \
+#      dotnet-apphost-pack-6.0 \
+      dotnet-sdk-7.0 \
+      dotnet-targeting-pack-7.0 \
+      dotnet-runtime-deps-7.0 \
+      dotnet-runtime-7.0 \
+      dotnet-hostfxr-7.0 \
+      dotnet-apphost-pack-7.0 \
       dotnet-host \
       procdump \
 #      procmon \