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/devops/Dockerfile b/linux/advanced/vscode-server/devops/Dockerfile
index f0e4b4fa9..758702f36 100644
--- a/linux/advanced/vscode-server/devops/Dockerfile
+++ b/linux/advanced/vscode-server/devops/Dockerfile
@@ -172,28 +172,34 @@ 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-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/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 \