diff --git a/linux/ubuntu/Dockerfile b/linux/ubuntu/Dockerfile
index 43b545b..0a5d493 100644
--- a/linux/ubuntu/Dockerfile
+++ b/linux/ubuntu/Dockerfile
@@ -67,17 +67,11 @@ RUN bash -c "$(curl -fsSL https://raw.githubusercontent.com/ilikenwf/apt-fast/ma
     && rm -rf /etc/apt/sources.list.d/* \
     && rm -rf /var/lib/apt/lists/*
 
-# Install current version of git
+# Install current version of git and git-lfs
 RUN add-apt-repository -y ppa:git-core/ppa \
     && apt-get -y update \
-    && apt-get -y install --no-install-recommends git \
-    && apt-get clean \
-    && rm -rf /etc/apt/sources.list.d/* \
-    && rm -rf /var/lib/apt/lists/*
-
-# Install Git-LFS
-RUN curl -Ls https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash \
-    && apt-get -y install --no-install-recommends --no-install-suggests \
+    && apt-get -y install --no-install-recommends \
+        git \
         git-lfs \
     && apt-get clean \
     && rm -rf /etc/apt/sources.list.d/* \
@@ -100,8 +94,7 @@ RUN echo "deb https://packages.microsoft.com/ubuntu/$(lsb_release -rs)/prod $(ls
     && rm -rf /var/lib/apt/lists/*
 
 # Set .NET related environment variables
-ENV \
-    DOTNET_ROOT=${AGENT_TOOLSDIRECTORY}/dotnet \
+ENV DOTNET_ROOT=${AGENT_TOOLSDIRECTORY}/dotnet \
     PATH=${AGENT_TOOLSDIRECTORY}/dotnet:${PATH} \
     DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
     DOTNET_NOLOGO=true \
@@ -217,15 +210,6 @@ RUN pwsh -NonInteractive -Command "Set-PSRepository -Name PSGallery -Installatio
     && while IFS='' read -r pwshModule; do echo "installing ${pwshModule}" && pwsh -NonInteractive -Command "Install-Module -Name ${pwshModule} -Scope AllUsers -Repository PSGallery"; done < <(jq -r '.powershellModules[].name' ${TOOLSET}) \
     && while IFS='' read -r azVersion; do echo "installing Az ${azVersion}" && pwsh -NonInteractive -Command "Install-Module -Name Az -RequiredVersion ${azVersion} -Scope AllUsers -Repository PSGallery"; done < <(jq -r '.azureModules[].versions[]' ${TOOLSET})
 
-# cleanup step
-RUN apt-get -y clean \
-    && rm -rf \
-        /var/cache/* \
-        /var/log/* \
-        /var/lib/apt/lists/* \
-        /tmp/* \
-    || echo 'Failed to delete directories'
-
 ARG RUNNER
 USER ${RUNNER}