diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6546d51a161de52d0670abdc8c77543b6757c849..81455d0b69579dbade1d2dd51db78c20a8f09627 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,18 +1,30 @@
-docker-build:
-  image: docker:stable
+# When using dind, it's wise to use the overlayfs driver for
+# improved performance.
+variables:
+  DOCKER_DRIVER: overlay2
 
-  # When using dind, it's wise to use the overlayfs driver for
-  # improved performance.
-  variables:
-    DOCKER_DRIVER: overlay2
+default:
+  image: docker:stable
 
   services:
     - docker:dind
   before_script:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
-  stage: build
   tags:
-    - generic_privileged 
+    - generic_privileged
+
+build-branch:
+  except:
+    - tags
+  stage: build
   script:
     - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
-    - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
\ No newline at end of file
+    - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
+
+build-tag:
+  only:
+    - tags
+  stage: build
+  script:
+    - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" .
+    - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
diff --git a/Dockerfile b/Dockerfile
index acbfb9666e54b9766c842c95d56e0f0b3eaf1793..bd4ed9ee1117456cadf82fb8c6b05c599b6f2237 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,7 @@
 FROM nextcloud:19.0.7-fpm
 RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images
 COPY patches/ /tmp/build_patches/
+RUN sed -i 's/19,0,7,1/19,0,7,3/g' /usr/src/nextcloud/version.php
 RUN patch -u /usr/src/nextcloud/core/Controller/LoginController.php -i /tmp/build_patches/002-login-without-domain.patch
+RUN patch -u /usr/src/nextcloud/core/templates/layout.user.php -i /tmp/build_patches/003-contact-search-removal.patch
+RUN patch -u /usr/src/nextcloud/core/Controller/ContactsMenuController.php -i /tmp/build_patches/004-contact-search-controller-removal.patch
\ No newline at end of file
diff --git a/patches/003-contact-search-removal.patch b/patches/003-contact-search-removal.patch
new file mode 100644
index 0000000000000000000000000000000000000000..a7b284006548737b3efa6a0617e0dd66b6781ac5
--- /dev/null
+++ b/patches/003-contact-search-removal.patch
@@ -0,0 +1,17 @@
+--- layout.user.php	2021-02-02 16:47:17.348572250 +0100
++++ layout.user.php-new	2021-02-02 16:47:33.128646878 +0100
+@@ -111,14 +111,6 @@
+ 						autocomplete="off">
+ 					<button class="icon-close-white" type="reset"><span class="hidden-visually"><?php p($l->t('Reset search'));?></span></button>
+ 				</form>
+-				<div id="contactsmenu">
+-					<div class="icon-contacts menutoggle" tabindex="0" role="button"
+-					aria-haspopup="true" aria-controls="contactsmenu-menu" aria-expanded="false">
+-						<span class="hidden-visually"><?php p($l->t('Contacts'));?></span>
+-					</div>
+-					<div id="contactsmenu-menu" class="menu"
+-						aria-label="<?php p($l->t('Contacts menu'));?>"></div>
+-				</div>
+ 				<div id="settings">
+ 					<div id="expand" tabindex="0" role="button" class="menutoggle"
+ 						aria-label="<?php p($l->t('Settings'));?>"
diff --git a/patches/004-contact-search-controller-removal.patch b/patches/004-contact-search-controller-removal.patch
new file mode 100644
index 0000000000000000000000000000000000000000..0ada43124a942cbe36f074d64d75e2d01cbb5879
--- /dev/null
+++ b/patches/004-contact-search-controller-removal.patch
@@ -0,0 +1,23 @@
+--- ContactsMenuController.php	2021-02-04 10:20:18.000000000 +0100
++++ ContactsMenuController-new.php	2021-02-04 10:30:13.000000000 +0100
+@@ -58,7 +58,7 @@
+ 	 * @return \JsonSerializable[]
+ 	 */
+ 	public function index($filter = null) {
+-		return $this->manager->getEntries($this->userSession->getUser(), $filter);
++		return [];
+ 	}
+ 
+ 	/**
+@@ -69,11 +69,6 @@
+ 	 * @return JSONResponse|\JsonSerializable
+ 	 */
+ 	public function findOne($shareType, $shareWith) {
+-		$contact = $this->manager->findOne($this->userSession->getUser(), $shareType, $shareWith);
+-
+-		if ($contact) {
+-			return $contact;
+-		}
+ 		return new JSONResponse([], Http::STATUS_NOT_FOUND);
+ 	}
+ }