diff --git a/.github/workflows/javadocs.yml b/.github/workflows/javadocs.yml
index 5c576a6a08a..c93bb4efbf1 100644
--- a/.github/workflows/javadocs.yml
+++ b/.github/workflows/javadocs.yml
@@ -16,6 +16,8 @@ jobs:
     - name: Gets the version
       id: get_version
       run: echo ::set-env name=TAG_VERSION::${GITHUB_REF/refs\/tags\//}
+    - name: Setup Graphviz environment
+      uses: kamiazya/setup-graphviz@v1
     - name: Grab the Master Branch
       uses: actions/checkout@v2
       with:
diff --git a/fhir-install/src/main/assembly/distribution.xml b/fhir-install/src/main/assembly/distribution.xml
index 7d3bcfe1861..02713280319 100644
--- a/fhir-install/src/main/assembly/distribution.xml
+++ b/fhir-install/src/main/assembly/distribution.xml
@@ -108,8 +108,8 @@
             <directoryMode>0755</directoryMode>
             <fileMode>0755</fileMode>
             <includes>
-                <include>com.ibm.fhir:fhir-persistence-schema:cli</include>
-                <include>com.ibm.fhir:fhir-swagger-generator:cli</include>
+                <include>com.ibm.fhir:fhir-persistence-schema</include>
+                <include>com.ibm.fhir:fhir-swagger-generator</include>
             </includes>
         </dependencySet>
     </dependencySets>