diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index afd7c36..0aad983 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -65,7 +65,7 @@ jobs:
           php -S localhost:8080 &
       - name: PHPUnit
         working-directory: apps/${{ env.APP_NAME }}
-        run: make test
+        run: make php-test
 
   mysql:
     runs-on: ubuntu-20.04
@@ -130,7 +130,7 @@ jobs:
           php -S localhost:8080 &
       - name: PHPUnit
         working-directory: apps/${{ env.APP_NAME }}
-        run: make test
+        run: make php-test
 
   pgsql:
     runs-on: ubuntu-20.04
@@ -197,4 +197,4 @@ jobs:
           php -S localhost:8080 &
       - name: PHPUnit
         working-directory: apps/${{ env.APP_NAME }}
-        run: make test
+        run: make php-test
diff --git a/.vscode/launch.json b/.vscode/launch.json
index d082e93..ed736e6 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -4,7 +4,6 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
-
         {
             "name": "Listen for XDebug",
             "type": "php",
@@ -53,6 +52,16 @@
               "${file}"
             ],
             "port": 9229
-        }
+        },
+		{
+			"type": "chrome",
+			"request": "launch",
+			"name": "vuejs: chrome",
+			"url": "http://localhost/nextcloud/index.php/settings/admin/workflow",
+			"webRoot": "${workspaceFolder}/src",
+			"sourceMapPathOverrides": {
+			  "webpack:///workflow_ocr/src/*": "${webRoot}/*"
+			}
+		},
     ]
-}
\ No newline at end of file
+}
diff --git a/Makefile b/Makefile
index c55c336..5885a82 100644
--- a/Makefile
+++ b/Makefile
@@ -183,16 +183,16 @@ appstore:
 	../$(app_name) \
 
 .PHONY: test
-test: composer
+php-test: composer
 	$(CURDIR)/vendor/phpunit/phpunit/phpunit -c phpunit.xml
 	$(CURDIR)/vendor/phpunit/phpunit/phpunit -c phpunit.integration.xml
 
-.PHONY: unittest
-unittest: composer
+.PHONY: php-unittest
+php-unittest: composer
 	$(CURDIR)/vendor/phpunit/phpunit/phpunit -c phpunit.xml
 
-.PHONY: integrationtest
-integrationtest: composer
+.PHONY: php-integrationtest
+php-integrationtest: composer
 	$(CURDIR)/vendor/phpunit/phpunit/phpunit -c phpunit.integration.xml
 
 .PHONY: coverage-php
@@ -223,3 +223,6 @@ lint-fix: composer npm-install
 .PHONY: js-test
 js-test:
 	npm run test:unit
+
+.PHONY: test
+test: php-test js-test
\ No newline at end of file
diff --git a/jest.config.js b/jest.config.js
index 7ffb7a5..f311bdc 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -17,6 +17,7 @@ module.exports = {
     transformIgnorePatterns: [
       "node_modules\/(?!(vue-material-design-icons)\/)",
       //"node_modules/(?!@babel)"
-    ]
+    ],
+    setupFilesAfterEnv: ['<rootDir>/src/test/setup-jest.js']
   }
   
\ No newline at end of file
diff --git a/lib/Model/WorkflowSettings.php b/lib/Model/WorkflowSettings.php
index eb31917..1f2c8bd 100644
--- a/lib/Model/WorkflowSettings.php
+++ b/lib/Model/WorkflowSettings.php
@@ -36,6 +36,12 @@ class WorkflowSettings {
 	/** @var bool */
 	private $removeBackground = false;
 
+	/** @var array string */
+	private $tagsToRemoveAfterOcr = [];
+
+	/** @var array string */
+	private $tagsToAddAfterOcr = [];
+
 	/**
 	 * @param string $json The serialized JSON string used in frontend as input for the Vue component
 	 */
@@ -57,6 +63,20 @@ public function getRemoveBackground(): bool {
 		return $this->removeBackground;
 	}
 
+	/**
+	 * @return array
+	 */
+	public function getTagsToRemoveAfterOcr(): array {
+		return $this->tagsToRemoveAfterOcr;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getTagsToAddAfterOcr(): array {
+		return $this->tagsToAddAfterOcr;
+	}
+
 	/**
 	 * Checks if a new WorkflowSettings object can be constructed from the given JSON string
 	 * @param string $json The serialized JSON string used in frontend as input for the Vue component
@@ -89,5 +109,11 @@ private function setJson(string $json = null) {
 		if (array_key_exists('removeBackground', $data) && is_bool($data['removeBackground'])) {
 			$this->removeBackground = $data['removeBackground'];
 		}
+		if (array_key_exists('tagsToRemoveAfterOcr', $data) && is_array($data['tagsToRemoveAfterOcr'])) {
+			$this->tagsToRemoveAfterOcr = $data['tagsToRemoveAfterOcr'];
+		}
+		if (array_key_exists('tagsToAddAfterOcr', $data) && is_array($data['tagsToAddAfterOcr'])) {
+			$this->tagsToAddAfterOcr = $data['tagsToAddAfterOcr'];
+		}
 	}
 }
diff --git a/lib/Service/OcrService.php b/lib/Service/OcrService.php
index 7807901..64790ff 100644
--- a/lib/Service/OcrService.php
+++ b/lib/Service/OcrService.php
@@ -30,6 +30,9 @@
 use OCA\WorkflowOcr\OcrProcessors\IOcrProcessorFactory;
 use OCA\WorkflowOcr\OcrProcessors\OcrProcessorResult;
 use OCP\Files\File;
+use OCP\SystemTag\ISystemTagObjectMapper;
+use OCP\SystemTag\TagNotFoundException;
+use Psr\Log\LoggerInterface;
 
 class OcrService implements IOcrService {
 	/** @var IOcrProcessorFactory */
@@ -38,14 +41,47 @@ class OcrService implements IOcrService {
 	/** @var IGlobalSettingsService */
 	private $globalSettingsService;
 
-	public function __construct(IOcrProcessorFactory $ocrProcessorFactory, IGlobalSettingsService $globalSettingsService) {
+	/** @var ISystemTagObjectMapper */
+	private $systemTagObjectMapper;
+
+	/** @var LoggerInterface */
+	private $logger;
+
+	public function __construct(IOcrProcessorFactory $ocrProcessorFactory, IGlobalSettingsService $globalSettingsService, ISystemTagObjectMapper $systemTagObjectMapper, LoggerInterface $logger) {
 		$this->ocrProcessorFactory = $ocrProcessorFactory;
 		$this->globalSettingsService = $globalSettingsService;
+		$this->systemTagObjectMapper = $systemTagObjectMapper;
+		$this->logger = $logger;
 	}
 
 	/** @inheritdoc */
 	public function ocrFile(File $file, WorkflowSettings $settings) : OcrProcessorResult {
 		$ocrProcessor = $this->ocrProcessorFactory->create($file->getMimeType());
-		return $ocrProcessor->ocrFile($file, $settings, $this->globalSettingsService->getGlobalSettings());
+		$result = $ocrProcessor->ocrFile($file, $settings, $this->globalSettingsService->getGlobalSettings());
+		$this->processTagsAfterSuccessfulOcr($file, $settings);
+		return  $result;
+	}
+
+	private function processTagsAfterSuccessfulOcr(File $file, WorkflowSettings $settings) : void {
+		$objectType = 'files';
+		$fileId = strval($file->getId());
+		$tagsToRemove = $settings->getTagsToRemoveAfterOcr();
+		$tagsToAdd = $settings->getTagsToAddAfterOcr();
+
+		foreach ($tagsToRemove as $tagToRemove) {
+			try {
+				$this->systemTagObjectMapper->unassignTags($fileId, $objectType, $tagToRemove);
+			} catch (TagNotFoundException $ex) {
+				$this->logger->warning("Cannot remove tag with id '$tagToRemove' because it was not found. Skipping.");
+			}
+		}
+
+		foreach ($tagsToAdd as $tagToAdd) {
+			try {
+				$this->systemTagObjectMapper->assignTags($fileId, $objectType, $tagToAdd);
+			} catch (TagNotFoundException $ex) {
+				$this->logger->warning("Cannot add tag with id '$tagToAdd' because it was not found. Skipping.");
+			}
+		}
 	}
 }
diff --git a/package-lock.json b/package-lock.json
index 909c87a..d1184e4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,7 +23,8 @@
 				"@nextcloud/webpack-vue-config": "^4.1.4",
 				"@vue/cli": "^4.5.15",
 				"@vue/cli-plugin-unit-jest": "^4.5.15",
-				"@vue/test-utils": "^1.3.0"
+				"@vue/test-utils": "^1.3.0",
+				"regenerator-runtime": "^0.13.9"
 			},
 			"engines": {
 				"node": "^14.0.0",
@@ -8547,6 +8548,11 @@
 			"deprecated": "core-js@<3.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Please, upgrade your dependencies to the actual version of core-js.",
 			"hasInstallScript": true
 		},
+		"node_modules/babel-runtime/node_modules/regenerator-runtime": {
+			"version": "0.11.1",
+			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+			"integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
+		},
 		"node_modules/babel-template": {
 			"version": "6.26.0",
 			"resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
@@ -25139,9 +25145,9 @@
 			}
 		},
 		"node_modules/regenerator-runtime": {
-			"version": "0.11.1",
-			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-			"integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
+			"version": "0.13.9",
+			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
+			"integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
 		},
 		"node_modules/regenerator-transform": {
 			"version": "0.14.5",
@@ -25162,11 +25168,6 @@
 				"node": ">=6.9.0"
 			}
 		},
-		"node_modules/regenerator-transform/node_modules/regenerator-runtime": {
-			"version": "0.13.9",
-			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-			"integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
-		},
 		"node_modules/regex-not": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
@@ -29752,11 +29753,6 @@
 				"node": ">=6.9.0"
 			}
 		},
-		"node_modules/v-tooltip/node_modules/regenerator-runtime": {
-			"version": "0.13.9",
-			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-			"integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
-		},
 		"node_modules/v8-compile-cache": {
 			"version": "2.3.0",
 			"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
@@ -30209,11 +30205,6 @@
 				"node": ">=6.9.0"
 			}
 		},
-		"node_modules/vue-resize/node_modules/regenerator-runtime": {
-			"version": "0.13.9",
-			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-			"integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
-		},
 		"node_modules/vue-style-loader": {
 			"version": "4.1.3",
 			"resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz",
@@ -38406,6 +38397,11 @@
 					"version": "2.6.12",
 					"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
 					"integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="
+				},
+				"regenerator-runtime": {
+					"version": "0.11.1",
+					"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+					"integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
 				}
 			}
 		},
@@ -51727,9 +51723,9 @@
 			}
 		},
 		"regenerator-runtime": {
-			"version": "0.11.1",
-			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-			"integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
+			"version": "0.13.9",
+			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
+			"integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
 		},
 		"regenerator-transform": {
 			"version": "0.14.5",
@@ -51746,11 +51742,6 @@
 					"requires": {
 						"regenerator-runtime": "^0.13.4"
 					}
-				},
-				"regenerator-runtime": {
-					"version": "0.13.9",
-					"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-					"integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
 				}
 			}
 		},
@@ -55390,11 +55381,6 @@
 					"requires": {
 						"regenerator-runtime": "^0.13.4"
 					}
-				},
-				"regenerator-runtime": {
-					"version": "0.13.9",
-					"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-					"integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
 				}
 			}
 		},
@@ -55745,11 +55731,6 @@
 					"requires": {
 						"regenerator-runtime": "^0.13.4"
 					}
-				},
-				"regenerator-runtime": {
-					"version": "0.13.9",
-					"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-					"integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
 				}
 			}
 		},
diff --git a/package.json b/package.json
index 2dee2e7..996d749 100644
--- a/package.json
+++ b/package.json
@@ -43,6 +43,7 @@
 		"@nextcloud/webpack-vue-config": "^4.1.4",
 		"@vue/cli": "^4.5.15",
 		"@vue/cli-plugin-unit-jest": "^4.5.15",
-		"@vue/test-utils": "^1.3.0"
+		"@vue/test-utils": "^1.3.0",
+		"regenerator-runtime": "^0.13.9"
 	}
 }
diff --git a/src/components/GlobalSettings.vue b/src/components/GlobalSettings.vue
index 7967f8d..5d471ac 100644
--- a/src/components/GlobalSettings.vue
+++ b/src/components/GlobalSettings.vue
@@ -22,8 +22,7 @@
 
 <template>
 	<div>
-		<SettingsSection
-			title="Workflow OCR"
+		<SettingsSection title="Workflow OCR"
 			:description="description"
 			doc-url="https://github.com/R0Wi/workflow_ocr/blob/master/README.md#global-settings">
 			<div class="div-table-row">
diff --git a/src/components/SettingsItem.vue b/src/components/SettingsItem.vue
new file mode 100644
index 0000000..8ca8d7e
--- /dev/null
+++ b/src/components/SettingsItem.vue
@@ -0,0 +1,101 @@
+<!--
+  - @copyright Copyright (c) 2022 Robin Windey <ro.windey@gmail.com>
+  -
+  - @author Robin Windey <ro.windey@gmail.com>
+  -
+  - @license GNU AGPL version 3 or any later version
+  -
+  - This program is free software: you can redistribute it and/or modify
+  - it under the terms of the GNU Affero General Public License as
+  - published by the Free Software Foundation, either version 3 of the
+  - License, or (at your option) any later version.
+  -
+  - This program is distributed in the hope that it will be useful,
+  - but WITHOUT ANY WARRANTY; without even the implied warranty of
+  - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  - GNU Affero General Public License for more details.
+  -
+  - You should have received a copy of the GNU Affero General Public License
+  - along with this program. If not, see <http://www.gnu.org/licenses/>.
+  -
+  -->
+
+<template>
+	<div class="div-table-row outer">
+		<div class="div-table-col div-table-col-left">
+			<span class="leftcol label">{{ label }}
+				<Popover v-if="hasInfoText"
+					trigger="hover focus">
+					<template #trigger>
+						<HelpCircle class="info"
+							:size="20"
+							decorative
+							title="" />
+					</template>
+					<p>{{ infoText }}</p>
+				</Popover>
+			</span>
+			<br>
+		</div>
+		<div class="div-table-col">
+			<slot />
+		</div>
+	</div>
+</template>
+
+<script>
+
+import HelpCircle from 'vue-material-design-icons/HelpCircle'
+import Popover from '@nextcloud/vue/dist/Components/Popover'
+
+export default {
+	name: 'SettingsItem',
+	components: {
+		HelpCircle: HelpCircle,
+		Popover: Popover,
+	},
+	props: {
+		label: {
+			type: String,
+			required: true,
+		},
+		infoText: {
+			type: String,
+			required: false,
+			default: null,
+		},
+	},
+	computed: {
+		hasInfoText: function() {
+			return this.infoText !== null
+		},
+	},
+}
+</script>
+
+<style lang="scss" scoped>
+	.label{
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.info {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 44px;
+		height: 44px;
+		margin: -14px;
+		margin-left: -10px;
+		opacity: .7;
+
+		&:hover, &:focus, &:active {
+			opacity: 1;
+		}
+	}
+
+	.outer {
+		margin-bottom: 10px;
+	}
+</style>
diff --git a/src/components/WorkflowOcr.vue b/src/components/WorkflowOcr.vue
index 4a1aecc..9aec6a2 100644
--- a/src/components/WorkflowOcr.vue
+++ b/src/components/WorkflowOcr.vue
@@ -22,16 +22,31 @@
 
 <template>
 	<div>
-		<Multiselect
-			v-model="selectedLanguages"
-			track-by="langCode"
-			label="label"
-			:tag-width="80"
-			:placeholder="placeholder"
-			:multiple="true"
-			:options="availableLanguages" />
-		<CheckboxRadioSwitch
-			:checked.sync="removeBackground"
+		<SettingsItem label="OCR language"
+			info-text="The language(s) to be used for OCR processing">
+			<Multiselect v-model="selectedLanguages"
+				track-by="langCode"
+				label="label"
+				:tag-width="80"
+				:placeholder="selectedLanguagesPlaceholder"
+				:multiple="true"
+				:options="availableLanguages" />
+		</SettingsItem>
+		<SettingsItem label="Assign tags after OCR"
+			info-text="These tags will be assigned to the file after OCR processing has finished">
+			<MultiselectTags v-model="tagsToAddAfterOcr"
+				:multiple="true">
+				{{ tagsToAddAfterOcr }}
+			</MultiselectTags>
+		</SettingsItem>
+		<SettingsItem label="Remove tags after OCR"
+			info-text="These tags will be removed from the file after OCR processing has finished">
+			<MultiselectTags v-model="tagsToRemoveAfterOcr"
+				:multiple="true">
+				{{ tagsToRemoveAfterOcr }}
+			</MultiselectTags>
+		</SettingsItem>
+		<CheckboxRadioSwitch :checked.sync="removeBackground"
 			type="switch">
 			{{ translate('Remove background') }}
 		</CheckboxRadioSwitch>
@@ -41,7 +56,9 @@
 <script>
 
 import { appId } from '../constants'
+import SettingsItem from './SettingsItem'
 import Multiselect from '@nextcloud/vue/dist/Components/Multiselect'
+import MultiselectTags from '@nextcloud/vue/dist/Components/MultiselectTags'
 import CheckboxRadioSwitch from '@nextcloud/vue/dist/Components/CheckboxRadioSwitch'
 
 const availableLanguages = [
@@ -60,7 +77,9 @@ export default {
 	name: 'WorkflowOcr',
 	components: {
 		Multiselect: Multiselect,
+		MultiselectTags: MultiselectTags,
 		CheckboxRadioSwitch: CheckboxRadioSwitch,
+		SettingsItem: SettingsItem,
 	},
 	props: {
 		// Will be set by the parent (serialized JSON value)
@@ -93,6 +112,28 @@ export default {
 				this.$emit('input', JSON.stringify(model))
 			},
 		},
+		tagsToAddAfterOcr: {
+			get: function() {
+				const model = this.getModel()
+				return model.tagsToAddAfterOcr ?? []
+			},
+			set: function(tagIdArray) {
+				const model = this.getModel()
+				model.tagsToAddAfterOcr = tagIdArray
+				this.$emit('input', JSON.stringify(model))
+			},
+		},
+		tagsToRemoveAfterOcr: {
+			get: function() {
+				const model = this.getModel()
+				return model.tagsToRemoveAfterOcr ?? []
+			},
+			set: function(tagIdArray) {
+				const model = this.getModel()
+				model.tagsToRemoveAfterOcr = tagIdArray
+				this.$emit('input', JSON.stringify(model))
+			},
+		},
 		removeBackground: {
 			get: function() {
 				const model = this.getModel()
@@ -104,7 +145,7 @@ export default {
 				this.$emit('input', JSON.stringify(model))
 			},
 		},
-		placeholder: function() {
+		selectedLanguagesPlaceholder: function() {
 			return this.translate('Select language(s)')
 		},
 	},
@@ -114,6 +155,8 @@ export default {
 			 * Model structure which is captured by NC parent as JSON string:
 			 * {
 			 *   languages: [ 'de', 'en' ],
+			 *   assignTagsAfterOcr: [1, 2, 3],
+			 *   removeTagsAfterOcr: [42, 43],
 			 *   removeBackground: true,
 			 * }
 			 */
diff --git a/src/test/components/SettingsItem.spec.js b/src/test/components/SettingsItem.spec.js
new file mode 100644
index 0000000..3074f4b
--- /dev/null
+++ b/src/test/components/SettingsItem.spec.js
@@ -0,0 +1,40 @@
+import { mount } from '@vue/test-utils'
+import SettingsItem from '../../components/SettingsItem.vue'
+import Popover from '@nextcloud/vue/dist/Components/Popover'
+
+beforeEach(() => {
+	global.t = jest.fn()
+	jest.resetAllMocks()
+})
+
+describe('SettingsItem', () => {
+	test('Should render label, infoText and child-content', () => {
+		const wrapper = mount(SettingsItem, {
+			propsData: {
+				label: 'label',
+				infoText: 'infoText',
+			},
+			slots: {
+				default: '<div class="child-content" />',
+			},
+		})
+		expect(wrapper.find('span.label').text()).toBe('label')
+		expect(wrapper.find('p').text()).toBe('infoText')
+		expect(wrapper.find('.child-content').exists()).toBe(true)
+	})
+
+	test('Should not render info icon if infoText is not set', () => {
+		const wrapper = mount(SettingsItem, {
+			propsData: {
+				label: 'label',
+			},
+			slots: {
+				default: '<div class="child-content" />',
+			},
+		})
+
+		expect(wrapper.find('span.label').text()).toBe('label')
+		expect(wrapper.find('.child-content').exists()).toBe(true)
+		expect(wrapper.findComponent(Popover).exists()).toBe(false)
+	})
+})
diff --git a/src/test/components/WorkflowOcr.spec.js b/src/test/components/WorkflowOcr.spec.js
index 66dcbd2..8be69b0 100644
--- a/src/test/components/WorkflowOcr.spec.js
+++ b/src/test/components/WorkflowOcr.spec.js
@@ -1,6 +1,8 @@
 import { mount } from '@vue/test-utils'
 import WorkflowOcr from '../../components/WorkflowOcr.vue'
+import SettingsItem from '../../components/SettingsItem.vue'
 import Multiselect from '@nextcloud/vue/dist/Components/Multiselect'
+import MultiselectTags from '@nextcloud/vue/dist/Components/MultiselectTags'
 import CheckboxRadioSwitch from '@nextcloud/vue/dist/Components/CheckboxRadioSwitch'
 
 beforeEach(() => {
@@ -69,7 +71,7 @@ describe('Language settings tests', () => {
 		})
 
 		// Simulate user input
-		const multiselect = wrapper.findComponent(Multiselect)
+		const multiselect = wrapper.findAllComponents(SettingsItem).at(0).findComponent(Multiselect)
 		multiselect.vm.$emit('input', [
 			{ label: 'German', langCode: 'de' },
 			{ label: 'English', langCode: 'en' },
@@ -81,6 +83,54 @@ describe('Language settings tests', () => {
 	})
 })
 
+describe('Add/remove tags tests', () => {
+	test('Values assignTagsAfterOcr/removeTagsAfterOcr tags are set to empty array if no value was choosen', () => {
+		const wrapper = mount(WorkflowOcr)
+		expect(wrapper.vm.tagsToAddAfterOcr).toEqual([])
+		expect(wrapper.vm.tagsToRemoveAfterOcr).toEqual([])
+	})
+
+	test('User input for assignTagsAfterOcr is applied correctly on empty component', async () => {
+		const wrapper = mount(WorkflowOcr, {
+			propsData: {
+				value: '{ "languages": [ "de" ], "removeBackground": true }',
+			},
+		})
+
+		const settingsItems = wrapper.findAllComponents(SettingsItem)
+		const assignTagsItem = settingsItems.at(1).findComponent(MultiselectTags)
+
+		// Simulate user input
+		assignTagsItem.vm.$emit('input', [1, 2])
+
+		await wrapper.vm.$nextTick()
+
+		const inputEvent = wrapper.emitted().input
+		expect(inputEvent).toBeTruthy()
+		expect(inputEvent[0][0]).toBe('{"languages":["de"],"removeBackground":true,"tagsToAddAfterOcr":[1,2]}')
+	})
+
+	test('User input for removeTagsAfterOcr is applied correctly on empty component', async () => {
+		const wrapper = mount(WorkflowOcr, {
+			propsData: {
+				value: '{ "languages": [ "de" ], "removeBackground": true }',
+			},
+		})
+
+		const settingsItems = wrapper.findAllComponents(SettingsItem)
+		const removeTagsItem = settingsItems.at(2).findComponent(MultiselectTags)
+
+		// Simulate user input
+		removeTagsItem.vm.$emit('input', [1, 2])
+
+		await wrapper.vm.$nextTick()
+
+		const inputEvent = wrapper.emitted().input
+		expect(inputEvent).toBeTruthy()
+		expect(inputEvent[0][0]).toBe('{"languages":["de"],"removeBackground":true,"tagsToRemoveAfterOcr":[1,2]}')
+	})
+})
+
 describe('Remove background tests', () => {
 	test('RemoveBackground default is false if value is not set', () => {
 		const wrapper = mount(WorkflowOcr)
diff --git a/src/test/setup-jest.js b/src/test/setup-jest.js
new file mode 100644
index 0000000..9589a9f
--- /dev/null
+++ b/src/test/setup-jest.js
@@ -0,0 +1,26 @@
+import {} from 'regenerator-runtime/runtime'
+
+const oc = {
+	getLanguage: function() {
+		return 'en-GB'
+	},
+
+	getLocale: function() {
+		return 'en_GB'
+	},
+
+	isUserAdmin: function() {
+		return true
+	},
+
+	Util: {
+		naturalSortCompare: function(_a, _b) {
+			return 0
+		},
+	},
+}
+
+global.OC = oc
+
+global.TRANSLATIONS = []
+global.SCOPE_VERSION = 1
diff --git a/tests/Unit/Service/OcrServiceTest.php b/tests/Unit/Service/OcrServiceTest.php
index 4f906af..4a4012f 100644
--- a/tests/Unit/Service/OcrServiceTest.php
+++ b/tests/Unit/Service/OcrServiceTest.php
@@ -30,8 +30,10 @@
 use OCA\WorkflowOcr\Service\IGlobalSettingsService;
 use OCA\WorkflowOcr\Service\OcrService;
 use OCP\Files\File;
+use OCP\SystemTag\ISystemTagObjectMapper;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
 
 class OcrServiceTest extends TestCase {
 	
@@ -41,6 +43,10 @@ class OcrServiceTest extends TestCase {
 	private $ocrProcessor;
 	/** @var IGlobalSettingsService|MockObject*/
 	private $globalSettingsService;
+	/** @var ISystemTagObjectMapper|MockObject */
+	private $systemTagObjectMapper;
+	/** @var LoggerInterface|MockObject */
+	private $logger;
 	/** @var OcrService */
 	private $ocrService;
 	/** @var File|MockObject */
@@ -52,9 +58,10 @@ public function setUp() : void {
 		$this->globalSettingsService = $this->createMock(IGlobalSettingsService::class);
 		$this->ocrProcessorFactory = $this->createMock(IOcrProcessorFactory::class);
 		$this->ocrProcessor = $this->createMock(IOcrProcessor::class);
+		$this->systemTagObjectMapper = $this->createMock(ISystemTagObjectMapper::class);
+		$this->logger = $this->createMock(LoggerInterface::class);
 		$this->fileInput = $this->createMock(File::class);
-
-		$this->ocrService = new OcrService($this->ocrProcessorFactory, $this->globalSettingsService);
+		$this->ocrService = new OcrService($this->ocrProcessorFactory, $this->globalSettingsService, $this->systemTagObjectMapper, $this->logger);
 	}
 
 	public function testCallsOcrProcessor_WithCorrectArguments() {
@@ -83,4 +90,77 @@ public function testCallsOcrProcessor_WithCorrectArguments() {
 
 		$this->ocrService->ocrFile($this->fileInput, $settings);
 	}
+
+	public function testCallsSystemTagObjectManager_WithCorrectArguments() {
+		$mime = 'application/pdf';
+		$content = 'someFileContent';
+		$settings = new WorkflowSettings("{\"tagsToRemoveAfterOcr\": [1,2], \"tagsToAddAfterOcr\": [3,4]}");
+		$globalSettings = new GlobalSettings();
+
+		$this->fileInput->method('getMimeType')
+			->willReturn($mime);
+		$this->fileInput->method('getContent')
+			->willReturn($content);
+		$this->fileInput->method('getId')
+			->willReturn(42);
+
+		$this->globalSettingsService->expects($this->once())
+			->method('getGlobalSettings')
+			->willReturn($globalSettings);
+
+		$this->ocrProcessorFactory->expects($this->once())
+			->method('create')
+			->with($mime)
+			->willReturn($this->ocrProcessor);
+
+		// Check call for function:
+		// unassignTags(string $objId, string $objectType, $tagIds);
+		$this->systemTagObjectMapper->expects($this->exactly(2))
+			->method('unassignTags')
+			->withConsecutive(["42", "files", 1], ["42", "files", 2]);
+
+		// Check call for function:
+		// assignTags(string $objId, string $objectType, $tagIds);
+		$this->systemTagObjectMapper->expects($this->exactly(2))
+			->method('assignTags')
+			->withConsecutive(["42", "files", 3], ["42", "files", 4]);
+
+		$this->ocrService->ocrFile($this->fileInput, $settings);
+	}
+
+	public function testCatchesTagNotFoundException() {
+		$mime = 'application/pdf';
+		$content = 'someFileContent';
+		$settings = new WorkflowSettings("{\"tagsToRemoveAfterOcr\": [1], \"tagsToAddAfterOcr\": [2]}");
+		$globalSettings = new GlobalSettings();
+
+		$this->fileInput->method('getMimeType')
+			->willReturn($mime);
+		$this->fileInput->method('getContent')
+			->willReturn($content);
+		$this->fileInput->method('getId')
+			->willReturn(42);
+
+		$this->globalSettingsService->expects($this->once())
+			->method('getGlobalSettings')
+			->willReturn($globalSettings);
+
+		$this->ocrProcessorFactory->expects($this->once())
+			->method('create')
+			->with($mime)
+			->willReturn($this->ocrProcessor);
+
+		$this->systemTagObjectMapper->expects($this->once())
+			->method('unassignTags')
+			->willThrowException(new \OCP\SystemTag\TagNotFoundException());
+
+		$this->systemTagObjectMapper->expects($this->once())
+			->method('assignTags')
+			->willThrowException(new \OCP\SystemTag\TagNotFoundException());
+
+		$this->logger->expects($this->exactly(2))
+			->method('warning');
+		
+		$this->ocrService->ocrFile($this->fileInput, $settings);
+	}
 }
diff --git a/webpack.js b/webpack.js
index 703fe94..33df4b6 100644
--- a/webpack.js
+++ b/webpack.js
@@ -7,4 +7,8 @@ const webpackConfig = require('@nextcloud/webpack-vue-config')
 // Add admin component
 webpackConfig.entry.globalSettings = path.resolve(path.join('src', 'globalSettings.js'))
 
-module.exports = webpackConfig
\ No newline at end of file
+// Makes debugging VUE components possible, see
+// https://v2.vuejs.org/v2/cookbook/debugging-in-vscode.html#Displaying-Source-Code-in-the-Browser
+webpackConfig.devtool = 'source-map'
+
+module.exports = webpackConfig