diff --git a/tools/build-containers/Dockerfile.android b/tools/build-containers/Dockerfile.android
index 2c3a2678..8d458637 100644
--- a/tools/build-containers/Dockerfile.android
+++ b/tools/build-containers/Dockerfile.android
@@ -1,5 +1,5 @@
 ARG img_version
-FROM godot-mono:${img_version}
+FROM godot-fedora:${img_version}
 
 RUN dnf -y install --setopt=install_weak_deps=False \
       gcc gcc-c++ java-1.8.0-openjdk-devel ncurses-compat-libs && \
diff --git a/tools/build-containers/Dockerfile.javascript b/tools/build-containers/Dockerfile.javascript
index 5a932e11..18ae0297 100644
--- a/tools/build-containers/Dockerfile.javascript
+++ b/tools/build-containers/Dockerfile.javascript
@@ -1,10 +1,8 @@
 ARG img_version
-FROM godot-mono:${img_version}
-
-ARG mono_version
+FROM godot-fedora:${img_version}
 
 RUN dnf -y install --setopt=install_weak_deps=False \
-      java-openjdk yasm && \
+      gcc gcc-c++ java-openjdk yasm && \
     git clone --progress https://github.com/emscripten-core/emsdk && \
     cd emsdk && \
     git checkout a5082b232617c762cb65832429f896c838df2483 && \
diff --git a/tools/build-containers/Dockerfile.osx b/tools/build-containers/Dockerfile.osx
index cdcc0284..041ae826 100644
--- a/tools/build-containers/Dockerfile.osx
+++ b/tools/build-containers/Dockerfile.osx
@@ -1,7 +1,5 @@
 ARG img_version
-FROM godot-mono:${img_version}
-
-ARG mono_version
+FROM godot-fedora:${img_version}
 
 RUN dnf -y install --setopt=install_weak_deps=False \
       automake autoconf bzip2-devel clang libicu-devel libtool libxml2-devel llvm-devel openssl-devel yasm && \
diff --git a/tools/build-containers/Dockerfile.windows b/tools/build-containers/Dockerfile.windows
index e4fbc3a4..6012ad2c 100644
--- a/tools/build-containers/Dockerfile.windows
+++ b/tools/build-containers/Dockerfile.windows
@@ -1,5 +1,5 @@
 ARG img_version
-FROM godot-mono:${img_version}
+FROM godot-fedora:${img_version}
 
 RUN dnf -y install --setopt=install_weak_deps=False \
       mingw32-gcc mingw32-gcc-c++ mingw32-winpthreads-static mingw64-gcc mingw64-gcc-c++ mingw64-winpthreads-static