diff --git a/roles/phabricator/files/harbormaster.patch b/roles/phabricator/files/harbormaster.patch
new file mode 100644
index 0000000..3d3df7e
--- /dev/null
+++ b/roles/phabricator/files/harbormaster.patch
@@ -0,0 +1,30 @@
+diff --git a/src/applications/harbormaster/stepgroup/HarbormasterDrydockBuildStepGroup.php b/src/applications/harbormaster/stepgroup/HarbormasterDrydockBuildStepGroup.p
+index 606a47a..67cb9f0 100644
+--- a/src/applications/harbormaster/stepgroup/HarbormasterDrydockBuildStepGroup.php
++++ b/src/applications/harbormaster/stepgroup/HarbormasterDrydockBuildStepGroup.php
+@@ -14,8 +14,9 @@ final class HarbormasterDrydockBuildStepGroup
+   }
+ 
+   public function isEnabled() {
+-    $drydock_class = 'PhabricatorDrydockApplication';
+-    return PhabricatorApplication::isClassInstalled($drydock_class);
++    return false;
++    //$drydock_class = 'PhabricatorDrydockApplication';
++    //return PhabricatorApplication::isClassInstalled($drydock_class);
+   }
+ 
+   public function shouldShowIfEmpty() {
+diff --git a/src/applications/harbormaster/stepgroup/HarbormasterPrototypeBuildStepGroup.php b/src/applications/harbormaster/stepgroup/HarbormasterPrototypeBuildStepGro
+index fb15764..c67fe38 100644
+--- a/src/applications/harbormaster/stepgroup/HarbormasterPrototypeBuildStepGroup.php
++++ b/src/applications/harbormaster/stepgroup/HarbormasterPrototypeBuildStepGroup.php
+@@ -14,7 +14,8 @@ final class HarbormasterPrototypeBuildStepGroup
+   }
+ 
+   public function isEnabled() {
+-    return PhabricatorEnv::getEnvConfig('phabricator.show-prototypes');
++    return false;
++    //return PhabricatorEnv::getEnvConfig('phabricator.show-prototypes');
+   }
+ 
+   public function shouldShowIfEmpty() {
diff --git a/roles/phabricator/tasks/customize.yml b/roles/phabricator/tasks/customize.yml
index 2e8478c..258a8dc 100644
--- a/roles/phabricator/tasks/customize.yml
+++ b/roles/phabricator/tasks/customize.yml
@@ -1,53 +1,57 @@
 ---
 - name: Custom classes from Phutil
   copy:
     src: "{{ item }}"
     dest: "{{ phabricator_path }}libphutil/src/extensions/{{ item }}"
   notify: reload apache
   with_items:
     - PhutilAuthAdapterShibboleth.php
 
 - name: Custom classes for Phabricator
   copy:
     src: "{{ item }}"
     dest: "{{ phabricator_path }}phabricator/src/extensions/{{ item }}"
   notify: reload apache
   with_items:
     - PhabricatorC4scienceApplication.php
     - PhabricatorHomeMainController.php
     - PhabricatorCustomRobotsController.php
     - PhabricatorSitemapsController.php
     - PhabricatorProjectProfileController.php
     - PhabricatorProjectWikiCreate.php
     - PhabricatorProjectWikiView.php
     - PhabricatorAuthProviderShibboleth.php
     - PhabricatorProjectWikiProfilePanel.php
     - PhabricatorProjectProfilePanelEngineCustom.php
     - PhabricatorPeopleProfileViewController.php
     - PhabricatorRepositoryAuthor.php
     - PhabricatorPasswordAuthProvider.php
     - RepositoryAuthorPolicyRule.php
      #- RevisionAuthorPolicyRule.php
      #- RevisionReviewerPolicyRule.php
     - PhabricatorFeedSearchEngine.php
     - PhabricatorFeedQuery.php
 
 - name: Custom class for Phabricator using templates
   template:
     src: "{{ item }}"
     dest: "{{ phabricator_path }}phabricator/src/extensions/{{ item }}"
   notify: reload apache
   with_items:
       - HarbormasterJenkinsBuildStepImplementation.php
 
 - name: Patch PhabricatorUser
   patch:
-    src: PhabricatorUserOmnipotent.patch
-    dest: "{{ phabricator_path }}phabricator/src/applications/people/storage/PhabricatorUser.php"
+    src: "{{ item }}"
+    basedir: "{{ phabricator_path }}phabricator/"
+    strip: 1
   notify: reload apache
+  with_items:
+      - PhabricatorUserOmnipotent.patch
+      - harbormaster.patch
 
 - name: Update repo script
   template:
     src: phab_update_repo.sh
     dest: /root/scripts/phab_update_repo.sh
     mode: 0750