diff --git a/.circleci/config.yml b/.circleci/config.yml
index 428d1fa5..4e89b296 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,6 +10,7 @@ version: 2
 defaults: &defaults
   machine:
     image: ubuntu-2004:202111-02
+  resource_class: large
   working_directory: ~/fun
 
 build_steps: &build_steps
@@ -46,6 +47,7 @@ build_steps: &build_steps
         command: |
           source $(bin/ci activate_path)
           make build
+        no_output_timeout: 30m
 
     # Development image build. It uses the "development" Dockerfile target
     # file
@@ -195,6 +197,7 @@ jobs:
           command: |
             source $(bin/ci activate_path)
             make build
+          no_output_timeout: 30m
 
       # Tag images with our DockerHub namespace (fundocker/), and list images to
       # check that they have been properly tagged.
diff --git a/.circleci/src/config.tpl b/.circleci/src/config.tpl
index 93088eb4..bfea31a2 100644
--- a/.circleci/src/config.tpl
+++ b/.circleci/src/config.tpl
@@ -6,6 +6,7 @@ version: 2
 defaults: &defaults
   machine:
     image: ubuntu-2004:202111-02
+  resource_class: large
   working_directory: ~/fun
 
 build_steps: &build_steps
@@ -42,6 +43,7 @@ build_steps: &build_steps
         command: |
           source $(bin/ci activate_path)
           make build
+        no_output_timeout: 30m
 
     # Development image build. It uses the "development" Dockerfile target
     # file
@@ -181,6 +183,7 @@ jobs:
           command: |
             source $(bin/ci activate_path)
             make build
+          no_output_timeout: 30m
 
       # Tag images with our DockerHub namespace (fundocker/), and list images to
       # check that they have been properly tagged.