diff --git a/minifi/minifi-assembly/src/main/resources/build.properties.template b/minifi/minifi-assembly/src/main/resources/build.properties.template
index 6197a6ebe905b..a54326a29ec4a 100644
--- a/minifi/minifi-assembly/src/main/resources/build.properties.template
+++ b/minifi/minifi-assembly/src/main/resources/build.properties.template
@@ -17,15 +17,11 @@
Build-Branch:${buildBranch}
Build-Timestamp:${timestamp}
-Built-By:${user.name}
MiNiFi-Version:${project.version}
Build-Revision:${buildRevision}
-Maven-Home:${maven.home}
Maven-Version:${maven.version}
Created-By:${maven.build.version}
-Build-Java-Home:${java.home}
Build-Jdk:${java.version}
Build-Jdk-Vendor:${java.vendor}
Build-Arch:${os.arch}
Build-Os:${os.name}
-Build-Os-Version:${os.version}
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
index b26cda3749e1c..c11af26fc7ac9 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
@@ -112,6 +112,7 @@
${restApiDirectory}
swagger
JSONANDYAML
+ true
true
200
${project.build.outputDirectory}/openapi.yaml
diff --git a/nifi-manifest/nifi-runtime-manifest/src/main/resources/build.properties b/nifi-manifest/nifi-runtime-manifest/src/main/resources/build.properties
index 988b8877636ce..1edc6b1d698fb 100644
--- a/nifi-manifest/nifi-runtime-manifest/src/main/resources/build.properties
+++ b/nifi-manifest/nifi-runtime-manifest/src/main/resources/build.properties
@@ -17,13 +17,9 @@ Project-Version:${project.version}
Build-Branch:${buildBranch}
Build-Revision:${buildRevision}
Build-Timestamp:${maven.build.timestamp}
-Built-By:${user.name}
-Maven-Home:${maven.home}
Maven-Version:${maven.version}
Created-By:${maven.build.version}
-Build-Java-Home:${java.home}
Build-Jdk:${java.version}
Build-Jdk-Vendor:${java.vendor}
Build-Arch:${os.arch}
Build-Os:${os.name}
-Build-Os-Version:${os.version}
\ No newline at end of file
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-web-api/pom.xml b/nifi-registry/nifi-registry-core/nifi-registry-web-api/pom.xml
index e3b639b8f5afd..28283dfdcb2a3 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-web-api/pom.xml
+++ b/nifi-registry/nifi-registry-core/nifi-registry-web-api/pom.xml
@@ -96,6 +96,7 @@
${api.docs.dir}
swagger
JSONANDYAML
+ true
true
200
${project.build.outputDirectory}/openapi.yaml
diff --git a/pom.xml b/pom.xml
index 41cb0b2a2c670..b11f799be4f56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -815,6 +815,8 @@
hisrc-higherjaxb40-maven-plugin
true
+
+ false
@@ -1009,6 +1011,21 @@
+
+
+ apache-release
+
+ false
+
+
+ true
+ rel/nifi-${project.version}
+ rel/nifi-${project.version}
+ main
+ ${project.build.outputTimestamp}
+
+
+