diff --git a/images/ubuntu/base/Dockerfile b/images/ubuntu/base/Dockerfile
index c8648172..0f88bc80 100644
--- a/images/ubuntu/base/Dockerfile
+++ b/images/ubuntu/base/Dockerfile
@@ -43,6 +43,15 @@ RUN apt-get -q update \
  && git lfs install --system --skip-repo \
  && apt-get clean
 
+# libstdc++6 upgrade
+RUN apt-get -q update \
+ && apt-get -q install -y --no-install-recommends software-properties-common \
+ && add-apt-repository -y ppa:ubuntu-toolchain-r/test \
+ && apt-get -q install -y --only-upgrade libstdc++6 \
+ && add-apt-repository -y --remove ppa:ubuntu-toolchain-r/test \ 
+ && apt-get -q remove -y --auto-remove software-properties-common \
+ && apt-get clean
+
 # Disable default sound card, which removes ALSA warnings
 RUN /bin/echo -e 'pcm.!default {\n\
     type plug\n\
diff --git a/images/ubuntu/editor/Dockerfile b/images/ubuntu/editor/Dockerfile
index 57d67f01..267fd0ec 100644
--- a/images/ubuntu/editor/Dockerfile
+++ b/images/ubuntu/editor/Dockerfile
@@ -266,16 +266,3 @@ RUN echo "$version-$module" | grep -q -v '^2021.*linux-il2cpp' \
     lld \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
-
-#=======================================================================================
-# [2021.x] libstdc++ 6 upgrade
-#=======================================================================================
-RUN echo "$version" | grep -q -v '^2021.' \
-  && exit 0 \
-  || : \
-  && apt-get -q update \
-  && apt-get -q install -y software-properties-common \
-  && add-apt-repository -y ppa:ubuntu-toolchain-r/test \
-  && apt-get -y install --only-upgrade libstdc++6 \
-  && apt-get clean \
-  && rm -rf /var/lib/apt/lists/*