diff --git a/CHANGELOG.md b/CHANGELOG.md
index 09f89b2767..9fd8aa8a49 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Change Log
 
+## [4.1.11](https://github.com/TheHive-Project/TheHive/milestone/81) (2021-10-06)
+
+**Implemented enhancements:**
+
+- [Feature Request] Add the ability to update type of observable [\#2125](https://github.com/TheHive-Project/TheHive/issues/2125)
+
+**Closed issues:**
+
+- [Bug] Editing Someone Else's Dashboard [\#2212](https://github.com/TheHive-Project/TheHive/issues/2212)
+
+**Fixed bugs:**
+
+- [Bug] Dashboard are shared in read only by default [\#2190](https://github.com/TheHive-Project/TheHive/issues/2190)
+- [Bug] Analyzer reports migration to 4.1.10 problem [\#2203](https://github.com/TheHive-Project/TheHive/issues/2203)
+
 ## [4.1.10](https://github.com/TheHive-Project/TheHive/milestone/79) (2021-08-26)
 
 **Fixed bugs:**
diff --git a/build.sbt b/build.sbt
index dcf8e152e5..660593ad36 100644
--- a/build.sbt
+++ b/build.sbt
@@ -2,7 +2,7 @@ import Dependencies._
 import com.typesafe.sbt.packager.Keys.bashScriptDefines
 import org.thp.ghcl.Milestone
 
-val thehiveVersion         = "4.1.10-1"
+val thehiveVersion         = "4.1.11-1"
 val scala212               = "2.12.13"
 val scala213               = "2.13.1"
 val supportedScalaVersions = List(scala212, scala213)
diff --git a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/JobSrv.scala b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/JobSrv.scala
index 34d5df72bf..7152f60ca6 100644
--- a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/JobSrv.scala
+++ b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/JobSrv.scala
@@ -195,7 +195,7 @@ class JobSrv @Inject() (
         val tags = cortexJob.report.fold[Seq[ReportTag]](Nil)(_.summary.map(_.toAnalyzerTag(job.workerName)))
         for {
           observable <- get(job).observable.getOrFail("Observable")
-          _          <- reportTagSrv.updateTags(observable, job.workerName, tags)
+          _          <- reportTagSrv.updateTags(observable, tags)
         } yield ()
       }
     else Success(())
diff --git a/frontend/app/scripts/controllers/case/CaseObservablesCtrl.js b/frontend/app/scripts/controllers/case/CaseObservablesCtrl.js
index 95d3b631fb..c86a5fe39f 100644
--- a/frontend/app/scripts/controllers/case/CaseObservablesCtrl.js
+++ b/frontend/app/scripts/controllers/case/CaseObservablesCtrl.js
@@ -1,7 +1,7 @@
 (function () {
     'use strict';
     angular.module('theHiveControllers').controller('CaseObservablesCtrl',
-        function ($scope, $q, $state, $stateParams, $filter, $uibModal, SecuritySrv, ModalUtilsSrv, FilteringSrv, StreamSrv, CaseTabsSrv, PaginatedQuerySrv, CaseArtifactSrv, NotificationSrv, AnalyzerSrv, CortexSrv, VersionSrv) {
+        function ($scope, $q, $state, $stateParams, $filter, $uibModal, SecuritySrv, ModalUtilsSrv, FilteringSrv, StreamSrv, CaseTabsSrv, PaginatedQuerySrv, ObservableTypeSrv, CaseArtifactSrv, NotificationSrv, AnalyzerSrv, CortexSrv, VersionSrv) {
 
             CaseTabsSrv.activateTab($state.current.data.tab);
 
@@ -241,6 +241,12 @@
                     resolve: {
                         selection: function () {
                             return $scope.selection.artifacts;
+                        },
+                        dataTypes: function () {
+                            return ObservableTypeSrv.list()
+                                .then(function (response) {
+                                    return response.data;
+                                });
                         }
                     }
                 });
diff --git a/frontend/app/scripts/controllers/case/ObservableUpdateCtrl.js b/frontend/app/scripts/controllers/case/ObservableUpdateCtrl.js
index f596796264..04691a77aa 100644
--- a/frontend/app/scripts/controllers/case/ObservableUpdateCtrl.js
+++ b/frontend/app/scripts/controllers/case/ObservableUpdateCtrl.js
@@ -1,34 +1,49 @@
-(function() {
+(function () {
     'use strict';
     angular.module('theHiveControllers').controller('ObservableUpdateCtrl',
-        function($scope, $uibModalInstance, TagSrv, TaxonomyCacheSrv, selection) {
+        function ($scope, $uibModalInstance, TagSrv, TaxonomyCacheSrv, selection, dataTypes) {
             var self = this;
 
             this.selection = selection;
-            this.state = {
-                all: false,
-                enableTlp: false,
-                enableIoc: false,
-                enableSighted: false,
-                enableIgnoreSimilarity: false,
-                enableAddTags: false,
-                enableRemoveTags: false
-            };
+            this.dataTypes = _.pluck(_.filter(dataTypes, function (item) {
+                return !item.isAttachment
+            }), 'name').sort();
+
+            this.$onInit = function () {
+                this.state = {
+                    all: false,
+                    enableDataType: false,
+                    enableTlp: false,
+                    enableIoc: false,
+                    enableSighted: false,
+                    enableIgnoreSimilarity: false,
+                    enableAddTags: false,
+                    enableRemoveTags: false
+                };
 
-            this.activeTlp = 'active';
-            this.params = {
-                ioc: false,
-                sighted: false,
-                ignoreSimilarity: false,
-                tlp: 2,
-                addTagNames: '',
-                removeTagNames: ''
-            };
+                this.activeTlp = 'active';
+                this.params = {
+                    dataType: null,
+                    ioc: false,
+                    sighted: false,
+                    ignoreSimilarity: false,
+                    tlp: 2,
+                    addTagNames: '',
+                    removeTagNames: ''
+                };
+
+                var selectionTypes = _.unique(_.pluck(this.selection, 'dataType'));
 
-            this.toggleAll = function() {
+                this.canUpdateDataType = selectionTypes.length === 1 && this.dataTypes.indexOf(selectionTypes[0]) !== -1;
+            };
 
+            this.toggleAll = function () {
                 this.state.all = !this.state.all;
 
+                if (this.canUpdateDataType) {
+                    this.state.enableDataType = this.state.all;
+                }
+
                 this.state.enableTlp = this.state.all;
                 this.state.enableIoc = this.state.all;
                 this.state.enableSighted = this.state.all;
@@ -37,14 +52,14 @@
                 this.state.enableRemoveTags = this.state.all;
             };
 
-            this.categorizeObservables = function() {
+            this.categorizeObservables = function () {
                 var data = {
                     withTags: [],
                     withoutTags: []
                 };
 
-                _.each(this.selection, function(item) {
-                    if(item.tags.length > 0) {
+                _.each(this.selection, function (item) {
+                    if (item.tags.length > 0) {
                         data.withTags.push(item);
                     } else {
                         data.withoutTags.push(item);
@@ -54,11 +69,17 @@
                 return data;
             };
 
-            this.buildOperations = function(postData) {
-                var flags = _.pick(postData, 'ioc', 'sighted', 'ignoreSimilarity', 'tlp');
+            this.buildOperations = function (postData) {
+                var flags = {};
+
+                if (this.canUpdateDataType) {
+                    flags = _.pick(postData, 'dataType', 'ioc', 'sighted', 'ignoreSimilarity', 'tlp');
+                } else {
+                    flags = _.pick(postData, 'ioc', 'sighted', 'ignoreSimilarity', 'tlp');
+                }
 
                 // Handle updates without tag changes
-                if(!postData.addTags && !postData.removeTags) {
+                if (!postData.addTags && !postData.removeTags) {
                     return [
                         {
                             ids: _.pluck(this.selection, '_id'),
@@ -70,28 +91,28 @@
                 // Handle update with tag changes
                 var input = this.categorizeObservables();
                 var operations = [];
-                if(input.withoutTags.length > 0) {
-                    var tags = (postData.addTags || []).filter(function(i) {
+                if (input.withoutTags.length > 0) {
+                    var tags = (postData.addTags || []).filter(function (i) {
                         return (postData.removeTags || []).indexOf(i) === -1;
                     });
 
                     operations.push({
                         ids: _.pluck(input.withoutTags, '_id'),
-                        patch: _.extend({}, flags ,{
+                        patch: _.extend({}, flags, {
                             tags: _.unique(tags)
                         })
                     });
                 }
 
-                if(input.withTags.length > 0) {
-                    _.each(input.withTags, function(observable) {
-                        tags = observable.tags.concat(postData.addTags || []).filter(function(i) {
+                if (input.withTags.length > 0) {
+                    _.each(input.withTags, function (observable) {
+                        tags = observable.tags.concat(postData.addTags || []).filter(function (i) {
                             return (postData.removeTags || []).indexOf(i) === -1;
                         });
 
                         operations.push({
                             ids: [observable._id],
-                            patch: _.extend({}, flags ,{
+                            patch: _.extend({}, flags, {
                                 tags: _.unique(tags)
                             })
                         });
@@ -101,49 +122,53 @@
                 return operations;
             };
 
-            this.save = function() {
+            this.save = function () {
 
                 var postData = {};
 
-                if(this.state.enableIoc) {
+                if (this.state.enableDataType && this.canUpdateDataType) {
+                    postData.dataType = this.params.dataType;
+                }
+
+                if (this.state.enableIoc) {
                     postData.ioc = this.params.ioc;
                 }
 
-                if(this.state.enableSighted) {
+                if (this.state.enableSighted) {
                     postData.sighted = this.params.sighted;
                 }
 
-                if(this.state.enableIgnoreSimilarity) {
+                if (this.state.enableIgnoreSimilarity) {
                     postData.ignoreSimilarity = this.params.ignoreSimilarity;
                 }
 
-                if(this.state.enableTlp) {
+                if (this.state.enableTlp) {
                     postData.tlp = this.params.tlp;
                 }
 
-                if(this.state.enableAddTags) {
+                if (this.state.enableAddTags) {
                     postData.addTags = _.pluck(this.params.addTags, 'text');
                 }
 
-                if(this.state.enableRemoveTags) {
+                if (this.state.enableRemoveTags) {
                     postData.removeTags = _.pluck(this.params.removeTags, 'text');
                 }
 
                 $uibModalInstance.close(this.buildOperations(postData));
             };
 
-            this.cancel = function() {
+            this.cancel = function () {
                 $uibModalInstance.dismiss();
             };
 
-            this.getTags = function(query) {
+            this.getTags = function (query) {
                 return TagSrv.autoComplete(query);
             };
 
-            self.fromTagLibrary = function(field) {
+            self.fromTagLibrary = function (field) {
                 TaxonomyCacheSrv.openTagLibrary()
-                    .then(function(tags){
-                        if(field === 'add') {
+                    .then(function (tags) {
+                        if (field === 'add') {
                             self.params.addTags = (self.params.addTags || []).concat(tags);
                             self.toggleAddTags();
                         } else if (field === 'remove') {
@@ -153,40 +178,49 @@
                     })
             };
 
-            this.toogleIoc = function() {
+            this.toggleDataType = function () {
+                if (!this.params.dataType || this.params.dataType.length === 0) {
+                    this.params.dataType = null;
+                    this.state.enableDataType = false;
+                } else {
+                    this.state.enableDataType = true;
+                }
+            };
+
+            this.toogleIoc = function () {
                 this.params.ioc = !this.params.ioc;
                 this.state.enableIoc = true;
             };
 
-            this.toogleSighted = function() {
+            this.toogleSighted = function () {
                 this.params.sighted = !this.params.sighted;
                 this.state.enableSighted = true;
             };
 
-            this.toogleIgnoreSimilarity = function() {
+            this.toogleIgnoreSimilarity = function () {
                 this.params.ignoreSimilarity = !this.params.ignoreSimilarity;
                 this.state.enableIgnoreSimilarity = true;
             };
 
-            this.toggleTlp = function(value) {
+            this.toggleTlp = function (value) {
                 this.params.tlp = value;
                 this.activeTlp = 'active';
                 this.state.enableTlp = true;
             };
 
-            this.toggleAddTags = function() {
+            this.toggleAddTags = function () {
                 this.state.enableAddTags = true;
             };
 
-            this.toggleRemoveTags = function() {
+            this.toggleRemoveTags = function () {
                 this.state.enableRemoveTags = true;
             };
 
-            $scope.$watchCollection('$dialog.params.addTags', function(value) {
+            $scope.$watchCollection('$dialog.params.addTags', function (value) {
                 self.params.addTagNames = _.pluck(value, 'text').join(',');
             });
 
-            $scope.$watchCollection('$dialog.params.removeTags', function(value) {
+            $scope.$watchCollection('$dialog.params.removeTags', function (value) {
                 self.params.removeTagNames = _.pluck(value, 'text').join(',');
             });
         }
diff --git a/frontend/app/views/partials/observables/observable.update.html b/frontend/app/views/partials/observables/observable.update.html
index ebb3dc5bf1..1a7aac2b46 100644
--- a/frontend/app/views/partials/observables/observable.update.html
+++ b/frontend/app/views/partials/observables/observable.update.html
@@ -5,67 +5,94 @@ <h3 class="modal-title">Update observable(s)</h3>
 
     <div class="modal-body">
         <p class="mb-xs">
-            Select the changes you want to apply to the selected observables. (<a href ng-click="$dialog.toggleAll()">{{$dialog.state.all ? 'Uncheck All' : 'Check all'}}</a>)
+            Select the changes you want to apply to the selected observables. (<a href
+                ng-click="$dialog.toggleAll()">{{$dialog.state.all ? 'Uncheck All' : 'Check all'}}</a>)
         </p>
 
+        <div class="form-group" ng-if="$dialog.canUpdateDataType">
+            <label class="col-md-3 control-label">Data Type <input class="ml-xxs" type="checkbox"
+                    ng-model="$dialog.state.enableDataType"></label>
+            <div class="col-md-9">
+                <select class="form-control" ng-options="v for v in $dialog.dataTypes"
+                    ng-model="$dialog.params.dataType" ng-change="$dialog.toggleDataType(newValue)">
+                    <option value=""></option>
+                </select>
+            </div>
+        </div>
+
         <div class="form-group">
-            <label class="col-md-3 control-label">TLP <input class="ml-xxs" type="checkbox" ng-model="$dialog.state.enableTlp"></label>
+            <label class="col-md-3 control-label">TLP <input class="ml-xxs" type="checkbox"
+                    ng-model="$dialog.state.enableTlp"></label>
             <div class="col-md-9">
                 <p class="form-control-static">
                     <a href ng-click="$dialog.activeTlp = 'active'">
-                        <tlp value="$dialog.params.tlp" format="$dialog.activeTlp" on-update="$dialog.toggleTlp(newValue)" class="form-control-static"></tlp>
+                        <tlp value="$dialog.params.tlp" format="$dialog.activeTlp"
+                            on-update="$dialog.toggleTlp(newValue)" class="form-control-static"></tlp>
                     </a>
                 </p>
             </div>
         </div>
 
         <div class="form-group">
-            <label class="col-md-3 control-label">Is IOC <input class="ml-xxs" type="checkbox" ng-model="$dialog.state.enableIoc"></label>
+            <label class="col-md-3 control-label">Is IOC <input class="ml-xxs" type="checkbox"
+                    ng-model="$dialog.state.enableIoc"></label>
             <div class="col-md-9">
                 <p class="form-control-static">
                     <a href ng-click="$dialog.toogleIoc()">
-                        <i class="text-primary fa" ng-class="{ 'fa-star' : $dialog.params.ioc, 'fa-star-o' : !$dialog.params.ioc }"></i>
+                        <i class="text-primary fa"
+                            ng-class="{ 'fa-star' : $dialog.params.ioc, 'fa-star-o' : !$dialog.params.ioc }"></i>
                     </a>
                 </p>
             </div>
         </div>
 
         <div class="form-group">
-            <label class="col-md-3 control-label">Has been sighted <input class="ml-xxs" type="checkbox" ng-model="$dialog.state.enableSighted"></label>
+            <label class="col-md-3 control-label">Has been sighted <input class="ml-xxs" type="checkbox"
+                    ng-model="$dialog.state.enableSighted"></label>
             <div class="col-md-9">
                 <p class="form-control-static">
                     <a href ng-click="$dialog.toogleSighted()">
-                        <i class="text-primary fa" ng-class="{ 'fa-toggle-on' : $dialog.params.sighted, 'fa-toggle-off' : !$dialog.params.sighted }"></i>
+                        <i class="text-primary fa"
+                            ng-class="{ 'fa-toggle-on' : $dialog.params.sighted, 'fa-toggle-off' : !$dialog.params.sighted }"></i>
                     </a>
                 </p>
             </div>
         </div>
 
         <div class="form-group">
-            <label class="col-md-3 control-label">Ignored for similarity <input class="ml-xxs" type="checkbox" ng-model="$dialog.state.enableIgnoreSimilarity"></label>
+            <label class="col-md-3 control-label">Ignored for similarity <input class="ml-xxs" type="checkbox"
+                    ng-model="$dialog.state.enableIgnoreSimilarity"></label>
             <div class="col-md-9">
                 <p class="form-control-static">
                     <a href ng-click="$dialog.toogleIgnoreSimilarity()">
-                        <i class="text-primary fa" ng-class="{ 'fa-chain-broken' : $dialog.params.ignoreSimilarity, 'fa-chain' : !$dialog.params.ignoreSimilarity }"></i>
+                        <i class="text-primary fa"
+                            ng-class="{ 'fa-chain-broken' : $dialog.params.ignoreSimilarity, 'fa-chain' : !$dialog.params.ignoreSimilarity }"></i>
                     </a>
                 </p>
             </div>
         </div>
 
-        <div class="form-group" ng-class="{ 'has-error' : observableForm.addTags.$invalid && !observableForm.addTagsInput.$pristine }">
-            <label class="col-md-3 control-label">Add Tags <input class="ml-xxs" type="checkbox" ng-model="$dialog.state.enableAddTags"></label>
+        <div class="form-group"
+            ng-class="{ 'has-error' : observableForm.addTags.$invalid && !observableForm.addTagsInput.$pristine }">
+            <label class="col-md-3 control-label">Add Tags <input class="ml-xxs" type="checkbox"
+                    ng-model="$dialog.state.enableAddTags"></label>
             <div class="col-md-9">
-                <input type="hidden" name="addTags" ng-model="$dialog.params.addTagNames" ng-required="$dialog.state.enableAddTags"/>
+                <input type="hidden" name="addTags" ng-model="$dialog.params.addTagNames"
+                    ng-required="$dialog.state.enableAddTags" />
 
                 <div class="input-group">
-                    <tags-input name="addTagsInput" ng-model="$dialog.params.addTags" class="ti-input-sm ti-tag-selector"
-                        placeholder="Add tags" replace-spaces-with-dashes="false" min-length="2"
-                        on-tag-added="$dialog.toggleAddTags()" template="views/directives/tag-input-item.html">
-                        <auto-complete min-length="3" debounce-delay="400" source="$dialog.getTags($query)"></auto-complete>
+                    <tags-input name="addTagsInput" ng-model="$dialog.params.addTags"
+                        class="ti-input-sm ti-tag-selector" placeholder="Add tags" replace-spaces-with-dashes="false"
+                        min-length="2" on-tag-added="$dialog.toggleAddTags()"
+                        template="views/directives/tag-input-item.html">
+                        <auto-complete min-length="3" debounce-delay="400" source="$dialog.getTags($query)">
+                        </auto-complete>
                     </tags-input>
 
                     <span class="input-group-btn vtop">
-                        <button type="button" class="btn btn-block btn-sm btn-primary" ng-click="$dialog.fromTagLibrary('add')" uib-tooltip="Add tag from library" tooltip-placement="left">
+                        <button type="button" class="btn btn-block btn-sm btn-primary"
+                            ng-click="$dialog.fromTagLibrary('add')" uib-tooltip="Add tag from library"
+                            tooltip-placement="left">
                             <span class="fa fa-plus"></span>
                         </button>
                     </span>
@@ -74,19 +101,26 @@ <h3 class="modal-title">Update observable(s)</h3>
             </div>
         </div>
 
-        <div class="form-group" ng-class="{ 'has-error' : observableForm.removeTags.$invalid && !observableForm.removeTagsInput.$pristine }">
-            <label class="col-md-3 control-label">Remove Tags <input class="ml-xxs" type="checkbox" ng-model="$dialog.state.enableRemoveTags"></label>
+        <div class="form-group"
+            ng-class="{ 'has-error' : observableForm.removeTags.$invalid && !observableForm.removeTagsInput.$pristine }">
+            <label class="col-md-3 control-label">Remove Tags <input class="ml-xxs" type="checkbox"
+                    ng-model="$dialog.state.enableRemoveTags"></label>
             <div class="col-md-9">
-                <input type="hidden" name="removeTags" ng-model="$dialog.params.removeTagNames" ng-required="$dialog.state.enableRemoveTags"/>
+                <input type="hidden" name="removeTags" ng-model="$dialog.params.removeTagNames"
+                    ng-required="$dialog.state.enableRemoveTags" />
                 <div class="input-group">
-                    <tags-input name="removeTagsInput" ng-model="$dialog.params.removeTags" class="ti-input-sm ti-tag-selector"
-                        placeholder="Remove tags" replace-spaces-with-dashes="false" min-length="2"
-                        on-tag-added="$dialog.toggleRemoveTags()" template="views/directives/tag-input-item.html">
-                        <auto-complete min-length="3" debounce-delay="400" source="$dialog.getTags($query)"></auto-complete>
+                    <tags-input name="removeTagsInput" ng-model="$dialog.params.removeTags"
+                        class="ti-input-sm ti-tag-selector" placeholder="Remove tags" replace-spaces-with-dashes="false"
+                        min-length="2" on-tag-added="$dialog.toggleRemoveTags()"
+                        template="views/directives/tag-input-item.html">
+                        <auto-complete min-length="3" debounce-delay="400" source="$dialog.getTags($query)">
+                        </auto-complete>
                     </tags-input>
 
                     <span class="input-group-btn vtop">
-                        <button type="button" class="btn btn-block btn-sm btn-primary" ng-click="$dialog.fromTagLibrary('remove')" uib-tooltip="Add tag from library" tooltip-placement="left">
+                        <button type="button" class="btn btn-block btn-sm btn-primary"
+                            ng-click="$dialog.fromTagLibrary('remove')" uib-tooltip="Add tag from library"
+                            tooltip-placement="left">
                             <span class="fa fa-plus"></span>
                         </button>
                     </span>
@@ -100,6 +134,7 @@ <h3 class="modal-title">Update observable(s)</h3>
 
     <div class="modal-footer text-left">
         <button class="btn btn-default" ng-click="$dialog.cancel()" type="button">Cancel</button>
-        <button class="btn btn-primary pull-right" ng-disabled="observableForm.$invalid" type="submit">Update observable(s)</button>
+        <button class="btn btn-primary pull-right" ng-disabled="observableForm.$invalid" type="submit">Update
+            observable(s)</button>
     </div>
 </form>
diff --git a/frontend/bower.json b/frontend/bower.json
index 563556caf8..09c88c068e 100644
--- a/frontend/bower.json
+++ b/frontend/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "thehive",
-  "version": "4.1.10-1",
+  "version": "4.1.11-1",
   "license": "AGPL-3.0",
   "dependencies": {
     "jquery": "^3.4.1",
diff --git a/frontend/package.json b/frontend/package.json
index 459306335f..cf156ca1df 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
     "name": "thehive",
-    "version": "4.1.10-1",
+    "version": "4.1.11-1",
     "license": "AGPL-3.0",
     "repository": {
         "type": "git",
diff --git a/migration/src/main/scala/org/thp/thehive/migration/Migrate.scala b/migration/src/main/scala/org/thp/thehive/migration/Migrate.scala
index 32d32e2267..8bf1397ba5 100644
--- a/migration/src/main/scala/org/thp/thehive/migration/Migrate.scala
+++ b/migration/src/main/scala/org/thp/thehive/migration/Migrate.scala
@@ -60,7 +60,7 @@ object Migrate extends App with MigrationOps {
         .valueName("http://ip1:port,ip2:port")
         .text("TheHive3 ElasticSearch URI")
         .action((u, c) => addConfig(c, "input.search.uri", u)),
-      opt[String]('i', "es-index")
+      opt[String]('e', "es-index")
         .valueName("<index>")
         .text("TheHive3 ElasticSearch index name")
         .action((i, c) => addConfig(c, "input.search.index", i)),
diff --git a/migration/src/main/scala/org/thp/thehive/migration/dto/InputObservable.scala b/migration/src/main/scala/org/thp/thehive/migration/dto/InputObservable.scala
index 2fb3a179c4..a4154c54fe 100644
--- a/migration/src/main/scala/org/thp/thehive/migration/dto/InputObservable.scala
+++ b/migration/src/main/scala/org/thp/thehive/migration/dto/InputObservable.scala
@@ -1,10 +1,11 @@
 package org.thp.thehive.migration.dto
 
-import org.thp.thehive.models.Observable
+import org.thp.thehive.models.{Observable, ReportTag}
 
 case class InputObservable(
     metaData: MetaData,
     observable: Observable,
     organisations: Set[String],
-    dataOrAttachment: Either[String, InputAttachment]
+    dataOrAttachment: Either[String, InputAttachment],
+    reportTags: Seq[ReportTag]
 )
diff --git a/migration/src/main/scala/org/thp/thehive/migration/th3/Conversion.scala b/migration/src/main/scala/org/thp/thehive/migration/th3/Conversion.scala
index 1189893faf..575a119432 100644
--- a/migration/src/main/scala/org/thp/thehive/migration/th3/Conversion.scala
+++ b/migration/src/main/scala/org/thp/thehive/migration/th3/Conversion.scala
@@ -10,9 +10,11 @@ import org.thp.thehive.dto.v1.InputCustomFieldValue
 import org.thp.thehive.migration.dto._
 import org.thp.thehive.models._
 import play.api.libs.functional.syntax._
+import play.api.libs.json.JsValue.jsValueToJsLookup
 import play.api.libs.json._
 
 import java.util.{Base64, Date}
+import scala.util.Try
 
 case class Attachment(name: String, hashes: Seq[Hash], size: Long, contentType: String, id: String)
 trait Conversion {
@@ -101,6 +103,24 @@ trait Conversion {
     )
   }
 
+  implicit val taxonomiesReads: Reads[Seq[ReportTag]] = Reads.JsObjectReads.map { input =>
+    input.fields.flatMap {
+      case (origin, value) =>
+        (value \ "taxonomies")
+          .asOpt[Seq[JsValue]]
+          .getOrElse(Nil)
+          .flatMap { taxonomy =>
+            for {
+              namespace <- (taxonomy \ "namespace").asOpt[String]
+              predicate <- (taxonomy \ "predicate").asOpt[String]
+              value = (taxonomy \ "value").getOrElse(JsNull)
+              levelName <- (taxonomy \ "level").asOpt[String]
+              level     <- Try(ReportTagLevel.withName(levelName)).toOption
+            } yield ReportTag(origin, level, namespace, predicate, value)
+          }
+    }
+  }
+
   implicit val observableReads: Reads[InputObservable] = Reads[InputObservable] { json =>
     for {
       metaData <- json.validate[MetaData]
@@ -110,6 +130,7 @@ trait Conversion {
       sighted  <- (json \ "sighted").validate[Boolean]
       dataType <- (json \ "dataType").validate[String]
       tags = (json \ "tags").asOpt[Set[String]].getOrElse(Set.empty)
+      taxonomiesList <- Json.parse((json \ "reports").asOpt[String].getOrElse("{}")).validate[Seq[ReportTag]]
       dataOrAttachment <-
         (json \ "data")
           .validate[String]
@@ -131,7 +152,8 @@ trait Conversion {
         tags = tags.toSeq
       ),
       Set(mainOrganisation),
-      dataOrAttachment
+      dataOrAttachment,
+      taxonomiesList
     )
   }
 
@@ -258,7 +280,8 @@ trait Conversion {
           tags = tags.toSeq
         ),
         Set(mainOrganisation),
-        dataOrAttachment
+        dataOrAttachment,
+        Nil
       )
 
     }
@@ -429,8 +452,8 @@ trait Conversion {
     for {
       metaData         <- json.validate[MetaData]
       workerId         <- (json \ "analyzerId").validate[String]
-      workerName       <- (json \ "analyzerId").validate[String]
-      workerDefinition <- (json \ "analyzerId").validate[String]
+      workerName       <- (json \ "analyzerName").validate[String]
+      workerDefinition <- (json \ "analyzerDefinition").validate[String]
       status           <- (json \ "status").validate[JobStatus.Value]
       startDate        <- (json \ "createdAt").validate[Date]
       endDate          <- (json \ "endDate").validate[Date]
@@ -484,7 +507,8 @@ trait Conversion {
           tags = tags.toSeq
         ),
         Set(mainOrganisation),
-        dataOrAttachment
+        dataOrAttachment,
+        Nil
       )
     }
 
diff --git a/migration/src/main/scala/org/thp/thehive/migration/th4/Output.scala b/migration/src/main/scala/org/thp/thehive/migration/th4/Output.scala
index 89a97b32a3..7ae698c83b 100644
--- a/migration/src/main/scala/org/thp/thehive/migration/th4/Output.scala
+++ b/migration/src/main/scala/org/thp/thehive/migration/th4/Output.scala
@@ -93,6 +93,7 @@ class Output @Inject() (
     caseSrv: CaseSrv,
     observableSrvProvider: Provider[ObservableSrv],
     dataSrv: DataSrv,
+    reportTagSrv: ReportTagSrv,
     userSrv: UserSrv,
     tagSrv: TagSrv,
     caseTemplateSrv: CaseTemplateSrv,
@@ -697,6 +698,7 @@ class Output @Inject() (
       for {
         organisations  <- inputObservable.organisations.toTry(getOrganisation)
         richObservable <- createObservable(caseId, inputObservable, organisations.map(_._id).toSet)
+        _              <- reportTagSrv.updateTags(richObservable, inputObservable.reportTags)
         case0          <- getCase(caseId)
         _              <- organisations.toTry(o => shareSrv.shareObservable(RichObservable(richObservable, None, None, Nil), case0, o._id))
       } yield IdMapping(inputObservable.metaData.id, richObservable._id)
@@ -730,6 +732,7 @@ class Output @Inject() (
     authTransaction(inputAlert.metaData.createdBy) { implicit graph => implicit authContext =>
       logger.debug(s"Create alert ${inputAlert.alert.`type`}:${inputAlert.alert.source}:${inputAlert.alert.sourceRef}")
       val `case` = inputAlert.caseId.flatMap(c => getCase(EntityId.read(c)).toOption)
+
       for {
         organisation <- getOrganisation(inputAlert.organisation)
         createdAlert <- alertSrv.createEntity(inputAlert.alert.copy(organisationId = organisation._id, caseId = `case`.fold(EntityId.empty)(_._id)))
diff --git a/thehive/app/org/thp/thehive/controllers/v0/DashboardCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/DashboardCtrl.scala
index 5224dfa4f3..c012d820a8 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/DashboardCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/DashboardCtrl.scala
@@ -38,7 +38,7 @@ class DashboardCtrl @Inject() (
           .flatMap {
             case richDashboard if dashboard.status == "Shared" =>
               dashboardSrv
-                .share(richDashboard.dashboard, request.organisation, writable = false)
+                .share(richDashboard.dashboard, request.organisation, writable = true)
                 .flatMap(_ => dashboardSrv.get(richDashboard.dashboard).richDashboard.getOrFail("Dashboard"))
             case richDashboard => Success(richDashboard)
           }
diff --git a/thehive/app/org/thp/thehive/controllers/v0/ObservableCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/ObservableCtrl.scala
index 70ae84b648..e42332554d 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/ObservableCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/ObservableCtrl.scala
@@ -358,6 +358,7 @@ class ObservableCtrl @Inject() (
 
 @Singleton
 class PublicObservable @Inject() (
+    observableTypeSrv: ObservableTypeSrv,
     observableSrv: ObservableSrv,
     organisationSrv: OrganisationSrv
 ) extends PublicData
@@ -424,7 +425,16 @@ class PublicObservable @Inject() (
     )
     .property("message", UMapping.string)(_.field.updatable)
     .property("tlp", UMapping.int)(_.field.updatable)
-    .property("dataType", UMapping.string)(_.field.readonly)
+    .property("dataType", UMapping.string)(_.field.custom { (_, value, vertex, graph, _) =>
+      val observable = observableSrv.model.converter(vertex)
+      for {
+        currentDataType <- observableTypeSrv.getByName(observable.dataType)(graph).getOrFail("ObservableType")
+        newDataType     <- observableTypeSrv.getByName(value)(graph).getOrFail("ObservableType")
+        isSameType = currentDataType.isAttachment == newDataType.isAttachment
+        _ <- if (isSameType) Success(()) else Failure(BadRequestError("Can not update dataType: isAttachment does not match"))
+        _ <- Try(observableSrv.get(vertex)(graph).update(_.dataType, value).iterate())
+      } yield Json.obj("dataType" -> value)
+    })
     .property("data", UMapping.string.optional)(_.field.readonly)
     .property("attachment.name", UMapping.string.optional)(_.select(_.attachments.value(_.name)).readonly)
     .property("attachment.hashes", UMapping.hash.sequence)(_.select(_.attachments.value(_.hashes)).readonly)
diff --git a/thehive/app/org/thp/thehive/controllers/v1/DashboardCtrl.scala b/thehive/app/org/thp/thehive/controllers/v1/DashboardCtrl.scala
index 7b539e105b..3f358942bd 100644
--- a/thehive/app/org/thp/thehive/controllers/v1/DashboardCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v1/DashboardCtrl.scala
@@ -63,7 +63,7 @@ class DashboardCtrl @Inject() (
           .flatMap {
             case richDashboard if dashboard.status == "Shared" =>
               dashboardSrv
-                .share(richDashboard.dashboard, request.organisation, writable = false)
+                .share(richDashboard.dashboard, request.organisation, writable = true)
                 .flatMap(_ => dashboardSrv.get(richDashboard.dashboard).richDashboard.getOrFail("Dashboard"))
             case richDashboard => Success(richDashboard)
           }
diff --git a/thehive/app/org/thp/thehive/controllers/v1/Properties.scala b/thehive/app/org/thp/thehive/controllers/v1/Properties.scala
index a262ff3bf0..4992217ba7 100644
--- a/thehive/app/org/thp/thehive/controllers/v1/Properties.scala
+++ b/thehive/app/org/thp/thehive/controllers/v1/Properties.scala
@@ -28,7 +28,7 @@ import org.thp.thehive.services._
 import play.api.libs.json.{JsObject, JsValue, Json}
 
 import javax.inject.{Inject, Singleton}
-import scala.util.Failure
+import scala.util.{Failure, Success, Try}
 
 @Singleton
 class Properties @Inject() (
@@ -39,6 +39,7 @@ class Properties @Inject() (
     dashboardSrv: DashboardSrv,
     caseTemplateSrv: CaseTemplateSrv,
     observableSrv: ObservableSrv,
+    observableTypeSrv: ObservableTypeSrv,
     customFieldSrv: CustomFieldSrv,
     organisationSrv: OrganisationSrv,
     db: Database
@@ -440,7 +441,16 @@ class Properties @Inject() (
       )
       .property("message", UMapping.string)(_.field.updatable)
       .property("tlp", UMapping.int)(_.field.updatable)
-      .property("dataType", UMapping.string)(_.field.readonly)
+      .property("dataType", UMapping.string)(_.field.custom { (_, value, vertex, graph, _) =>
+        val observable = observableSrv.model.converter(vertex)
+        for {
+          currentDataType <- observableTypeSrv.getByName(observable.dataType)(graph).getOrFail("ObservableType")
+          newDataType     <- observableTypeSrv.getByName(value)(graph).getOrFail("ObservableType")
+          isSameType = currentDataType.isAttachment == newDataType.isAttachment
+          _ <- if (isSameType) Success(()) else Failure(BadRequestError("Can not update dataType: isAttachment does not match"))
+          _ <- Try(observableSrv.get(vertex)(graph).update(_.dataType, value).iterate())
+        } yield Json.obj("dataType" -> value)
+      })
       .property("data", UMapping.string.optional)(_.field.readonly)
       .property("attachment.name", UMapping.string.optional)(_.select(_.attachments.value(_.name)).readonly)
       .property("attachment.hashes", UMapping.hash.sequence)(_.select(_.attachments.value(_.hashes)).readonly)
diff --git a/thehive/app/org/thp/thehive/services/ReportTagSrv.scala b/thehive/app/org/thp/thehive/services/ReportTagSrv.scala
index ef2c33d214..bc622d5f6f 100644
--- a/thehive/app/org/thp/thehive/services/ReportTagSrv.scala
+++ b/thehive/app/org/thp/thehive/services/ReportTagSrv.scala
@@ -17,11 +17,13 @@ import scala.util.Try
 class ReportTagSrv @Inject() (observableSrv: ObservableSrv) extends VertexSrv[ReportTag] {
   val observableReportTagSrv = new EdgeSrv[ObservableReportTag, Observable, ReportTag]
 
-  def updateTags(observable: Observable with Entity, origin: String, reportTags: Seq[ReportTag])(implicit
+  def updateTags(observable: Observable with Entity, reportTags: Seq[ReportTag])(implicit
       graph: Graph,
       authContext: AuthContext
   ): Try[Unit] = {
-    observableSrv.get(observable).reportTags.fromOrigin(origin).remove()
+    reportTags.map(_.origin).distinct.foreach { origin =>
+      observableSrv.get(observable).reportTags.fromOrigin(origin).remove()
+    }
     reportTags
       .toTry { tag =>
         createEntity(tag).flatMap(t => observableReportTagSrv.create(ObservableReportTag(), observable, t))