diff --git a/CHANGELOG.md b/CHANGELOG.md
index 57d5153b..aa86fde0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## Unreleased
 
-
+- Fix Ruby installation with high amount of CPU cores ([#1084](https://github.com/opendevstack/ods-quickstarters/issues/1084))
 - Update OS packages by default and bump gitleaks version ([#1049](https://github.com/opendevstack/ods-quickstarters/issues/1049))
 - Install java 17 devel only in scala and jdk agents ([#1057](https://github.com/opendevstack/ods-quickstarters/pull/1057))
 - Update Angular, Ionic and Typescript Quickstarters ([#1033](https://github.com/opendevstack/ods-quickstarters/issues/1033))
diff --git a/common/jenkins-agents/terraform-2306/docker/Dockerfile.ubi8 b/common/jenkins-agents/terraform-2306/docker/Dockerfile.ubi8
index 60b7b4f4..daece93d 100644
--- a/common/jenkins-agents/terraform-2306/docker/Dockerfile.ubi8
+++ b/common/jenkins-agents/terraform-2306/docker/Dockerfile.ubi8
@@ -177,7 +177,7 @@ RUN cd /opt \
     && git clone https://github.com/rbenv/ruby-build.git /opt/rbenv/plugins/ruby-build \
     && echo 'export PATH="/opt/rbenv/plugins/ruby-build/bin:$PATH"' >> ~/.bash_profile \
     && source ~/.bash_profile \
-    && rbenv install $RUBY_VERSION \
+    && MAKE_OPTS='-j 4' rbenv install $RUBY_VERSION \
     && rbenv global $RUBY_VERSION \
     && gem install bundler -v $BUNDLER_VERSION \
     && RBENV_VERSION=$RUBY_VERSION gem install bundler -v $BUNDLER_VERSION \
diff --git a/common/jenkins-agents/terraform-2408/docker/Dockerfile.ubi8 b/common/jenkins-agents/terraform-2408/docker/Dockerfile.ubi8
index 7b3cd309..a665463d 100644
--- a/common/jenkins-agents/terraform-2408/docker/Dockerfile.ubi8
+++ b/common/jenkins-agents/terraform-2408/docker/Dockerfile.ubi8
@@ -193,7 +193,7 @@ RUN cd /opt \
     && git clone https://github.com/rbenv/ruby-build.git /opt/rbenv/plugins/ruby-build \
     && echo 'export PATH="/opt/rbenv/plugins/ruby-build/bin:$PATH"' >> ~/.bash_profile \
     && source ~/.bash_profile \
-    && rbenv install $RUBY_VERSION \
+    && MAKE_OPTS='-j 4' rbenv install $RUBY_VERSION \
     && rbenv global $RUBY_VERSION \
     && gem install bundler -v $BUNDLER_VERSION \
     && RBENV_VERSION=$RUBY_VERSION gem install bundler -v $BUNDLER_VERSION \