diff --git a/ubuntu-jammy/Dockerfile b/ubuntu-22.04/Dockerfile
similarity index 78%
rename from ubuntu-jammy/Dockerfile
rename to ubuntu-22.04/Dockerfile
index 444b363..37ea139 100644
--- a/ubuntu-jammy/Dockerfile
+++ b/ubuntu-22.04/Dockerfile
@@ -66,8 +66,7 @@ RUN apt-get update -y \
       make \
       openssl \
       sudo \
-      tklib \
-      vim
+      tklib
 
 RUN groupadd --gid 1000 runner \
     && adduser --home /workspace --shell /bin/sh --uid 1000 --gid 1000 --disabled-password runner \
@@ -85,7 +84,7 @@ RUN mkdir -p /usr/share/keyrings \
     && echo "deb [signed-by=/usr/share/keyrings/git-core_ppa.gpg] https://ppa.launchpadcontent.net/git-core/ppa/ubuntu ${DISTRIB_CODENAME} main" | tee /etc/apt/sources.list.d/git-core_ppa.list > /dev/null \
     && echo "deb [signed-by=/usr/share/keyrings/github_git-lfs.gpg] https://packagecloud.io/github/git-lfs/ubuntu ${DISTRIB_CODENAME} main" | tee /etc/apt/sources.list.d/github_git-lfs.list > /dev/null \
     && apt-get update -y \
-    && apt-get install --no-install-recommends --no-install-suggests -y \
+    && apt-get install --no-install-recommends --no-install-suggests \
       git \
       git-lfs
 
@@ -95,8 +94,8 @@ RUN set -x \
     && chmod 0644 /usr/share/keyrings/nodesource.gpg \
     && arch=$(dpkg --print-architecture) \
     && echo "deb [arch=$arch signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_${NODEJS_VERSION} nodistro main" | tee /etc/apt/sources.list.d/nodesource.list > /dev/null \
-    && apt-get update -y \
-    && apt-get install --no-install-recommends --no-install-suggests -y nodejs \
+    && apt-get update \
+    && apt-get install --no-install-recommends --no-install-suggests nodejs \
     && npm update --global npm \
     && npm install --global yarn \
     && curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v${NVM_VERSION}/install.sh | bash
@@ -116,15 +115,29 @@ RUN set -x \
       ansible \
       virtualenv
 
-RUN curl -sSL -O https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb \
-    && dpkg -i packages-microsoft-prod.deb \
-    && rm packages-microsoft-prod.deb \
-    && apt-get update -y \
-    && apt-get install --no-install-recommends --no-install-suggests -y azcopy
+RUN cd /tmp/build \
+    && curl -OL https://aka.ms/downloadazcopy-v10-linux \
+    && tar -xvzf downloadazcopy-v10-linux \
+    && rm downloadazcopy-v10-linux \
+    && cp -r azcopy_linux_amd64_*/azcopy /usr/local/bin/ \
+    && rm -r azcopy_linux_amd64_* \
+    && chmod 0755 /usr/local/bin/azcopy \
+    && ln -s /usr/local/bin/azcopy /usr/local/bin/azcopy10
 
-RUN mkdir -p /opt/hostedtoolcache \
-    && chown runner:runner /opt/hostedtoolcache \
-    && chmod 0755 /opt/hostedtoolcache
+RUN if [[ -f "/etc/fwupd/daemon.conf" ]]; then \
+        sed -i 's/UpdateMotd=true/UpdateMotd=false/g' /etc/fwupd/daemon.conf; \
+    fi
+
+RUN echo 'session required pam_limits.so' >> /etc/pam.d/common-session \
+    && echo 'session required pam_limits.so' >> /etc/pam.d/common-session-noninteractive \
+    && echo 'DefaultLimitNOFILE=65536' >> /etc/systemd/system.conf \
+    && echo 'DefaultLimitSTACK=16M:infinity' >> /etc/systemd/system.conf \
+    \
+    && echo '* soft nofile 65536' >> /etc/security/limits.conf \
+    && echo '* hard nofile 65536' >> /etc/security/limits.conf \
+    \
+    && echo '* soft stack 16384' >> /etc/security/limits.conf \
+    && echo '* hard stack 16384' >> /etc/security/limits.conf
 
 USER runner
 WORKDIR /workspace