diff --git a/CHANGELOG.md b/CHANGELOG.md
index c6e8732823..749b4604df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 CHANGELOG
 =========
 
-3.1.0
+3.1.1
 ------
 
 **ENHANCEMENTS**
diff --git a/api/infrastructure/parallelcluster-api.yaml b/api/infrastructure/parallelcluster-api.yaml
index edf32c4b7e..9a90617e17 100644
--- a/api/infrastructure/parallelcluster-api.yaml
+++ b/api/infrastructure/parallelcluster-api.yaml
@@ -22,7 +22,7 @@ Parameters:
   ApiDefinitionS3Uri:
     Description: S3 URI of the ParallelCluster API spec
     Type: String
-    Default: s3://<REGION>-aws-parallelcluster/parallelcluster/3.1.0/api/ParallelCluster.openapi.yaml
+    Default: s3://<REGION>-aws-parallelcluster/parallelcluster/3.1.1/api/ParallelCluster.openapi.yaml
 
   CustomDomainName:
     Description: When specified, the custom domain name of the ParallelCluster API. Requires specifying a custom domain certificate
@@ -42,7 +42,7 @@ Parameters:
   PublicEcrImageUri:
     Description: When specified, the URI of the Docker image for the Lambda of the ParallelCluster API
     Type: String
-    Default: public.ecr.aws/parallelcluster/pcluster-api:3.1.0
+    Default: public.ecr.aws/parallelcluster/pcluster-api:3.1.1
 
   VpcEndpointId:
     Description: When specified, configure a private API with the specified endpoint
@@ -77,8 +77,8 @@ Parameters:
 Mappings:
   ParallelCluster:
     Constants:
-      Version: 3.1.0  # major.minor.patch+alpha/beta_identifier
-      ShortVersion: 3.1.0  # major.minor.patch
+      Version: 3.1.1  # major.minor.patch+alpha/beta_identifier
+      ShortVersion: 3.1.1  # major.minor.patch
       Stage: prod
 
 
diff --git a/cli/setup.py b/cli/setup.py
index e2f1f67066..5388d9d563 100644
--- a/cli/setup.py
+++ b/cli/setup.py
@@ -20,7 +20,7 @@ def readme():
         return f.read()
 
 
-VERSION = "3.1.0"
+VERSION = "3.1.1"
 CDK_VERSION = "1.137"
 REQUIRES = [
     "setuptools",
diff --git a/cli/src/pcluster/constants.py b/cli/src/pcluster/constants.py
index 05d5be998c..9e2314d069 100644
--- a/cli/src/pcluster/constants.py
+++ b/cli/src/pcluster/constants.py
@@ -65,8 +65,8 @@
 MAX_STORAGE_COUNT = {"ebs": 5, "efs": 1, "fsx": 1, "raid": 1}
 
 COOKBOOK_PACKAGES_VERSIONS = {
-    "parallelcluster": "3.1.0",
-    "cookbook": "aws-parallelcluster-cookbook-3.1.0",
+    "parallelcluster": "3.1.1",
+    "cookbook": "aws-parallelcluster-cookbook-3.1.1",
     "chef": "17.2.29",
     "berkshelf": "7.2.0",
     "ami": "dev",