diff --git a/teamcity-agent/Dockerfile b/teamcity-agent/Dockerfile
index 23a856506..cc20494f6 100644
--- a/teamcity-agent/Dockerfile
+++ b/teamcity-agent/Dockerfile
@@ -94,13 +94,120 @@ RUN ln -s /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 /usr/lib/x86_64-linux-gnu/l
     dotnet help
 
 
+##################################################################
+#                   Installing PHP7
+##################################################################
+#installing php repo
+RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
+RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list'
+
+#Install base packages
+RUN apt-get update && \
+    apt-get install -y  --allow-unauthenticated \
+      php7.3-gmp \
+      php7.3-snmp \
+      php7.3-ldap \
+      php7.3-dev \
+      php7.3 \
+      php7.3-mail  \
+      php7.3-mailparse \
+      php7.3-soap \
+      php7.3-mysql \
+      php7.3-memcached \
+      php7.3-memcache \
+      php7.3-igbinary \
+      php7.3-curl \
+      php7.3-gd \
+      php7.3-intl \
+      php7.3-zip \
+      php7.3-bcmath \
+      php7.3-fpm \
+      php-pear \
+      php7.3-imap \
+      php7.3-pspell \
+      php7.3-recode \
+      php7.3-sqlite3 \
+      php7.3-tidy \
+      php7.3-xmlrpc \
+      php7.3-xml \
+      php7.3-mbstring \
+      php7.3-gettext \
+      php7.3-apcu \
+      php7.3-cli \
+      php7.3-common \
+      php7.3-cgi \
+      php7.3-json \
+      php7.3-readline \
+      php7.3-enchant \
+      php7.3-ssh2 \
+      php7.3-oauth \
+      php7.3-gmagick \
+      php7.3-gnupg \
+      php7.3-redis \
+      php7.3-smbclient \
+      php7.3-yaml \
+      php7.3-geoip \
+      sendmail && \
+    phpenmod \
+      snmp \
+      gmp \
+      calendar \
+      ldap \
+      curl \
+      exif \
+      ftp \
+      fileinfo \
+      gd \
+      geoip \
+      gettext \
+      gnupg \
+      iconv \
+      imap \
+      json \
+      mbstring \
+      memcached \
+      mysqli \
+      mysqlnd \
+      oauth \
+      pdo_mysql \
+      pdo_sqlite \
+      phar \
+      posix \
+      readline \
+      redis \
+      simplexml \
+      sockets \
+      sqlite3 \
+      ssh2 \
+      tokenizer \
+      xml \
+      xmlreader \
+      xmlrpc \
+      xmlwriter \
+      xsl \
+      yaml && \
+    openssl dhparam -out /etc/php/dhparam.pem 4096 && \
+    php -v
+
+##################################################################
+#                   Installing Composer addon
+##################################################################
+RUN cd /tmp && \
+     php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \
+     php composer-setup.php  --install-dir=/usr/local/bin --filename=composer && \
+     rm /tmp/composer-setup.php
+
+
+
 ##################################################################
 #                   cleaninig up
 ##################################################################
 RUN apt clean -y && \
     apt autoclean -y && \
     rm -rfv /var/lib/apt/lists/* && \
-    rm -rfv /var/cache/apt/archives/*.deb
+    rm -rfv /var/cache/apt/archives/*.deb && \
+    rm -rfv /tmp/deb/* && \
+    rm -rfv /tmp/composer-setup.php
 
 CMD ["/run-services.sh"]
 
diff --git a/teamcity-agent/Makefile b/teamcity-agent/Makefile
index e1422112b..589ca6d1c 100644
--- a/teamcity-agent/Makefile
+++ b/teamcity-agent/Makefile
@@ -1,4 +1,4 @@
 all: tca
 tca:
-	docker build --compress -t epicmorg/teamcity-agent .
+	docker build --compress -t epicmorg/teamcity-agent:latest .