diff --git a/lxc-shared/alpine3.12-ruby2.4/image b/lxc-shared/alpine3.12-ruby2.4/image
index bf768db..6f33b5c 100644
--- a/lxc-shared/alpine3.12-ruby2.4/image
+++ b/lxc-shared/alpine3.12-ruby2.4/image
@@ -15,6 +15,8 @@ RUN EOF
     # Compile and install Ruby
     cd /usr/src/ruby
     autoconf
+    # Hackfix isnan/isinf macros
+    export ac_cv_func_isnan=yes ac_cv_func_isinf=yes
     ./configure --build=x86_64-linux-musl --disable-install-doc --enable-shared
     make -j $(getconf _NPROCESSORS_ONLN)
     make install
diff --git a/lxc-shared/alpine3.12-ruby2.6/image b/lxc-shared/alpine3.12-ruby2.6/image
index 4a33bf6..92b98f0 100644
--- a/lxc-shared/alpine3.12-ruby2.6/image
+++ b/lxc-shared/alpine3.12-ruby2.6/image
@@ -14,7 +14,13 @@ RUN EOF
 
     # Compile and install Ruby
     cd /usr/src/ruby
+    # Hackfix thread stack size
+    # https://github.com/docker-library/ruby/issues/196, https://bugs.ruby-lang.org/issues/14387
+    wget 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch' -O thread-stack-fix.patch
+    patch -p1 -i thread-stack-fix.patch
     autoconf
+    # Hackfix isnan/isinf macros
+    export ac_cv_func_isnan=yes ac_cv_func_isinf=yes
     ./configure --build=x86_64-linux-musl --disable-install-doc --enable-shared
     make -j $(getconf _NPROCESSORS_ONLN)
     make install
diff --git a/lxc-shared/alpine3.8-ruby2.4/image b/lxc-shared/alpine3.8-ruby2.4/image
index 1241cd3..8b32af3 100644
--- a/lxc-shared/alpine3.8-ruby2.4/image
+++ b/lxc-shared/alpine3.8-ruby2.4/image
@@ -15,6 +15,8 @@ RUN EOF
     # Compile and install Ruby
     cd /usr/src/ruby
     autoconf
+    # Hackfix isnan/isinf macros
+    export ac_cv_func_isnan=yes ac_cv_func_isinf=yes
     ./configure --build=x86_64-linux-musl --disable-install-doc --enable-shared
     make -j $(getconf _NPROCESSORS_ONLN)
     make install