diff --git a/buildspecs/release-javadoc.yml b/buildspecs/release-javadoc.yml
index 7fec529f9ac4..f8c8c882c8bd 100644
--- a/buildspecs/release-javadoc.yml
+++ b/buildspecs/release-javadoc.yml
@@ -1,11 +1,13 @@
 version: 0.2
-
+env:
+  variables:
+    JAVA_HOME: "/usr/lib/jvm/java-17-amazon-corretto/"
 phases:
   install:
-    runtime-versions:
-      java: "$JAVA_RUNTIME"
-
     commands:
+    - apt-get update; apt-get install -y java-17-amazon-corretto-jdk
+    - update-alternatives --auto javac
+    - update-alternatives --auto java
     - pip install awscli==1.19.34 --upgrade --user
 
   pre_build:
@@ -16,7 +18,7 @@ phases:
     commands:
     - python ./scripts/doc_crosslinks/generate_cross_link_data.py --apiDefinitionsBasePath ./services/ --apiDefinitionsRelativeFilePath src/main/resources/codegen-resources/service-2.json  --templateFilePath ./scripts/doc_crosslinks/crosslink_redirect.html --outputFilePath ./scripts/crosslink_redirect.html
     - mvn install -P quick -T1C
-    - mvn clean install javadoc:aggregate -B -Ppublic-javadoc -Dcheckstyle.skip -Dspotbugs.skip -DskipTests -Ddoclint=none -pl '!:protocol-tests,!:protocol-tests-core,!:codegen-generated-classes-test,!:sdk-benchmarks,!:module-path-tests,!:test-utils,!:http-client-tests,!:tests-coverage-reporting'
+    - mvn clean install javadoc:aggregate -B -Ppublic-javadoc -Dcheckstyle.skip -Dspotbugs.skip -DskipTests -Ddoclint=none -pl '!:protocol-tests,!:protocol-tests-core,!:codegen-generated-classes-test,!:sdk-benchmarks,!:s3-benchmarks,!:module-path-tests,!:test-utils,!:http-client-tests,!:tests-coverage-reporting,!:sdk-native-image-test'
     - RELEASE_VERSION=`mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec`
     -
     - aws s3 sync target/site/apidocs/ $DOC_PATH/$RELEASE_VERSION/
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/MemberModel.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/MemberModel.java
index 41e7ef8422b7..7d8ba338126e 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/MemberModel.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/MemberModel.java
@@ -480,17 +480,18 @@ public String getDeprecatedSetterDocumentation() {
             + LF;
     }
 
-    public String getDefaultConsumerFluentSetterDocumentation() {
+    public String getDefaultConsumerFluentSetterDocumentation(String variableType) {
         return (StringUtils.isNotBlank(documentation) ? documentation : defaultSetter().replace("%s", name) + "\n")
                + LF
                + "This is a convenience method that creates an instance of the {@link "
-               + variable.getSimpleType()
+               + variableType
                + ".Builder} avoiding the need to create one manually via {@link "
-               + variable.getSimpleType()
+               + variableType
                + "#builder()}.\n"
                + LF
+               + "<p>"
                + "When the {@link Consumer} completes, {@link "
-               + variable.getSimpleType()
+               + variableType
                + ".Builder#build()} is called immediately and its result is passed to {@link #"
                + getFluentGetterMethodName()
                + "("
@@ -500,14 +501,14 @@ public String getDefaultConsumerFluentSetterDocumentation() {
                + "@param "
                + variable.getVariableName()
                + " a consumer that will call methods on {@link "
-               + variable.getSimpleType() + ".Builder}"
+               + variableType + ".Builder}"
                + LF
                + "@return " + stripHtmlTags(defaultFluentReturn())
                + LF
                + "@see #"
                + getFluentSetterMethodName()
                + "("
-               + variable.getSimpleType()
+               + variable.getVariableSetterType()
                + ")";
     }
 
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ListSetters.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ListSetters.java
index 84beecae8b2c..3a9395562925 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ListSetters.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ListSetters.java
@@ -63,13 +63,17 @@ public List<MethodSpec> fluentDeclarations(TypeName returnType) {
                 .varargs(true)
                 .build());
 
+        TypeName elementType = listElementType();
+
         if (elementModel().hasBuilder()) {
             fluentDeclarations.add(fluentAbstractSetterDeclaration(ParameterSpec.builder(asConsumerBuilderArray(),
                                                                                          fieldName())
                                                                                 .build(), returnType)
-                                           .varargs(true)
-                                           .addJavadoc("$L", memberModel().getDefaultConsumerFluentSetterDocumentation())
-                                           .build());
+                                       .varargs(true)
+                                       .addJavadoc("$L",
+                                                   memberModel().getDefaultConsumerFluentSetterDocumentation(
+                                                       elementType.toString()))
+                                       .build());
         }
 
         if (enumTypeInListMemberModel() != null) {
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/NonCollectionSetters.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/NonCollectionSetters.java
index 5c308ec34d5b..142191a1a0ac 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/NonCollectionSetters.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/NonCollectionSetters.java
@@ -150,15 +150,16 @@ private MethodSpec fluentEnumToStringSetter(TypeName returnType) {
     }
 
     private MethodSpec fluentConsumerFluentSetter(TypeName returnType) {
-        ClassName memberClass = poetExtensions.getModelClass(memberModel().getShape().getC2jName());
+        MemberModel memberModel = memberModel();
+        ClassName memberClass = poetExtensions.getModelClass(memberModel.getShape().getC2jName());
         ClassName builderClass = memberClass.nestedClass("Builder");
         return fluentDefaultSetterDeclaration(builderConsumerParam(builderClass), returnType)
             .addModifiers(Modifier.DEFAULT)
             .addStatement("return $N($T.builder().applyMutation($N).build())",
-                          memberModel().getFluentSetterMethodName(),
+                          memberModel.getFluentSetterMethodName(),
                           memberClass,
                           fieldName())
-            .addJavadoc("$L", memberModel().getDefaultConsumerFluentSetterDocumentation())
+            .addJavadoc("$L", memberModel.getDefaultConsumerFluentSetterDocumentation(memberModel.getVariable().getSimpleType()))
             .build();
     }
 
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/alltypesrequest.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/alltypesrequest.java
index 0a3bb74e63a9..d2ecca7be480 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/alltypesrequest.java
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/alltypesrequest.java
@@ -1748,16 +1748,21 @@ public interface Builder extends JsonProtocolTestsRequest.Builder, SdkPojo, Copy
         /**
          * Sets the value of the ListOfStructs property for this object.
          *
-         * This is a convenience method that creates an instance of the {@link List<SimpleStruct>.Builder} avoiding the
-         * need to create one manually via {@link List<SimpleStruct>#builder()}.
+         * This is a convenience method that creates an instance of the
+         * {@link software.amazon.awssdk.services.jsonprotocoltests.model.SimpleStruct.Builder} avoiding the need to
+         * create one manually via
+         * {@link software.amazon.awssdk.services.jsonprotocoltests.model.SimpleStruct#builder()}.
          *
-         * When the {@link Consumer} completes, {@link List<SimpleStruct>.Builder#build()} is called immediately and its
-         * result is passed to {@link #listOfStructs(List<SimpleStruct>)}.
+         * <p>
+         * When the {@link Consumer} completes,
+         * {@link software.amazon.awssdk.services.jsonprotocoltests.model.SimpleStruct.Builder#build()} is called
+         * immediately and its result is passed to {@link #listOfStructs(List<SimpleStruct>)}.
          *
          * @param listOfStructs
-         *        a consumer that will call methods on {@link List<SimpleStruct>.Builder}
+         *        a consumer that will call methods on
+         *        {@link software.amazon.awssdk.services.jsonprotocoltests.model.SimpleStruct.Builder}
          * @return Returns a reference to this object so that method calls can be chained together.
-         * @see #listOfStructs(List<SimpleStruct>)
+         * @see #listOfStructs(java.util.Collection<SimpleStruct>)
          */
         Builder listOfStructs(Consumer<SimpleStruct.Builder>... listOfStructs);
 
@@ -1956,6 +1961,7 @@ public interface Builder extends JsonProtocolTestsRequest.Builder, SdkPojo, Copy
          * This is a convenience method that creates an instance of the {@link StructWithTimestamp.Builder} avoiding the
          * need to create one manually via {@link StructWithTimestamp#builder()}.
          *
+         * <p>
          * When the {@link Consumer} completes, {@link StructWithTimestamp.Builder#build()} is called immediately and
          * its result is passed to {@link #structWithNestedTimestampMember(StructWithTimestamp)}.
          *
@@ -1993,6 +1999,7 @@ default Builder structWithNestedTimestampMember(Consumer<StructWithTimestamp.Bui
          * This is a convenience method that creates an instance of the {@link StructWithNestedBlobType.Builder}
          * avoiding the need to create one manually via {@link StructWithNestedBlobType#builder()}.
          *
+         * <p>
          * When the {@link Consumer} completes, {@link StructWithNestedBlobType.Builder#build()} is called immediately
          * and its result is passed to {@link #structWithNestedBlob(StructWithNestedBlobType)}.
          *
@@ -2047,6 +2054,7 @@ default Builder structWithNestedBlob(Consumer<StructWithNestedBlobType.Builder>
          * This is a convenience method that creates an instance of the {@link RecursiveStructType.Builder} avoiding the
          * need to create one manually via {@link RecursiveStructType#builder()}.
          *
+         * <p>
          * When the {@link Consumer} completes, {@link RecursiveStructType.Builder#build()} is called immediately and
          * its result is passed to {@link #recursiveStruct(RecursiveStructType)}.
          *
@@ -2074,6 +2082,7 @@ default Builder recursiveStruct(Consumer<RecursiveStructType.Builder> recursiveS
          * This is a convenience method that creates an instance of the {@link BaseType.Builder} avoiding the need to
          * create one manually via {@link BaseType#builder()}.
          *
+         * <p>
          * When the {@link Consumer} completes, {@link BaseType.Builder#build()} is called immediately and its result is
          * passed to {@link #polymorphicTypeWithSubTypes(BaseType)}.
          *
@@ -2101,6 +2110,7 @@ default Builder polymorphicTypeWithSubTypes(Consumer<BaseType.Builder> polymorph
          * This is a convenience method that creates an instance of the {@link SubTypeOne.Builder} avoiding the need to
          * create one manually via {@link SubTypeOne#builder()}.
          *
+         * <p>
          * When the {@link Consumer} completes, {@link SubTypeOne.Builder#build()} is called immediately and its result
          * is passed to {@link #polymorphicTypeWithoutSubTypes(SubTypeOne)}.
          *
@@ -2150,6 +2160,7 @@ default Builder polymorphicTypeWithoutSubTypes(Consumer<SubTypeOne.Builder> poly
          * This is a convenience method that creates an instance of the {@link Underscore_Name_Type.Builder} avoiding
          * the need to create one manually via {@link Underscore_Name_Type#builder()}.
          *
+         * <p>
          * When the {@link Consumer} completes, {@link Underscore_Name_Type.Builder#build()} is called immediately and
          * its result is passed to {@link #underscore_Name_Type(Underscore_Name_Type)}.
          *
@@ -2186,6 +2197,7 @@ default Builder underscore_Name_Type(Consumer<Underscore_Name_Type.Builder> unde
          * This is a convenience method that creates an instance of the {@link AllTypesUnionStructure.Builder} avoiding
          * the need to create one manually via {@link AllTypesUnionStructure#builder()}.
          *
+         * <p>
          * When the {@link Consumer} completes, {@link AllTypesUnionStructure.Builder#build()} is called immediately and
          * its result is passed to {@link #allTypesUnionStructure(AllTypesUnionStructure)}.
          *
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/alltypesresponse.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/alltypesresponse.java
index 2c04ee94e1f3..ea1c98f4518b 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/alltypesresponse.java
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/alltypesresponse.java
@@ -1747,16 +1747,21 @@ public interface Builder extends JsonProtocolTestsResponse.Builder, SdkPojo, Cop
         /**
          * Sets the value of the ListOfStructs property for this object.
          *
-         * This is a convenience method that creates an instance of the {@link List<SimpleStruct>.Builder} avoiding the
-         * need to create one manually via {@link List<SimpleStruct>#builder()}.
+         * This is a convenience method that creates an instance of the
+         * {@link software.amazon.awssdk.services.jsonprotocoltests.model.SimpleStruct.Builder} avoiding the need to
+         * create one manually via
+         * {@link software.amazon.awssdk.services.jsonprotocoltests.model.SimpleStruct#builder()}.
          *
-         * When the {@link Consumer} completes, {@link List<SimpleStruct>.Builder#build()} is called immediately and its
-         * result is passed to {@link #listOfStructs(List<SimpleStruct>)}.
+         * <p>
+         * When the {@link Consumer} completes,
+         * {@link software.amazon.awssdk.services.jsonprotocoltests.model.SimpleStruct.Builder#build()} is called
+         * immediately and its result is passed to {@link #listOfStructs(List<SimpleStruct>)}.
          *
          * @param listOfStructs
-         *        a consumer that will call methods on {@link List<SimpleStruct>.Builder}
+         *        a consumer that will call methods on
+         *        {@link software.amazon.awssdk.services.jsonprotocoltests.model.SimpleStruct.Builder}
          * @return Returns a reference to this object so that method calls can be chained together.
-         * @see #listOfStructs(List<SimpleStruct>)
+         * @see #listOfStructs(java.util.Collection<SimpleStruct>)
          */
         Builder listOfStructs(Consumer<SimpleStruct.Builder>... listOfStructs);
 
@@ -1955,6 +1960,7 @@ public interface Builder extends JsonProtocolTestsResponse.Builder, SdkPojo, Cop
          * This is a convenience method that creates an instance of the {@link StructWithTimestamp.Builder} avoiding the
          * need to create one manually via {@link StructWithTimestamp#builder()}.
          *
+         * <p>
          * When the {@link Consumer} completes, {@link StructWithTimestamp.Builder#build()} is called immediately and
          * its result is passed to {@link #structWithNestedTimestampMember(StructWithTimestamp)}.
          *
@@ -1992,6 +1998,7 @@ default Builder structWithNestedTimestampMember(Consumer<StructWithTimestamp.Bui
          * This is a convenience method that creates an instance of the {@link StructWithNestedBlobType.Builder}
          * avoiding the need to create one manually via {@link StructWithNestedBlobType#builder()}.
          *
+         * <p>
          * When the {@link Consumer} completes, {@link StructWithNestedBlobType.Builder#build()} is called immediately
          * and its result is passed to {@link #structWithNestedBlob(StructWithNestedBlobType)}.
          *
@@ -2046,6 +2053,7 @@ default Builder structWithNestedBlob(Consumer<StructWithNestedBlobType.Builder>
          * This is a convenience method that creates an instance of the {@link RecursiveStructType.Builder} avoiding the
          * need to create one manually via {@link RecursiveStructType#builder()}.
          *
+         * <p>
          * When the {@link Consumer} completes, {@link RecursiveStructType.Builder#build()} is called immediately and
          * its result is passed to {@link #recursiveStruct(RecursiveStructType)}.
          *
@@ -2073,6 +2081,7 @@ default Builder recursiveStruct(Consumer<RecursiveStructType.Builder> recursiveS
          * This is a convenience method that creates an instance of the {@link BaseType.Builder} avoiding the need to
          * create one manually via {@link BaseType#builder()}.
          *
+         * <p>
          * When the {@link Consumer} completes, {@link BaseType.Builder#build()} is called immediately and its result is
          * passed to {@link #polymorphicTypeWithSubTypes(BaseType)}.
          *
@@ -2100,6 +2109,7 @@ default Builder polymorphicTypeWithSubTypes(Consumer<BaseType.Builder> polymorph
          * This is a convenience method that creates an instance of the {@link SubTypeOne.Builder} avoiding the need to
          * create one manually via {@link SubTypeOne#builder()}.
          *
+         * <p>
          * When the {@link Consumer} completes, {@link SubTypeOne.Builder#build()} is called immediately and its result
          * is passed to {@link #polymorphicTypeWithoutSubTypes(SubTypeOne)}.
          *
@@ -2149,6 +2159,7 @@ default Builder polymorphicTypeWithoutSubTypes(Consumer<SubTypeOne.Builder> poly
          * This is a convenience method that creates an instance of the {@link Underscore_Name_Type.Builder} avoiding
          * the need to create one manually via {@link Underscore_Name_Type#builder()}.
          *
+         * <p>
          * When the {@link Consumer} completes, {@link Underscore_Name_Type.Builder#build()} is called immediately and
          * its result is passed to {@link #underscore_Name_Type(Underscore_Name_Type)}.
          *
@@ -2185,6 +2196,7 @@ default Builder underscore_Name_Type(Consumer<Underscore_Name_Type.Builder> unde
          * This is a convenience method that creates an instance of the {@link AllTypesUnionStructure.Builder} avoiding
          * the need to create one manually via {@link AllTypesUnionStructure#builder()}.
          *
+         * <p>
          * When the {@link Consumer} completes, {@link AllTypesUnionStructure.Builder#build()} is called immediately and
          * its result is passed to {@link #allTypesUnionStructure(AllTypesUnionStructure)}.
          *
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/alltypesunionstructure.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/alltypesunionstructure.java
index f5bfe8f0d458..c06e64940b14 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/alltypesunionstructure.java
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/alltypesunionstructure.java
@@ -2410,16 +2410,21 @@ public interface Builder extends SdkPojo, CopyableBuilder<Builder, AllTypesUnion
         /**
          * Sets the value of the ListOfStructs property for this object.
          *
-         * This is a convenience method that creates an instance of the {@link List<SimpleStruct>.Builder} avoiding the
-         * need to create one manually via {@link List<SimpleStruct>#builder()}.
+         * This is a convenience method that creates an instance of the
+         * {@link software.amazon.awssdk.services.jsonprotocoltests.model.SimpleStruct.Builder} avoiding the need to
+         * create one manually via
+         * {@link software.amazon.awssdk.services.jsonprotocoltests.model.SimpleStruct#builder()}.
          *
-         * When the {@link Consumer} completes, {@link List<SimpleStruct>.Builder#build()} is called immediately and its
-         * result is passed to {@link #listOfStructs(List<SimpleStruct>)}.
+         * <p>
+         * When the {@link Consumer} completes,
+         * {@link software.amazon.awssdk.services.jsonprotocoltests.model.SimpleStruct.Builder#build()} is called
+         * immediately and its result is passed to {@link #listOfStructs(List<SimpleStruct>)}.
          *
          * @param listOfStructs
-         *        a consumer that will call methods on {@link List<SimpleStruct>.Builder}
+         *        a consumer that will call methods on
+         *        {@link software.amazon.awssdk.services.jsonprotocoltests.model.SimpleStruct.Builder}
          * @return Returns a reference to this object so that method calls can be chained together.
-         * @see #listOfStructs(List<SimpleStruct>)
+         * @see #listOfStructs(java.util.Collection<SimpleStruct>)
          */
         Builder listOfStructs(Consumer<SimpleStruct.Builder>... listOfStructs);
 
@@ -2618,6 +2623,7 @@ public interface Builder extends SdkPojo, CopyableBuilder<Builder, AllTypesUnion
          * This is a convenience method that creates an instance of the {@link StructWithTimestamp.Builder} avoiding the
          * need to create one manually via {@link StructWithTimestamp#builder()}.
          *
+         * <p>
          * When the {@link Consumer} completes, {@link StructWithTimestamp.Builder#build()} is called immediately and
          * its result is passed to {@link #structWithNestedTimestampMember(StructWithTimestamp)}.
          *
@@ -2655,6 +2661,7 @@ default Builder structWithNestedTimestampMember(Consumer<StructWithTimestamp.Bui
          * This is a convenience method that creates an instance of the {@link StructWithNestedBlobType.Builder}
          * avoiding the need to create one manually via {@link StructWithNestedBlobType#builder()}.
          *
+         * <p>
          * When the {@link Consumer} completes, {@link StructWithNestedBlobType.Builder#build()} is called immediately
          * and its result is passed to {@link #structWithNestedBlob(StructWithNestedBlobType)}.
          *
@@ -2709,6 +2716,7 @@ default Builder structWithNestedBlob(Consumer<StructWithNestedBlobType.Builder>
          * This is a convenience method that creates an instance of the {@link RecursiveStructType.Builder} avoiding the
          * need to create one manually via {@link RecursiveStructType#builder()}.
          *
+         * <p>
          * When the {@link Consumer} completes, {@link RecursiveStructType.Builder#build()} is called immediately and
          * its result is passed to {@link #recursiveStruct(RecursiveStructType)}.
          *
@@ -2736,6 +2744,7 @@ default Builder recursiveStruct(Consumer<RecursiveStructType.Builder> recursiveS
          * This is a convenience method that creates an instance of the {@link BaseType.Builder} avoiding the need to
          * create one manually via {@link BaseType#builder()}.
          *
+         * <p>
          * When the {@link Consumer} completes, {@link BaseType.Builder#build()} is called immediately and its result is
          * passed to {@link #polymorphicTypeWithSubTypes(BaseType)}.
          *
@@ -2763,6 +2772,7 @@ default Builder polymorphicTypeWithSubTypes(Consumer<BaseType.Builder> polymorph
          * This is a convenience method that creates an instance of the {@link SubTypeOne.Builder} avoiding the need to
          * create one manually via {@link SubTypeOne#builder()}.
          *
+         * <p>
          * When the {@link Consumer} completes, {@link SubTypeOne.Builder#build()} is called immediately and its result
          * is passed to {@link #polymorphicTypeWithoutSubTypes(SubTypeOne)}.
          *
@@ -2812,6 +2822,7 @@ default Builder polymorphicTypeWithoutSubTypes(Consumer<SubTypeOne.Builder> poly
          * This is a convenience method that creates an instance of the {@link Underscore_Name_Type.Builder} avoiding
          * the need to create one manually via {@link Underscore_Name_Type#builder()}.
          *
+         * <p>
          * When the {@link Consumer} completes, {@link Underscore_Name_Type.Builder#build()} is called immediately and
          * its result is passed to {@link #underscore_Name_Type(Underscore_Name_Type)}.
          *
@@ -2848,6 +2859,7 @@ default Builder underscore_Name_Type(Consumer<Underscore_Name_Type.Builder> unde
          * This is a convenience method that creates an instance of the {@link AllTypesUnionStructure.Builder} avoiding
          * the need to create one manually via {@link AllTypesUnionStructure#builder()}.
          *
+         * <p>
          * When the {@link Consumer} completes, {@link AllTypesUnionStructure.Builder#build()} is called immediately and
          * its result is passed to {@link #allTypesUnionStructure(AllTypesUnionStructure)}.
          *
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/recursivestructtype.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/recursivestructtype.java
index 91f4850cb9e0..b952493bc537 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/recursivestructtype.java
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/recursivestructtype.java
@@ -277,6 +277,7 @@ public interface Builder extends SdkPojo, CopyableBuilder<Builder, RecursiveStru
          * This is a convenience method that creates an instance of the {@link RecursiveStructType.Builder} avoiding the
          * need to create one manually via {@link RecursiveStructType#builder()}.
          *
+         * <p>
          * When the {@link Consumer} completes, {@link RecursiveStructType.Builder#build()} is called immediately and
          * its result is passed to {@link #recursiveStruct(RecursiveStructType)}.
          *
@@ -310,16 +311,21 @@ default Builder recursiveStruct(Consumer<Builder> recursiveStruct) {
         /**
          * Sets the value of the RecursiveList property for this object.
          *
-         * This is a convenience method that creates an instance of the {@link List<RecursiveStructType>.Builder}
-         * avoiding the need to create one manually via {@link List<RecursiveStructType>#builder()}.
+         * This is a convenience method that creates an instance of the
+         * {@link software.amazon.awssdk.services.jsonprotocoltests.model.RecursiveStructType.Builder} avoiding the need
+         * to create one manually via
+         * {@link software.amazon.awssdk.services.jsonprotocoltests.model.RecursiveStructType#builder()}.
          *
-         * When the {@link Consumer} completes, {@link List<RecursiveStructType>.Builder#build()} is called immediately
-         * and its result is passed to {@link #recursiveList(List<RecursiveStructType>)}.
+         * <p>
+         * When the {@link Consumer} completes,
+         * {@link software.amazon.awssdk.services.jsonprotocoltests.model.RecursiveStructType.Builder#build()} is called
+         * immediately and its result is passed to {@link #recursiveList(List<RecursiveStructType>)}.
          *
          * @param recursiveList
-         *        a consumer that will call methods on {@link List<RecursiveStructType>.Builder}
+         *        a consumer that will call methods on
+         *        {@link software.amazon.awssdk.services.jsonprotocoltests.model.RecursiveStructType.Builder}
          * @return Returns a reference to this object so that method calls can be chained together.
-         * @see #recursiveList(List<RecursiveStructType>)
+         * @see #recursiveList(java.util.Collection<RecursiveStructType>)
          */
         Builder recursiveList(Consumer<Builder>... recursiveList);
 
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/xmlnamespace/testxmlnamespacerequest.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/xmlnamespace/testxmlnamespacerequest.java
index 9d5e60d21a0e..907a75855a50 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/xmlnamespace/testxmlnamespacerequest.java
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/xmlnamespace/testxmlnamespacerequest.java
@@ -215,6 +215,7 @@ public interface Builder extends ProtocolRestXmlRequest.Builder, SdkPojo, Copyab
          * This is a convenience method that creates an instance of the {@link XmlNamespaceMember.Builder} avoiding the
          * need to create one manually via {@link XmlNamespaceMember#builder()}.
          *
+         * <p>
          * When the {@link Consumer} completes, {@link XmlNamespaceMember.Builder#build()} is called immediately and its
          * result is passed to {@link #xmlNamespaceMember(XmlNamespaceMember)}.
          *
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/xmlnamespace/testxmlnamespaceresponse.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/xmlnamespace/testxmlnamespaceresponse.java
index 7f3471fb6435..5cc0fc34be26 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/xmlnamespace/testxmlnamespaceresponse.java
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/xmlnamespace/testxmlnamespaceresponse.java
@@ -214,6 +214,7 @@ public interface Builder extends ProtocolRestXmlResponse.Builder, SdkPojo, Copya
          * This is a convenience method that creates an instance of the {@link XmlNamespaceMember.Builder} avoiding the
          * need to create one manually via {@link XmlNamespaceMember#builder()}.
          *
+         * <p>
          * When the {@link Consumer} completes, {@link XmlNamespaceMember.Builder#build()} is called immediately and its
          * result is passed to {@link #xmlNamespaceMember(XmlNamespaceMember)}.
          *
diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/http/HttpMetric.java b/http-client-spi/src/main/java/software/amazon/awssdk/http/HttpMetric.java
index 7a58f5ff8c76..34f6ff9ec418 100644
--- a/http-client-spi/src/main/java/software/amazon/awssdk/http/HttpMetric.java
+++ b/http-client-spi/src/main/java/software/amazon/awssdk/http/HttpMetric.java
@@ -100,7 +100,8 @@ public final class HttpMetric {
     /**
      * The status code of the HTTP response.
      *
-     * @implSpec This is reported by the SDK core, and should not be reported by an individual HTTP client implementation.
+     * <p>
+     * This is reported by the SDK core, and should not be reported by an individual HTTP client implementation.
      */
     public static final SdkMetric<Integer> HTTP_STATUS_CODE =
         metric("HttpStatusCode", Integer.class, MetricLevel.TRACE);
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/NettyNioAsyncHttpClient.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/NettyNioAsyncHttpClient.java
index c88173223cbc..78a3fa80fa87 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/NettyNioAsyncHttpClient.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/NettyNioAsyncHttpClient.java
@@ -239,7 +239,6 @@ public interface Builder extends SdkAsyncHttpClient.Builder<NettyNioAsyncHttpCli
          * {@link #maxPendingConnectionAcquires(Integer)}</p>) and can cause increased latencies. If the client is overloaded
          * enough such that the pending connection queue fills up, subsequent requests may be rejected or time out
          * (see {@link #connectionAcquisitionTimeout(Duration)}).
-         * </p>
          *
          * @param maxConcurrency New value for max concurrency.
          * @return This builder for method chaining.
diff --git a/pom.xml b/pom.xml
index e08573c944f9..e832912eabdf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,7 +138,7 @@
         <maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
         <maven-failsafe-plugin.version>3.0.0-M5</maven-failsafe-plugin.version>
         <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
-        <maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version>
+        <maven-javadoc-plugin.version>3.4.1</maven-javadoc-plugin.version>
         <maven.build.timestamp.format>yyyy</maven.build.timestamp.format>
         <maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
         <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
@@ -218,6 +218,23 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
                     <version>${maven-javadoc-plugin.version}</version>
+                    <executions>
+                        <execution>
+                            <id>generate-javadocs</id>
+                            <goals>
+                                <goal>jar</goal>
+                            </goals>
+                            <configuration>
+                                <detectJavaApiLink>false</detectJavaApiLink>
+                                <source>8</source>
+                                <notree>true</notree>
+                                <includeDependencySources>false</includeDependencySources>
+                                <doclint>none</doclint>
+                                <!-- Exclude service packages to accelerate build -->
+                                <excludePackageNames>software.amazon.awssdk.services.*:*.codegen</excludePackageNames>
+                            </configuration>
+                        </execution>
+                    </executions>
                 </plugin>
 
                 <plugin>
@@ -636,6 +653,7 @@
                 <spotbugs.skip>true</spotbugs.skip>
                 <mdep.analyze.skip>true</mdep.analyze.skip>
                 <japicmp.skip>true</japicmp.skip>
+                <javadoc.skip>true</javadoc.skip>
             </properties>
         </profile>
 
@@ -700,6 +718,7 @@
                 <skip.unit.tests>true</skip.unit.tests>
                 <mdep.analyze.skip>true</mdep.analyze.skip>
                 <japicmp.skip>true</japicmp.skip>
+                <javadoc.skip>true</javadoc.skip>
             </properties>
         </profile>
 
@@ -716,6 +735,7 @@
                 <skip.unit.tests>true</skip.unit.tests>
                 <mdep.analyze.skip>true</mdep.analyze.skip>
                 <japicmp.skip>true</japicmp.skip>
+                <javadoc.skip>true</javadoc.skip>
             </properties>
             <build>
                 <plugins>
@@ -765,6 +785,7 @@
                 <skip.unit.tests>true</skip.unit.tests>
                 <mdep.analyze.skip>true</mdep.analyze.skip>
                 <japicmp.skip>true</japicmp.skip>
+                <javadoc.skip>true</javadoc.skip>
             </properties>
             <build>
                 <plugins>
@@ -803,6 +824,7 @@
                 <skip.unit.tests>true</skip.unit.tests>
                 <mdep.analyze.skip>true</mdep.analyze.skip>
                 <japicmp.skip>true</japicmp.skip>
+                <javadoc.skip>true</javadoc.skip>
             </properties>
             <build>
                 <plugins>
@@ -848,6 +870,7 @@
                 <skip.unit.tests>true</skip.unit.tests>
                 <mdep.analyze.skip>true</mdep.analyze.skip>
                 <japicmp.skip>true</japicmp.skip>
+                <javadoc.skip>true</javadoc.skip>
             </properties>
             <build>
                 <plugins>
@@ -892,6 +915,7 @@
                             <author>false</author>
                             <version>true</version>
                             <use>false</use>
+                            <source>8</source>
                             <notree>true</notree>
                             <nodeprecatedlist>true</nodeprecatedlist>
                             <additionalJOptions>
@@ -1280,12 +1304,12 @@
                                     <packages>software.amazon.awssdk*</packages>
                                 </group>
                             </groups>
-                            <header><![CDATA[<h2>AWS SDK for Java API Reference - ${project.version}</h2>]]></header>
-                            <footer><![CDATA[
-                            <div style="margin:1.2em;"><a id="fdbk" target="_blank">Provide feedback</a></div>
-                            ]]>
-                            </footer>
+                            <header><![CDATA[
+                                <h2>AWS SDK for Java API Reference - ${project.version}</h2>
+                                ]]>
+                            </header>
                             <bottom><![CDATA[
+                              <div style="margin:1.2em;"><h3><a id="fdbk" target="_blank">Provide feedback</a><h3></div>
                               <span id="awsdocs-legal-zone-copyright"></span>
                               <script type="text/javascript">document.addEventListener("DOMContentLoaded",()=>{
                                 var a=document.createElement("meta"),b=document.createElement("meta"),c=document.createElement("script"),
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/S3Presigner.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/S3Presigner.java
index 29113edff7fe..c2aa3e457403 100644
--- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/S3Presigner.java
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/S3Presigner.java
@@ -299,10 +299,8 @@ default PresignedGetObjectRequest presignGetObject(Consumer<GetObjectPresignRequ
     /**
      * Presign a {@link PutObjectRequest} so that it can be executed at a later time without requiring additional
      * signing or authentication.
-     * <p/>
-     *
+     * <p>
      * <b>Example Usage</b>
-     * <p/>
      *
      * <pre>
      * {@code
@@ -329,7 +327,7 @@ default PresignedGetObjectRequest presignGetObject(Consumer<GetObjectPresignRequ
     /**
      * Presign a {@link PutObjectRequest} so that it can be executed at a later time without requiring additional
      * signing or authentication.
-     * <p />
+     * <p>
      * This is a shorter method of invoking {@link #presignPutObject(PutObjectPresignRequest)} without needing
      * to call {@code PutObjectPresignRequest.builder()} or {@code .build()}.
      *
@@ -344,10 +342,8 @@ default PresignedPutObjectRequest presignPutObject(Consumer<PutObjectPresignRequ
     /**
      * Presign a {@link CreateMultipartUploadRequest} so that it can be executed at a later time without requiring additional
      * signing or authentication.
-     * <p/>
-     *
+     * <p>
      * <b>Example Usage</b>
-     * <p/>
      *
      * <pre>
      * {@code
@@ -374,7 +370,7 @@ default PresignedPutObjectRequest presignPutObject(Consumer<PutObjectPresignRequ
     /**
      * Presign a {@link CreateMultipartUploadRequest} so that it can be executed at a later time without requiring additional
      * signing or authentication.
-     * <p />
+     * <p>
      * This is a shorter method of invoking {@link #presignCreateMultipartUpload(CreateMultipartUploadPresignRequest)} without
      * needing to call {@code CreateMultipartUploadPresignRequest.builder()} or {@code .build()}.
      *
@@ -390,10 +386,9 @@ default PresignedCreateMultipartUploadRequest presignCreateMultipartUpload(
     /**
      * Presign a {@link UploadPartRequest} so that it can be executed at a later time without requiring additional
      * signing or authentication.
-     * <p/>
+     * <p>
      *
      * <b>Example Usage</b>
-     * <p/>
      *
      * <pre>
      * {@code
@@ -420,7 +415,7 @@ default PresignedCreateMultipartUploadRequest presignCreateMultipartUpload(
     /**
      * Presign a {@link UploadPartRequest} so that it can be executed at a later time without requiring additional
      * signing or authentication.
-     * <p />
+     * <p>
      * This is a shorter method of invoking {@link #presignUploadPart(UploadPartPresignRequest)} without needing
      * to call {@code UploadPartPresignRequest.builder()} or {@code .build()}.
      *
@@ -435,10 +430,9 @@ default PresignedUploadPartRequest presignUploadPart(Consumer<UploadPartPresignR
     /**
      * Presign a {@link CompleteMultipartUploadRequest} so that it can be executed at a later time without requiring additional
      * signing or authentication.
-     * <p/>
+     * <p>
      *
      * <b>Example Usage</b>
-     * <p/>
      *
      * <pre>
      * {@code
@@ -465,7 +459,7 @@ default PresignedUploadPartRequest presignUploadPart(Consumer<UploadPartPresignR
     /**
      * Presign a {@link CompleteMultipartUploadRequest} so that it can be executed at a later time without requiring additional
      * signing or authentication.
-     * <p />
+     * <p>
      * This is a shorter method of invoking {@link #presignCompleteMultipartUpload(CompleteMultipartUploadPresignRequest)} without
      * needing to call {@code CompleteMultipartUploadPresignRequest.builder()} or {@code .build()}.
      *
@@ -481,10 +475,9 @@ default PresignedCompleteMultipartUploadRequest presignCompleteMultipartUpload(
     /**
      * Presign a {@link AbortMultipartUploadRequest} so that it can be executed at a later time without requiring additional
      * signing or authentication.
-     * <p/>
+     * <p>
      *
      * <b>Example Usage</b>
-     * <p/>
      *
      * <pre>
      * {@code
@@ -511,7 +504,7 @@ default PresignedCompleteMultipartUploadRequest presignCompleteMultipartUpload(
     /**
      * Presign a {@link AbortMultipartUploadRequest} so that it can be executed at a later time without requiring additional
      * signing or authentication.
-     * <p />
+     * <p>
      * This is a shorter method of invoking {@link #presignAbortMultipartUpload(AbortMultipartUploadPresignRequest)} without
      * needing to call {@code AbortMultipartUploadPresignRequest.builder()} or {@code .build()}.
      *